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 /extensions | |
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 'extensions')
7 files changed, 21 insertions, 19 deletions
diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx index 45247e50af4e..4ed9384162af 100644 --- a/extensions/source/abpilot/datasourcehandling.cxx +++ b/extensions/source/abpilot/datasourcehandling.cxx @@ -24,7 +24,6 @@ #include "datasourcehandling.hxx" #include "addresssettings.hxx" -#include <boost/noncopyable.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/frame/XStorable.hpp> @@ -180,7 +179,7 @@ namespace abp } } - struct ODataSourceContextImpl: private boost::noncopyable + struct ODataSourceContextImpl { Reference< XComponentContext > xORB; Reference< XNameAccess > xContext; /// the UNO data source context @@ -190,6 +189,8 @@ namespace abp : xORB(_rxORB) { } + ODataSourceContextImpl(const ODataSourceContextImpl&) = delete; + ODataSourceContextImpl& operator=(const ODataSourceContextImpl&) = delete; }; ODataSourceContext::ODataSourceContext(const Reference< XComponentContext >& _rxORB) diff --git a/extensions/source/config/ldap/ldapaccess.cxx b/extensions/source/config/ldap/ldapaccess.cxx index 3e03f2c4a34f..a1f28f0fb326 100644 --- a/extensions/source/config/ldap/ldapaccess.cxx +++ b/extensions/source/config/ldap/ldapaccess.cxx @@ -20,8 +20,6 @@ #include "ldapaccess.hxx" -#include <boost/noncopyable.hpp> - #include <osl/diagnose.h> #include <rtl/ustrbuf.hxx> #include <rtl/strbuf.hxx> @@ -32,7 +30,7 @@ namespace extensions { namespace config { namespace ldap { typedef int LdapErrCode; -struct LdapMessageHolder: private boost::noncopyable +struct LdapMessageHolder { LdapMessageHolder() : msg(nullptr) {} ~LdapMessageHolder() @@ -40,6 +38,8 @@ struct LdapMessageHolder: private boost::noncopyable if (msg) ldap_msgfree(msg); } + LdapMessageHolder(const LdapMessageHolder&) = delete; + LdapMessageHolder& operator=(const LdapMessageHolder&) = delete; LDAPMessage * msg; }; diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx index 0c14e3f5aeb3..ab0d37aabc52 100644 --- a/extensions/source/propctrlr/browserlistbox.cxx +++ b/extensions/source/propctrlr/browserlistbox.cxx @@ -24,7 +24,6 @@ #include "linedescriptor.hxx" #include "inspectorhelpwindow.hxx" -#include <boost/noncopyable.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/inspection/PropertyControlType.hpp> @@ -77,13 +76,15 @@ namespace pcr } }; - class SharedNotifier: private boost::noncopyable + class SharedNotifier { private: static ::osl::Mutex& getMutex(); static ::rtl::Reference< ::comphelper::AsyncEventNotifier > s_pNotifier; public: + SharedNotifier(const SharedNotifier&) = delete; + SharedNotifier& operator=(const SharedNotifier&) = delete; static const ::rtl::Reference< ::comphelper::AsyncEventNotifier >& getNotifier(); }; diff --git a/extensions/source/propctrlr/composeduiupdate.cxx b/extensions/source/propctrlr/composeduiupdate.cxx index 8181405d8411..c930c768ab43 100644 --- a/extensions/source/propctrlr/composeduiupdate.cxx +++ b/extensions/source/propctrlr/composeduiupdate.cxx @@ -19,7 +19,6 @@ #include "composeduiupdate.hxx" -#include <boost/noncopyable.hpp> #include <com/sun/star/inspection/XObjectInspectorUI.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/inspection/PropertyLineElement.hpp> @@ -72,8 +71,7 @@ namespace pcr typedef ::cppu::WeakImplHelper < css::inspection::XObjectInspectorUI > CachedInspectorUI_Base; - struct CachedInspectorUI: - public CachedInspectorUI_Base, private boost::noncopyable + struct CachedInspectorUI : public CachedInspectorUI_Base { private: ::osl::Mutex m_aMutex; @@ -129,6 +127,8 @@ namespace pcr public: CachedInspectorUI( ComposedPropertyUIUpdate& _rMaster, FNotifySingleUIChange _pUIChangeNotification ); + CachedInspectorUI(const CachedInspectorUI&) = delete; + CachedInspectorUI& operator=(const CachedInspectorUI&) = delete; /// disposes the instance void dispose(); diff --git a/extensions/source/propctrlr/genericpropertyhandler.cxx b/extensions/source/propctrlr/genericpropertyhandler.cxx index f08bff7cff98..53e2879e4b25 100644 --- a/extensions/source/propctrlr/genericpropertyhandler.cxx +++ b/extensions/source/propctrlr/genericpropertyhandler.cxx @@ -22,7 +22,6 @@ #include "handlerhelper.hxx" #include "pcrservices.hxx" -#include <boost/noncopyable.hpp> #include <com/sun/star/container/XHierarchicalNameAccess.hpp> #include <com/sun/star/reflection/XEnumTypeDescription.hpp> #include <com/sun/star/beans/theIntrospection.hpp> @@ -63,8 +62,7 @@ namespace pcr using ::com::sun::star::awt::XActionListener; using ::com::sun::star::awt::ActionEvent; - class EnumRepresentation: - public IPropertyEnumRepresentation, private boost::noncopyable + class EnumRepresentation : public IPropertyEnumRepresentation { private: Reference< XEnumTypeDescription > m_xTypeDescription; @@ -72,6 +70,8 @@ namespace pcr public: EnumRepresentation( const Reference< XComponentContext >& _rxContext, const Type& _rEnumType ); + EnumRepresentation(const EnumRepresentation&) = delete; + EnumRepresentation& operator=(const EnumRepresentation&) = delete; // IPropertyEnumRepresentation implementqation virtual ::std::vector< OUString > diff --git a/extensions/source/propctrlr/stringrepresentation.cxx b/extensions/source/propctrlr/stringrepresentation.cxx index 10618afd9feb..8c0c9dfc0985 100644 --- a/extensions/source/propctrlr/stringrepresentation.cxx +++ b/extensions/source/propctrlr/stringrepresentation.cxx @@ -19,7 +19,6 @@ #include "sal/config.h" -#include "boost/noncopyable.hpp" #include "cppuhelper/factory.hxx" #include "cppuhelper/implementationentry.hxx" #include <cppuhelper/implbase.hxx> @@ -67,11 +66,12 @@ class StringRepresentation: public ::cppu::WeakImplHelper< lang::XServiceInfo, inspection::XStringRepresentation, - lang::XInitialization>, - private boost::noncopyable + lang::XInitialization> { public: explicit StringRepresentation(uno::Reference< uno::XComponentContext > const & context); + StringRepresentation (const StringRepresentation&) = delete; + StringRepresentation& operator=(const StringRepresentation&) = delete; // lang::XServiceInfo: virtual OUString SAL_CALL getImplementationName() throw (uno::RuntimeException, std::exception) override; diff --git a/extensions/source/update/check/updatehdl.hxx b/extensions/source/update/check/updatehdl.hxx index 8b76b8deddee..f509c73bbbc3 100644 --- a/extensions/source/update/check/updatehdl.hxx +++ b/extensions/source/update/check/updatehdl.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_EXTENSIONS_SOURCE_UPDATE_CHECK_UPDATEHDL_HXX #define INCLUDED_EXTENSIONS_SOURCE_UPDATE_CHECK_UPDATEHDL_HXX -#include "boost/noncopyable.hpp" #include <osl/mutex.hxx> #include "com/sun/star/uno/Any.h" #include "com/sun/star/uno/Reference.h" @@ -67,8 +66,7 @@ enum UpdateState { UPDATESTATES_COUNT }; -class UpdateHandler : private ::boost::noncopyable, - public cppu::WeakImplHelper< css::awt::XActionListener, +class UpdateHandler : public cppu::WeakImplHelper< css::awt::XActionListener, css::awt::XTopWindowListener, css::task::XInteractionHandler, css::frame::XTerminateListener > @@ -158,6 +156,8 @@ public: UpdateHandler( const css::uno::Reference< css::uno::XComponentContext > & rxContext, const rtl::Reference< IActionListener > & rxActionListener ); virtual ~UpdateHandler(); + UpdateHandler(const UpdateHandler&) = delete; + UpdateHandler& operator=(const UpdateHandler&) = delete; bool isVisible() const; bool isMinimized() const { return mbMinimized; } |