Clean up function declarations and some unused functions

Change-Id: I58c425ab9d2c01f8844226aff820dd56d88ec09c

6 files changed, 15 insertions, 34 deletions

diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx
index 9932c6efc4f1..d16314d33c95 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -20,6 +20,7 @@
 #include <algorithm>
 #include <functional>
 
+#include <boost/noncopyable.hpp>
 #include <boost/scoped_array.hpp>
 #include <boost/unordered_set.hpp>
 
@@ -97,15 +98,12 @@ struct WW8_SED
 
 // class WW8_WrPlc0 is only used for header and footer positioning
 // ie there is no content support structure
-class WW8_WrPlc0
+class WW8_WrPlc0: private boost::noncopyable
 {
 private:
     std::vector<sal_uLong> aPos;      // PTRARR of CPs / FCs
     sal_uLong nOfs;
 
-    //No copying
-    WW8_WrPlc0(const WW8_WrPlc0&);
-    WW8_WrPlc0 &operator=(const WW8_WrPlc0&);
 public:
     WW8_WrPlc0( sal_uLong nOffset );
     sal_uInt16 Count() const                { return aPos.size(); }
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index c05aa512587d..0d1e9c8aac2b 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -19,6 +19,7 @@
 
 #include <iostream>
 
+#include <boost/noncopyable.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/embed/XStorage.hpp>
 #include <unotools/ucbstreamhelper.hxx>
@@ -179,13 +180,11 @@ typedef std::pair<long,BKMK> BKMKCP;
 typedef std::multimap<long,BKMKCP*> BKMKCPs;
 typedef BKMKCPs::iterator CPItr;
 
-class WW8_WrtBookmarks
+class WW8_WrtBookmarks: private boost::noncopyable
 {
 private:
     BKMKCPs aSttCps,aEndCps;
     BKMKNames maSwBkmkNms;
-    WW8_WrtBookmarks(const WW8_WrtBookmarks&);
-    WW8_WrtBookmarks& operator=(const WW8_WrtBookmarks&);
 
 public:
     WW8_WrtBookmarks();
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 84c51d18827b..292c6cdd0332 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -567,16 +567,7 @@ private:
 public:
     explicit Chunk(long nStart, const OUString &rURL)
         : msURL(rURL), mnStartPos(nStart), mnEndPos(0)  {}
-    Chunk(const Chunk &rChunk)
-        : msURL(rChunk.msURL), mnStartPos(rChunk.mnStartPos),
-        mnEndPos(rChunk.mnEndPos) {}
-    Chunk& operator=(const Chunk &rChunk)
-    {
-        msURL = rChunk.msURL;
-        mnStartPos = rChunk.mnStartPos;
-        mnEndPos = rChunk.mnEndPos;
-        return *this;
-    }
+
     void SetEndPos(long nEnd) { mnEndPos = nEnd; }
     long GetStartPos() const {return mnStartPos;}
     long GetEndPos() const {return mnEndPos;}
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index aa3c81a8f625..3d5425cd7c55 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <boost/noncopyable.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
 
 #include <i18nlangtag/languagetag.hxx>
@@ -422,7 +425,7 @@ OUString BasicProjImportHelper::getProjectName()
     return sProjName;
 }
 
-class Sttb : TBBase
+class Sttb : TBBase, private boost::noncopyable
 {
 struct SBBItem
 {
@@ -436,8 +439,6 @@ struct SBBItem
 
     std::vector< SBBItem > dataItems;
 
-    Sttb(const Sttb&);
-    Sttb& operator = ( const Sttb&);
 public:
     Sttb();
     virtual ~Sttb();
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 16aabb6bedf5..5bcc3e0fc26d 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <boost/noncopyable.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <comphelper/string.hxx>
 #include <tools/solar.h>
@@ -71,11 +74,8 @@
 using namespace ::com::sun::star;
 
 class WW8SelBoxInfo
-    : public std::vector<SwTableBox*>
+    : public std::vector<SwTableBox*>, private boost::noncopyable
 {
-private:
-    WW8SelBoxInfo(const WW8SelBoxInfo&);
-    WW8SelBoxInfo& operator=(const WW8SelBoxInfo&);
 public:
     short nGroupXStart;
     short nGroupWidth;
@@ -102,7 +102,7 @@ WW8TabBandDesc::~WW8TabBandDesc()
     delete[] pNewSHDs;
 }
 
-class WW8TabDesc
+class WW8TabDesc: private boost::noncopyable
 {
     std::vector<OUString> aNumRuleNames;
     sw::util::RedlineStack *mpOldRedlineStack;
@@ -166,9 +166,7 @@ class WW8TabDesc
         WW8SelBoxInfo* pActGroup, SwTableBox* pActBox, sal_uInt16 nCol  );
     void StartMiserableHackForUnsupportedDirection(short nWwCol);
     void EndMiserableHackForUnsupportedDirection(short nWwCol);
-    //No copying
-    WW8TabDesc(const WW8TabDesc&);
-    WW8TabDesc &operator=(const WW8TabDesc&);
+
 public:
     const SwTable* pTable;          // table
     SwPosition* pParentPos;
@@ -189,7 +187,6 @@ public:
     void MergeCells();
     short GetMinLeft() const { return nConvertedLeft; }
     ~WW8TabDesc();
-    SwPosition *GetPos() { return pTmpPos; }
 
     const WW8_TCell* GetAktWWCell() const { return pAktWWCell; }
     short GetAktCol() const { return nAktCol; }
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index d466e8444c68..492568a8aed9 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -5011,11 +5011,6 @@ struct SprmReadInfo
     FNReadRecord pReadFnc;
 };
 
-bool operator==(const SprmReadInfo &rFirst, const SprmReadInfo &rSecond)
-{
-    return (rFirst.nId == rSecond.nId);
-}
-
 bool operator<(const SprmReadInfo &rFirst, const SprmReadInfo &rSecond)
 {
     return (rFirst.nId < rSecond.nId);