boost::noncopyable->'= delete'

Change-Id: If0f898a1e912fcd2095d8ba88b2b8046596e16ea

16 files changed, 67 insertions, 44 deletions

diff --git a/configmgr/CppunitTest_configmgr_unit.mk b/configmgr/CppunitTest_configmgr_unit.mk
index 1672c9f42556..adec0152befe 100644
--- a/configmgr/CppunitTest_configmgr_unit.mk
+++ b/configmgr/CppunitTest_configmgr_unit.mk
@@ -48,6 +48,5 @@ $(eval $(call gb_CppunitTest_use_components,configmgr_unit,\
 ))
 
 $(eval $(call gb_CppunitTest_use_externals,configmgr_unit,\
-    boost_headers \
     icu_headers \
 ))
diff --git a/configmgr/Library_configmgr.mk b/configmgr/Library_configmgr.mk
index 528b15091ac2..bab1448b7ab0 100644
--- a/configmgr/Library_configmgr.mk
+++ b/configmgr/Library_configmgr.mk
@@ -46,8 +46,6 @@ $(eval $(call gb_Library_add_exception_objects,configmgr, \
     configmgr/source/xmldata \
 ))
 
-$(eval $(call gb_Library_use_external,configmgr,boost_headers))
-
 $(eval $(call gb_Library_use_sdk_api,configmgr))
 
 $(eval $(call gb_Library_use_libraries,configmgr, \
diff --git a/configmgr/inc/pch/precompiled_configmgr.hxx b/configmgr/inc/pch/precompiled_configmgr.hxx
index a7204b9642f8..bcc533e86b13 100644
--- a/configmgr/inc/pch/precompiled_configmgr.hxx
+++ b/configmgr/inc/pch/precompiled_configmgr.hxx
@@ -15,7 +15,6 @@
 */
 
 #include <algorithm>
-#include <boost/noncopyable.hpp>
 #include <cassert>
 #include <climits>
 #include <com/sun/star/beans/NamedValue.hpp>
diff --git a/configmgr/source/access.hxx b/configmgr/source/access.hxx
index dde2848f35e8..ba197b7c16d4 100644
--- a/configmgr/source/access.hxx
+++ b/configmgr/source/access.hxx
@@ -28,7 +28,6 @@
 #include <vector>
 #include "config_map.hxx"
 
-#include <boost/noncopyable.hpp>
 #include <com/sun/star/beans/PropertyVetoException.hpp>
 #include <com/sun/star/beans/UnknownPropertyException.hpp>
 #include <com/sun/star/beans/XExactName.hpp>
@@ -109,8 +108,7 @@ class Access:
     public com::sun::star::beans::XMultiHierarchicalPropertySet,
     public com::sun::star::beans::XHierarchicalPropertySetInfo,
     public com::sun::star::container::XNameContainer,
-    public com::sun::star::lang::XSingleServiceFactory,
-    private boost::noncopyable
+    public com::sun::star::lang::XSingleServiceFactory
 {
 public:
     oslInterlockedCount acquireCounting();
@@ -476,6 +474,9 @@ protected:
     bool isDisposed() const { return disposed_;}
 
 private:
+    Access(const Access&) SAL_DELETED_FUNCTION;
+    Access& operator=(const Access&) SAL_DELETED_FUNCTION;
+
     struct ModifiedChild {
         rtl::Reference< ChildAccess > child;
         bool directlyModified;
diff --git a/configmgr/source/broadcaster.hxx b/configmgr/source/broadcaster.hxx
index 9c7e2822685a..46b7f64ee934 100644
--- a/configmgr/source/broadcaster.hxx
+++ b/configmgr/source/broadcaster.hxx
@@ -24,7 +24,6 @@
 
 #include <vector>
 
-#include <boost/noncopyable.hpp>
 #include <com/sun/star/beans/PropertyChangeEvent.hpp>
 #include <com/sun/star/container/ContainerEvent.hpp>
 #include <com/sun/star/lang/EventObject.hpp>
@@ -44,8 +43,10 @@ namespace com { namespace sun { namespace star {
 
 namespace configmgr {
 
-class Broadcaster: private boost::noncopyable {
+class Broadcaster {
 public:
+    Broadcaster() {}
+
     void addDisposeNotification(
         com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >
             const & listener,
@@ -85,6 +86,9 @@ public:
     void send();
 
 private:
+    Broadcaster(const Broadcaster&) SAL_DELETED_FUNCTION;
+    Broadcaster& operator=(const Broadcaster&) SAL_DELETED_FUNCTION;
+
     struct DisposeNotification {
         com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >
             listener;
diff --git a/configmgr/source/components.hxx b/configmgr/source/components.hxx
index a545914bef19..6dd7d1d3ec5c 100644
--- a/configmgr/source/components.hxx
+++ b/configmgr/source/components.hxx
@@ -23,9 +23,9 @@
 #include <sal/config.h>
 
 #include <map>
+#include <memory>
 #include <set>
 
-#include <boost/noncopyable.hpp>
 #include <com/sun/star/beans/Optional.hpp>
 #include <com/sun/star/uno/Reference.hxx>
 #include <rtl/ref.hxx>
@@ -50,7 +50,7 @@ class Node;
 class Partial;
 class RootAccess;
 
-class Components: private boost::noncopyable {
+class Components {
 public:
     static Components & getSingleton(
         com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
@@ -105,6 +105,9 @@ public:
     getExternalValue(OUString const & descriptor);
 
 private:
+    Components(const Components&) SAL_DELETED_FUNCTION;
+    Components& operator=(const Components&) SAL_DELETED_FUNCTION;
+
     typedef void FileParser(
         OUString const &, int, Data &, Partial const *, Modifications *,
         Additions *);
diff --git a/configmgr/source/configurationprovider.cxx b/configmgr/source/configurationprovider.cxx
index 31f6cff0618c..51f1a0dbf35b 100644
--- a/configmgr/source/configurationprovider.cxx
+++ b/configmgr/source/configurationprovider.cxx
@@ -23,7 +23,6 @@
 #include <memory>
 #include <vector>
 
-#include <boost/noncopyable.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/configuration/theDefaultProvider.hpp>
@@ -89,7 +88,7 @@ typedef
     ServiceBase;
 
 class Service:
-    private cppu::BaseMutex, public ServiceBase, private boost::noncopyable
+    private cppu::BaseMutex, public ServiceBase
 {
 public:
     Service(
@@ -111,6 +110,9 @@ public:
     }
 
 private:
+    Service(const Service&) SAL_DELETED_FUNCTION;
+    Service& operator=(const Service&) SAL_DELETED_FUNCTION;
+
     virtual ~Service() {}
 
     virtual void SAL_CALL disposing() SAL_OVERRIDE { flushModifications(); }
@@ -368,13 +370,15 @@ void Service::flushModifications() const {
 
 class Factory:
     public cppu::WeakImplHelper2<
-        css::lang::XSingleComponentFactory, css::lang::XServiceInfo >,
-    private boost::noncopyable
+        css::lang::XSingleComponentFactory, css::lang::XServiceInfo >
 {
 public:
     Factory() {}
 
 private:
+    Factory(const Factory&) SAL_DELETED_FUNCTION;
+    Factory& operator=(const Factory&) SAL_DELETED_FUNCTION;
+
     virtual ~Factory() {}
 
     virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
diff --git a/configmgr/source/configurationregistry.cxx b/configmgr/source/configurationregistry.cxx
index 2df0b1552e95..9a9ad9d596ba 100644
--- a/configmgr/source/configurationregistry.cxx
+++ b/configmgr/source/configurationregistry.cxx
@@ -21,7 +21,6 @@
 
 #include <cassert>
 
-#include <boost/noncopyable.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/beans/Property.hpp>
 #include <com/sun/star/beans/XProperty.hpp>
@@ -71,13 +70,15 @@ namespace {
 class Service:
     public cppu::WeakImplHelper3<
         css::lang::XServiceInfo, css::registry::XSimpleRegistry,
-        css::util::XFlushable >,
-    private boost::noncopyable
+        css::util::XFlushable >
 {
 public:
     Service(css::uno::Reference< css::uno::XComponentContext > const & context);
 
 private:
+    Service(const Service&) SAL_DELETED_FUNCTION;
+    Service& operator=(const Service&) SAL_DELETED_FUNCTION;
+
     virtual ~Service() {}
 
     virtual OUString SAL_CALL getImplementationName()
@@ -151,14 +152,16 @@ private:
 };
 
 class RegistryKey:
-    public cppu::WeakImplHelper1< css::registry::XRegistryKey >,
-    private boost::noncopyable
+    public cppu::WeakImplHelper1< css::registry::XRegistryKey >
 {
 public:
     RegistryKey(Service & service, css::uno::Any const & value):
         service_(service), value_(value) {}
 
 private:
+    RegistryKey(const RegistryKey&) SAL_DELETED_FUNCTION;
+    RegistryKey& operator=(const RegistryKey&) SAL_DELETED_FUNCTION;
+
     virtual ~RegistryKey() {}
 
     virtual OUString SAL_CALL getKeyName()
diff --git a/configmgr/source/data.hxx b/configmgr/source/data.hxx
index 17a0e1dec879..681bf55aa261 100644
--- a/configmgr/source/data.hxx
+++ b/configmgr/source/data.hxx
@@ -26,7 +26,6 @@
 #include "config_map.hxx"
 #include <vector>
 
-#include <boost/noncopyable.hpp>
 #include <rtl/ref.hxx>
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
@@ -41,7 +40,7 @@ namespace configmgr {
 
 class Node;
 
-struct Data: private boost::noncopyable {
+struct Data {
     enum { NO_LAYER = INT_MAX };
 
     struct ExtensionXcu: public salhelper::SimpleReferenceObject {
@@ -86,6 +85,9 @@ struct Data: private boost::noncopyable {
         OUString const & url);
 
 private:
+    Data(const Data&) SAL_DELETED_FUNCTION;
+    Data& operator=(const Data&) SAL_DELETED_FUNCTION;
+
     typedef config_map< rtl::Reference< ExtensionXcu > >
         ExtensionXcuAdditions;
 
diff --git a/configmgr/source/modifications.hxx b/configmgr/source/modifications.hxx
index 0521da5ae9ab..7fac66758403 100644
--- a/configmgr/source/modifications.hxx
+++ b/configmgr/source/modifications.hxx
@@ -22,18 +22,17 @@
 
 #include <sal/config.h>
 
-#include <boost/unordered_map.hpp>
-#include <boost/noncopyable.hpp>
+#include <unordered_map>
 
 #include "path.hxx"
 
 
 namespace configmgr {
 
-class Modifications: private boost::noncopyable {
+class Modifications {
 public:
     struct Node {
-        typedef boost::unordered_map<OUString, Node, OUStringHash> Children;
+        typedef std::unordered_map<OUString, Node, OUStringHash> Children;
 
         Children children;
     };
@@ -49,6 +48,9 @@ public:
     Node const & getRoot() const { return root_;}
 
 private:
+    Modifications(const Modifications&) SAL_DELETED_FUNCTION;
+    Modifications& operator=(const Modifications&) SAL_DELETED_FUNCTION;
+
     Node root_;
 };
 
diff --git a/configmgr/source/partial.hxx b/configmgr/source/partial.hxx
index 75411aba84b7..a9b10f9eb80b 100644
--- a/configmgr/source/partial.hxx
+++ b/configmgr/source/partial.hxx
@@ -22,17 +22,15 @@
 
 #include <sal/config.h>
 
-#include <boost/unordered_map.hpp>
 #include <set>
-
-#include <boost/noncopyable.hpp>
+#include <unordered_map>
 
 #include "path.hxx"
 #include <rtl/ustring.hxx>
 
 namespace configmgr {
 
-class Partial: private boost::noncopyable {
+class Partial {
 public:
     enum Containment { CONTAINS_NOT, CONTAINS_SUBNODES, CONTAINS_NODE };
 
@@ -45,8 +43,11 @@ public:
     Containment contains(Path const & path) const;
 
 private:
+    Partial(const Partial&) SAL_DELETED_FUNCTION;
+    Partial& operator=(const Partial&) SAL_DELETED_FUNCTION;
+
     struct Node {
-        typedef boost::unordered_map< OUString, Node, OUStringHash > Children;
+        typedef std::unordered_map< OUString, Node, OUStringHash > Children;
 
         Node(): startInclude(false) {}
         void clear() { startInclude=false; children.clear(); }
diff --git a/configmgr/source/readonlyaccess.cxx b/configmgr/source/readonlyaccess.cxx
index 7b227ce03e28..9989eac30ab2 100644
--- a/configmgr/source/readonlyaccess.cxx
+++ b/configmgr/source/readonlyaccess.cxx
@@ -9,7 +9,6 @@
 
 #include <sal/config.h>
 
-#include <boost/noncopyable.hpp>
 #include <com/sun/star/container/NoSuchElementException.hpp>
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
@@ -44,8 +43,7 @@ namespace {
 class Service:
     public cppu::WeakImplHelper3<
         css::lang::XServiceInfo, css::lang::XInitialization,
-        css::container::XHierarchicalNameAccess >,
-    private boost::noncopyable
+        css::container::XHierarchicalNameAccess >
 {
 public:
     explicit Service(
@@ -53,6 +51,9 @@ public:
         context_(context) {}
 
 private:
+    Service(const Service&) SAL_DELETED_FUNCTION;
+    Service& operator=(const Service&) SAL_DELETED_FUNCTION;
+
     virtual ~Service() {}
 
     virtual OUString SAL_CALL getImplementationName()
diff --git a/configmgr/source/readwriteaccess.cxx b/configmgr/source/readwriteaccess.cxx
index 5d404df5e2ec..e503d9d556fe 100644
--- a/configmgr/source/readwriteaccess.cxx
+++ b/configmgr/source/readwriteaccess.cxx
@@ -9,7 +9,6 @@
 
 #include <sal/config.h>
 
-#include <boost/noncopyable.hpp>
 #include <com/sun/star/configuration/XReadWriteAccess.hpp>
 #include <com/sun/star/container/NoSuchElementException.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
@@ -46,8 +45,7 @@ namespace {
 class Service:
     public cppu::WeakImplHelper3<
         css::lang::XServiceInfo, css::lang::XInitialization,
-        css::configuration::XReadWriteAccess >,
-    private boost::noncopyable
+        css::configuration::XReadWriteAccess >
 {
 public:
     explicit Service(
@@ -55,6 +53,9 @@ public:
         context_(context) {}
 
 private:
+    Service(const Service&) SAL_DELETED_FUNCTION;
+    Service& operator=(const Service&) SAL_DELETED_FUNCTION;
+
     virtual ~Service() {}
 
     virtual OUString SAL_CALL getImplementationName()
diff --git a/configmgr/source/update.cxx b/configmgr/source/update.cxx
index 7c6371b493a5..6e5563eccb6f 100644
--- a/configmgr/source/update.cxx
+++ b/configmgr/source/update.cxx
@@ -23,7 +23,6 @@
 #include <memory>
 #include <set>
 
-#include <boost/noncopyable.hpp>
 #include <com/sun/star/configuration/XUpdate.hpp>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/RuntimeException.hpp>
@@ -58,8 +57,7 @@ std::set< OUString > seqToSet(
 }
 
 class Service:
-    public cppu::WeakImplHelper1< css::configuration::XUpdate >,
-    private boost::noncopyable
+    public cppu::WeakImplHelper1< css::configuration::XUpdate >
 {
 public:
     Service(css::uno::Reference< css::uno::XComponentContext > const context):
@@ -70,6 +68,9 @@ public:
     }
 
 private:
+    Service(const Service&) SAL_DELETED_FUNCTION;
+    Service& operator=(const Service&) SAL_DELETED_FUNCTION;
+
     virtual ~Service() {}
 
     virtual void SAL_CALL insertExtensionXcsFile(
diff --git a/configmgr/source/valueparser.hxx b/configmgr/source/valueparser.hxx
index 1f0aef061324..1a0751807bd8 100644
--- a/configmgr/source/valueparser.hxx
+++ b/configmgr/source/valueparser.hxx
@@ -25,7 +25,6 @@
 #include <set>
 #include <vector>
 
-#include <boost/noncopyable.hpp>
 #include <rtl/ref.hxx>
 #include <rtl/string.hxx>
 #include <rtl/ustring.hxx>
@@ -43,7 +42,7 @@ namespace configmgr {
 
 class Node;
 
-class ValueParser: private boost::noncopyable {
+class ValueParser {
 public:
     ValueParser(int layer);
 
@@ -69,6 +68,9 @@ public:
     OString separator_;
 
 private:
+    ValueParser(const ValueParser&) SAL_DELETED_FUNCTION;
+    ValueParser& operator=(const ValueParser&) SAL_DELETED_FUNCTION;
+
     template< typename T > com::sun::star::uno::Any convertItems();
 
     enum State { STATE_TEXT, STATE_TEXT_UNICODE, STATE_IT, STATE_IT_UNICODE };
diff --git a/configmgr/source/writemodfile.cxx b/configmgr/source/writemodfile.cxx
index 463ab070ec04..e73753e81886 100644
--- a/configmgr/source/writemodfile.cxx
+++ b/configmgr/source/writemodfile.cxx
@@ -21,7 +21,6 @@
 
 #include <cassert>
 
-#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>
@@ -74,7 +73,7 @@ OString convertToUtf8(
     return s;
 }
 
-struct TempFile: public boost::noncopyable {
+struct TempFile {
     OUString url;
     oslFileHandle handle;
     bool closed;
@@ -82,6 +81,9 @@ struct TempFile: public boost::noncopyable {
     TempFile(): handle(0), closed(false) {}
 
     ~TempFile();
+private:
+    TempFile(const TempFile&) SAL_DELETED_FUNCTION;
+    TempFile& operator=(const TempFile&) SAL_DELETED_FUNCTION;
 };
 
 TempFile::~TempFile() {