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

Change-Id: I672b187c92ccb71a6c4b9bc5e1169970fb61aa7d

9 files changed, 39 insertions, 21 deletions

diff --git a/sw/inc/breakit.hxx b/sw/inc/breakit.hxx
index dd2ba2dafc8f..9145517ead40 100644
--- a/sw/inc/breakit.hxx
+++ b/sw/inc/breakit.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SW_INC_BREAKIT_HXX
 #define INCLUDED_SW_INC_BREAKIT_HXX
 
-#include <boost/noncopyable.hpp>
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/i18n/XBreakIterator.hpp>
@@ -31,7 +30,7 @@
 
 enum class SvtScriptType;
 
-class SW_DLLPUBLIC SwBreakIt : private ::boost::noncopyable
+class SW_DLLPUBLIC SwBreakIt
 {
     css::uno::Reference< css::uno::XComponentContext > m_xContext;
     mutable css::uno::Reference< css::i18n::XBreakIterator > xBreak;
@@ -47,6 +46,9 @@ class SW_DLLPUBLIC SwBreakIt : private ::boost::noncopyable
 
     void createBreakIterator() const;
 
+    SwBreakIt(SwBreakIt const&) = delete;
+    SwBreakIt& operator=(SwBreakIt const&) = delete;
+
     // private (see @ _Create, _Delete).
     explicit SwBreakIt(
         const css::uno::Reference< css::uno::XComponentContext > & rxContext);
diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx
index c0c260860c9b..42064d57c899 100644
--- a/sw/inc/calbck.hxx
+++ b/sw/inc/calbck.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SW_INC_CALBCK_HXX
 
 #include "swdllapi.h"
-#include <boost/noncopyable.hpp>
 #include <ring.hxx>
 #include <hintids.hxx>
 #include <hints.hxx>
@@ -72,13 +71,17 @@ namespace sw
         const SfxPoolItem* m_pNew;
     };
     /// refactoring out the some of the more sane SwClient functionality
