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

Change-Id: Iac20763c7d1db467420f9c2fbb3cd636839d4c80

7 files changed, 27 insertions, 17 deletions

diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx
index 53ad3c2c500e..e085bbacea95 100644
--- a/sw/inc/pch/precompiled_sw.hxx
+++ b/sw/inc/pch/precompiled_sw.hxx
@@ -52,7 +52,6 @@
 #include <unordered_map>
 #include <utility>
 #include <vector>
-#include <boost/noncopyable.hpp>
 #include <boost/numeric/conversion/cast.hpp>
 #include <boost/optional.hpp>
 #include <boost/optional/optional.hpp>
diff --git a/sw/inc/pch/precompiled_swui.hxx b/sw/inc/pch/precompiled_swui.hxx
index f49478c40a83..480012e50f39 100644
--- a/sw/inc/pch/precompiled_swui.hxx
+++ b/sw/inc/pch/precompiled_swui.hxx
@@ -61,7 +61,6 @@
 #include <utility>
 #include <vector>
 #include <boost/intrusive_ptr.hpp>
-#include <boost/noncopyable.hpp>
 #include <boost/optional.hpp>
 #include <osl/diagnose.h>
 #include <osl/doublecheckedlocking.h>
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index 9edc798f7301..a9e3d58abdb1 100644
--- a/sw/source/core/doc/tblafmt.cxx
+++ b/sw/source/core/doc/tblafmt.cxx
@@ -41,8 +41,6 @@
 #include <fmtornt.hxx>
 #include <editsh.hxx>
 
-#include <boost/noncopyable.hpp>
-
 #include <memory>
 #include <vector>
 
@@ -130,7 +128,7 @@ namespace
 
     See also: BeginSwBlock and EndSwBlock.
     */
-    class WriterSpecificAutoFormatBlock : private ::boost::noncopyable
+    class WriterSpecificAutoFormatBlock
     {
     public:
         explicit WriterSpecificAutoFormatBlock(SvStream &rStream) : _rStream(rStream)
@@ -144,6 +142,9 @@ namespace
         }
 
     private:
+        WriterSpecificAutoFormatBlock(WriterSpecificAutoFormatBlock const&) = delete;
+        WriterSpecificAutoFormatBlock& operator=(WriterSpecificAutoFormatBlock const&) = delete;
+
         SvStream &_rStream;
         sal_uInt64 _whereToWriteEndOfBlock;
     };
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index ae4abb0b7cf5..b0153bd07a62 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -91,7 +91,6 @@
 
 #include <o3tl/make_unique.hxx>
 
-#include <boost/noncopyable.hpp>
 #include <memory>
 #include <swuiexp.hxx>
 
@@ -157,7 +156,7 @@ struct DB_Column
     }
 };
 
-struct DB_ColumnConfigData: private boost::noncopyable
+struct DB_ColumnConfigData
 {
     SwInsDBColumns aDBColumns;
     OUString sSource;
@@ -171,6 +170,9 @@ struct DB_ColumnConfigData: private boost::noncopyable
          bIsHeadlineOn : 1,
          bIsEmptyHeadln : 1;
 
+    DB_ColumnConfigData(DB_ColumnConfigData const&) = delete;
+    DB_ColumnConfigData& operator=(DB_ColumnConfigData const&) = delete;
+
     DB_ColumnConfigData()
     {
         bIsTable = bIsHeadlineOn = true;
diff --git a/sw/source/uibase/app/swdllimpl.hxx b/sw/source/uibase/app/swdllimpl.hxx
index 06f277ce120c..57a34bed2c81 100644
--- a/sw/source/uibase/app/swdllimpl.hxx
+++ b/sw/source/uibase/app/swdllimpl.hxx
@@ -12,12 +12,11 @@
 
 #include <sal/config.h>
 
-#include <boost/noncopyable.hpp>
 #include <memory>
 
 namespace sw { class Filters; }
 
-class SwDLL: private boost::noncopyable
+class SwDLL
 {
 public:
     static void RegisterFactories();
@@ -30,6 +29,9 @@ public:
     sw::Filters & getFilters();
 
 private:
+    SwDLL(SwDLL const&) = delete;
+    SwDLL& operator=(SwDLL const&) = delete;
+
     std::unique_ptr< sw::Filters > filters_;
 };
 
diff --git a/sw/source/uibase/sidebar/SwPanelFactory.cxx b/sw/source/uibase/sidebar/SwPanelFactory.cxx
index dc0487452a0d..ed9263baf5b9 100644
--- a/sw/source/uibase/sidebar/SwPanelFactory.cxx
+++ b/sw/source/uibase/sidebar/SwPanelFactory.cxx
@@ -37,7 +37,6 @@
 #include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
-#include <boost/noncopyable.hpp>
 
 using namespace css;
 using namespace css::uno;
@@ -49,10 +48,13 @@ typedef ::cppu::WeakComponentImplHelper <
         > PanelFactoryInterfaceBase;
 
 class SwPanelFactory
-    : private ::boost::noncopyable,
-      private ::cppu::BaseMutex,
-      public PanelFactoryInterfaceBase
+    : private ::cppu::BaseMutex
+    , public PanelFactoryInterfaceBase
 {
+private:
+    SwPanelFactory(SwPanelFactory const&) = delete;
+    SwPanelFactory& operator=(SwPanelFactory const&) = delete;
+
 public:
     SwPanelFactory();
     virtual ~SwPanelFactory();
diff --git a/sw/source/uibase/uno/unomailmerge.cxx b/sw/source/uibase/uno/unomailmerge.cxx
index d29be104d4fc..7c8a6022d946 100644
--- a/sw/source/uibase/uno/unomailmerge.cxx
+++ b/sw/source/uibase/uno/unomailmerge.cxx
@@ -70,7 +70,6 @@
 
 #include <unomid.h>
 
-#include <boost/noncopyable.hpp>
 #include <memory>
 
 using namespace ::com::sun::star;
@@ -184,8 +183,7 @@ static bool LoadFromURL_impl(
 
 namespace
 {
-    class DelayedFileDeletion : public ::cppu::WeakImplHelper< util::XCloseListener >,
-                                private boost::noncopyable
+    class DelayedFileDeletion : public ::cppu::WeakImplHelper<util::XCloseListener>
     {
     protected:
         ::osl::Mutex                    m_aMutex;
@@ -194,6 +192,9 @@ namespace
         OUString                        m_sTemporaryFile;
         sal_Int32                       m_nPendingDeleteAttempts;
 
+        DelayedFileDeletion(DelayedFileDeletion const&) = delete;
+        DelayedFileDeletion& operator=(DelayedFileDeletion const&) = delete;
+
     public:
         DelayedFileDeletion( const Reference< XModel >& _rxModel,
                              const OUString& _rTemporaryFile );
@@ -409,7 +410,8 @@ SwXMailMerge::~SwXMailMerge()
 }
 
 // Guarantee object consistence in case of an exception
-class MailMergeExecuteFinalizer: private boost::noncopyable {
+class MailMergeExecuteFinalizer
+{
 public:
     explicit MailMergeExecuteFinalizer(SwXMailMerge *mailmerge)
         : m_pMailMerge(mailmerge)
@@ -423,6 +425,9 @@ public:
     }
 
 private:
+    MailMergeExecuteFinalizer(MailMergeExecuteFinalizer const&) = delete;
+    MailMergeExecuteFinalizer& operator=(MailMergeExecuteFinalizer const&) = delete;
+
     SwXMailMerge *m_pMailMerge;
 };