[Libreoffice-commits] core.git: stoc/source store/source svgio/inc svgio/source svl/source svtools/source svx/inc svx/source test/source testtools/source toolkit/source tools/source unotest/source uui/source vbahelper/source vcl/osx writerperfect/source xmloff/inc xmloff/source xmlsecurity/source
Jochen Nitschke
j.nitschke+logerrit at ok.de
Wed Apr 13 11:19:27 UTC 2016
stoc/source/implementationregistration/implreg.cxx | 5 +-
stoc/source/javavm/interact.cxx | 11 +++--
stoc/source/javavm/javavm.cxx | 12 ++++--
stoc/source/uriproc/ExternalUriReferenceTranslator.cxx | 7 ++-
stoc/source/uriproc/UriReferenceFactory.cxx | 13 ++++--
stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx | 13 ++++--
stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx | 13 ++++--
stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx | 7 ++-
store/source/lockbyte.cxx | 19 ++++++----
store/source/storbase.cxx | 7 ++-
store/source/storcach.cxx | 2 -
store/source/storcach.hxx | 7 ++-
svgio/inc/svgio/svgreader/svgdocument.hxx | 8 ++--
svgio/inc/svgio/svgreader/svgnode.hxx | 5 +-
svgio/source/svguno/xsvgparser.cxx | 5 +-
svl/source/config/asiancfg.cxx | 6 ++-
svl/source/items/aeitem.cxx | 1
svl/source/misc/getstringresource.cxx | 6 ++-
svl/source/misc/inethist.cxx | 5 +-
svl/source/svdde/ddeimp.hxx | 5 +-
svtools/source/edit/textwindowpeer.cxx | 6 ++-
svtools/source/misc/svtaccessiblefactory.cxx | 5 +-
svtools/source/table/mousefunction.hxx | 6 +--
svtools/source/uno/contextmenuhelper.cxx | 6 +--
svtools/source/uno/unocontroltablemodel.hxx | 1
svtools/source/uno/unogridcolumnfacade.cxx | 4 +-
svtools/source/uno/unogridcolumnfacade.hxx | 5 +-
svx/inc/AccessibleTableShape.hxx | 11 +++--
svx/source/accessibility/lookupcolorname.cxx | 5 +-
svx/source/form/fmscriptingenv.cxx | 5 +-
svx/source/sdr/contact/viewcontactofunocontrol.cxx | 1
svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx | 7 +--
svx/source/sidebar/PanelFactory.cxx | 7 +--
svx/source/table/accessiblecell.hxx | 12 ++----
svx/source/tbxctrls/lboxctrl.cxx | 1
svx/source/xml/xmlgrhlp.cxx | 9 +++-
test/source/vclbootstrapprotector.cxx | 5 +-
testtools/source/bridgetest/constructors.cxx | 6 +--
testtools/source/bridgetest/currentcontextchecker.cxx | 7 ++-
toolkit/source/awt/asynccallback.cxx | 6 +--
toolkit/source/controls/unocontrol.cxx | 5 +-
toolkit/source/helper/accessibilityclient.cxx | 6 +--
tools/source/generic/fract.cxx | 7 ++-
unotest/source/cpp/unobootstrapprotector/unobootstrapprotector.cxx | 6 ++-
unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx | 6 ++-
uui/source/interactionhandler.cxx | 7 ++-
vbahelper/source/vbahelper/vbaapplicationbase.cxx | 6 ++-
vcl/osx/DragSource.hxx | 7 +--
vcl/osx/DragSourceContext.hxx | 7 +--
vcl/osx/DropTarget.hxx | 7 +--
vcl/osx/OSXTransferable.hxx | 6 +--
vcl/osx/clipboard.hxx | 6 +--
writerperfect/source/common/WPXSvInputStream.cxx | 5 +-
xmloff/inc/txtlists.hxx | 5 +-
xmloff/source/chart/SchXMLExport.cxx | 6 ++-
xmloff/source/style/impastpl.hxx | 7 ++-
xmloff/source/text/txtimp.cxx | 4 +-
xmlsecurity/source/xmlsec/serialnumberadapter.cxx | 6 +--
58 files changed, 214 insertions(+), 167 deletions(-)
New commits:
commit 97abbec95665b43a9a09e10a0fb31854cdbd5c0d
Author: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Date: Wed Apr 13 10:11:37 2016 +0200
tdf#94306 replace boost::noncopyable in stoc to xmlsec..
Replace with C++11 delete copy-constructur
and copy-assignment.
Remove boost/noncopyable.hpp includes.
Add missing default ctors.
With this commit there should be no users
of boost::noncopyable left.
Change-Id: I6b1e47824912a6a80cc3f00f34938ebc048d8975
Reviewed-on: https://gerrit.libreoffice.org/24051
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
diff --git a/stoc/source/implementationregistration/implreg.cxx b/stoc/source/implementationregistration/implreg.cxx
index 45d699f..438ee79 100644
--- a/stoc/source/implementationregistration/implreg.cxx
+++ b/stoc/source/implementationregistration/implreg.cxx
@@ -21,7 +21,6 @@
#include <string.h>
#include <list>
-#include <boost/noncopyable.hpp>
#include <cppuhelper/queryinterface.hxx>
#include <cppuhelper/weak.hxx>
#include <cppuhelper/implbase.hxx>
@@ -66,7 +65,7 @@ using namespace osl;
namespace {
-struct StringPool: private boost::noncopyable
+struct StringPool
{
OUString slash_UNO_slash_REGISTRY_LINKS;
OUString slash_IMPLEMENTATIONS;
@@ -92,6 +91,8 @@ struct StringPool: private boost::noncopyable
, com_sun_star_registry_SimpleRegistry("com.sun.star.registry.SimpleRegistry" )
, Registry( "Registry" )
{}
+ StringPool(const StringPool&) = delete;
+ StringPool& operator=(const StringPool&) = delete;
};
const StringPool &spool()
diff --git a/stoc/source/javavm/interact.cxx b/stoc/source/javavm/interact.cxx
index cb3f080..c2962d0 100644
--- a/stoc/source/javavm/interact.cxx
+++ b/stoc/source/javavm/interact.cxx
@@ -20,7 +20,6 @@
#include "interact.hxx"
-#include <boost/noncopyable.hpp>
#include <com/sun/star/java/JavaDisabledException.hpp>
#include <com/sun/star/java/JavaVMCreationFailureException.hpp>
#include <com/sun/star/task/XInteractionAbort.hpp>
@@ -34,11 +33,12 @@ using stoc_javavm::InteractionRequest;
namespace {
class AbortContinuation:
- public cppu::WeakImplHelper<css::task::XInteractionAbort>,
- private boost::noncopyable
+ public cppu::WeakImplHelper<css::task::XInteractionAbort>
{
public:
inline AbortContinuation() {}
+ AbortContinuation(const AbortContinuation&) = delete;
+ AbortContinuation& operator=(const AbortContinuation&)= delete;
virtual void SAL_CALL select() throw (css::uno::RuntimeException, std::exception) override {}
@@ -49,11 +49,12 @@ private:
}
class InteractionRequest::RetryContinuation:
- public cppu::WeakImplHelper<css::task::XInteractionRetry>,
- private boost::noncopyable
+ public cppu::WeakImplHelper<css::task::XInteractionRetry>
{
public:
inline RetryContinuation(): m_bSelected(false) {}
+ RetryContinuation(const RetryContinuation&) = delete;
+ RetryContinuation& operator=(const RetryContinuation&) = delete;
virtual void SAL_CALL select() throw (css::uno::RuntimeException, std::exception) override;
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index 7a1e08c..683e6ef 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -78,7 +78,6 @@
#include <time.h>
#include <memory>
#include <vector>
-#include <boost/noncopyable.hpp>
// Properties of the javavm can be put
// as a komma separated list in this
@@ -117,8 +116,7 @@ class NoJavaIniException: public css::uno::Exception
};
class SingletonFactory:
- private cppu::WeakImplHelper< css::lang::XEventListener >,
- private boost::noncopyable
+ private cppu::WeakImplHelper< css::lang::XEventListener >
{
public:
static css::uno::Reference< css::uno::XInterface > getSingleton(
@@ -129,6 +127,9 @@ private:
virtual inline ~SingletonFactory() {}
+ SingletonFactory(const SingletonFactory&) = delete;
+ SingletonFactory& operator=(const SingletonFactory&) = delete;
+
virtual void SAL_CALL disposing(css::lang::EventObject const &)
throw (css::uno::RuntimeException, std::exception) override;
@@ -530,7 +531,7 @@ void initVMConfiguration(
setTimeZone(pjvm);
}
-class DetachCurrentThread: private boost::noncopyable {
+class DetachCurrentThread {
public:
explicit DetachCurrentThread(JavaVM * jvm): m_jvm(jvm) {}
@@ -540,6 +541,9 @@ public:
}
}
+ DetachCurrentThread(const DetachCurrentThread&) = delete;
+ DetachCurrentThread& operator=(const DetachCurrentThread&) = delete;
+
private:
JavaVM * m_jvm;
};
diff --git a/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx b/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
index 7c81651..cc08209 100644
--- a/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
+++ b/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <boost/noncopyable.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/uno/Exception.hpp>
#include <com/sun/star/uno/Reference.hxx>
@@ -42,12 +41,14 @@ namespace {
class Translator:
public cppu::WeakImplHelper<
- css::lang::XServiceInfo, css::uri::XExternalUriReferenceTranslator>,
- private boost::noncopyable
+ css::lang::XServiceInfo, css::uri::XExternalUriReferenceTranslator>
{
public:
Translator() {}
+ Translator(const Translator&) = delete;
+ Translator& operator=(const Translator&) = delete;
+
virtual OUString SAL_CALL getImplementationName()
throw (css::uno::RuntimeException, std::exception) override;
diff --git a/stoc/source/uriproc/UriReferenceFactory.cxx b/stoc/source/uriproc/UriReferenceFactory.cxx
index e8d3c6a..88310c5 100644
--- a/stoc/source/uriproc/UriReferenceFactory.cxx
+++ b/stoc/source/uriproc/UriReferenceFactory.cxx
@@ -25,7 +25,6 @@
#include <exception>
#include <vector>
-#include <boost/noncopyable.hpp>
#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
#include <com/sun/star/lang/XMultiComponentFactory.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -93,8 +92,7 @@ sal_Int32 parseScheme(OUString const & uriReference) {
}
class UriReference:
- public cppu::WeakImplHelper<css::uri::XUriReference>,
- private boost::noncopyable
+ public cppu::WeakImplHelper<css::uri::XUriReference>
{
public:
UriReference(
@@ -106,6 +104,9 @@ public:
query)
{}
+ UriReference(const UriReference&) = delete;
+ UriReference& operator=(const UriReference&) = delete;
+
virtual OUString SAL_CALL getUriReference()
throw (css::uno::RuntimeException, std::exception) override
{ return m_base.getUriReference(); }
@@ -258,14 +259,16 @@ void processSegments(
class Factory:
public cppu::WeakImplHelper<
- css::lang::XServiceInfo, css::uri::XUriReferenceFactory>,
- private boost::noncopyable
+ css::lang::XServiceInfo, css::uri::XUriReferenceFactory>
{
public:
explicit Factory(
css::uno::Reference< css::uno::XComponentContext > const & context):
m_context(context) {}
+ Factory(const Factory&) = delete;
+ Factory& operator=(const Factory&) = delete;
+
virtual OUString SAL_CALL getImplementationName()
throw (css::uno::RuntimeException, std::exception) override;
diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx
index 2637958..cd6eef4 100644
--- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx
+++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx
@@ -21,7 +21,6 @@
#include <exception>
-#include <boost/noncopyable.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/uno/Reference.hxx>
@@ -56,8 +55,7 @@ bool parseSchemeSpecificPart(OUString const & part) {
}
class UrlReference:
- public ::cppu::WeakImplHelper<css::uri::XVndSunStarExpandUrlReference>,
- private boost::noncopyable
+ public ::cppu::WeakImplHelper<css::uri::XVndSunStarExpandUrlReference>
{
public:
UrlReference(OUString const & scheme, OUString const & path):
@@ -66,6 +64,9 @@ public:
OUString())
{}
+ UrlReference(const UrlReference&) = delete;
+ UrlReference& operator=(const UrlReference&) = delete;
+
virtual OUString SAL_CALL getUriReference()
throw (css::uno::RuntimeException, std::exception) override
{ return base_.getUriReference(); }
@@ -152,12 +153,14 @@ OUString UrlReference::expand(
class Parser:
public ::cppu::WeakImplHelper<
- css::lang::XServiceInfo, css::uri::XUriSchemeParser>,
- private boost::noncopyable
+ css::lang::XServiceInfo, css::uri::XUriSchemeParser>
{
public:
Parser() {}
+ Parser(const Parser&) = delete;
+ Parser& operator=(const Parser&) = delete;
+
virtual OUString SAL_CALL getImplementationName()
throw (css::uno::RuntimeException, std::exception) override;
diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
index 3092c8d..2f12979 100644
--- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
+++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
@@ -19,7 +19,6 @@
#include "UriReference.hxx"
-#include <boost/noncopyable.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/uno/Reference.hxx>
@@ -188,8 +187,7 @@ bool parseSchemeSpecificPart(OUString const & part) {
}
class UrlReference:
- public cppu::WeakImplHelper<css::uri::XVndSunStarScriptUrlReference>,
- private boost::noncopyable
+ public cppu::WeakImplHelper<css::uri::XVndSunStarScriptUrlReference>
{
public:
UrlReference(OUString const & scheme, OUString const & path):
@@ -197,6 +195,9 @@ public:
scheme, false, false, OUString(), path, false, OUString())
{}
+ UrlReference(const UrlReference&) = delete;
+ UrlReference& operator=(const UrlReference&) = delete;
+
virtual OUString SAL_CALL getUriReference()
throw (css::uno::RuntimeException, std::exception) override
{ return m_base.getUriReference(); }
@@ -374,12 +375,14 @@ sal_Int32 UrlReference::findParameter(OUString const & key) {
class Parser:
public cppu::WeakImplHelper<
- css::lang::XServiceInfo, css::uri::XUriSchemeParser>,
- private boost::noncopyable
+ css::lang::XServiceInfo, css::uri::XUriSchemeParser>
{
public:
Parser() {}
+ Parser(const Parser&) = delete;
+ Parser& operator=(const Parser&) = delete;
+
virtual OUString SAL_CALL getImplementationName()
throw (css::uno::RuntimeException, std::exception) override;
diff --git a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
index 5bb9fb0..c96b081 100644
--- a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
+++ b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <boost/noncopyable.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/uno/Exception.hpp>
#include <com/sun/star/uno/Reference.hxx>
@@ -45,14 +44,16 @@ namespace {
class Factory:
public cppu::WeakImplHelper<
- css::lang::XServiceInfo, css::uri::XVndSunStarPkgUrlReferenceFactory>,
- private boost::noncopyable
+ css::lang::XServiceInfo, css::uri::XVndSunStarPkgUrlReferenceFactory>
{
public:
explicit Factory(
css::uno::Reference< css::uno::XComponentContext > const & context):
m_context(context) {}
+ Factory(const Factory&) = delete;
+ Factory& operator=(const Factory&) = delete;
+
virtual OUString SAL_CALL getImplementationName()
throw (css::uno::RuntimeException, std::exception) override;
diff --git a/store/source/lockbyte.cxx b/store/source/lockbyte.cxx
index beb21b1..0bb42b5 100644
--- a/store/source/lockbyte.cxx
+++ b/store/source/lockbyte.cxx
@@ -19,7 +19,6 @@
#include "lockbyte.hxx"
-#include "boost/noncopyable.hpp"
#include "sal/types.h"
#include "osl/diagnose.h"
#include "osl/file.h"
@@ -278,8 +277,7 @@ struct FileHandle
class FileLockBytes :
public store::OStoreObject,
- public store::ILockBytes,
- private boost::noncopyable
+ public store::ILockBytes
{
/** Representation.
*/
@@ -309,6 +307,9 @@ public:
*/
explicit FileLockBytes (FileHandle & rFile);
+ FileLockBytes(const FileLockBytes&) = delete;
+ FileLockBytes& operator=(const FileLockBytes&) = delete;
+
protected:
/** Destruction.
*/
@@ -500,8 +501,7 @@ struct FileMapping
class MappedLockBytes :
public store::OStoreObject,
public store::PageData::Allocator,
- public store::ILockBytes,
- private boost::noncopyable
+ public store::ILockBytes
{
/** Representation.
*/
@@ -535,6 +535,9 @@ public:
*/
explicit MappedLockBytes (FileMapping & rMapping);
+ MappedLockBytes(const MappedLockBytes&) = delete;
+ MappedLockBytes& operator=(const MappedLockBytes&) = delete;
+
protected:
/* Destruction.
*/
@@ -642,8 +645,7 @@ namespace store
class MemoryLockBytes :
public store::OStoreObject,
- public store::ILockBytes,
- private boost::noncopyable
+ public store::ILockBytes
{
/** Representation.
*/
@@ -671,6 +673,9 @@ public:
*/
MemoryLockBytes();
+ MemoryLockBytes(const MemoryLockBytes&) = delete;
+ MemoryLockBytes& operator=(const MemoryLockBytes&) = delete;
+
protected:
/** Destruction.
*/
diff --git a/store/source/storbase.cxx b/store/source/storbase.cxx
index df505d8..2515de5 100644
--- a/store/source/storbase.cxx
+++ b/store/source/storbase.cxx
@@ -19,7 +19,6 @@
#include "storbase.hxx"
-#include "boost/noncopyable.hpp"
#include "sal/types.h"
#include "rtl/alloc.h"
#include "rtl/ref.hxx"
@@ -75,14 +74,16 @@ namespace store
class PageData::Allocator_Impl :
public store::OStoreObject,
- public store::PageData::Allocator,
- private boost::noncopyable
+ public store::PageData::Allocator
{
public:
/** Construction (two phase).
*/
Allocator_Impl();
+ Allocator_Impl(const Allocator_Impl&) = delete;
+ Allocator_Impl& operator=(const Allocator_Impl&) = delete;
+
storeError initialize (sal_uInt16 nPageSize);
protected:
diff --git a/store/source/storcach.cxx b/store/source/storcach.cxx
index af4ec4c..1f5e147 100644
--- a/store/source/storcach.cxx
+++ b/store/source/storcach.cxx
@@ -19,8 +19,6 @@
#include "sal/config.h"
-#include "boost/noncopyable.hpp"
-
#include "storcach.hxx"
#include "sal/log.hxx"
diff --git a/store/source/storcach.hxx b/store/source/storcach.hxx
index 446d39c..bc53fd6 100644
--- a/store/source/storcach.hxx
+++ b/store/source/storcach.hxx
@@ -26,7 +26,6 @@
#include "store/types.h"
#include "storbase.hxx"
#include "object.hxx"
-#include "boost/noncopyable.hpp"
namespace store
{
@@ -40,8 +39,7 @@ struct Entry;
*======================================================================*/
class PageCache :
- public store::OStoreObject,
- private boost::noncopyable
+ public store::OStoreObject
{
// Representation
static size_t const theTableSize = 32;
@@ -73,6 +71,9 @@ public:
// Construction
explicit PageCache (sal_uInt16 nPageSize);
+ PageCache(const PageCache&) = delete;
+ PageCache& operator=(const PageCache&) = delete;
+
/** load.
*/
storeError lookupPageAt (
diff --git a/svgio/inc/svgio/svgreader/svgdocument.hxx b/svgio/inc/svgio/svgreader/svgdocument.hxx
index 274360c..5a4b631 100644
--- a/svgio/inc/svgio/svgreader/svgdocument.hxx
+++ b/svgio/inc/svgio/svgreader/svgdocument.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGDOCUMENT_HXX
#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGDOCUMENT_HXX
-#include <boost/noncopyable.hpp>
#include <svgio/svgreader/svgnode.hxx>
#include <unordered_map>
@@ -28,7 +27,7 @@ namespace svgio
{
namespace svgreader
{
- class SvgDocument : private boost::noncopyable
+ class SvgDocument
{
private:
/// the document hierarchy with all root nodes
@@ -49,9 +48,12 @@ namespace svgio
IdStyleTokenMapper maIdStyleTokenMapperList;
public:
- SvgDocument(const OUString& rAbsolutePath);
+ explicit SvgDocument(const OUString& rAbsolutePath);
~SvgDocument();
+ SvgDocument(const SvgDocument&) = delete;
+ SvgDocument& operator=(const SvgDocument&) = delete;
+
/// append another root node, ownership changes
void appendNode(SvgNode* pNode);
diff --git a/svgio/inc/svgio/svgreader/svgnode.hxx b/svgio/inc/svgio/svgreader/svgnode.hxx
index 0184f29..1b8359d 100644
--- a/svgio/inc/svgio/svgreader/svgnode.hxx
+++ b/svgio/inc/svgio/svgreader/svgnode.hxx
@@ -26,7 +26,6 @@
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <com/sun/star/xml/sax/XAttributeList.hpp>
#include <vector>
-#include <boost/noncopyable.hpp>
// predefines
namespace svgio
@@ -82,7 +81,7 @@ namespace svgio
// which members should be initialized
Display getDisplayFromContent(const OUString& aContent);
- class SvgNode : private boost::noncopyable, public InfoProvider
+ class SvgNode : public InfoProvider
{
private:
/// basic data, Type, document we belong to and parent (if not root)
@@ -135,6 +134,8 @@ namespace svgio
SvgDocument& rDocument,
SvgNode* pParent);
virtual ~SvgNode();
+ SvgNode(const SvgNode&) = delete;
+ SvgNode& operator=(const SvgNode&) = delete;
/// scan helper to read and interpret a local CssStyle to mpLocalCssStyle
void readLocalCssStyle(const OUString& aContent);
diff --git a/svgio/source/svguno/xsvgparser.cxx b/svgio/source/svguno/xsvgparser.cxx
index 1484c9f..14f184f 100644
--- a/svgio/source/svguno/xsvgparser.cxx
+++ b/svgio/source/svguno/xsvgparser.cxx
@@ -19,7 +19,6 @@
#include <sal/config.h>
-#include <boost/noncopyable.hpp>
#include <com/sun/star/graphic/XSvgParser.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
@@ -40,7 +39,7 @@ namespace svgio
{
namespace svgreader
{
- class XSvgParser : public ::cppu::WeakAggImplHelper2< graphic::XSvgParser, lang::XServiceInfo >, private boost::noncopyable
+ class XSvgParser : public ::cppu::WeakAggImplHelper2< graphic::XSvgParser, lang::XServiceInfo >
{
private:
uno::Reference< uno::XComponentContext > context_;
@@ -50,6 +49,8 @@ namespace svgio
explicit XSvgParser(
uno::Reference< uno::XComponentContext > const & context);
virtual ~XSvgParser();
+ XSvgParser(const XSvgParser&) = delete;
+ XSvgParser& operator=(const XSvgParser&) = delete;
// XSvgParser
virtual uno::Sequence< uno::Reference< ::graphic::XPrimitive2D > > SAL_CALL getDecomposition(
diff --git a/svl/source/config/asiancfg.cxx b/svl/source/config/asiancfg.cxx
index 3386689..209771a 100644
--- a/svl/source/config/asiancfg.cxx
+++ b/svl/source/config/asiancfg.cxx
@@ -21,7 +21,6 @@
#include <cassert>
-#include <boost/noncopyable.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/container/ElementExistException.hpp>
#include <com/sun/star/container/NoSuchElementException.hpp>
@@ -55,12 +54,15 @@ OUString toString(css::lang::Locale const & locale) {
}
-struct SvxAsianConfig::Impl: private boost::noncopyable {
+struct SvxAsianConfig::Impl {
Impl():
context(comphelper::getProcessComponentContext()),
batch(comphelper::ConfigurationChanges::create(context))
{}
+ Impl(const Impl&) = delete;
+ Impl& operator=(const Impl&) = delete;
+
css::uno::Reference< css::uno::XComponentContext > context;
std::shared_ptr< comphelper::ConfigurationChanges > batch;
diff --git a/svl/source/items/aeitem.cxx b/svl/source/items/aeitem.cxx
index 89fdad7..730aa17 100644
--- a/svl/source/items/aeitem.cxx
+++ b/svl/source/items/aeitem.cxx
@@ -19,7 +19,6 @@
#include <rtl/ustring.hxx>
#include <svl/aeitem.hxx>
-#include <boost/noncopyable.hpp>
#include <vector>
diff --git a/svl/source/misc/getstringresource.cxx b/svl/source/misc/getstringresource.cxx
index 6f0de30..fe18e96 100644
--- a/svl/source/misc/getstringresource.cxx
+++ b/svl/source/misc/getstringresource.cxx
@@ -21,7 +21,6 @@
#include <map>
#include <memory>
-#include <boost/noncopyable.hpp>
#include <i18nlangtag/languagetag.hxx>
#include <rtl/instance.hxx>
#include <rtl/ustrbuf.hxx>
@@ -34,9 +33,12 @@
namespace {
-class ResMgrMap: private boost::noncopyable {
+class ResMgrMap {
public:
+ ResMgrMap() = default;
~ResMgrMap();
+ ResMgrMap(const ResMgrMap&) = delete;
+ ResMgrMap& operator=(const ResMgrMap&) = delete;
SimpleResMgr * get(LanguageTag const & locale);
diff --git a/svl/source/misc/inethist.cxx b/svl/source/misc/inethist.cxx
index 09fec7d..8db4ac9 100644
--- a/svl/source/misc/inethist.cxx
+++ b/svl/source/misc/inethist.cxx
@@ -22,7 +22,6 @@
#include <algorithm>
#include <string.h>
-#include <boost/noncopyable.hpp>
#include <rtl/instance.hxx>
#include <rtl/crc.h>
#include <osl/diagnose.h>
@@ -41,7 +40,7 @@
#define INETHIST_SIZE_LIMIT 1024
#define INETHIST_MAGIC_HEAD 0x484D4849UL
-class INetURLHistory_Impl: private boost::noncopyable
+class INetURLHistory_Impl
{
struct head_entry
{
@@ -156,6 +155,8 @@ class INetURLHistory_Impl: private boost::noncopyable
public:
INetURLHistory_Impl();
~INetURLHistory_Impl();
+ INetURLHistory_Impl(const INetURLHistory_Impl&) = delete;
+ INetURLHistory_Impl& operator=(const INetURLHistory_Impl&) = delete;
/** putUrl/queryUrl.
*/
diff --git a/svl/source/svdde/ddeimp.hxx b/svl/source/svdde/ddeimp.hxx
index 52df936..6c7b3d3 100644
--- a/svl/source/svdde/ddeimp.hxx
+++ b/svl/source/svdde/ddeimp.hxx
@@ -23,7 +23,6 @@
#include <windows.h>
#include <ddeml.h>
-#include <boost/noncopyable.hpp>
#include <rtl/ustring.hxx>
#include <svl/svdde.hxx>
#include <vector>
@@ -82,7 +81,7 @@ struct DdeDataImp
class DdeConnection;
-class DdeInstData : private boost::noncopyable
+class DdeInstData
{
public:
sal_uInt16 nRefCount;
@@ -106,6 +105,8 @@ public:
, nInstanceCli(0)
{
}
+ DdeInstData(const DdeInstData&) = delete;
+ DdeInstData& operator=(const DdeInstData&) = delete;
};
DdeInstData* ImpGetInstData();
diff --git a/svtools/source/edit/textwindowpeer.cxx b/svtools/source/edit/textwindowpeer.cxx
index 96ae2bb..8ceb80d 100644
--- a/svtools/source/edit/textwindowpeer.cxx
+++ b/svtools/source/edit/textwindowpeer.cxx
@@ -21,7 +21,6 @@
#include <svtaccessiblefactory.hxx>
-#include <boost/noncopyable.hpp>
#include <com/sun/star/accessibility/XAccessibleContext.hpp>
#include <com/sun/star/awt/XWindowPeer.hpp>
#include <com/sun/star/uno/Reference.hxx>
@@ -33,12 +32,15 @@
namespace {
-class TextWindowPeer: public VCLXWindow, private boost::noncopyable {
+class TextWindowPeer: public VCLXWindow {
public:
explicit TextWindowPeer(TextView & view);
virtual ~TextWindowPeer() {}
+ TextWindowPeer(const TextWindowPeer&) = delete;
+ TextWindowPeer& operator=(const TextWindowPeer&) = delete;
+
private:
virtual css::uno::Reference<css::accessibility::XAccessibleContext>
CreateAccessibleContext() override;
diff --git a/svtools/source/misc/svtaccessiblefactory.cxx b/svtools/source/misc/svtaccessiblefactory.cxx
index 97e866c..03a68d0 100644
--- a/svtools/source/misc/svtaccessiblefactory.cxx
+++ b/svtools/source/misc/svtaccessiblefactory.cxx
@@ -21,7 +21,6 @@
#include "svtaccessiblefactory.hxx"
-#include <boost/noncopyable.hpp>
#include <osl/module.h>
namespace svt
@@ -44,10 +43,12 @@ namespace svt
//= AccessibleDummyFactory
class AccessibleDummyFactory:
- public IAccessibleFactory, private boost::noncopyable
+ public IAccessibleFactory
{
public:
AccessibleDummyFactory();
+ AccessibleDummyFactory(const AccessibleDummyFactory&) = delete;
+ AccessibleDummyFactory& operator=(const AccessibleDummyFactory&) = delete;
protected:
virtual ~AccessibleDummyFactory();
diff --git a/svtools/source/table/mousefunction.hxx b/svtools/source/table/mousefunction.hxx
index f819050..4ecca06 100644
--- a/svtools/source/table/mousefunction.hxx
+++ b/svtools/source/table/mousefunction.hxx
@@ -25,8 +25,6 @@
#include <rtl/ref.hxx>
#include <salhelper/simplereferenceobject.hxx>
-#include <boost/noncopyable.hpp>
-
class MouseEvent;
@@ -51,10 +49,12 @@ namespace svt { namespace table
//= MouseFunction
- class MouseFunction : public ::salhelper::SimpleReferenceObject, public ::boost::noncopyable
+ class MouseFunction : public ::salhelper::SimpleReferenceObject
{
public:
MouseFunction() {}
+ MouseFunction(const MouseFunction&) = delete;
+ MouseFunction& operator=(const MouseFunction&) = delete;
virtual FunctionResult handleMouseMove( ITableControl& i_tableControl, MouseEvent const & i_event ) = 0;
virtual FunctionResult handleMouseDown( ITableControl& i_tableControl, MouseEvent const & i_event ) = 0;
virtual FunctionResult handleMouseUp( ITableControl& i_tableControl, MouseEvent const & i_event ) = 0;
diff --git a/svtools/source/uno/contextmenuhelper.cxx b/svtools/source/uno/contextmenuhelper.cxx
index e661dd3..b245c01 100644
--- a/svtools/source/uno/contextmenuhelper.cxx
+++ b/svtools/source/uno/contextmenuhelper.cxx
@@ -19,7 +19,6 @@
#include <sal/config.h>
-#include <boost/noncopyable.hpp>
#include <svtools/contextmenuhelper.hxx>
#include <svtools/menuoptions.hxx>
#include <svtools/miscopt.hxx>
@@ -56,14 +55,15 @@ namespace svt
// internal helper class to retrieve status updates
class StateEventHelper : public css::frame::XStatusListener,
- public ::cppu::OWeakObject,
- private boost::noncopyable
+ public ::cppu::OWeakObject
{
public:
StateEventHelper( const uno::Reference< frame::XDispatchProvider >& xDispatchProvider,
const uno::Reference< util::XURLTransformer >& xURLTransformer,
const OUString& aCommandURL );
virtual ~StateEventHelper();
+ StateEventHelper(const StateEventHelper&) = delete;
+ StateEventHelper& operator=(const StateEventHelper&) = delete;
bool isCommandEnabled();
diff --git a/svtools/source/uno/unocontroltablemodel.hxx b/svtools/source/uno/unocontroltablemodel.hxx
index 0f859c8..87ee6c7 100644
--- a/svtools/source/uno/unocontroltablemodel.hxx
+++ b/svtools/source/uno/unocontroltablemodel.hxx
@@ -34,7 +34,6 @@
#include <rtl/ref.hxx>
-#include <boost/noncopyable.hpp>
#include <memory>
diff --git a/svtools/source/uno/unogridcolumnfacade.cxx b/svtools/source/uno/unogridcolumnfacade.cxx
index a8a023a..5492488 100644
--- a/svtools/source/uno/unogridcolumnfacade.cxx
+++ b/svtools/source/uno/unogridcolumnfacade.cxx
@@ -33,7 +33,6 @@
#include <vcl/svapp.hxx>
#include <osl/mutex.hxx>
#include <cppuhelper/implbase.hxx>
-#include <boost/noncopyable.hpp>
namespace svt { namespace table
@@ -91,10 +90,11 @@ namespace svt { namespace table
typedef ::cppu::WeakImplHelper < XGridColumnListener
> ColumnChangeMultiplexer_Base;
class ColumnChangeMultiplexer :public ColumnChangeMultiplexer_Base
- ,public ::boost::noncopyable
{
public:
explicit ColumnChangeMultiplexer( UnoGridColumnFacade& i_colImpl );
+ ColumnChangeMultiplexer(const ColumnChangeMultiplexer&) = delete;
+ ColumnChangeMultiplexer& operator=(const ColumnChangeMultiplexer&) = delete;
void dispose();
diff --git a/svtools/source/uno/unogridcolumnfacade.hxx b/svtools/source/uno/unogridcolumnfacade.hxx
index aed2376..0128174 100644
--- a/svtools/source/uno/unogridcolumnfacade.hxx
+++ b/svtools/source/uno/unogridcolumnfacade.hxx
@@ -29,8 +29,6 @@
#include <rtl/ref.hxx>
-#include <boost/noncopyable.hpp>
-
namespace svt { namespace table
{
@@ -41,7 +39,6 @@ namespace svt { namespace table
class ColumnChangeMultiplexer;
class UnoControlTableModel;
class UnoGridColumnFacade :public IColumnModel
- ,public ::boost::noncopyable
{
public:
UnoGridColumnFacade(
@@ -49,6 +46,8 @@ namespace svt { namespace table
css::uno::Reference< css::awt::grid::XGridColumn > const & i_gridColumn
);
virtual ~UnoGridColumnFacade();
+ UnoGridColumnFacade(const UnoGridColumnFacade&) = delete;
+ UnoGridColumnFacade& operator=(const UnoGridColumnFacade&) = delete;
// IColumnModel overridables
virtual OUString getName() const override;
diff --git a/svx/inc/AccessibleTableShape.hxx b/svx/inc/AccessibleTableShape.hxx
index ea152b5..d026af7 100644
--- a/svx/inc/AccessibleTableShape.hxx
+++ b/svx/inc/AccessibleTableShape.hxx
@@ -34,8 +34,6 @@
#include <com/sun/star/accessibility/XAccessibleTableSelection.hpp>
#include <cppuhelper/compbase.hxx>
-#include <boost/noncopyable.hpp>
-
namespace sdr { namespace table {
class SvxTableController;
} }
@@ -51,11 +49,13 @@ namespace accessibility
> AccessibleTableShape_Base;
/** @descr
*/
-class AccessibleTableShape : private boost::noncopyable, public AccessibleTableShape_Base, public css::accessibility::XAccessibleTableSelection
+class AccessibleTableShape : public AccessibleTableShape_Base, public css::accessibility::XAccessibleTableSelection
{
public:
AccessibleTableShape( const AccessibleShapeInfo& rShapeInfo, const AccessibleShapeTreeInfo& rShapeTreeInfo );
virtual ~AccessibleTableShape( );
+ AccessibleTableShape(const AccessibleTableShape&) = delete;
+ AccessibleTableShape& operator=(const AccessibleTableShape&) = delete;
virtual void Init() override;
@@ -159,14 +159,15 @@ typedef ::cppu::WeakImplHelper<
css::accessibility::XAccessibleTableSelection >
AccessibleTableHeaderShape_BASE;
-class AccessibleTableHeaderShape : private boost::noncopyable,
- public MutexOwner,
+class AccessibleTableHeaderShape : public MutexOwner,
public AccessibleTableHeaderShape_BASE
{
public:
// bRow, true means rowheader, false means columnheader
AccessibleTableHeaderShape( AccessibleTableShape* pTable, bool bRow );
virtual ~AccessibleTableHeaderShape();
+ AccessibleTableHeaderShape(const AccessibleTableHeaderShape&) = delete;
+ AccessibleTableHeaderShape& operator=(const AccessibleTableHeaderShape&) = delete;
// XAccessible
virtual css::uno::Reference< css::accessibility::XAccessibleContext> SAL_CALL getAccessibleContext( ) throw(css::uno::RuntimeException, std::exception) override;
diff --git a/svx/source/accessibility/lookupcolorname.cxx b/svx/source/accessibility/lookupcolorname.cxx
index dafe833..06cfee7 100644
--- a/svx/source/accessibility/lookupcolorname.cxx
+++ b/svx/source/accessibility/lookupcolorname.cxx
@@ -19,7 +19,6 @@
#include "sal/config.h"
-#include "boost/noncopyable.hpp"
#include "com/sun/star/container/XNameAccess.hpp"
#include "com/sun/star/container/XNameContainer.hpp"
#include "com/sun/star/drawing/ColorTable.hpp"
@@ -38,9 +37,11 @@
namespace {
-class ColorNameMap: private boost::noncopyable {
+class ColorNameMap {
public:
ColorNameMap();
+ ColorNameMap(const ColorNameMap&) = delete;
+ ColorNameMap& operator=(const ColorNameMap&) = delete;
OUString lookUp(long color) const;
diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx
index f122650..3f3c8e0 100644
--- a/svx/source/form/fmscriptingenv.cxx
+++ b/svx/source/form/fmscriptingenv.cxx
@@ -39,7 +39,6 @@
#include <sfx2/app.hxx>
#include <basic/basmgr.hxx>
-#include <boost/noncopyable.hpp>
#include <boost/assign/list_of.hpp>
#include <memory>
#include <set>
@@ -140,7 +139,7 @@ namespace svxform
};
class FormScriptingEnvironment:
- public IFormScriptingEnvironment, private boost::noncopyable
+ public IFormScriptingEnvironment
{
private:
typedef rtl::Reference<FormScriptListener> ListenerImplementation;
@@ -154,6 +153,8 @@ namespace svxform
public:
explicit FormScriptingEnvironment( FmFormModel& _rModel );
virtual ~FormScriptingEnvironment();
+ FormScriptingEnvironment(const FormScriptingEnvironment&) = delete;
+ FormScriptingEnvironment& operator=(const FormScriptingEnvironment&) = delete;
// callback for FormScriptListener
void doFireScriptEvent( const ScriptEvent& _rEvent, Any* _pSynchronousResult );
diff --git a/svx/source/sdr/contact/viewcontactofunocontrol.cxx b/svx/source/sdr/contact/viewcontactofunocontrol.cxx
index ef6ac44..2050c27 100644
--- a/svx/source/sdr/contact/viewcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewcontactofunocontrol.cxx
@@ -19,7 +19,6 @@
#include <sal/config.h>
-#include <boost/noncopyable.hpp>
#include <sdr/contact/viewcontactofunocontrol.hxx>
#include <sdr/contact/viewobjectcontactofunocontrol.hxx>
#include <sdr/contact/objectcontactofpageview.hxx>
diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
index c89f60a..bc60a1c 100644
--- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
@@ -56,8 +56,6 @@
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <drawinglayer/primitive2d/controlprimitive2d.hxx>
-#include <boost/noncopyable.hpp>
-
/*
Form controls (more precise: UNO Controls) in the drawing layer are ... prone to breakage, since they have some
@@ -500,8 +498,7 @@ namespace sdr { namespace contact {
> ViewObjectContactOfUnoControl_Impl_Base;
class SVX_DLLPRIVATE ViewObjectContactOfUnoControl_Impl:
- public ViewObjectContactOfUnoControl_Impl_Base,
- private boost::noncopyable
+ public ViewObjectContactOfUnoControl_Impl_Base
{
private:
// fdo#41935 note that access to members is protected with SolarMutex;
@@ -541,6 +538,8 @@ namespace sdr { namespace contact {
public:
explicit ViewObjectContactOfUnoControl_Impl( ViewObjectContactOfUnoControl* _pAntiImpl );
+ ViewObjectContactOfUnoControl_Impl(const ViewObjectContactOfUnoControl_Impl&) = delete;
+ ViewObjectContactOfUnoControl_Impl& operator=(const ViewObjectContactOfUnoControl_Impl&) = delete;
/** disposes the instance, which is nonfunctional afterwards
*/
diff --git a/svx/source/sidebar/PanelFactory.cxx b/svx/source/sidebar/PanelFactory.cxx
index 3c2d80d..4b954ec 100644
--- a/svx/source/sidebar/PanelFactory.cxx
+++ b/svx/source/sidebar/PanelFactory.cxx
@@ -42,8 +42,6 @@
#include <com/sun/star/ui/XSidebar.hpp>
#include <com/sun/star/ui/XUIElementFactory.hpp>
-#include <boost/noncopyable.hpp>
-
using namespace css;
using namespace css::uno;
using namespace svx::sidebar;
@@ -60,13 +58,14 @@ typedef ::cppu::WeakComponentImplHelper< css::ui::XUIElementFactory, css::lang::
PanelFactoryInterfaceBase;
class PanelFactory
- : private ::boost::noncopyable,
- private ::cppu::BaseMutex,
+ : private ::cppu::BaseMutex,
public PanelFactoryInterfaceBase
{
public:
PanelFactory();
virtual ~PanelFactory();
+ PanelFactory(const PanelFactory&) = delete;
+ PanelFactory& operator=(const PanelFactory&) = delete;
// XUIElementFactory
css::uno::Reference<css::ui::XUIElement> SAL_CALL createUIElement (
diff --git a/svx/source/table/accessiblecell.hxx b/svx/source/table/accessiblecell.hxx
index edc8e8f..0aa17a2 100644
--- a/svx/source/table/accessiblecell.hxx
+++ b/svx/source/table/accessiblecell.hxx
@@ -38,8 +38,6 @@
#include "cell.hxx"
-#include <boost/noncopyable.hpp>
-
namespace accessibility
{
@@ -48,11 +46,15 @@ class AccessibleShapeTreeInfo;
typedef ::cppu::ImplInheritanceHelper< AccessibleContextBase, css::accessibility::XAccessibleExtendedComponent > AccessibleCellBase;
-class AccessibleCell : private boost::noncopyable, public AccessibleCellBase, public AccessibleComponentBase, public IAccessibleViewForwarderListener
+class AccessibleCell : public AccessibleCellBase
+ , public AccessibleComponentBase
+ , public IAccessibleViewForwarderListener
{
public:
AccessibleCell( const css::uno::Reference< css::accessibility::XAccessible>& rxParent, const sdr::table::CellRef& rCell, sal_Int32 nIndex, const AccessibleShapeTreeInfo& rShapeTreeInfo);
virtual ~AccessibleCell();
+ AccessibleCell(const AccessibleCell&) = delete;
+ AccessibleCell& operator=(const AccessibleCell&) = delete;
void Init();
@@ -127,10 +129,6 @@ protected:
virtual void SAL_CALL disposing() override;
AccessibleTableShape *pAccTable;
-
-private:
- AccessibleCell(const AccessibleCell&) = delete;
- AccessibleCell& operator=(const AccessibleCell&) = delete;
};
} // end of namespace accessibility
diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx
index e5141f1..ca300c4 100644
--- a/svx/source/tbxctrls/lboxctrl.cxx
+++ b/svx/source/tbxctrls/lboxctrl.cxx
@@ -19,7 +19,6 @@
#include <sal/config.h>
-#include <boost/noncopyable.hpp>
#include <tools/debug.hxx>
#include <sal/types.h>
#include <vcl/lstbox.hxx>
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index fc6e86c..7ae6fa2 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -19,7 +19,6 @@
#include <sal/config.h>
-#include <boost/noncopyable.hpp>
#include <comphelper/string.hxx>
#include <sal/macros.h>
#include <com/sun/star/embed/XTransactedObject.hpp>
@@ -74,7 +73,7 @@ const MetaCommentAction* ImplCheckForEPS( GDIMetaFile& rMtf )
}
class SvXMLGraphicInputStream:
- public cppu::WeakImplHelper<XInputStream>, private boost::noncopyable
+ public cppu::WeakImplHelper<XInputStream>
{
private:
@@ -93,6 +92,8 @@ public:
explicit SvXMLGraphicInputStream( const OUString& rGraphicId );
virtual ~SvXMLGraphicInputStream();
+ SvXMLGraphicInputStream(const SvXMLGraphicInputStream&) = delete;
+ SvXMLGraphicInputStream& operator=(const SvXMLGraphicInputStream&) = delete;
bool Exists() const { return mxStmWrapper.is(); }
};
@@ -200,7 +201,7 @@ void SAL_CALL SvXMLGraphicInputStream::closeInput() throw( NotConnectedException
}
class SvXMLGraphicOutputStream:
- public cppu::WeakImplHelper<XOutputStream>, private boost::noncopyable
+ public cppu::WeakImplHelper<XOutputStream>
{
private:
@@ -221,6 +222,8 @@ public:
SvXMLGraphicOutputStream();
virtual ~SvXMLGraphicOutputStream();
+ SvXMLGraphicOutputStream(const SvXMLGraphicOutputStream&) = delete;
+ SvXMLGraphicOutputStream& operator=(const SvXMLGraphicOutputStream&) = delete;
bool Exists() const { return mxStmWrapper.is(); }
const GraphicObject& GetGraphicObject();
diff --git a/test/source/vclbootstrapprotector.cxx b/test/source/vclbootstrapprotector.cxx
index 3fbb0a9..2f193c6 100644
--- a/test/source/vclbootstrapprotector.cxx
+++ b/test/source/vclbootstrapprotector.cxx
@@ -9,7 +9,6 @@
#include <sal/config.h>
-#include <boost/noncopyable.hpp>
#include <com/sun/star/configuration/theDefaultProvider.hpp>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/util/XFlushable.hpp>
@@ -29,7 +28,7 @@
namespace {
-class Protector: public CppUnit::Protector, private boost::noncopyable {
+class Protector: public CppUnit::Protector {
public:
Protector() {
// Force locale (and resource files loaded) to en-US:
@@ -45,6 +44,8 @@ public:
}
Application::setDeInitHook(LINK(this, Protector, deinitHook));
}
+ Protector(const Protector&) = delete;
+ Protector& operator=(const Protector&) = delete;
private:
virtual ~Protector() {
diff --git a/testtools/source/bridgetest/constructors.cxx b/testtools/source/bridgetest/constructors.cxx
index 3c14cd7..3933fec 100644
--- a/testtools/source/bridgetest/constructors.cxx
+++ b/testtools/source/bridgetest/constructors.cxx
@@ -20,7 +20,6 @@
#include "sal/config.h"
-#include "boost/noncopyable.hpp"
#include "com/sun/star/lang/XInitialization.hpp"
#include "com/sun/star/lang/XComponent.hpp"
#include "com/sun/star/uno/Any.hxx"
@@ -50,11 +49,12 @@ namespace {
namespace ttb = ::test::testtools::bridgetest;
class Impl:
- public cppu::WeakImplHelper<css::lang::XInitialization>,
- private boost::noncopyable
+ public cppu::WeakImplHelper<css::lang::XInitialization>
{
public:
Impl() {}
+ Impl(const Impl&) = delete;
+ Impl& operator=(const Impl&) = delete;
private:
virtual ~Impl() {}
diff --git a/testtools/source/bridgetest/currentcontextchecker.cxx b/testtools/source/bridgetest/currentcontextchecker.cxx
index a3d03b5..e283163 100644
--- a/testtools/source/bridgetest/currentcontextchecker.cxx
+++ b/testtools/source/bridgetest/currentcontextchecker.cxx
@@ -22,7 +22,6 @@
#include "currentcontextchecker.hxx"
-#include "boost/noncopyable.hpp"
#include "com/sun/star/uno/Any.hxx"
#include "com/sun/star/uno/Reference.hxx"
#include "com/sun/star/uno/RuntimeException.hpp"
@@ -44,14 +43,16 @@ static char const VALUE[] = "good";
class CurrentContext:
public ::osl::DebugBase< CurrentContext >,
- public ::cppu::WeakImplHelper< css::uno::XCurrentContext >,
- private boost::noncopyable
+ public ::cppu::WeakImplHelper< css::uno::XCurrentContext >
{
public:
CurrentContext();
virtual ~CurrentContext();
+ CurrentContext(const CurrentContext&) = delete;
+ CurrentContext& operator=(const CurrentContext&) = delete;
+
virtual css::uno::Any SAL_CALL getValueByName(OUString const & Name)
throw (css::uno::RuntimeException, std::exception) override;
};
diff --git a/toolkit/source/awt/asynccallback.cxx b/toolkit/source/awt/asynccallback.cxx
index 0064dda..2d30afe 100644
--- a/toolkit/source/awt/asynccallback.cxx
+++ b/toolkit/source/awt/asynccallback.cxx
@@ -19,7 +19,6 @@
#include <sal/config.h>
-#include <boost/noncopyable.hpp>
#include <vcl/svapp.hxx>
#include "osl/mutex.hxx"
#include "cppuhelper/factory.hxx"
@@ -36,11 +35,12 @@ namespace {
class AsyncCallback:
public ::cppu::WeakImplHelper<
css::lang::XServiceInfo,
- css::awt::XRequestCallback>,
- private boost::noncopyable
+ css::awt::XRequestCallback>
{
public:
AsyncCallback() {}
+ AsyncCallback(const AsyncCallback&) = delete;
+ AsyncCallback& operator=(const AsyncCallback&) = delete;
// css::lang::XServiceInfo:
virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx
index a76c26e..c6d79b8 100644
--- a/toolkit/source/controls/unocontrol.cxx
+++ b/toolkit/source/controls/unocontrol.cxx
@@ -19,7 +19,6 @@
#include <sal/config.h>
-#include <boost/noncopyable.hpp>
#include <com/sun/star/awt/XControlContainer.hpp>
#include <com/sun/star/awt/WindowAttribute.hpp>
#include <com/sun/star/awt/VclWindowPeerAttribute.hpp>
@@ -95,7 +94,7 @@ static Sequence< OUString> lcl_ImplGetPropertyNames( const Reference< XMultiProp
}
-class VclListenerLock: private boost::noncopyable
+class VclListenerLock
{
private:
VCLXWindow* m_pLockWindow;
@@ -112,6 +111,8 @@ public:
if ( m_pLockWindow )
m_pLockWindow->resumeVclEventListening( );
}
+ VclListenerLock(const VclListenerLock&) = delete;
+ VclListenerLock& operator=(const VclListenerLock&) = delete;
};
typedef ::std::map< OUString, sal_Int32 > MapString2Int;
diff --git a/toolkit/source/helper/accessibilityclient.cxx b/toolkit/source/helper/accessibilityclient.cxx
index 7be84b2..d004ba7 100644
--- a/toolkit/source/helper/accessibilityclient.cxx
+++ b/toolkit/source/helper/accessibilityclient.cxx
@@ -21,8 +21,6 @@
#include <sal/config.h>
-#include <boost/noncopyable.hpp>
-
#include <toolkit/helper/accessiblefactory.hxx>
#include <osl/module.h>
#include <osl/diagnose.h>
@@ -51,10 +49,12 @@ namespace toolkit
//= AccessibleDummyFactory
class AccessibleDummyFactory:
- public IAccessibleFactory, private boost::noncopyable
+ public IAccessibleFactory
{
public:
AccessibleDummyFactory();
+ AccessibleDummyFactory(const AccessibleDummyFactory&) = delete;
+ AccessibleDummyFactory& operator=(const AccessibleDummyFactory&) = delete;
protected:
virtual ~AccessibleDummyFactory();
diff --git a/tools/source/generic/fract.cxx b/tools/source/generic/fract.cxx
index d2c60b8..b6e8135 100644
--- a/tools/source/generic/fract.cxx
+++ b/tools/source/generic/fract.cxx
@@ -30,7 +30,6 @@
#include <cmath>
#include <boost/rational.hpp>
-#include <boost/noncopyable.hpp>
template<typename T>
static boost::rational<T> rational_FromDouble(double dVal);
@@ -38,10 +37,14 @@ static boost::rational<T> rational_FromDouble(double dVal);
template<typename T>
static void rational_ReduceInaccurate(boost::rational<T>& rRational, unsigned nSignificantBits);
-struct Fraction::Impl : boost::noncopyable
+struct Fraction::Impl
{
bool valid;
boost::rational<sal_Int64> value;
+
+ Impl() = default;
+ Impl(const Impl&) = delete;
+ Impl& operator=(const Impl&) = delete;
};
Fraction::Fraction() : mpImpl(new Impl)
diff --git a/unotest/source/cpp/unobootstrapprotector/unobootstrapprotector.cxx b/unotest/source/cpp/unobootstrapprotector/unobootstrapprotector.cxx
index 964ce13..c34de5f 100644
--- a/unotest/source/cpp/unobootstrapprotector/unobootstrapprotector.cxx
+++ b/unotest/source/cpp/unobootstrapprotector/unobootstrapprotector.cxx
@@ -21,7 +21,6 @@
#include <string>
#include <iostream>
-#include "boost/noncopyable.hpp"
#include "com/sun/star/uno/Exception.hpp"
#include <cppuhelper/bootstrap.hxx>
@@ -56,13 +55,16 @@ using namespace com::sun::star;
//the first dispose. So lets setup the default context once before
//all tests are run, and tear it down once after all have finished
-class Prot : public CppUnit::Protector, private boost::noncopyable
+class Prot : public CppUnit::Protector
{
public:
Prot();
virtual ~Prot();
+ Prot(const Prot&) = delete;
+ Prot& operator=(const Prot&) = delete;
+
virtual bool protect(
CppUnit::Functor const & functor,
CppUnit::ProtectorContext const & context) override;
diff --git a/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx b/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx
index e1300b9..820b32e 100644
--- a/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx
+++ b/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx
@@ -20,7 +20,6 @@
#include <string>
#include <iostream>
-#include "boost/noncopyable.hpp"
#include "com/sun/star/uno/Any.hxx"
#include "com/sun/star/uno/Exception.hpp"
#include "cppuhelper/exc_hlp.hxx"
@@ -44,13 +43,16 @@ std::string convert(OUString const & s16) {
s8.getStr(), static_cast< std::string::size_type >(s8.getLength()));
}
-class Prot : public CppUnit::Protector, private boost::noncopyable
+class Prot : public CppUnit::Protector
{
public:
Prot() {}
virtual ~Prot() {}
+ Prot(const Prot&) = delete;
+ Prot& operator=(const Prot&) = delete;
+
virtual bool protect(
CppUnit::Functor const & functor,
CppUnit::ProtectorContext const & context) override;
diff --git a/uui/source/interactionhandler.cxx b/uui/source/interactionhandler.cxx
index 56b6088..c45fb95 100644
--- a/uui/source/interactionhandler.cxx
+++ b/uui/source/interactionhandler.cxx
@@ -19,7 +19,6 @@
#include <sal/config.h>
-#include <boost/noncopyable.hpp>
#include <com/sun/star/awt/XWindow.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -37,8 +36,7 @@ namespace {
class UUIInteractionHandler:
public cppu::WeakImplHelper< css::lang::XServiceInfo,
css::lang::XInitialization,
- css::task::XInteractionHandler2 >,
- private boost::noncopyable
+ css::task::XInteractionHandler2 >
{
private:
UUIInteractionHelper * m_pImpl;
@@ -48,6 +46,9 @@ public:
virtual ~UUIInteractionHandler();
+ UUIInteractionHandler(const UUIInteractionHandler&) = delete;
+ UUIInteractionHandler& operator=(const UUIInteractionHandler&) = delete;
+
virtual OUString SAL_CALL getImplementationName()
throw (css::uno::RuntimeException, std::exception) override;
diff --git a/vbahelper/source/vbahelper/vbaapplicationbase.cxx b/vbahelper/source/vbahelper/vbaapplicationbase.cxx
index 641ed88..0c8798d 100644
--- a/vbahelper/source/vbahelper/vbaapplicationbase.cxx
+++ b/vbahelper/source/vbahelper/vbaapplicationbase.cxx
@@ -33,7 +33,6 @@
#include <com/sun/star/document/XEmbeddedScripts.hpp>
#include <com/sun/star/awt/XWindow2.hpp>
-#include <boost/noncopyable.hpp>
#include <filter/msfilter/msvbahelper.hxx>
#include <tools/datetime.hxx>
@@ -57,7 +56,7 @@ using namespace ::ooo::vba;
typedef ::std::pair< OUString, ::std::pair< double, double > > VbaTimerInfo;
// ====VbaTimer==================================
-class VbaTimer: private boost::noncopyable
+class VbaTimer
{
Timer m_aTimer;
VbaTimerInfo m_aTimerInfo;
@@ -72,6 +71,9 @@ public:
m_aTimer.Stop();
}
+ VbaTimer(const VbaTimer&) = delete;
+ VbaTimer& operator=(const VbaTimer&) = delete;
+
static double GetNow()
{
Date aDateNow( Date::SYSTEM );
diff --git a/vcl/osx/DragSource.hxx b/vcl/osx/DragSource.hxx
index e96a3de..ea16c26 100644
--- a/vcl/osx/DragSource.hxx
+++ b/vcl/osx/DragSource.hxx
@@ -30,8 +30,6 @@
#include <osl/thread.h>
#include <com/sun/star/awt/MouseEvent.hpp>
-#include <boost/noncopyable.hpp>
-
#include <premac.h>
#import <Cocoa/Cocoa.h>
#include <postmac.h>
@@ -72,12 +70,13 @@ class AquaSalFrame;
class DragSource : public ::cppu::BaseMutex,
public ::cppu::WeakComponentImplHelper< css::datatransfer::dnd::XDragSource,
css::lang::XInitialization,
- css::lang::XServiceInfo >,
- private ::boost::noncopyable
+ css::lang::XServiceInfo >
{
public:
DragSource();
virtual ~DragSource();
+ DragSource(const DragSource&) = delete;
+ DragSource& operator=(const DragSource&) = delete;
// XInitialization
virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
diff --git a/vcl/osx/DragSourceContext.hxx b/vcl/osx/DragSourceContext.hxx
index da5a3a8..0aa74c6 100644
--- a/vcl/osx/DragSourceContext.hxx
+++ b/vcl/osx/DragSourceContext.hxx
@@ -24,8 +24,6 @@
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
-#include <boost/noncopyable.hpp>
-
// This class fires events to XDragSourceListener implementations.
// Of that interface only dragDropEnd and dropActionChanged are called.
// The functions dragEnter, dragExit and dragOver are not supported
@@ -33,12 +31,13 @@
// An instance of SourceContext only lives as long as the drag and drop
// operation lasts.
class DragSourceContext: public cppu::BaseMutex,
- public cppu::WeakComponentImplHelper<css::datatransfer::dnd::XDragSourceContext>,
- private ::boost::noncopyable
+ public cppu::WeakComponentImplHelper<css::datatransfer::dnd::XDragSourceContext>
{
public:
DragSourceContext();
virtual ~DragSourceContext();
+ DragSourceContext(const DragSourceContext&) = delete;
+ DragSourceContext& operator=(const DragSourceContext&) = delete;
virtual sal_Int32 SAL_CALL getCurrentCursor( )
throw( css::uno::RuntimeException, std::exception) override;
diff --git a/vcl/osx/DropTarget.hxx b/vcl/osx/DropTarget.hxx
index a54d390..7659eed 100644
--- a/vcl/osx/DropTarget.hxx
+++ b/vcl/osx/DropTarget.hxx
@@ -34,8 +34,6 @@
#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/lang/XMultiComponentFactory.hpp>
-#include <boost/noncopyable.hpp>
-
#include <premac.h>
#import <Cocoa/Cocoa.h>
#include <postmac.h>
@@ -77,12 +75,13 @@ class DropTarget: public cppu::BaseMutex,
css::datatransfer::dnd::XDropTarget,
css::datatransfer::dnd::XDropTargetDragContext,
css::datatransfer::dnd::XDropTargetDropContext,
- css::lang::XServiceInfo >,
- private boost::noncopyable
+ css::lang::XServiceInfo >
{
public:
DropTarget();
virtual ~DropTarget();
+ DropTarget(const DropTarget&) = delete;
+ DropTarget& operator=(const DropTarget&) = delete;
// Overrides WeakComponentImplHelper::disposing which is called by
// WeakComponentImplHelper::dispose
diff --git a/vcl/osx/OSXTransferable.hxx b/vcl/osx/OSXTransferable.hxx
index b8c06fc..906138b 100644
--- a/vcl/osx/OSXTransferable.hxx
+++ b/vcl/osx/OSXTransferable.hxx
@@ -31,12 +31,10 @@
#import <Cocoa/Cocoa.h>
#include <postmac.h>
-#include <boost/noncopyable.hpp>
#include <memory>
#include <vector>
-class OSXTransferable : public ::cppu::WeakImplHelper<css::datatransfer::XTransferable>,
- private ::boost::noncopyable
+class OSXTransferable : public ::cppu::WeakImplHelper<css::datatransfer::XTransferable>
{
public:
explicit OSXTransferable(css::uno::Reference< css::datatransfer::XMimeContentTypeFactory> rXMimeCntFactory,
@@ -44,6 +42,8 @@ public:
NSPasteboard* pasteboard);
virtual ~OSXTransferable();
+ OSXTransferable(const OSXTransferable&) = delete;
+ OSXTransferable& operator=(const OSXTransferable&) = delete;
// XTransferable
diff --git a/vcl/osx/clipboard.hxx b/vcl/osx/clipboard.hxx
index 6ff1721..2a0afd9 100644
--- a/vcl/osx/clipboard.hxx
+++ b/vcl/osx/clipboard.hxx
@@ -36,7 +36,6 @@
#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/lang/XMultiComponentFactory.hpp>
-#include <boost/noncopyable.hpp>
#include <list>
#include <premac.h>
@@ -65,8 +64,7 @@ class AquaClipboard;
class AquaClipboard : public ::cppu::BaseMutex,
public ::cppu::WeakComponentImplHelper< css::datatransfer::clipboard::XSystemClipboard,
css::datatransfer::clipboard::XFlushableClipboard,
- css::lang::XServiceInfo >,
- private ::boost::noncopyable
+ css::lang::XServiceInfo >
{
public:
/* Create a clipboard instance.
@@ -84,6 +82,8 @@ public:
bool bUseSystemClipboard = true);
virtual ~AquaClipboard();
+ AquaClipboard(const AquaClipboard&) = delete;
+ AquaClipboard& operator=(const AquaClipboard&) = delete;
// XClipboard
diff --git a/writerperfect/source/common/WPXSvInputStream.cxx b/writerperfect/source/common/WPXSvInputStream.cxx
index aa9ddea..95d5dd0 100644
--- a/writerperfect/source/common/WPXSvInputStream.cxx
+++ b/writerperfect/source/common/WPXSvInputStream.cxx
@@ -22,7 +22,6 @@
#include <unotools/streamwrap.hxx>
#include <unotools/ucbstreamhelper.hxx>
-#include <boost/noncopyable.hpp>
#include <limits>
#include <memory>
#include <unordered_map>
@@ -41,11 +40,13 @@ namespace packages = com::sun::star::packages;
namespace
{
-class PositionHolder : private boost::noncopyable
+class PositionHolder
{
public:
explicit PositionHolder(const Reference<XSeekable> &rxSeekable);
~PositionHolder();
+ PositionHolder(const PositionHolder&) = delete;
+ PositionHolder& operator=(const PositionHolder&) = delete;
private:
const Reference<XSeekable> mxSeekable;
diff --git a/xmloff/inc/txtlists.hxx b/xmloff/inc/txtlists.hxx
index fc8f12d..d1c2ede 100644
--- a/xmloff/inc/txtlists.hxx
+++ b/xmloff/inc/txtlists.hxx
@@ -25,7 +25,6 @@
#include <stack>
#include <tuple>
#include <vector>
-#include <boost/noncopyable.hpp>
#include <com/sun/star/container/XIndexReplace.hpp>
#include <xmloff/xmlictxt.hxx>
@@ -34,11 +33,13 @@ class XMLTextListBlockContext;
class XMLTextListItemContext;
class XMLNumberedParaContext;
-class XMLTextListsHelper : private boost::noncopyable
+class XMLTextListsHelper
{
public:
XMLTextListsHelper();
~XMLTextListsHelper();
+ XMLTextListsHelper(const XMLTextListsHelper&) = delete;
+ XMLTextListsHelper& operator=(const XMLTextListsHelper&) = delete;
/// list stack for importing:
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index 57abb96..c64ef59 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -19,7 +19,6 @@
#include <sal/config.h>
-#include <boost/noncopyable.hpp>
#include <sax/tools/converter.hxx>
#include <xmloff/xmlprmap.hxx>
@@ -118,7 +117,7 @@ using ::std::vector;
// class SchXMLExportHelper_Impl
-class SchXMLExportHelper_Impl: private boost::noncopyable
+class SchXMLExportHelper_Impl
{
public:
// first: data sequence for label, second: data sequence for values.
@@ -132,6 +131,9 @@ public:
virtual ~SchXMLExportHelper_Impl();
+ SchXMLExportHelper_Impl(const SchXMLExportHelper_Impl&) = delete;
+ SchXMLExportHelper_Impl& operator=(const SchXMLExportHelper_Impl&) = delete;
+
// auto-styles
/// parse chart and collect all auto-styles used in current pool
void collectAutoStyles( css::uno::Reference< css::chart::XChartDocument > rChartDoc );
diff --git a/xmloff/source/style/impastpl.hxx b/xmloff/source/style/impastpl.hxx
index 803e93f..dc3b97d 100644
--- a/xmloff/source/style/impastpl.hxx
+++ b/xmloff/source/style/impastpl.hxx
@@ -34,8 +34,6 @@
#include <xmloff/maptype.hxx>
#include <xmloff/xmlexppr.hxx>
-#include <boost/noncopyable.hpp>
-
class SvXMLAutoStylePoolP;
class XMLAutoStylePoolParent;
struct XMLAutoStyleFamily;
@@ -102,7 +100,7 @@ public:
// Implementationclass for stylefamily-information
-struct XMLAutoStyleFamily : boost::noncopyable
+struct XMLAutoStyleFamily
{
typedef std::set<std::unique_ptr<XMLAutoStylePoolParent>,
comphelper::UniquePtrValueLess<XMLAutoStylePoolParent>> ParentSetType;
@@ -126,6 +124,9 @@ struct XMLAutoStyleFamily : boost::noncopyable
explicit XMLAutoStyleFamily( sal_Int32 nFamily );
~XMLAutoStyleFamily();
+ XMLAutoStyleFamily(const XMLAutoStyleFamily&) = delete;
+ XMLAutoStyleFamily& operator=(const XMLAutoStyleFamily&) = delete;
+
friend bool operator<(const XMLAutoStyleFamily& r1, const XMLAutoStyleFamily& r2);
void ClearEntries();
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index 0c4cc55..6ad3333 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -61,7 +61,6 @@
#include <com/sun/star/beans/XPropertyState.hpp>
#include <txtlists.hxx>
#include <xmloff/odffields.hxx>
-#include <boost/noncopyable.hpp>
using ::com::sun::star::ucb::XAnyCompare;
@@ -490,7 +489,6 @@ static const SvXMLTokenMapEntry aTextFieldAttrTokenMap[] =
#define MAX_COMBINED_CHARACTERS 6
struct XMLTextImportHelper::Impl
- : private ::boost::noncopyable
{
std::unique_ptr<SvXMLTokenMap> m_xTextElemTokenMap;
std::unique_ptr<SvXMLTokenMap> m_xTextPElemTokenMap;
@@ -596,6 +594,8 @@ struct XMLTextImportHelper::Impl
, m_bInsideDeleteContext( false )
{
}
+ Impl(const Impl&) = delete;
+ Impl& operator=(const Impl&) = delete;
void InitOutlineStylesCandidates()
{
diff --git a/xmlsecurity/source/xmlsec/serialnumberadapter.cxx b/xmlsecurity/source/xmlsec/serialnumberadapter.cxx
index 6f1848d..5b48422 100644
--- a/xmlsecurity/source/xmlsec/serialnumberadapter.cxx
+++ b/xmlsecurity/source/xmlsec/serialnumberadapter.cxx
@@ -19,7 +19,6 @@
#include <sal/config.h>
-#include <boost/noncopyable.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/security/XSerialNumberAdapter.hpp>
#include <com/sun/star/uno/Reference.hxx>
@@ -40,11 +39,12 @@ namespace {
class Service:
public cppu::WeakImplHelper<
- css::lang::XServiceInfo, css::security::XSerialNumberAdapter >,
- private boost::noncopyable
+ css::lang::XServiceInfo, css::security::XSerialNumberAdapter >
{
public:
Service() {}
+ Service(const Service&) = delete;
+ Service& operator=(const Service&) = delete;
private:
virtual ~Service() {}
More information about the Libreoffice-commits
mailing list