[Libreoffice-commits] core.git: editeng/source extensions/source filter/source forms/source framework/inc framework/source jvmfwk/plugins l10ntools/inc lingucomponent/source linguistic/source oox/source
Jochen Nitschke
j.nitschke+logerrit at ok.de
Mon Apr 11 07:23:14 UTC 2016
editeng/source/editeng/editattr.hxx | 7 +++--
editeng/source/editeng/editdoc.hxx | 6 ++--
editeng/source/editeng/editobj2.hxx | 10 +++++--
editeng/source/editeng/impedit.hxx | 5 ++-
extensions/source/abpilot/datasourcehandling.cxx | 5 ++-
extensions/source/config/ldap/ldapaccess.cxx | 6 ++--
extensions/source/propctrlr/browserlistbox.cxx | 5 ++-
extensions/source/propctrlr/composeduiupdate.cxx | 6 ++--
extensions/source/propctrlr/genericpropertyhandler.cxx | 6 ++--
extensions/source/propctrlr/stringrepresentation.cxx | 6 ++--
extensions/source/update/check/updatehdl.hxx | 6 ++--
filter/source/svg/test/odfserializer.cxx | 6 ++--
forms/source/inc/propertybaghelper.hxx | 6 ++--
framework/inc/threadhelp/gate.hxx | 13 ++++++++--
framework/inc/threadhelp/transactionguard.hxx | 5 ++-
framework/inc/threadhelp/transactionmanager.hxx | 5 ++-
framework/source/layoutmanager/layoutmanager.cxx | 5 ++-
framework/source/services/ContextChangeEventMultiplexer.cxx | 6 ++--
framework/source/services/modulemanager.cxx | 8 +++---
framework/source/uielement/langselectionstatusbarcontroller.cxx | 5 ++-
framework/source/uielement/menubarmanager.cxx | 6 ++--
jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 6 +++-
l10ntools/inc/po.hxx | 13 ++++++----
lingucomponent/source/languageguessing/guesslang.cxx | 6 ++--
linguistic/source/convdiclist.cxx | 6 ++--
linguistic/source/lngsvcmgr.cxx | 8 +++---
linguistic/source/spelldsp.cxx | 5 ++-
oox/source/core/filterbase.cxx | 5 ++-
28 files changed, 106 insertions(+), 76 deletions(-)
New commits:
commit d84ef731d8f5d8c1e896ecda3d03d4bb9129578d
Author: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Date: Sat Apr 9 17:07:54 2016 +0200
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 at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/editeng/source/editeng/editattr.hxx b/editeng/source/editeng/editattr.hxx
index 6db6fd6..13bf5a2 100644
--- a/editeng/source/editeng/editattr.hxx
+++ b/editeng/source/editeng/editattr.hxx
@@ -23,8 +23,6 @@
#include <editeng/eeitem.hxx>
#include <svl/poolitem.hxx>
-#include <boost/noncopyable.hpp>
-
class Color;
class SvxFont;
class SvxFontItem;
@@ -65,7 +63,7 @@ class SfxGrabBagItem;
// bFeature: Attribute must not expand/shrink, length is always 1
// bEdge: Attribute will not expand, if you want to expand just on the edge
-class EditCharAttrib : private boost::noncopyable
+class EditCharAttrib
{
protected:
const SfxPoolItem* pItem;
@@ -79,6 +77,9 @@ public:
EditCharAttrib( const SfxPoolItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
virtual ~EditCharAttrib();
+ EditCharAttrib(const EditCharAttrib&) = delete;
+ EditCharAttrib& operator=(const EditCharAttrib&) = delete;
+
sal_uInt16 Which() const { return pItem->Which(); }
const SfxPoolItem* GetItem() const { return pItem; }
diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx
index 024c4b4..a18a682 100644
--- a/editeng/source/editeng/editdoc.hxx
+++ b/editeng/source/editeng/editdoc.hxx
@@ -35,8 +35,6 @@
#include <memory>
#include <vector>
-#include <boost/noncopyable.hpp>
-
class ImpEditEngine;
class SvxTabStop;
@@ -233,7 +231,7 @@ public:
// class ContentNode
-class ContentNode : private boost::noncopyable
+class ContentNode
{
private:
OUString maString;
@@ -247,6 +245,8 @@ public:
ContentNode( SfxItemPool& rItemPool );
ContentNode( const OUString& rStr, const ContentAttribs& rContentAttribs );
~ContentNode();
+ ContentNode(const ContentNode&) = delete;
+ ContentNode& operator=(const ContentNode&) = delete;
ContentAttribs& GetContentAttribs() { return aContentAttribs; }
const ContentAttribs& GetContentAttribs() const { return aContentAttribs; }
diff --git a/editeng/source/editeng/editobj2.hxx b/editeng/source/editeng/editobj2.hxx
index 6f9fae2..aeeab19 100644
--- a/editeng/source/editeng/editobj2.hxx
+++ b/editeng/source/editeng/editobj2.hxx
@@ -28,7 +28,6 @@
#include "svl/sharedstring.hxx"
#include <svl/languageoptions.hxx>
-#include <boost/noncopyable.hpp>
#include <memory>
#include <vector>
@@ -107,7 +106,7 @@ public:
};
-class ContentInfo : private boost::noncopyable
+class ContentInfo
{
friend class EditTextObjectImpl;
public:
@@ -127,6 +126,8 @@ private:
public:
~ContentInfo();
+ ContentInfo(const ContentInfo&) = delete;
+ ContentInfo& operator=(const ContentInfo&) = delete;
void NormalizeString( svl::SharedStringPool& rPool );
const svl::SharedString& GetSharedString() const { return maText;}
@@ -155,7 +156,7 @@ public:
#endif
};
-class EditTextObjectImpl : private boost::noncopyable
+class EditTextObjectImpl
{
public:
typedef std::vector<std::unique_ptr<ContentInfo> > ContentInfosType;
@@ -188,6 +189,9 @@ public:
EditTextObjectImpl( EditTextObject* pFront, const EditTextObjectImpl& r );
~EditTextObjectImpl();
+ EditTextObjectImpl(const EditTextObjectImpl&) = delete;
+ EditTextObjectImpl& operator=(const EditTextObjectImpl&) = delete;
+
sal_uInt16 GetUserType() const { return nUserType;}
void SetUserType( sal_uInt16 n );
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index ff7d328..7ab03f8 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -57,7 +57,6 @@
#include <rtl/ref.hxx>
#include <LibreOfficeKit/LibreOfficeKitTypes.h>
-#include <boost/noncopyable.hpp>
#include <memory>
#include <vector>
@@ -387,7 +386,7 @@ public:
// ImpEditEngine
-class ImpEditEngine : public SfxListener, private boost::noncopyable
+class ImpEditEngine : public SfxListener
{
friend class EditEngine;
friend class EditDbg;
@@ -700,6 +699,8 @@ protected:
public:
virtual ~ImpEditEngine();
+ ImpEditEngine(const ImpEditEngine&) = delete;
+ ImpEditEngine& operator=(const ImpEditEngine&) = delete;
inline EditUndoManager& GetUndoManager();
inline ::svl::IUndoManager* SetUndoManager(::svl::IUndoManager* pNew);
diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx
index 45247e5..4ed9384 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 3e03f2c..a1f28f0 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 0c14e3f..ab0d37a 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 8181405..c930c76 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 f08bff7..53e2879 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 10618af..8c0c9df 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 8b76b8d..f509c73 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; }
diff --git a/filter/source/svg/test/odfserializer.cxx b/filter/source/svg/test/odfserializer.cxx
index b4b78c4..30d7586 100644
--- a/filter/source/svg/test/odfserializer.cxx
+++ b/filter/source/svg/test/odfserializer.cxx
@@ -23,7 +23,6 @@
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/uno/Sequence.hxx>
-#include <boost/noncopyable.hpp>
using namespace ::com::sun::star;
@@ -34,8 +33,7 @@ typedef ::cppu::WeakComponentImplHelper<
css::xml::sax::XDocumentHandler> ODFSerializerBase;
class ODFSerializer : private cppu::BaseMutex,
- public ODFSerializerBase,
- private boost::noncopyable
+ public ODFSerializerBase
{
public:
explicit ODFSerializer(const uno::Reference<io::XOutputStream>& xOut) :
@@ -46,6 +44,8 @@ public:
{
m_aLineFeed[0] = '\n';
}
+ ODFSerializer(const ODFSerializer&) = delete;
+ ODFSerializer& operator=(const ODFSerializer&) = delete;
virtual void SAL_CALL startDocument( ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) override;
virtual void SAL_CALL endDocument( ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) override;
diff --git a/forms/source/inc/propertybaghelper.hxx b/forms/source/inc/propertybaghelper.hxx
index a309085..f4ca932 100644
--- a/forms/source/inc/propertybaghelper.hxx
+++ b/forms/source/inc/propertybaghelper.hxx
@@ -25,8 +25,6 @@
#include <comphelper/propertybag.hxx>
#include <comphelper/propagg.hxx>
-#include <boost/noncopyable.hpp>
-
namespace frm
{
@@ -51,7 +49,7 @@ namespace frm
~IPropertyBagHelperContext() {}
};
- class PropertyBagHelper : public ::boost::noncopyable
+ class PropertyBagHelper
{
private:
IPropertyBagHelperContext& m_rContext;
@@ -62,6 +60,8 @@ namespace frm
public:
PropertyBagHelper( IPropertyBagHelperContext& _rContext );
~PropertyBagHelper();
+ PropertyBagHelper(const PropertyBagHelper&) = delete;
+ PropertyBagHelper& operator=(const PropertyBagHelper&) = delete;
// XComponent equivalent
void dispose();
diff --git a/framework/inc/threadhelp/gate.hxx b/framework/inc/threadhelp/gate.hxx
index f4eaec8..0c04660 100644
--- a/framework/inc/threadhelp/gate.hxx
+++ b/framework/inc/threadhelp/gate.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_FRAMEWORK_INC_THREADHELP_GATE_HXX
#define INCLUDED_FRAMEWORK_INC_THREADHELP_GATE_HXX
-#include <boost/noncopyable.hpp>
#include <osl/time.h>
#include <osl/mutex.hxx>
#include <osl/conditn.hxx>
@@ -37,7 +36,7 @@ namespace framework{
@devstatus ready to use
*//*-*************************************************************************************************************/
-class Gate : private boost::noncopyable
+class Gate
{
// public methods
@@ -64,6 +63,16 @@ class Gate : private boost::noncopyable
{
open();
}
+ /*-****************************************************************************************************
+ @short copy-ctor
+ @descr Forbid copy construction
+ *//*-*****************************************************************************************************/
+ Gate(const Gate&) = delete;
+ /*-****************************************************************************************************
+ @short copy-assignment
+ @descr Forbid copy assiging
+ *//*-*****************************************************************************************************/
+ Gate& operator=(const Gate&) = delete;
/*-****************************************************************************************************
@short open the gate
diff --git a/framework/inc/threadhelp/transactionguard.hxx b/framework/inc/threadhelp/transactionguard.hxx
index 0b87721..033f61b 100644
--- a/framework/inc/threadhelp/transactionguard.hxx
+++ b/framework/inc/threadhelp/transactionguard.hxx
@@ -20,12 +20,11 @@
#ifndef INCLUDED_FRAMEWORK_INC_THREADHELP_TRANSACTIONGUARD_HXX
#define INCLUDED_FRAMEWORK_INC_THREADHELP_TRANSACTIONGUARD_HXX
-#include <boost/noncopyable.hpp>
#include <threadhelp/transactionmanager.hxx>
namespace framework{
-class TransactionGuard : private boost::noncopyable
+class TransactionGuard
{
public:
inline TransactionGuard( TransactionManager& rManager, EExceptionMode eMode )
@@ -38,6 +37,8 @@ class TransactionGuard : private boost::noncopyable
{
m_pManager->unregisterTransaction();
}
+ TransactionGuard(const TransactionGuard&) = delete;
+ TransactionGuard& operator=(const TransactionGuard&) = delete;
private:
TransactionManager* m_pManager;
diff --git a/framework/inc/threadhelp/transactionmanager.hxx b/framework/inc/threadhelp/transactionmanager.hxx
index 3c7393f..a4a6e9d 100644
--- a/framework/inc/threadhelp/transactionmanager.hxx
+++ b/framework/inc/threadhelp/transactionmanager.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_FRAMEWORK_INC_THREADHELP_TRANSACTIONMANAGER_HXX
#define INCLUDED_FRAMEWORK_INC_THREADHELP_TRANSACTIONMANAGER_HXX
-#include <boost/noncopyable.hpp>
#include <threadhelp/gate.hxx>
#include <com/sun/star/uno/XInterface.hpp>
@@ -96,7 +95,7 @@ enum EExceptionMode
@devstatus draft
*//*-*************************************************************************************************************/
-class FWI_DLLPUBLIC TransactionManager: private boost::noncopyable
+class FWI_DLLPUBLIC TransactionManager
{
// public methods
@@ -105,6 +104,8 @@ class FWI_DLLPUBLIC TransactionManager: private boost::noncopyable
TransactionManager ( );
~TransactionManager ( );
+ TransactionManager(const TransactionManager&) = delete;
+ TransactionManager& operator=(const TransactionManager&) = delete;
void setWorkingMode ( EWorkingMode eMode );
EWorkingMode getWorkingMode ( ) const;
void registerTransaction ( EExceptionMode eMode ) throw( css::uno::RuntimeException, css::lang::DisposedException );
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index e676170..4eff39e 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 27e2e08..9ea5227 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 e697295..250170b 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 2aa6c61..26daaf1 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 d740888..9b4b334 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() {}
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index 4cf1871..bd65ec9 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -33,7 +33,6 @@
#include "rtl/instance.hxx"
#include "salhelper/linkhelper.hxx"
#include "salhelper/thread.hxx"
-#include "boost/noncopyable.hpp"
#include <memory>
#include "com/sun/star/uno/Sequence.hxx"
#include <utility>
@@ -205,7 +204,7 @@ rtl::Bootstrap * getBootstrap()
}
-class FileHandleGuard: private boost::noncopyable
+class FileHandleGuard
{
public:
explicit FileHandleGuard(oslFileHandle & rHandle):
@@ -213,6 +212,9 @@ public:
inline ~FileHandleGuard();
+ FileHandleGuard(const FileHandleGuard&) = delete;
+ FileHandleGuard& operator=(const FileHandleGuard&) = delete;
+
inline oslFileHandle & getHandle() { return m_rHandle; }
private:
diff --git a/l10ntools/inc/po.hxx b/l10ntools/inc/po.hxx
index 24f9c28..3004a18 100644
--- a/l10ntools/inc/po.hxx
+++ b/l10ntools/inc/po.hxx
@@ -13,7 +13,6 @@
#include <fstream>
#include <memory>
#include <rtl/string.hxx>
-#include <boost/noncopyable.hpp>
class PoOfstream;
class PoIfstream;
@@ -74,7 +73,7 @@ public:
a po file. It's main function to generate header to
template po files(pot).
*/
-class PoHeader: private boost::noncopyable
+class PoHeader
{
private:
@@ -88,10 +87,12 @@ public:
PoHeader( const OString& rExtSrc ); ///< Template Constructor
~PoHeader();
+ PoHeader(const PoHeader&) = delete;
+ PoHeader& operator=(const PoHeader&) = delete;
};
/// Interface to write po entry to files as output streams
-class PoOfstream: private boost::noncopyable
+class PoOfstream
{
private:
@@ -105,6 +106,8 @@ public:
PoOfstream();
PoOfstream(const OString& rFileName, OpenMode aMode = TRUNC );
~PoOfstream();
+ PoOfstream(const PoOfstream&) = delete;
+ PoOfstream& operator=(const PoOfstream&) = delete;
bool isOpen() const { return m_aOutPut.is_open(); }
void open(const OString& rFileName, OpenMode aMode = TRUNC );
@@ -114,7 +117,7 @@ public:
};
/// Interface to read po entry from files as input streams
-class PoIfstream: private boost::noncopyable
+class PoIfstream
{
private:
@@ -128,6 +131,8 @@ public:
PoIfstream();
PoIfstream( const OString& rFileName );
~PoIfstream();
+ PoIfstream(const PoIfstream&) = delete;
+ PoIfstream& operator=(const PoIfstream&) = delete;
bool isOpen() const { return m_aInPut.is_open(); }
bool eof() const { return m_bEof; }
diff --git a/lingucomponent/source/languageguessing/guesslang.cxx b/lingucomponent/source/languageguessing/guesslang.cxx
index c1df022..9000923 100644
--- a/lingucomponent/source/languageguessing/guesslang.cxx
+++ b/lingucomponent/source/languageguessing/guesslang.cxx
@@ -19,7 +19,6 @@
#include <iostream>
-#include <boost/noncopyable.hpp>
#include <osl/file.hxx>
#include <tools/debug.hxx>
@@ -75,8 +74,7 @@ static osl::Mutex & GetLangGuessMutex()
class LangGuess_Impl :
public ::cppu::WeakImplHelper<
XLanguageGuessing,
- XServiceInfo >,
- private boost::noncopyable
+ XServiceInfo >
{
SimpleGuesser m_aGuesser;
bool m_bInitialized;
@@ -86,6 +84,8 @@ class LangGuess_Impl :
public:
LangGuess_Impl();
+ LangGuess_Impl(const LangGuess_Impl&) = delete;
+ LangGuess_Impl& operator=(const LangGuess_Impl&) = delete;
// XServiceInfo implementation
virtual OUString SAL_CALL getImplementationName( ) throw(RuntimeException, std::exception) override;
diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx
index de7160f..1748759 100644
--- a/linguistic/source/convdiclist.cxx
+++ b/linguistic/source/convdiclist.cxx
@@ -19,7 +19,6 @@
#include <sal/config.h>
-#include <boost/noncopyable.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/lang/Locale.hpp>
#include <com/sun/star/linguistic2/ConversionDictionaryType.hpp>
@@ -77,8 +76,7 @@ OUString GetConvDicMainURL( const OUString &rDicName, const OUString &rDirectory
}
class ConvDicNameContainer :
- public cppu::WeakImplHelper< css::container::XNameContainer >,
- private boost::noncopyable
+ public cppu::WeakImplHelper< css::container::XNameContainer >
{
std::vector< uno::Reference< XConversionDictionary > > aConvDics;
@@ -87,6 +85,8 @@ class ConvDicNameContainer :
public:
ConvDicNameContainer();
virtual ~ConvDicNameContainer();
+ ConvDicNameContainer(const ConvDicNameContainer&) = delete;
+ ConvDicNameContainer& operator=(const ConvDicNameContainer&) = delete;
// XElementAccess
virtual css::uno::Type SAL_CALL getElementType( ) throw (css::uno::RuntimeException, std::exception) override;
diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx
index d45b409..bb83b7a 100644
--- a/linguistic/source/lngsvcmgr.cxx
+++ b/linguistic/source/lngsvcmgr.cxx
@@ -35,8 +35,6 @@
#include <cppuhelper/factory.hxx>
#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
-#include <boost/checked_delete.hpp>
-#include <boost/noncopyable.hpp>
#include <o3tl/make_unique.hxx>
#include "lngsvcmgr.hxx"
@@ -178,8 +176,7 @@ class LngSvcMgrListenerHelper :
<
linguistic2::XLinguServiceEventListener,
linguistic2::XDictionaryListEventListener
- >,
- private boost::noncopyable
+ >
{
LngSvcMgr &rMyManager;
@@ -197,6 +194,9 @@ public:
LngSvcMgrListenerHelper( LngSvcMgr &rLngSvcMgr,
const uno::Reference< linguistic2::XSearchableDictionaryList > &rxDicList );
+ LngSvcMgrListenerHelper(const LngSvcMgrListenerHelper&) = delete;
+ LngSvcMgrListenerHelper& operator=(const LngSvcMgrListenerHelper&) = delete;
+
// lang::XEventListener
virtual void SAL_CALL
disposing( const lang::EventObject& rSource )
diff --git a/linguistic/source/spelldsp.cxx b/linguistic/source/spelldsp.cxx
index e1d86ba..4c8b230 100644
--- a/linguistic/source/spelldsp.cxx
+++ b/linguistic/source/spelldsp.cxx
@@ -19,7 +19,6 @@
#include <sal/config.h>
-#include <boost/noncopyable.hpp>
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/linguistic2/XSearchableDictionaryList.hpp>
#include <com/sun/star/linguistic2/SpellFailure.hpp>
@@ -56,7 +55,7 @@ using namespace linguistic;
// Removing entries is done by assigning the empty string.
// The sequence is constructed from all non empty strings in the original
// while maintaining the order.
-class ProposalList: private boost::noncopyable
+class ProposalList
{
std::vector< OUString > aVec;
@@ -64,6 +63,8 @@ class ProposalList: private boost::noncopyable
public:
ProposalList() {}
+ ProposalList(const ProposalList&) = delete;
+ ProposalList& operator=(const ProposalList&) = delete;
size_t Count() const;
void Prepend( const OUString &rText );
diff --git a/oox/source/core/filterbase.cxx b/oox/source/core/filterbase.cxx
index 3500901..b7b197c 100644
--- a/oox/source/core/filterbase.cxx
+++ b/oox/source/core/filterbase.cxx
@@ -19,7 +19,6 @@
#include <sal/config.h>
-#include <boost/noncopyable.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/drawing/XShape.hpp>
#include <com/sun/star/frame/XModel.hpp>
@@ -74,11 +73,13 @@ struct UrlPool
struct StaticUrlPool : public ::rtl::Static< UrlPool, StaticUrlPool > {};
/** This guard prevents recursive loading/saving of the same document. */
-class DocumentOpenedGuard: private boost::noncopyable
+class DocumentOpenedGuard
{
public:
explicit DocumentOpenedGuard( const OUString& rUrl );
~DocumentOpenedGuard();
+ DocumentOpenedGuard(const DocumentOpenedGuard&) = delete;
+ DocumentOpenedGuard& operator=(const DocumentOpenedGuard&) = delete;
inline bool isValid() const { return mbValid; }
More information about the Libreoffice-commits
mailing list