diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2016-04-08 14:58:51 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2016-04-08 17:42:57 +0000 |
| commit | 922ee9a9da62febfe38a7780b11cf0d7ea0d5685 (patch) | |
| tree | c9e59d34db8a32b17894991b6f377101990bc7fe /desktop/test/deployment | |
| parent | 25934decf8bfd94506bccd48ac66be9d7eb4dce2 (diff) | |
tdf#94306 replace boost::noncopyable in d...
dbaccess, desktop and drawinglayer.
Replace with C++11 delete copy-constructur
and copy-assignment.
Nothing special, only one unused include in
dbaccess/source/filter/xml/xmlfilter.cxx.
Change-Id: Iebabbc658215162450d4caf08d4fb2f116c456d9
Reviewed-on: https://gerrit.libreoffice.org/23918
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'desktop/test/deployment')
| -rw-r--r-- | desktop/test/deployment/active/active_native.cxx | 13 | ||||
| -rw-r--r-- | desktop/test/deployment/passive/passive_native.cxx | 13 |
2 files changed, 16 insertions, 10 deletions
diff --git a/desktop/test/deployment/active/active_native.cxx b/desktop/test/deployment/active/active_native.cxx index 5baf91c14de9..82325ec74d33 100644 --- a/desktop/test/deployment/active/active_native.cxx +++ b/desktop/test/deployment/active/active_native.cxx @@ -21,7 +21,6 @@ #include <cassert> -#include <boost/noncopyable.hpp> #include <com/sun/star/awt/MessageBoxButtons.hpp> #include <com/sun/star/awt/Rectangle.hpp> #include <com/sun/star/awt/Toolkit.hpp> @@ -60,10 +59,12 @@ namespace { class Provider: public cppu::WeakImplHelper2< - css::lang::XServiceInfo, css::frame::XDispatchProvider >, - private boost::noncopyable + css::lang::XServiceInfo, css::frame::XDispatchProvider > { public: + Provider(const Provider&) = delete; + const Provider& operator=(const Provider&) = delete; + static css::uno::Reference< css::uno::XInterface > SAL_CALL static_create( css::uno::Reference< css::uno::XComponentContext > const & xContext) { return static_cast< cppu::OWeakObject * >(new Provider(xContext)); } @@ -151,10 +152,12 @@ Provider::queryDispatches( class Dispatch: public cppu::WeakImplHelper2< - css::lang::XServiceInfo, css::frame::XDispatch >, - private boost::noncopyable + css::lang::XServiceInfo, css::frame::XDispatch > { public: + Dispatch(const Dispatch&) = delete; + const Dispatch& operator=(const Dispatch&) = delete; + static css::uno::Reference< css::uno::XInterface > SAL_CALL static_create( css::uno::Reference< css::uno::XComponentContext > const & xContext) { return static_cast< cppu::OWeakObject * >(new Dispatch(xContext)); } diff --git a/desktop/test/deployment/passive/passive_native.cxx b/desktop/test/deployment/passive/passive_native.cxx index 41970549eabb..fac8c7bc5515 100644 --- a/desktop/test/deployment/passive/passive_native.cxx +++ b/desktop/test/deployment/passive/passive_native.cxx @@ -21,7 +21,6 @@ #include <cassert> -#include <boost/noncopyable.hpp> #include <com/sun/star/awt/MessageBoxButtons.hpp> #include <com/sun/star/awt/Rectangle.hpp> #include <com/sun/star/awt/Toolkit.hpp> @@ -57,10 +56,12 @@ namespace { class Provider: public cppu::WeakImplHelper2< - css::lang::XServiceInfo, css::frame::XDispatchProvider >, - private boost::noncopyable + css::lang::XServiceInfo, css::frame::XDispatchProvider > { public: + Provider(const Provider&) = delete; + const Provider& operator=(const Provider&) = delete; + static css::uno::Reference< css::uno::XInterface > SAL_CALL static_create( css::uno::Reference< css::uno::XComponentContext > const & xContext) { return static_cast< cppu::OWeakObject * >(new Provider(xContext)); } @@ -148,10 +149,12 @@ Provider::queryDispatches( class Dispatch: public cppu::WeakImplHelper2< - css::lang::XServiceInfo, css::frame::XDispatch >, - private boost::noncopyable + css::lang::XServiceInfo, css::frame::XDispatch > { public: + Dispatch(const Dispatch&) = delete; + const Dispatch& operator=(const Dispatch&) = delete; + static css::uno::Reference< css::uno::XInterface > SAL_CALL static_create( css::uno::Reference< css::uno::XComponentContext > const & xContext) { return static_cast< cppu::OWeakObject * >(new Dispatch(xContext)); } |