diff options
author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2016-04-13 10:07:19 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2016-04-13 11:34:32 +0000 |
commit | 0de868cd0f430efc6256926c2865530818d7b7dd (patch) | |
tree | 60e681b0e119d50022500fbc0f91cbdd4d7c979c /sot | |
parent | 19b34c0039c6293f9b37aa70f8055aa2be28ba09 (diff) |
tdf#94306 replace boost::noncopyable in sfx2 to sot
Replace with C++11 delete copy-constructur
and copy-assignment.
Remove boost/noncopyable.hpp includes.
Add missing default ctors.
Make some overloaded ctors explicit,
seems cppcheck doesn't flag: T(const template<X>& rx).
Change-Id: I63c5a3ac84a33ea6d49868e2d9aa281ada79958e
Reviewed-on: https://gerrit.libreoffice.org/24050
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'sot')
-rw-r--r-- | sot/source/sdstor/stgcache.hxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sot/source/sdstor/stgcache.hxx b/sot/source/sdstor/stgcache.hxx index d0ac5c89494e..bc8511b64be8 100644 --- a/sot/source/sdstor/stgcache.hxx +++ b/sot/source/sdstor/stgcache.hxx @@ -25,7 +25,6 @@ #include <tools/solar.h> #include <tools/stream.hxx> #include <stgelem.hxx> -#include <boost/noncopyable.hpp> #include <salhelper/simplereferenceobject.hxx> #include <unordered_map> #include <functional> @@ -95,7 +94,7 @@ public: void Clear(); // clear the cache }; -class StgPage : public salhelper::SimpleReferenceObject, private boost::noncopyable +class StgPage : public salhelper::SimpleReferenceObject { const sal_Int32 mnPage; // page index sal_uInt8* mpData; // nSize bytes @@ -103,6 +102,8 @@ class StgPage : public salhelper::SimpleReferenceObject, private boost::noncopya StgPage( short nData, sal_Int32 nPage ); virtual ~StgPage(); public: + StgPage(const StgPage&) = delete; + StgPage& operator=(const StgPage&) = delete; static rtl::Reference< StgPage > Create( short nData, sal_Int32 nPage ); sal_Int32 GetPage() { return mnPage; } |