boost::noncopyable->'= delete'

Change-Id: If0f898a1e912fcd2095d8ba88b2b8046596e16ea

3 files changed, 13 insertions, 6 deletions

diff --git a/include/unotools/charclass.hxx b/include/unotools/charclass.hxx
index e35a423b27ea..06ec048723b2 100644
--- a/include/unotools/charclass.hxx
+++ b/include/unotools/charclass.hxx
@@ -22,7 +22,6 @@
 #ifndef INCLUDED_UNOTOOLS_CHARCLASS_HXX
 #define INCLUDED_UNOTOOLS_CHARCLASS_HXX
 
-#include <boost/noncopyable.hpp>
 #include <i18nlangtag/languagetag.hxx>
 #include <com/sun/star/i18n/KCharacterType.hpp>
 #include <com/sun/star/i18n/KParseTokens.hpp>
@@ -64,12 +63,15 @@ const sal_Int32 nCharClassNumericTypeMask =
     ::com::sun::star::i18n::KCharacterType::PRINTABLE |
     ::com::sun::star::i18n::KCharacterType::BASE_FORM;
 
-class UNOTOOLS_DLLPUBLIC CharClass : private boost::noncopyable
+class UNOTOOLS_DLLPUBLIC CharClass
 {
     LanguageTag                 maLanguageTag;
     ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCharacterClassification >    xCC;
     mutable ::osl::Mutex        aMutex;
 
+    CharClass(const CharClass&) SAL_DELETED_FUNCTION;
+    CharClass& operator=(const CharClass&) SAL_DELETED_FUNCTION;
+
 public:
     /// Preferred ctor with service manager specified
     CharClass(
diff --git a/include/unotools/configmgr.hxx b/include/unotools/configmgr.hxx
index 4b63803ed96d..14a5abf34575 100644
--- a/include/unotools/configmgr.hxx
+++ b/include/unotools/configmgr.hxx
@@ -24,7 +24,6 @@
 
 #include <list>
 
-#include <boost/noncopyable.hpp>
 #include <com/sun/star/uno/Reference.hxx>
 #include <sal/types.h>
 #include <unotools/unotoolsdllapi.h>
@@ -36,7 +35,7 @@ namespace utl { class ConfigItem; }
 
 namespace utl {
 
-class UNOTOOLS_DLLPUBLIC ConfigManager: private boost::noncopyable {
+class UNOTOOLS_DLLPUBLIC ConfigManager {
 public:
     static OUString getAboutBoxProductVersion();
 
@@ -75,6 +74,10 @@ public:
     SAL_DLLPRIVATE void registerConfigItem(utl::ConfigItem * item);
 
 private:
+
+    ConfigManager(const ConfigManager&) SAL_DELETED_FUNCTION;
+    ConfigManager& operator=(const ConfigManager&) SAL_DELETED_FUNCTION;
+
     void doStoreConfigItems();
 
     std::list< ConfigItem * > items_;
diff --git a/include/unotools/localedatawrapper.hxx b/include/unotools/localedatawrapper.hxx
index 219d5ebc52fd..7c5d6278af71 100644
--- a/include/unotools/localedatawrapper.hxx
+++ b/include/unotools/localedatawrapper.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_UNOTOOLS_LOCALEDATAWRAPPER_HXX
 #define INCLUDED_UNOTOOLS_LOCALEDATAWRAPPER_HXX
 
-#include <boost/noncopyable.hpp>
 #include <com/sun/star/i18n/XLocaleData4.hpp>
 #include <com/sun/star/i18n/LocaleItem.hpp>
 #include <com/sun/star/i18n/reservedWords.hpp>
@@ -50,7 +49,7 @@ enum MeasurementSystem {
     MEASURE_US
 };
 
-class UNOTOOLS_DLLPUBLIC LocaleDataWrapper : private boost::noncopyable
+class UNOTOOLS_DLLPUBLIC LocaleDataWrapper
 {
     static  sal_uInt8                nLocaleDataChecking;    // 0:=dontknow, 1:=yes, 2:=no
 
@@ -344,6 +343,9 @@ public:
     static  void                outputCheckMessage( const OUString& rMsg );
     static  void                outputCheckMessage( const char* pStr);
 
+    LocaleDataWrapper(const LocaleDataWrapper&) SAL_DELETED_FUNCTION;
+    LocaleDataWrapper& operator=(const LocaleDataWrapper&) SAL_DELETED_FUNCTION;
+
 private:
 
     const ::com::sun::star::lang::Locale &  getMyLocale() const;