diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2016-04-13 10:11:37 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-04-13 11:19:04 +0000 |
| commit | 97abbec95665b43a9a09e10a0fb31854cdbd5c0d (patch) | |
| tree | b6917d80775c411a5480febd77b89fb256203b6a /toolkit | |
| parent | 9a2ff36b51f86ca3ade8093d7698314c0d3db6a6 (diff) | |
tdf#94306 replace boost::noncopyable in stoc to xmlsec..
Replace with C++11 delete copy-constructur
and copy-assignment.
Remove boost/noncopyable.hpp includes.
Add missing default ctors.
With this commit there should be no users
of boost::noncopyable left.
Change-Id: I6b1e47824912a6a80cc3f00f34938ebc048d8975
Reviewed-on: https://gerrit.libreoffice.org/24051
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/source/awt/asynccallback.cxx | 6 | ||||
| -rw-r--r-- | toolkit/source/controls/unocontrol.cxx | 5 | ||||
| -rw-r--r-- | toolkit/source/helper/accessibilityclient.cxx | 6 |
3 files changed, 9 insertions, 8 deletions
diff --git a/toolkit/source/awt/asynccallback.cxx b/toolkit/source/awt/asynccallback.cxx index 0064dda518e4..2d30afedc206 100644 --- a/toolkit/source/awt/asynccallback.cxx +++ b/toolkit/source/awt/asynccallback.cxx @@ -19,7 +19,6 @@ #include <sal/config.h> -#include <boost/noncopyable.hpp> #include <vcl/svapp.hxx> #include "osl/mutex.hxx" #include "cppuhelper/factory.hxx" @@ -36,11 +35,12 @@ namespace { class AsyncCallback: public ::cppu::WeakImplHelper< css::lang::XServiceInfo, - css::awt::XRequestCallback>, - private boost::noncopyable + css::awt::XRequestCallback> { public: AsyncCallback() {} + AsyncCallback(const AsyncCallback&) = delete; + AsyncCallback& operator=(const AsyncCallback&) = delete; // css::lang::XServiceInfo: virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx index a76c26e08e45..c6d79b8e2762 100644 --- a/toolkit/source/controls/unocontrol.cxx +++ b/toolkit/source/controls/unocontrol.cxx @@ -19,7 +19,6 @@ #include <sal/config.h> -#include <boost/noncopyable.hpp> #include <com/sun/star/awt/XControlContainer.hpp> #include <com/sun/star/awt/WindowAttribute.hpp> #include <com/sun/star/awt/VclWindowPeerAttribute.hpp> @@ -95,7 +94,7 @@ static Sequence< OUString> lcl_ImplGetPropertyNames( const Reference< XMultiProp } -class VclListenerLock: private boost::noncopyable +class VclListenerLock { private: VCLXWindow* m_pLockWindow; @@ -112,6 +111,8 @@ public: if ( m_pLockWindow ) m_pLockWindow->resumeVclEventListening( ); } + VclListenerLock(const VclListenerLock&) = delete; + VclListenerLock& operator=(const VclListenerLock&) = delete; }; typedef ::std::map< OUString, sal_Int32 > MapString2Int; diff --git a/toolkit/source/helper/accessibilityclient.cxx b/toolkit/source/helper/accessibilityclient.cxx index 7be84b29a9fc..d004ba7edd0c 100644 --- a/toolkit/source/helper/accessibilityclient.cxx +++ b/toolkit/source/helper/accessibilityclient.cxx @@ -21,8 +21,6 @@ #include <sal/config.h> -#include <boost/noncopyable.hpp> - #include <toolkit/helper/accessiblefactory.hxx> #include <osl/module.h> #include <osl/diagnose.h> @@ -51,10 +49,12 @@ namespace toolkit //= AccessibleDummyFactory class AccessibleDummyFactory: - public IAccessibleFactory, private boost::noncopyable + public IAccessibleFactory { public: AccessibleDummyFactory(); + AccessibleDummyFactory(const AccessibleDummyFactory&) = delete; + AccessibleDummyFactory& operator=(const AccessibleDummyFactory&) = delete; protected: virtual ~AccessibleDummyFactory(); |