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 | |
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')
-rw-r--r-- | desktop/source/app/cmdlineargs.hxx | 6 | ||||
-rw-r--r-- | desktop/source/deployment/gui/dp_gui_service.cxx | 6 | ||||
-rw-r--r-- | desktop/source/deployment/misc/dp_descriptioninfoset.cxx | 7 | ||||
-rw-r--r-- | desktop/source/migration/services/jvmfwk.cxx | 5 | ||||
-rw-r--r-- | desktop/test/deployment/active/active_native.cxx | 13 | ||||
-rw-r--r-- | desktop/test/deployment/passive/passive_native.cxx | 13 |
6 files changed, 31 insertions, 19 deletions
diff --git a/desktop/source/app/cmdlineargs.hxx b/desktop/source/app/cmdlineargs.hxx index e0c3726f675a..f110567b42e1 100644 --- a/desktop/source/app/cmdlineargs.hxx +++ b/desktop/source/app/cmdlineargs.hxx @@ -25,13 +25,12 @@ #include <vector> #include <rtl/ustring.hxx> -#include <boost/noncopyable.hpp> #include <boost/optional.hpp> namespace desktop { -class CommandLineArgs: private boost::noncopyable +class CommandLineArgs { public: struct Supplier @@ -53,6 +52,9 @@ class CommandLineArgs: private boost::noncopyable CommandLineArgs(); explicit CommandLineArgs( Supplier& supplier ); + CommandLineArgs(const CommandLineArgs&) = delete; + const CommandLineArgs& operator=(const CommandLineArgs&) = delete; + boost::optional< OUString > getCwdUrl() const { return m_cwdUrl; } // Access to bool parameters diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx index 60686a6d9060..a62c07671bf2 100644 --- a/desktop/source/deployment/gui/dp_gui_service.cxx +++ b/desktop/source/deployment/gui/dp_gui_service.cxx @@ -36,7 +36,6 @@ #include <com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.hpp> #include <boost/optional.hpp> -#include <boost/noncopyable.hpp> #include "license_dialog.hxx" #include "dp_gui_dialog2.hxx" #include "dp_gui_extensioncmdqueue.hxx" @@ -50,12 +49,15 @@ namespace sdecl = comphelper::service_decl; namespace dp_gui { -class MyApp : public Application, private boost::noncopyable +class MyApp : public Application { public: MyApp(); virtual ~MyApp(); + MyApp(const MyApp&) = delete; + const MyApp& operator=(const MyApp&) = delete; + // Application virtual int Main() override; virtual void DeInit() override; diff --git a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx index 021de7ae7e0a..1e0563378b20 100644 --- a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx +++ b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx @@ -25,7 +25,6 @@ #include <comphelper/sequence.hxx> #include <comphelper/seqstream.hxx> #include <comphelper/processfactory.hxx> -#include <boost/noncopyable.hpp> #include <boost/optional.hpp> #include <com/sun/star/configuration/theDefaultProvider.hpp> #include <com/sun/star/container/XNameAccess.hpp> @@ -58,14 +57,16 @@ namespace { using css::uno::Reference; class EmptyNodeList: - public cppu::WeakImplHelper<css::xml::dom::XNodeList>, - private boost::noncopyable + public cppu::WeakImplHelper<css::xml::dom::XNodeList> { public: EmptyNodeList(); virtual ~EmptyNodeList(); + EmptyNodeList(const EmptyNodeList&) = delete; + const EmptyNodeList& operator=(const EmptyNodeList&) = delete; + virtual ::sal_Int32 SAL_CALL getLength() throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL diff --git a/desktop/source/migration/services/jvmfwk.cxx b/desktop/source/migration/services/jvmfwk.cxx index 8be315f15de7..02d26b3a303d 100644 --- a/desktop/source/migration/services/jvmfwk.cxx +++ b/desktop/source/migration/services/jvmfwk.cxx @@ -27,7 +27,6 @@ #include <rtl/bootstrap.hxx> #include <sal/types.h> #include <sal/config.h> -#include <boost/noncopyable.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/WrappedTargetException.hpp> @@ -58,12 +57,14 @@ using namespace com::sun::star::configuration::backend; namespace migration { -class CJavaInfo: private boost::noncopyable +class CJavaInfo { public: JavaInfo* pData; CJavaInfo(); ~CJavaInfo(); + CJavaInfo(const CJavaInfo&) = delete; + const CJavaInfo& operator=(const CJavaInfo&) = delete; operator JavaInfo* () const { return pData;} }; 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)); } |