sw: replace boost::noncopyable with C++11 delete

Change-Id: I67d8d06012ac8835d957c77b122c8f0cda84a712

23 files changed, 111 insertions, 74 deletions

diff --git a/sw/source/core/inc/DocumentChartDataProviderManager.hxx b/sw/source/core/inc/DocumentChartDataProviderManager.hxx
index 627178ed5a6e..aca39d771ba2 100644
--- a/sw/source/core/inc/DocumentChartDataProviderManager.hxx
+++ b/sw/source/core/inc/DocumentChartDataProviderManager.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SW_SOURCE_CORE_INC_DOCUMENTCHARTDATAPROVIDEMANAGER_HXX
 
 #include <IDocumentChartDataProviderAccess.hxx>
-#include <boost/noncopyable.hpp>
 
 #include <rtl/ref.hxx>
 
@@ -37,8 +36,7 @@ class SwDoc;
 
 namespace sw {
 
-class DocumentChartDataProviderManager : public IDocumentChartDataProviderAccess,
-                                         public ::boost::noncopyable
+class DocumentChartDataProviderManager : public IDocumentChartDataProviderAccess
 {
 
 public:
@@ -55,6 +53,9 @@ public:
 
 private:
 
+    DocumentChartDataProviderManager(DocumentChartDataProviderManager const&) = delete;
+    DocumentChartDataProviderManager& operator=(DocumentChartDataProviderManager const&) = delete;
+
     SwDoc& m_rDoc;
 
     mutable rtl::Reference<SwChartDataProvider> maChartDataProviderImplRef;
diff --git a/sw/source/core/inc/DocumentContentOperationsManager.hxx b/sw/source/core/inc/DocumentContentOperationsManager.hxx
index 5d8fca4f2f80..670c2a245383 100644
--- a/sw/source/core/inc/DocumentContentOperationsManager.hxx
+++ b/sw/source/core/inc/DocumentContentOperationsManager.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SW_SOURCE_CORE_INC_DOCUMENTCONTENTOPERATIONSMANAGER_HXX
 
 #include <IDocumentContentOperations.hxx>
-#include <boost/noncopyable.hpp>
 #include <ndarr.hxx> //Only for lcl_RstTxtAttr
 
 class SwDoc;
@@ -32,8 +31,7 @@ class SwHistory;
 namespace sw
 {
 
-class DocumentContentOperationsManager : public IDocumentContentOperations,
-                                         public ::boost::noncopyable
+class DocumentContentOperationsManager : public IDocumentContentOperations
 {
 public:
     DocumentContentOperationsManager( SwDoc& i_rSwdoc );
@@ -165,6 +163,9 @@ private:
      Position may not lie within range! */
     bool CopyImpl( SwPaM&, SwPosition&, const bool MakeNewFrames /*= true */,
             const bool bCopyAll, SwPaM *const pCpyRng /*= 0*/ ) const;
+
+    DocumentContentOperationsManager(DocumentContentOperationsManager const&) = delete;
+    DocumentContentOperationsManager& operator=(DocumentContentOperationsManager const&) = delete;
 };
 
 }
diff --git a/sw/source/core/inc/DocumentDeviceManager.hxx b/sw/source/core/inc/DocumentDeviceManager.hxx
index a4991ec00483..20184b2c2359 100644
--- a/sw/source/core/inc/DocumentDeviceManager.hxx
+++ b/sw/source/core/inc/DocumentDeviceManager.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_SW_SOURCE_CORE_INC_DOCUMENTDEVICEMANAGER_HXX
 
 #include <IDocumentDeviceAccess.hxx>
-#include <boost/noncopyable.hpp>
 #include <sal/types.h>
 #include <vcl/vclptr.hxx>
 
@@ -33,8 +32,7 @@ class SwPrintData;
 
 namespace sw {
 
-class DocumentDeviceManager : public IDocumentDeviceAccess,
-                              public ::boost::noncopyable
+class DocumentDeviceManager : public IDocumentDeviceAccess
 {
 
 public:
@@ -65,6 +63,9 @@ public:
 
 private:
 
+    DocumentDeviceManager(DocumentDeviceManager const&) = delete;
+    DocumentDeviceManager& operator=(DocumentDeviceManager const&) = delete;
+
     VirtualDevice& CreateVirtualDevice_() const;
     SfxPrinter& CreatePrinter_() const;
     void PrtDataChanged(); /**< Printer or JobSetup altered.
diff --git a/sw/source/core/inc/DocumentDrawModelManager.hxx b/sw/source/core/inc/DocumentDrawModelManager.hxx
index 486657e4b368..5584a24f67ba 100644
--- a/sw/source/core/inc/DocumentDrawModelManager.hxx
+++ b/sw/source/core/inc/DocumentDrawModelManager.hxx
@@ -22,7 +22,6 @@
 
 #include <sal/types.h>
 #include <IDocumentDrawModelAccess.hxx>
-#include <boost/noncopyable.hpp>
 #include <svx/svdtypes.hxx>
 
 class SwDrawModel;
@@ -32,8 +31,7 @@ class SwDoc;
 namespace sw
 {
 
-class DocumentDrawModelManager : public IDocumentDrawModelAccess,
-                                 public ::boost::noncopyable
+class DocumentDrawModelManager : public IDocumentDrawModelAccess
 {
 public:
 
@@ -67,6 +65,9 @@ public:
 
 private:
 
+    DocumentDrawModelManager(DocumentDrawModelManager const&) = delete;
+    DocumentDrawModelManager& operator=(DocumentDrawModelManager const&) = delete;
+
     SwDoc& m_rDoc;
 
 
diff --git a/sw/source/core/inc/DocumentExternalDataManager.hxx b/sw/source/core/inc/DocumentExternalDataManager.hxx
index 781fb081ca67..c4198577e5be 100644
--- a/sw/source/core/inc/DocumentExternalDataManager.hxx
+++ b/sw/source/core/inc/DocumentExternalDataManager.hxx
@@ -21,16 +21,20 @@
 #define INCLUDED_SW_SOURCE_CORE_INC_DOCUMENTEXTERNALDATAMANAGER_HXX
 
 #include <IDocumentExternalData.hxx>
-#include <boost/noncopyable.hpp>
 #include <sal/types.h>
 
 namespace sw {
 
-class DocumentExternalDataManager : public IDocumentExternalData,
-                                    public ::boost::noncopyable
+class DocumentExternalDataManager : public IDocumentExternalData
 {
 
+private:
+    DocumentExternalDataManager(DocumentExternalDataManager const&) = delete;
+    DocumentExternalDataManager& operator=(DocumentExternalDataManager const&) = delete;
+
 public:
+    DocumentExternalDataManager() = default;
+
     void setExternalData( ::sw::tExternalDataType eType, ::sw::tExternalDataPointer pPayload) override;
     ::sw::tExternalDataPointer getExternalData(::sw::tExternalDataType eType) override;
 
diff --git a/sw/source/core/inc/DocumentFieldsManager.hxx b/sw/source/core/inc/DocumentFieldsManager.hxx
index 45ebc0624879..f1200104955f 100644
--- a/sw/source/core/inc/DocumentFieldsManager.hxx
+++ b/sw/source/core/inc/DocumentFieldsManager.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_SW_SOURCE_CORE_INC_DOCUMENTFIELDSMANAGER_HXX
 
 #include <IDocumentFieldsAccess.hxx>
-#include <boost/noncopyable.hpp>
 #include <sal/types.h>
 
 class SwDoc;
@@ -28,8 +27,7 @@ class SwDBNameInfField;
 
 namespace sw {
 
-class DocumentFieldsManager : public IDocumentFieldsAccess,
-                              public ::boost::noncopyable
+class DocumentFieldsManager : public IDocumentFieldsAccess
 {
 
 public:
@@ -92,6 +90,9 @@ public:
 
 private:
 
+    DocumentFieldsManager(DocumentFieldsManager const&) = delete;
+    DocumentFieldsManager& operator=(DocumentFieldsManager const&) = delete;
+
     SwDoc& m_rDoc;
 
     bool mbNewFieldLst; //< TRUE: Rebuild field-list.
diff --git a/sw/source/core/inc/DocumentLayoutManager.hxx b/sw/source/core/inc/DocumentLayoutManager.hxx
index c3f900fce214..624d868aced1 100644
--- a/sw/source/core/inc/DocumentLayoutManager.hxx
+++ b/sw/source/core/inc/DocumentLayoutManager.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SW_SOURCE_CORE_INC_DOCUMENTLAYOUTMANAGER_HXX
 
 #include <IDocumentLayoutAccess.hxx>
-#include <boost/noncopyable.hpp>
 
 class SwDoc;
 class SwViewShell;
@@ -29,8 +28,7 @@ class SwLayouter;
 
 namespace sw {
 
-class DocumentLayoutManager : public IDocumentLayoutAccess,
-                              public ::boost::noncopyable
+class DocumentLayoutManager : public IDocumentLayoutAccess
 {
 
 public:
@@ -60,6 +58,9 @@ public:
 
 private:
 
+    DocumentLayoutManager(DocumentLayoutManager const&) = delete;
+    DocumentLayoutManager& operator=(DocumentLayoutManager const&) = delete;
+
     SwDoc& m_rDoc;
 
     SwViewShell *mpCurrentView; //< SwDoc should get a new member mpCurrentView
diff --git a/sw/source/core/inc/DocumentLinksAdministrationManager.hxx b/sw/source/core/inc/DocumentLinksAdministrationManager.hxx
index 1fbd4039d106..a2f015af673d 100644
--- a/sw/source/core/inc/DocumentLinksAdministrationManager.hxx
+++ b/sw/source/core/inc/DocumentLinksAdministrationManager.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SW_SOURCE_CORE_INC_DOCUMENTLINKSADMINISTRATIONMANAGER_HXX
 
 #include <IDocumentLinksAdministration.hxx>
-#include <boost/noncopyable.hpp>
 
 
 namespace sfx2 { class LinkManager; }
@@ -32,8 +31,7 @@ class SwNodeRange;
 namespace sw
 {
 
-class DocumentLinksAdministrationManager : public IDocumentLinksAdministration,
-                                           public ::boost::noncopyable
+class DocumentLinksAdministrationManager : public IDocumentLinksAdministration
 {
 public:
 
@@ -68,6 +66,9 @@ public:
 
 private:
 
+    DocumentLinksAdministrationManager(DocumentLinksAdministrationManager const&) = delete;
+    DocumentLinksAdministrationManager& operator=(DocumentLinksAdministrationManager const&) = delete;
+
     bool mbVisibleLinks; //< TRUE: Links are inserted visibly.
     bool mbLinksUpdated; //< #i38810# flag indicating, that the links have been updated.
     sfx2::LinkManager *mpLinkMgr; //< List of linked stuff (graphics/DDE/OLE).
diff --git a/sw/source/core/inc/DocumentListItemsManager.hxx b/sw/source/core/inc/DocumentListItemsManager.hxx
index 34e9fcc99437..ca557cfdd640 100644
--- a/sw/source/core/inc/DocumentListItemsManager.hxx
+++ b/sw/source/core/inc/DocumentListItemsManager.hxx
@@ -21,14 +21,12 @@
 #define INCLUDED_SW_SOURCE_CORE_INC_DOCUMENTLISTITEMSMANAGER_HXX
 
 #include <IDocumentListItems.hxx>
-#include <boost/noncopyable.hpp>
 #include <set>
 
 namespace sw
 {
 
-class DocumentListItemsManager : public IDocumentListItems,
-                                 public ::boost::noncopyable
+class DocumentListItemsManager : public IDocumentListItems
 {
 public:
 
@@ -55,6 +53,9 @@ public:
 
 private:
 
+    DocumentListItemsManager(DocumentListItemsManager const&) = delete;
+    DocumentListItemsManager& operator=(DocumentListItemsManager const&) = delete;
+
     tImplSortedNodeNumList* mpListItemsList;
 };
 
diff --git a/sw/source/core/inc/DocumentListsManager.hxx b/sw/source/core/inc/DocumentListsManager.hxx
index bf11ae119989..0bb6c2f8b33a 100644
--- a/sw/source/core/inc/DocumentListsManager.hxx
+++ b/sw/source/core/inc/DocumentListsManager.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SW_SOURCE_CORE_INC_DOCUMENTLISTSMANAGER_HXX
 
 #include <IDocumentListsAccess.hxx>
-#include <boost/noncopyable.hpp>
 #include <unordered_map>
 
 class SwList;
@@ -31,8 +30,7 @@ namespace sw
 {
 
 
-class DocumentListsManager : public IDocumentListsAccess,
-                             public ::boost::noncopyable
+class DocumentListsManager : public IDocumentListsAccess
 {
     public:
 
@@ -54,6 +52,9 @@ class DocumentListsManager : public IDocumentListsAccess,
 
     private:
 
+        DocumentListsManager(DocumentListsManager const&) = delete;
+        DocumentListsManager& operator=(DocumentListsManager const&) = delete;
+
         SwDoc& m_rDoc;
 
         typedef std::unordered_map<OUString, SwList*, OUStringHash> tHashMapForLists;
diff --git a/sw/source/core/inc/DocumentOutlineNodesManager.hxx b/sw/source/core/inc/DocumentOutlineNodesManager.hxx
index 1b932aacb141..8afafe420ff0 100644
--- a/sw/source/core/inc/DocumentOutlineNodesManager.hxx
+++ b/sw/source/core/inc/DocumentOutlineNodesManager.hxx
@@ -21,15 +21,13 @@
 #define INCLUDED_SW_SOURCE_CORE_INC_DOCUMENTOUTLINENODESMANAGER_HXX
 
 #include <IDocumentOutlineNodes.hxx>
-#include <boost/noncopyable.hpp>
 
 class SwDoc;
 
 namespace sw
 {
 
-class DocumentOutlineNodesManager : public IDocumentOutlineNodes,
-                                    public ::boost::noncopyable
+class DocumentOutlineNodesManager : public IDocumentOutlineNodes
 {
 public:
 
@@ -51,6 +49,9 @@ public:
 
 private:
 
+    DocumentOutlineNodesManager(DocumentOutlineNodesManager const&) = delete;
+    DocumentOutlineNodesManager& operator=(DocumentOutlineNodesManager const&) = delete;
+
     SwDoc& m_rDoc;
 };
 
diff --git a/sw/source/core/inc/DocumentRedlineManager.hxx b/sw/source/core/inc/DocumentRedlineManager.hxx
index 89bca6123a45..dfd3edadd171 100644
--- a/sw/source/core/inc/DocumentRedlineManager.hxx
+++ b/sw/source/core/inc/DocumentRedlineManager.hxx
@@ -21,15 +21,13 @@
 #define INCLUDED_SW_SOURCE_CORE_INC_DOCUMENTREDLINEMANAGER_HXX
 
 #include <IDocumentRedlineAccess.hxx>
-#include <boost/noncopyable.hpp>
 
 class SwDoc;
 
 namespace sw
 {
 
-class DocumentRedlineManager : public IDocumentRedlineAccess,
-                               public ::boost::noncopyable
+class DocumentRedlineManager : public IDocumentRedlineAccess
 {
 public:
     DocumentRedlineManager( SwDoc& i_rSwdoc );
@@ -124,6 +122,10 @@ public:
     virtual ~DocumentRedlineManager();
 
 private:
+
+    DocumentRedlineManager(DocumentRedlineManager const&) = delete;
+    DocumentRedlineManager& operator=(DocumentRedlineManager const&) = delete;
+
     SwDoc& m_rDoc;
 
     RedlineMode_t meRedlineMode;     //< Current Redline Mode.
diff --git a/sw/source/core/inc/DocumentStateManager.hxx b/sw/source/core/inc/DocumentStateManager.hxx
index ae765bdd74b9..99b6a86385c8 100644
--- a/sw/source/core/inc/DocumentStateManager.hxx
+++ b/sw/source/core/inc/DocumentStateManager.hxx
@@ -21,15 +21,13 @@
 #define INCLUDED_SW_SOURCE_CORE_INC_DOCUMENTSTATEMANAGER_HXX
 
 #include <IDocumentState.hxx>
-#include <boost/noncopyable.hpp>
 
 class SwDoc;
 
 
 namespace sw {
 
-class DocumentStateManager : public IDocumentState,
-                             public ::boost::noncopyable
+class DocumentStateManager : public IDocumentState
 {
 
 public:
@@ -46,6 +44,10 @@ public:
     void SetLoaded() override;
 
 private:
+
+    DocumentStateManager(DocumentStateManager const&) = delete;
+    DocumentStateManager& operator=(DocumentStateManager const&) = delete;
+
     SwDoc& m_rDoc;
 
     bool mbModified      ;    //< TRUE: document has changed.
diff --git a/sw/source/core/inc/DocumentStatisticsManager.hxx b/sw/source/core/inc/DocumentStatisticsManager.hxx
index b35aaf5729c1..1988a0072d5b 100644
--- a/sw/source/core/inc/DocumentStatisticsManager.hxx
+++ b/sw/source/core/inc/DocumentStatisticsManager.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_SW_SOURCE_CORE_INC_DOCUMENTSTATISTICSMANAGER_HXX
 
 #include <IDocumentStatistics.hxx>
-#include <boost/noncopyable.hpp>
 #include <vcl/timer.hxx>
 
 class SwDoc;
@@ -29,8 +28,7 @@ class Timer;
 
 namespace sw {
 
-class DocumentStatisticsManager : public IDocumentStatistics,
-                                  public ::boost::noncopyable
+class DocumentStatisticsManager : public IDocumentStatistics
 {
 
 public:
@@ -48,8 +46,10 @@ public:
 
 private:
 
-    SwDoc& m_rDoc;
+    DocumentStatisticsManager(DocumentStatisticsManager const&) = delete;
+    DocumentStatisticsManager& operator=(DocumentStatisticsManager const&) = delete;
 
+    SwDoc& m_rDoc;
 
     /** continue computing a chunk of document statistics
       * \param nChars  number of characters to count before exiting
diff --git a/sw/source/core/inc/DocumentStylePoolManager.hxx b/sw/source/core/inc/DocumentStylePoolManager.hxx
index 0637765e80ec..b215295e4468 100644
--- a/sw/source/core/inc/DocumentStylePoolManager.hxx
+++ b/sw/source/core/inc/DocumentStylePoolManager.hxx
@@ -21,14 +21,12 @@
 #define INCLUDED_SW_SOURCE_CORE_INC_DOCUMENTSTYLEPOOLMANAGER_HXX
 
 #include <IDocumentStylePoolAccess.hxx>
-#include <boost/noncopyable.hpp>
 
 class SwDoc;
 
 namespace sw {
 
-class DocumentStylePoolManager : public IDocumentStylePoolAccess,
-                                 public ::boost::noncopyable
+class DocumentStylePoolManager : public IDocumentStylePoolAccess
 {
 
 public:
@@ -49,6 +47,9 @@ public:
 
 private:
 
+    DocumentStylePoolManager(DocumentStylePoolManager const&) = delete;
+    DocumentStylePoolManager& operator=(DocumentStylePoolManager const&) = delete;
+
     SwDoc& m_rDoc;
 };
 
diff --git a/sw/source/core/inc/DocumentTimerManager.hxx b/sw/source/core/inc/DocumentTimerManager.hxx
index a1dbf2e5aa6b..762003d01036 100644
--- a/sw/source/core/inc/DocumentTimerManager.hxx
+++ b/sw/source/core/inc/DocumentTimerManager.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SW_SOURCE_CORE_INC_DOCUMENTTIMERMANAGER_HXX
 
 #include <IDocumentTimerAccess.hxx>
-#include <boost/noncopyable.hpp>
 
 #include <vcl/idle.hxx>
 #include <sal/types.h>
@@ -32,8 +31,7 @@ class SwDoc;
 namespace sw
 {
 
-class DocumentTimerManager : public IDocumentTimerAccess,
-                             public ::boost::noncopyable
+class DocumentTimerManager : public IDocumentTimerAccess
 {
 public:
 
@@ -56,11 +54,14 @@ public:
 
 private:
 
-     SwDoc& m_rDoc;
+    DocumentTimerManager(DocumentTimerManager const&) = delete;
+    DocumentTimerManager& operator=(DocumentTimerManager const&) = delete;
 
-     bool mbStartIdleTimer; //< idle timer mode start/stop
-     sal_Int32 mIdleBlockCount;
-     Idle  maIdle;
+    SwDoc& m_rDoc;
+
+    bool mbStartIdleTimer; //< idle timer mode start/stop
+    sal_Int32 mIdleBlockCount;
+    Idle  maIdle;
 };
 
 }
diff --git a/sw/source/core/inc/MarkManager.hxx b/sw/source/core/inc/MarkManager.hxx
index c0f09c939cc8..ac93ab3f74bf 100644
--- a/sw/source/core/inc/MarkManager.hxx
+++ b/sw/source/core/inc/MarkManager.hxx
@@ -24,15 +24,13 @@
 #include <IDocumentMarkAccess.hxx>
 #include <unordered_set>
 #include <unordered_map>
-#include <boost/noncopyable.hpp>
 
 namespace sw {
     namespace mark {
     typedef std::unordered_map<OUString, sal_Int32, OUStringHash> MarkBasenameMapUniqueOffset_t;
 
     class MarkManager
-        : private ::boost::noncopyable
-        , virtual public IDocumentMarkAccess
+        : virtual public IDocumentMarkAccess
     {
         public:
             MarkManager(/*[in/out]*/ SwDoc& rDoc);
@@ -97,6 +95,10 @@ namespace sw {
             virtual void assureSortedMarkContainers() const override;
 
         private:
+
+            MarkManager(MarkManager const&) = delete;
+            MarkManager& operator=(MarkManager const&) = delete;
+
             // make names
             OUString getUniqueMarkName(const OUString& rName) const;
             void sortMarks();
diff --git a/sw/source/core/inc/UndoTable.hxx b/sw/source/core/inc/UndoTable.hxx
index 807ff64d7c87..dd7bad3406fd 100644
--- a/sw/source/core/inc/UndoTable.hxx
+++ b/sw/source/core/inc/UndoTable.hxx
@@ -26,7 +26,6 @@
 #include <itabenum.hxx>
 #include <memory>
 #include <vector>
-#include <boost/noncopyable.hpp>
 
 class SfxItemSet;
 
@@ -162,7 +161,7 @@ public:
     void SaveBoxContent( const SwTableBox& rBox );
 };
 
-class SwUndoTableNdsChg : public SwUndo, private boost::noncopyable
+class SwUndoTableNdsChg : public SwUndo
 {
     _SaveTable* pSaveTable;
     std::set<sal_uLong> m_Boxes;
@@ -181,6 +180,9 @@ class SwUndoTableNdsChg : public SwUndo, private boost::noncopyable
     bool bFlag;
     bool bSameHeight;                   // only used for SplitRow
 
+    SwUndoTableNdsChg(SwUndoTableNdsChg const&) = delete;
+    SwUndoTableNdsChg& operator=(SwUndoTableNdsChg const&) = delete;
+
 public:
     SwUndoTableNdsChg( SwUndoId UndoId,
                     const SwSelBoxes& rBoxes,
diff --git a/sw/source/core/inc/bookmrk.hxx b/sw/source/core/inc/bookmrk.hxx
index 633dffbab771..ac5fae6a37db 100644
--- a/sw/source/core/inc/bookmrk.hxx
+++ b/sw/source/core/inc/bookmrk.hxx
@@ -24,7 +24,6 @@
 #include <sfx2/Metadatable.hxx>
 #include <vcl/keycod.hxx>
 #include <memory>
-#include <boost/noncopyable.hpp>
 #include <map>
 #include <rtl/ustring.hxx>
 #include <IMark.hxx>
diff --git a/sw/source/core/inc/swthreadmanager.hxx b/sw/source/core/inc/swthreadmanager.hxx
index f501b9146743..a57c91650bd0 100644
--- a/sw/source/core/inc/swthreadmanager.hxx
+++ b/sw/source/core/inc/swthreadmanager.hxx
@@ -23,7 +23,6 @@
 #include <osl/mutex.hxx>
 #include <rtl/ref.hxx>
 
-#include <boost/noncopyable.hpp>
 #include <memory>
 
 class ObservableThread;
@@ -35,7 +34,6 @@ class ThreadManager;
     Conforms the singleton pattern
 */
 class SwThreadManager
-    : private ::boost::noncopyable
 {
     public:
 
@@ -66,6 +64,10 @@ class SwThreadManager
         bool StartingOfThreadsSuspended();
 
     private:
+
+        SwThreadManager(SwThreadManager const&) = delete;
+        SwThreadManager& operator=(SwThreadManager const&) = delete;
+
         static bool mbThreadManagerInstantiated;
 
         ::std::unique_ptr<ThreadManager> mpThreadManagerImpl;
diff --git a/sw/source/core/inc/unometa.hxx b/sw/source/core/inc/unometa.hxx
index 9acb6a5d9773..d5447f56c806 100644
--- a/sw/source/core/inc/unometa.hxx
+++ b/sw/source/core/inc/unometa.hxx
@@ -33,7 +33,6 @@
 #include <cppuhelper/implbase.hxx>
 
 #include <sfx2/Metadatable.hxx>
-#include <boost/noncopyable.hpp>
 
 #include <unobaseclass.hxx>
 
@@ -60,7 +59,6 @@ typedef ::cppu::ImplInheritanceHelper
 
 class SwXMeta
     : public SwXMeta_Base
-    , private ::boost::noncopyable
 {
 
 public:
@@ -79,6 +77,9 @@ protected:
 
     virtual ~SwXMeta();
 
+    SwXMeta(SwXMeta const&) = delete;
+    SwXMeta& operator=(SwXMeta const&) = delete;
+
     /// @param pDoc and pMeta != 0, but not & because of ImplInheritanceHelper
     SwXMeta(SwDoc *const pDoc, ::sw::Meta *const pMeta,
         css::uno::Reference< css::text::XText> const&  xParentText,
diff --git a/sw/source/filter/inc/fltshell.hxx b/sw/source/filter/inc/fltshell.hxx
index c83c360c0924..f8558d1977a7 100644
--- a/sw/source/filter/inc/fltshell.hxx
+++ b/sw/source/filter/inc/fltshell.hxx
@@ -32,8 +32,6 @@
 #include <pam.hxx>
 #include <IDocumentRedlineAccess.hxx>
 
-#include <boost/noncopyable.hpp>
-
 #include <memory>
 #include <deque>
 
@@ -92,8 +90,12 @@ public:
 };
 
 // Stack-Eintrag fuer die Attribute Es werden immer Pointer auf neue Attribute uebergeben.
-class SwFltStackEntry : private ::boost::noncopyable
+class SwFltStackEntry
 {
+private:
+    SwFltStackEntry(SwFltStackEntry const&) = delete;
+    SwFltStackEntry& operator=(SwFltStackEntry const&) = delete;
+
 public:
     SwFltPosition m_aMkPos;
     SwFltPosition m_aPtPos;
@@ -125,15 +127,18 @@ public:
     void SetIsParaEnd(bool bArg){ bIsParaEnd = bArg;}
 };
 
-class SW_DLLPUBLIC SwFltControlStack : private ::boost::noncopyable
+class SW_DLLPUBLIC SwFltControlStack
 {
+private:
+    SwFltControlStack(SwFltControlStack const&) = delete;
+    SwFltControlStack& operator=(SwFltControlStack const&) = delete;
+
     typedef std::deque<std::unique_ptr<SwFltStackEntry>> Entries;
     typedef Entries::iterator myEIter;
     Entries m_Entries;
 
     sal_uLong nFieldFlags;
 
-private:
     bool bHasSdOD;
     bool bSdODChecked;
 
diff --git a/sw/source/filter/inc/msfilter.hxx b/sw/source/filter/inc/msfilter.hxx
index 951e6e78d27f..66771cffa8c9 100644
--- a/sw/source/filter/inc/msfilter.hxx
+++ b/sw/source/filter/inc/msfilter.hxx
@@ -34,8 +34,6 @@
 #include <shellio.hxx>
 #include <svl/zforlist.hxx>
 
-#include <boost/noncopyable.hpp>
-
 class SwDoc;
 class SwPaM;
 class SwTableNode;
@@ -335,12 +333,16 @@ namespace sw
             @author
                 <a href="mailto:mmaher@openoffice.org">Martin Maher</a>
          */
-        class RedlineStack : public boost::noncopyable
+        class RedlineStack
         {
         private:
             std::vector<SwFltStackEntry *> maStack;
             typedef std::vector<SwFltStackEntry *>::reverse_iterator myriter;
             SwDoc &mrDoc;
+
+            RedlineStack(RedlineStack const&) = delete;
+            RedlineStack& operator=(RedlineStack const&) = delete;
+
         public:
             explicit RedlineStack(SwDoc &rDoc) : mrDoc(rDoc) {}
             void open(const SwPosition& rPos, const SfxPoolItem& rAttr);
@@ -398,13 +400,17 @@ namespace sw
                 const;
         };
 
-        class WrtRedlineAuthor : public boost::noncopyable
+        class WrtRedlineAuthor
         {
         protected:
-            std::vector<OUString> maAuthors;          // Array of Sw - Bookmarknames
+            std::vector<OUString> maAuthors; // Array of Sw - Bookmarknames
+
+        private:
+            WrtRedlineAuthor(WrtRedlineAuthor const&) = delete;
+            WrtRedlineAuthor& operator=(WrtRedlineAuthor const&) = delete;
 
         public:
-            WrtRedlineAuthor() {}
+            WrtRedlineAuthor() = default;
             virtual ~WrtRedlineAuthor() {}
 
             sal_uInt16 AddName( const OUString& rNm );