-    class SW_DLLPUBLIC WriterListener : private ::boost::noncopyable
+    class SW_DLLPUBLIC WriterListener
     {
         friend class ::SwModify;
         friend class ::sw::ClientIteratorBase;
         private:
             WriterListener* m_pLeft;
             WriterListener* m_pRight; ///< double-linked list of other clients
+
+            WriterListener(WriterListener const&) = delete;
+            WriterListener& operator=(WriterListener const&) = delete;
+
         protected:
             WriterListener()
                 : m_pLeft(nullptr), m_pRight(nullptr)
diff --git a/sw/inc/fmtmeta.hxx b/sw/inc/fmtmeta.hxx
index eb276dfc2690..b4ba789d582a 100644
--- a/sw/inc/fmtmeta.hxx
+++ b/sw/inc/fmtmeta.hxx
@@ -25,8 +25,6 @@
 #include <svl/poolitem.hxx>
 #include <sfx2/Metadatable.hxx>
 
-#include <boost/noncopyable.hpp>
-
 #include <memory>
 #include <vector>
 
@@ -194,7 +192,6 @@ public:
 
     /// knows all meta-fields in the document.
 class SW_DLLPUBLIC MetaFieldManager
-    : private ::boost::noncopyable
 {
 private:
     typedef ::std::vector< std::weak_ptr<MetaField> > MetaFieldList_t;
@@ -202,6 +199,9 @@ private:
     /// Document properties of a clipboard document, empty for non-clipboard documents.
     css::uno::Reference<css::document::XDocumentProperties> m_xDocumentProperties;
 
+    MetaFieldManager(MetaFieldManager const&) = delete;
+    MetaFieldManager& operator=(MetaFieldManager const&) = delete;
+
 public:
     MetaFieldManager();
     std::shared_ptr<MetaField> makeMetaField(
diff --git a/sw/inc/init.hxx b/sw/inc/init.hxx
index 96fb0c15fc07..8730c9de1716 100644
--- a/sw/inc/init.hxx
+++ b/sw/inc/init.hxx
@@ -21,7 +21,6 @@
 
 #include <sal/config.h>
 
-#include <boost/noncopyable.hpp>
 #include <osl/module.h>
 #include <osl/module.hxx>
 
@@ -33,7 +32,12 @@ void _FinitCore();
 namespace sw {
 
 // basflt/fltini.cxx
-class Filters: private boost::noncopyable {
+class Filters
+{
+private:
+    Filters(Filters const&) = delete;
+    Filters& operator=(Filters const&) = delete;
+
 public:
     Filters();
 
diff --git a/sw/inc/ndarr.hxx b/sw/inc/ndarr.hxx
index fc51e57e65b1..f2b2d12ccdd4 100644
--- a/sw/inc/ndarr.hxx
+++ b/sw/inc/ndarr.hxx
@@ -23,8 +23,6 @@
 #include <vector>
 #include <memory>
 
-#include <boost/noncopyable.hpp>
-
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
 
 #include <svtools/embedhlp.hxx>
@@ -87,7 +85,6 @@ public:
 
 class SW_DLLPUBLIC SwNodes
     : private BigPtrArray
-    , private ::boost::noncopyable
 {
     friend class SwDoc;
     friend class SwNode;
@@ -129,6 +126,9 @@ class SW_DLLPUBLIC SwNodes
                     bool bNewFrames = true, bool bTableInsDummyNode = false ) const;
     void _DelDummyNodes( const SwNodeRange& rRg );
 
+    SwNodes(SwNodes const&) = delete;
+    SwNodes& operator=(SwNodes const&) = delete;
+
 protected:
     SwNodes( SwDoc* pDoc );
 
diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx
index 24e860d4c744..2649010afa3d 100644
--- a/sw/inc/redline.hxx
+++ b/sw/inc/redline.hxx
@@ -27,7 +27,6 @@
 
 #include <IDocumentRedlineAccess.hxx>
 
-#include <boost/noncopyable.hpp>
 #include <svl/smplhint.hxx>
 #include <vector>
 
@@ -293,9 +292,13 @@ public:
 };
 
 /// Base object for 'Redlines' that are not of 'Ranged' type (like table row insert\delete)
-class SW_DLLPUBLIC SwExtraRedline : private boost::noncopyable
+class SW_DLLPUBLIC SwExtraRedline
 {
+private:
+    SwExtraRedline(SwExtraRedline const&) = delete;
+    SwExtraRedline& operator=(SwExtraRedline const&) = delete;
 public:
+    SwExtraRedline() = default;
     virtual ~SwExtraRedline();
 };
 
diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx
index 9d492b38a322..6c6160224602 100644
--- a/sw/inc/shellio.hxx
+++ b/sw/inc/shellio.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_SW_INC_SHELLIO_HXX
 
 #include <memory>
-#include <boost/noncopyable.hpp>
 
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/embed/XStorage.hpp>
@@ -355,7 +354,6 @@ class IDocumentStylePoolAccess;
 
 class SW_DLLPUBLIC Writer
     : public SvRefBase
-    , private ::boost::noncopyable
 {
     SwAsciiOptions aAscOpts;
     OUString       sBaseURL;
@@ -365,6 +363,9 @@ class SW_DLLPUBLIC Writer
 
     ::std::unique_ptr<Writer_Impl> m_pImpl;
 
+    Writer(Writer const&) = delete;
+    Writer& operator=(Writer const&) = delete;
+
 protected:
 
     SwPaM* pOrigPam;            // Last Pam that has to be processed.
diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index 4909ccbc751e..34a31aa99e49 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -18,6 +18,7 @@
  */
 #ifndef INCLUDED_SW_INC_SWTABLE_HXX
 #define INCLUDED_SW_INC_SWTABLE_HXX
+
 #include <tools/mempool.hxx>
 #include <tools/ref.hxx>
 #include <tblenum.hxx>
@@ -27,7 +28,6 @@
 #include <swtblfmt.hxx>
 
 #include <memory>
-#include <boost/noncopyable.hpp>
 #include <vector>
 #include <algorithm>
 #include <o3tl/sorted_vector.hxx>
@@ -496,12 +496,15 @@ public:
 };
 
 class SwCellFrame;
-class SW_DLLPUBLIC SwTableCellInfo : public ::boost::noncopyable
+class SW_DLLPUBLIC SwTableCellInfo
 {
     struct Impl;
     ::std::unique_ptr<Impl> m_pImpl;
 
-    const SwCellFrame * getCellFrame() const ;
+    const SwCellFrame * getCellFrame() const;
+
+    SwTableCellInfo(SwTableCellInfo const&) = delete;
+    SwTableCellInfo& operator=(SwTableCellInfo const&) = delete;
 
 public:
     SwTableCellInfo(const SwTable * pTable);
diff --git a/sw/inc/txatbase.hxx b/sw/inc/txatbase.hxx
index b31feacf7757..1efbe7b92e29 100644
--- a/sw/inc/txatbase.hxx
+++ b/sw/inc/txatbase.hxx
@@ -33,12 +33,11 @@
 #include <fchrfmt.hxx>
 #include <tox.hxx>
 
-#include <boost/noncopyable.hpp>
 
 class SfxItemPool;
 class SvXMLAttrContainerItem;
 
-class SwTextAttr : private boost::noncopyable
+class SwTextAttr
 {
 private:
     SfxPoolItem * const m_pAttr;
@@ -57,6 +56,9 @@ private:
     bool m_bFormatIgnoreEnd     : 1;    ///< text formatting should ignore end
     bool m_bHasContent          : 1;    // text attribute with content
 
+    SwTextAttr(SwTextAttr const&) = delete;
+    SwTextAttr& operator=(SwTextAttr const&) = delete;
+
 protected:
     SwTextAttr( SfxPoolItem& rAttr, sal_Int32 nStart );
     virtual ~SwTextAttr();