diff options
author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2016-04-09 17:07:54 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2016-04-11 07:22:50 +0000 |
commit | d84ef731d8f5d8c1e896ecda3d03d4bb9129578d (patch) | |
tree | 582bdc8fc22114031c5564e2abb1691ef56acfe0 /framework/source | |
parent | 2553c5b95d4596fc1ef679a42073d5bc62737914 (diff) |
tdf#94306 replace boost::noncopyable ...
... in modules editeng to oox.
Replace with C++11 delete copy-constructur and
copy-assignment.
Remove boost/noncopyable.hpp includes and
one unused boost/checked_delete.hpp include in linguistic.
Change-Id: I5a38d8e5ac1b4286bdeb3858d56490a53d13fe80
Reviewed-on: https://gerrit.libreoffice.org/23928
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'framework/source')
5 files changed, 16 insertions, 14 deletions
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index e67617016cc9..4eff39e2efdc 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -80,7 +80,6 @@ #include <rtl/strbuf.hxx> #include <algorithm> -#include <boost/noncopyable.hpp> // using namespace using namespace ::com::sun::star; @@ -3156,7 +3155,7 @@ void SAL_CALL LayoutManager::getFastPropertyValue( uno::Any& aValue, sal_Int32 n namespace detail { - class InfoHelperBuilder : private ::boost::noncopyable + class InfoHelperBuilder { private: ::cppu::OPropertyArrayHelper *m_pInfoHelper; @@ -3171,6 +3170,8 @@ namespace detail { delete m_pInfoHelper; } + InfoHelperBuilder(const InfoHelperBuilder&) = delete; + InfoHelperBuilder& operator=(const InfoHelperBuilder&) = delete; ::cppu::OPropertyArrayHelper& getHelper() { return *m_pInfoHelper; } }; diff --git a/framework/source/services/ContextChangeEventMultiplexer.cxx b/framework/source/services/ContextChangeEventMultiplexer.cxx index 27e2e088fc1d..9ea52275db80 100644 --- a/framework/source/services/ContextChangeEventMultiplexer.cxx +++ b/framework/source/services/ContextChangeEventMultiplexer.cxx @@ -32,7 +32,6 @@ #include <algorithm> #include <map> #include <vector> -#include <boost/noncopyable.hpp> namespace cssl = css::lang; namespace cssu = css::uno; @@ -49,13 +48,14 @@ typedef ::cppu::WeakComponentImplHelper < > ContextChangeEventMultiplexerInterfaceBase; class ContextChangeEventMultiplexer - : private ::boost::noncopyable, - private ::cppu::BaseMutex, + : private ::cppu::BaseMutex, public ContextChangeEventMultiplexerInterfaceBase { public: ContextChangeEventMultiplexer(); virtual ~ContextChangeEventMultiplexer(); + ContextChangeEventMultiplexer(const ContextChangeEventMultiplexer&) = delete; + ContextChangeEventMultiplexer& operator=(const ContextChangeEventMultiplexer&) = delete; virtual void SAL_CALL disposing() override; diff --git a/framework/source/services/modulemanager.cxx b/framework/source/services/modulemanager.cxx index e697295964c3..250170b40d0f 100644 --- a/framework/source/services/modulemanager.cxx +++ b/framework/source/services/modulemanager.cxx @@ -36,16 +36,13 @@ #include <comphelper/sequence.hxx> #include <comphelper/enumhelper.hxx> -#include <boost/noncopyable.hpp> - namespace { class ModuleManager: public cppu::WeakImplHelper< css::lang::XServiceInfo, css::frame::XModuleManager2, - css::container::XContainerQuery >, - private boost::noncopyable + css::container::XContainerQuery > { private: @@ -66,6 +63,9 @@ public: virtual ~ModuleManager(); + ModuleManager(const ModuleManager&) = delete; + ModuleManager& operator=(const ModuleManager&) = delete; + // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx index 2aa6c6188d27..26daaf1c586f 100644 --- a/framework/source/uielement/langselectionstatusbarcontroller.cxx +++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx @@ -26,7 +26,6 @@ #include <vcl/status.hxx> #include <toolkit/helper/convert.hxx> -#include <boost/noncopyable.hpp> #include <cppuhelper/supportsservice.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <com/sun/star/awt/PopupMenu.hpp> @@ -75,10 +74,12 @@ using namespace framework; namespace { class LangSelectionStatusbarController: - public svt::StatusbarController, private boost::noncopyable + public svt::StatusbarController { public: explicit LangSelectionStatusbarController( const css::uno::Reference< css::uno::XComponentContext >& xContext ); + LangSelectionStatusbarController(const LangSelectionStatusbarController&) = delete; + LangSelectionStatusbarController& operator=(const LangSelectionStatusbarController&) = delete; // XInitialization virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index d7408886cd90..9b4b334189e7 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -75,7 +75,6 @@ #include <svtools/acceleratorexecute.hxx> #include <svtools/miscopt.hxx> #include <uielement/menubarmerger.hxx> -#include <boost/noncopyable.hpp> #include <tools/urlobj.hxx> using namespace ::cppu; @@ -705,14 +704,15 @@ static void lcl_CheckForChildren(Menu* pMenu, sal_uInt16 nItemId) namespace { class QuietInteractionContext: - public cppu::WeakImplHelper< css::uno::XCurrentContext >, - private boost::noncopyable + public cppu::WeakImplHelper< css::uno::XCurrentContext > { public: explicit QuietInteractionContext( css::uno::Reference< css::uno::XCurrentContext > const & context): context_(context) {} + QuietInteractionContext(const QuietInteractionContext&) = delete; + QuietInteractionContext& operator=(const QuietInteractionContext&) = delete; private: virtual ~QuietInteractionContext() {} |