boost::noncopyable->'= delete'

Change-Id: If0f898a1e912fcd2095d8ba88b2b8046596e16ea

8 files changed, 20 insertions, 17 deletions

diff --git a/unotools/CppunitTest_unotools_fontdefs.mk b/unotools/CppunitTest_unotools_fontdefs.mk
index c96385c22fb8..b5f08a083d08 100644
--- a/unotools/CppunitTest_unotools_fontdefs.mk
+++ b/unotools/CppunitTest_unotools_fontdefs.mk
@@ -9,8 +9,6 @@
 
 $(eval $(call gb_CppunitTest_CppunitTest,unotools_fontdefs))
 
-$(eval $(call gb_CppunitTest_use_external,unotools_fontdefs,boost_headers))
-
 $(eval $(call gb_CppunitTest_use_api,unotools_fontdefs, \
     offapi \
     udkapi \
diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk
index 52f2eff48653..9067660e7944 100644
--- a/unotools/Library_utl.mk
+++ b/unotools/Library_utl.mk
@@ -11,8 +11,6 @@
 # utl is the name of the library as it is found in Repository.mk
 $(eval $(call gb_Library_Library,utl))
 
-$(eval $(call gb_Library_use_external,utl,boost_headers))
-
 $(eval $(call gb_Library_use_custom_headers,utl,\
  officecfg/registry \
 ))
diff --git a/unotools/inc/pch/precompiled_utl.hxx b/unotools/inc/pch/precompiled_utl.hxx
index 81f64950192a..14761a542031 100644
--- a/unotools/inc/pch/precompiled_utl.hxx
+++ b/unotools/inc/pch/precompiled_utl.hxx
@@ -15,7 +15,6 @@
 */
 
 #include <algorithm>
-#include <boost/noncopyable.hpp>
 #include <cassert>
 #include <com/sun/star/awt/XRequestCallback.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
diff --git a/unotools/source/config/configmgr.cxx b/unotools/source/config/configmgr.cxx
index 0fa8f6f123b3..c0a79eb7e3e6 100644
--- a/unotools/source/config/configmgr.cxx
+++ b/unotools/source/config/configmgr.cxx
@@ -21,7 +21,6 @@
 
 #include <list>
 
-#include <boost/noncopyable.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
 #include <com/sun/star/configuration/theDefaultProvider.hpp>
@@ -39,7 +38,7 @@
 
 namespace {
 
-class RegisterConfigItemHelper: private boost::noncopyable {
+class RegisterConfigItemHelper {
 public:
     RegisterConfigItemHelper(
         utl::ConfigManager & manager, utl::ConfigItem & item):
@@ -59,6 +58,9 @@ public:
 private:
     utl::ConfigManager & manager_;
     utl::ConfigItem * item_;
+
+    RegisterConfigItemHelper(const RegisterConfigItemHelper&) SAL_DELETED_FUNCTION;
+    RegisterConfigItemHelper& operator=(const RegisterConfigItemHelper&) SAL_DELETED_FUNCTION;
 };
 
 css::uno::Reference< css::lang::XMultiServiceFactory >
diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx
index 9194c838a79e..881c81889ed0 100644
--- a/unotools/source/config/lingucfg.cxx
+++ b/unotools/source/config/lingucfg.cxx
@@ -19,7 +19,6 @@
 
 #include <sal/config.h>
 
-#include <boost/noncopyable.hpp>
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
@@ -142,7 +141,7 @@ SvtLinguOptions::SvtLinguOptions()
 {
 }
 
-class SvtLinguConfigItem: public utl::ConfigItem, private boost::noncopyable
+class SvtLinguConfigItem : public utl::ConfigItem
 {
     SvtLinguOptions     aOpt;
 
@@ -151,6 +150,9 @@ class SvtLinguConfigItem: public utl::ConfigItem, private boost::noncopyable
     bool                LoadOptions( const uno::Sequence< OUString > &rProperyNames );
     bool                SaveOptions( const uno::Sequence< OUString > &rProperyNames );
 
+    SvtLinguConfigItem(const SvtLinguConfigItem&) SAL_DELETED_FUNCTION;
+    SvtLinguConfigItem& operator=(const SvtLinguConfigItem&) SAL_DELETED_FUNCTION;
+
 public:
     SvtLinguConfigItem();
     virtual ~SvtLinguConfigItem();
diff --git a/unotools/source/config/searchopt.cxx b/unotools/source/config/searchopt.cxx
index c4b0578963ab..bca047c4e270 100644
--- a/unotools/source/config/searchopt.cxx
+++ b/unotools/source/config/searchopt.cxx
@@ -19,7 +19,6 @@
 
 #include <sal/config.h>
 
-#include <boost/noncopyable.hpp>
 #include <unotools/searchopt.hxx>
 #include <tools/debug.hxx>
 #include <unotools/configitem.hxx>
@@ -36,11 +35,14 @@ using namespace com::sun::star::i18n;
 
 #define MAX_FLAGS_OFFSET    27
 
-class SvtSearchOptions_Impl: public ConfigItem, private boost::noncopyable
+class SvtSearchOptions_Impl : public ConfigItem
 {
     sal_Int32   nFlags;
     bool    bModified;
 
+    SvtSearchOptions_Impl(const SvtSearchOptions_Impl&) SAL_DELETED_FUNCTION;
+    SvtSearchOptions_Impl& operator=(const SvtSearchOptions_Impl&) SAL_DELETED_FUNCTION;
+
 protected:
     bool            IsModified() const { return bModified; }
     using ConfigItem::SetModified;
diff --git a/unotools/source/misc/componentresmodule.cxx b/unotools/source/misc/componentresmodule.cxx
index 5d6fc7644ee0..7b75a86cdc51 100644
--- a/unotools/source/misc/componentresmodule.cxx
+++ b/unotools/source/misc/componentresmodule.cxx
@@ -18,8 +18,6 @@
  */
 
 #include <unotools/componentresmodule.hxx>
-
-#include <boost/noncopyable.hpp>
 #include <tools/resmgr.hxx>
 #include <osl/diagnose.h>
 #include <rtl/strbuf.hxx>
@@ -33,13 +31,16 @@ namespace utl
 
         not threadsafe!
     */
-    class OComponentResModuleImpl: private boost::noncopyable
+    class OComponentResModuleImpl
     {
     private:
         ResMgr*         m_pResources;
         bool            m_bInitialized;
         OString  m_sResFilePrefix;
 
+        OComponentResModuleImpl(const OComponentResModuleImpl&) SAL_DELETED_FUNCTION;
+        OComponentResModuleImpl& operator=(const OComponentResModuleImpl&) SAL_DELETED_FUNCTION;
+
     public:
         OComponentResModuleImpl( const OString& _rResFilePrefix )
             :m_pResources( NULL )
diff --git a/unotools/source/misc/sharedunocomponent.cxx b/unotools/source/misc/sharedunocomponent.cxx
index 393b0c3feaa3..7d78e06aff7d 100644
--- a/unotools/source/misc/sharedunocomponent.cxx
+++ b/unotools/source/misc/sharedunocomponent.cxx
@@ -20,7 +20,6 @@
 #include <sal/config.h>
 #include <osl/diagnose.h>
 
-#include <boost/noncopyable.hpp>
 #include <unotools/sharedunocomponent.hxx>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/util/XCloseable.hpp>
@@ -67,12 +66,14 @@ namespace utl
 
     typedef ::cppu::WeakImplHelper1 <   XCloseListener
                                     >   CloseableComponentImpl_Base;
-    class CloseableComponentImpl:
-        public CloseableComponentImpl_Base, private boost::noncopyable
+    class CloseableComponentImpl : public CloseableComponentImpl_Base
     {
     private:
         Reference< XCloseable > m_xCloseable;
 
+        CloseableComponentImpl(const CloseableComponentImpl&) SAL_DELETED_FUNCTION;
+        CloseableComponentImpl& operator=(const CloseableComponentImpl&) SAL_DELETED_FUNCTION;
+
     public:
         CloseableComponentImpl( const Reference< XInterface >& _rxComponent );