loplugin:deletedspecial

Change-Id: Ia2b137e0167966a3d0b60f3c642a106834da8f1c

57 files changed, 242 insertions, 353 deletions

diff --git a/sw/inc/HandleAnchorNodeChg.hxx b/sw/inc/HandleAnchorNodeChg.hxx
index fbd6402baab5..ac9d4b0f13a5 100644
--- a/sw/inc/HandleAnchorNodeChg.hxx
+++ b/sw/inc/HandleAnchorNodeChg.hxx
@@ -64,10 +64,8 @@ private:
     // and that re-creation of fly frames is necessary.
     bool mbAnchorNodeChanged;
 
-    // no copy-constructor
-    SwHandleAnchorNodeChg( const SwHandleAnchorNodeChg& );
-    // no assignment-operator
-    void operator=( const SwHandleAnchorNodeChg );
+    SwHandleAnchorNodeChg( const SwHandleAnchorNodeChg& ) SAL_DELETED_FUNCTION;
+    void operator=( const SwHandleAnchorNodeChg ) SAL_DELETED_FUNCTION;
 };
 #endif
 
diff --git a/sw/inc/SwNodeNum.hxx b/sw/inc/SwNodeNum.hxx
index 5efa72f6b386..81e96800613d 100644
--- a/sw/inc/SwNodeNum.hxx
+++ b/sw/inc/SwNodeNum.hxx
@@ -87,8 +87,8 @@ private:
 
     static void _UnregisterMeAndChildrenDueToRootDelete( SwNodeNum& rNodeNum );
 
-    SwNodeNum( const SwNodeNum& );              // no copy constructor
-    SwNodeNum& operator=( const SwNodeNum& );   // no assignment operator
+    SwNodeNum( const SwNodeNum& ) SAL_DELETED_FUNCTION;
+    SwNodeNum& operator=( const SwNodeNum& ) SAL_DELETED_FUNCTION;
 
     virtual bool IsCountPhantoms() const SAL_OVERRIDE;
 
diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx
index 4f51aefc27e3..d103f3e49340 100644
--- a/sw/inc/calc.hxx
+++ b/sw/inc/calc.hxx
@@ -180,9 +180,8 @@ class SwCalc
     OUString  GetColumnName( const OUString& rName );
     OUString  GetDBName( const OUString& rName );
 
-    // dont call this methods
-    SwCalc( const SwCalc& );
-    SwCalc& operator=( const SwCalc& );
+    SwCalc( const SwCalc& ) SAL_DELETED_FUNCTION;
+    SwCalc& operator=( const SwCalc& ) SAL_DELETED_FUNCTION;
 
 public:
         SwCalc( SwDoc& rD );
diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx
index 6b63023dbfc3..9747c9325b4b 100644
--- a/sw/inc/dcontact.hxx
+++ b/sw/inc/dcontact.hxx
@@ -380,9 +380,8 @@ class SwDrawContact : public SwContact
 
         void _InvalidateObjs( const bool _bUpdateSortedObjsList = false );
 
-        /// no copy-constructor and no assignment operator
-        SwDrawContact( const SwDrawContact& );
-        SwDrawContact& operator=( const SwDrawContact& );
+        SwDrawContact( const SwDrawContact& ) SAL_DELETED_FUNCTION;
+        SwDrawContact& operator=( const SwDrawContact& ) SAL_DELETED_FUNCTION;
 
     protected:
         /// virtuelle Methoden von SwClient
diff --git a/sw/inc/dlelstnr.hxx b/sw/inc/dlelstnr.hxx
index 99ca2865a489..74e5db326522 100644
--- a/sw/inc/dlelstnr.hxx
+++ b/sw/inc/dlelstnr.hxx
@@ -57,9 +57,8 @@ class SwLinguServiceEventListener :
     com::sun::star::uno::Reference<
         com::sun::star::linguistic2::XProofreadingIterator >    xGCIterator;
 
-    /// disallow use of copy-constructor and assignment operator
-    SwLinguServiceEventListener(const SwLinguServiceEventListener &);
-    SwLinguServiceEventListener & operator = (const SwLinguServiceEventListener &);
+    SwLinguServiceEventListener(const SwLinguServiceEventListener &) SAL_DELETED_FUNCTION;
+    SwLinguServiceEventListener & operator = (const SwLinguServiceEventListener &) SAL_DELETED_FUNCTION;
 
 public:
     SwLinguServiceEventListener();
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 1b9b31775003..1fe0fd95dd2c 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -414,8 +414,7 @@ private:
                                 const SwFrmFmt& rSrcFmt, SwFrmFmt& rDestFmt );
     SwFmt* FindFmtByName( const SwFmtsBase& rFmtArr, const OUString& rName ) const;
 
-    // gcc: aFtnInfo::CopyCtor is private, therefore we too have to protect ourselves.
-    SwDoc( const SwDoc &);
+    SwDoc( const SwDoc &) SAL_DELETED_FUNCTION;
 
     // Database fields:
     void AddUsedDBToList( std::vector<OUString>& rDBNameList,
diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx
index 448f486febeb..acf16d94aac3 100644
--- a/sw/inc/docstyle.hxx
+++ b/sw/inc/docstyle.hxx
@@ -229,9 +229,8 @@ public:
 protected:
     virtual ~SwDocStyleSheetPool();
 
-    /// For not-so-clever compilers.
 private:
-    SwDocStyleSheetPool( const SwDocStyleSheetPool& );
+    SwDocStyleSheetPool( const SwDocStyleSheetPool& ) SAL_DELETED_FUNCTION;
 };
 
 #endif
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 34c44092b7f0..7c2e9e3d5484 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -943,9 +943,8 @@ public:
     virtual ~SwEditShell();
 
 private:
-    /// For METWARE: no copying and no assignment.
-    SwEditShell(const SwEditShell &);
-    const SwEditShell &operator=(const SwEditShell &);
+    SwEditShell(const SwEditShell &) SAL_DELETED_FUNCTION;
+    const SwEditShell &operator=(const SwEditShell &) SAL_DELETED_FUNCTION;
 };
 
 inline const sfx2::LinkManager& SwEditShell::GetLinkManager() const
diff --git a/sw/inc/fchrfmt.hxx b/sw/inc/fchrfmt.hxx
index 40c259b7675e..d70f43a18a82 100644
--- a/sw/inc/fchrfmt.hxx
+++ b/sw/inc/fchrfmt.hxx
@@ -46,7 +46,7 @@ protected:
 
 private:
     /// @@@ public copy ctor, but no copy assignment?
-    SwFmtCharFmt & operator= (const SwFmtCharFmt &);
+    SwFmtCharFmt & operator= (const SwFmtCharFmt &) SAL_DELETED_FUNCTION;
 public:
 
     TYPEINFO_OVERRIDE();
diff --git a/sw/inc/finalthreadmanager.hxx b/sw/inc/finalthreadmanager.hxx
index 17e4c761012b..c2d489c7618a 100644
--- a/sw/inc/finalthreadmanager.hxx
+++ b/sw/inc/finalthreadmanager.hxx
@@ -73,8 +73,8 @@ public:
     virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
 private:
-    FinalThreadManager(FinalThreadManager &); // not defined
-    void operator =(FinalThreadManager &); // not defined
+    FinalThreadManager(FinalThreadManager &) SAL_DELETED_FUNCTION;
+    void operator =(FinalThreadManager &) SAL_DELETED_FUNCTION;
 
     virtual ~FinalThreadManager();
 
diff --git a/sw/inc/fmtautofmt.hxx b/sw/inc/fmtautofmt.hxx
index 90650b839de4..6a8381d14940 100644
--- a/sw/inc/fmtautofmt.hxx
+++ b/sw/inc/fmtautofmt.hxx
@@ -37,7 +37,7 @@ public:
     SwFmtAutoFmt( const SwFmtAutoFmt& rAttr );
 private:
     /// @@@ public copy ctor, but no copy assignment?
-    SwFmtAutoFmt & operator= (const SwFmtAutoFmt &);
+    SwFmtAutoFmt & operator= (const SwFmtAutoFmt &) SAL_DELETED_FUNCTION;
 public:
 
     TYPEINFO_OVERRIDE();
diff --git a/sw/inc/fmtcntnt.hxx b/sw/inc/fmtcntnt.hxx
index cb8aac06a27c..c81bbc704b58 100644
--- a/sw/inc/fmtcntnt.hxx
+++ b/sw/inc/fmtcntnt.hxx
@@ -31,7 +31,7 @@ class SW_DLLPUBLIC SwFmtCntnt: public SfxPoolItem
 {
     SwNodeIndex *pStartNode;
 
-    SwFmtCntnt &operator=( const SwFmtCntnt & ); ///< Copying not allowed.
+    SwFmtCntnt &operator=( const SwFmtCntnt & ) SAL_DELETED_FUNCTION;
 
 public:
     SwFmtCntnt( const SwStartNode* pStartNode = 0 );
diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx
index d04ee7395186..ce65a1c9505d 100644
--- a/sw/inc/fmtcol.hxx
+++ b/sw/inc/fmtcol.hxx
@@ -44,10 +44,8 @@ protected:
     { SetAuto( false ); }
 
 private:
-
-    /// For now don't copy and don't assign.
-    SwFmtColl(const SwFmtColl & );
-    const SwFmtColl &operator=(const SwFmtColl &);
+    SwFmtColl(const SwFmtColl & ) SAL_DELETED_FUNCTION;
+    const SwFmtColl &operator=(const SwFmtColl &) SAL_DELETED_FUNCTION;
 };
 
 /// Represents the style of a paragraph.
@@ -56,7 +54,7 @@ class SW_DLLPUBLIC SwTxtFmtColl: public SwFmtColl
     friend class SwDoc;
     friend class ::sw::DocumentStylePoolManager;
 
-    SwTxtFmtColl(const SwTxtFmtColl & rRef);
+    SwTxtFmtColl(const SwTxtFmtColl & rRef) SAL_DELETED_FUNCTION;
 
     bool mbStayAssignedToListLevelOfOutlineStyle;
 
@@ -194,7 +192,7 @@ public:
     SwCollCondition( const SwCollCondition& rCpy );
 private:
     /// @@@ public copy ctor, but no copy assignment?
-    SwCollCondition & operator= (const SwCollCondition &);
+    SwCollCondition & operator= (const SwCollCondition &) SAL_DELETED_FUNCTION;
 public:
 
     bool operator==( const SwCollCondition& rCmp ) const;
diff --git a/sw/inc/fmtflcnt.hxx b/sw/inc/fmtflcnt.hxx
index ea57e384c8f6..136038d69209 100644
--- a/sw/inc/fmtflcnt.hxx
+++ b/sw/inc/fmtflcnt.hxx
@@ -34,8 +34,7 @@ class SwFmtFlyCnt : public SfxPoolItem
     friend class SwTxtFlyCnt;
     SwTxtFlyCnt* pTxtAttr;
     SwFrmFmt* pFmt; ///< My Fly/DrawFrame-format.
-    /// protected CopyCtor
-    SwFmtFlyCnt& operator=(const SwFmtFlyCnt& rFlyCnt);
+    SwFmtFlyCnt& operator=(const SwFmtFlyCnt& rFlyCnt) SAL_DELETED_FUNCTION;
 
 public:
     SwFmtFlyCnt( SwFrmFmt *pFrmFmt );
diff --git a/sw/inc/fmtfld.hxx b/sw/inc/fmtfld.hxx
index 9cc505d8c8bb..c4f5e973a5d6 100644
--- a/sw/inc/fmtfld.hxx
+++ b/sw/inc/fmtfld.hxx
@@ -51,7 +51,7 @@ class SW_DLLPUBLIC SwFmtFld
     SwTxtFld* mpTxtFld; // the TextAttribute
 
     // @@@ copy construction allowed, but copy assignment is not? @@@
-    SwFmtFld& operator=(const SwFmtFld& rFld);
+    SwFmtFld& operator=(const SwFmtFld& rFld) SAL_DELETED_FUNCTION;
 
 protected:
     virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
diff --git a/sw/inc/fmtftn.hxx b/sw/inc/fmtftn.hxx
index 0e2b52cc20e9..51e6a215919c 100644
--- a/sw/inc/fmtftn.hxx
+++ b/sw/inc/fmtftn.hxx
@@ -47,9 +47,8 @@ class SW_DLLPUBLIC SwFmtFtn
 
     css::uno::WeakReference<css::text::XFootnote> m_wXFootnote;
 
-    /// Protected CopyCtor.
-    SwFmtFtn& operator=(const SwFmtFtn& rFtn);
-    SwFmtFtn( const SwFmtFtn& );
+    SwFmtFtn& operator=(const SwFmtFtn& rFtn) SAL_DELETED_FUNCTION;
+    SwFmtFtn( const SwFmtFtn& ) SAL_DELETED_FUNCTION;
 
 public:
     SwFmtFtn( bool bEndNote = false );
diff --git a/sw/inc/fmtrfmrk.hxx b/sw/inc/fmtrfmrk.hxx
index 4825699a6fae..cfa8efd67d8f 100644
--- a/sw/inc/fmtrfmrk.hxx
+++ b/sw/inc/fmtrfmrk.hxx
@@ -40,8 +40,7 @@ class SwFmtRefMark
     friend class SwTxtRefMark;
     SwTxtRefMark* pTxtAttr;
 
-    /// Protected CopyCtor.
-    SwFmtRefMark& operator=(const SwFmtRefMark& rRefMark);
+    SwFmtRefMark& operator=(const SwFmtRefMark& rRefMark) SAL_DELETED_FUNCTION;
     OUString aRefName;
 
     css::uno::WeakReference<css::text::XTextContent> m_wXReferenceMark;
diff --git a/sw/inc/fmturl.hxx b/sw/inc/fmturl.hxx
index 55a09ac0dc23..f7bbdffef38d 100644
--- a/sw/inc/fmturl.hxx
+++ b/sw/inc/fmturl.hxx
@@ -38,7 +38,7 @@ class SW_DLLPUBLIC SwFmtURL: public SfxPoolItem
 
     bool      bIsServerMap;     ///< A ServerSideImageMap with the URL.
 
-    SwFmtURL& operator=( const SwFmtURL& );
+    SwFmtURL& operator=( const SwFmtURL& ) SAL_DELETED_FUNCTION;
 
 public:
     SwFmtURL();
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx
index 84baec5e1a86..9fbbccf1f5f7 100644
--- a/sw/inc/frmfmt.hxx
+++ b/sw/inc/frmfmt.hxx
@@ -160,8 +160,8 @@ class SW_DLLPUBLIC SwFlyFrmFmt: public SwFrmFmt
        when they get borders (this is done in SwWrtShell::CalcAndGetScale) */
     Point   m_aLastFlyFrmPrtRectPos;
 
-    SwFlyFrmFmt( const SwFlyFrmFmt &rCpy );
-    SwFlyFrmFmt &operator=( const SwFlyFrmFmt &rCpy );
+    SwFlyFrmFmt( const SwFlyFrmFmt &rCpy ) SAL_DELETED_FUNCTION;
+    SwFlyFrmFmt &operator=( const SwFlyFrmFmt &rCpy ) SAL_DELETED_FUNCTION;
 
 protected:
     SwFlyFrmFmt( SwAttrPool& rPool, const sal_Char* pFmtNm,
@@ -236,9 +236,8 @@ class SW_DLLPUBLIC SwDrawFrmFmt: public SwFrmFmt
     mutable const SdrObject * pSdrObjCached;
     mutable OUString sSdrObjCachedComment;
 
-    /// Both not existent.
-    SwDrawFrmFmt( const SwDrawFrmFmt &rCpy );
-    SwDrawFrmFmt &operator=( const SwDrawFrmFmt &rCpy );
+    SwDrawFrmFmt( const SwDrawFrmFmt &rCpy ) SAL_DELETED_FUNCTION;
+    SwDrawFrmFmt &operator=( const SwDrawFrmFmt &rCpy ) SAL_DELETED_FUNCTION;
 
     SwFrmFmt::tLayoutDir meLayoutDir;
 
diff --git a/sw/inc/list.hxx b/sw/inc/list.hxx
index dfa6eaafa5f6..a0a41959984c 100644
--- a/sw/inc/list.hxx
+++ b/sw/inc/list.hxx
@@ -53,9 +53,8 @@ class SwList
         bool IsListLevelMarked( const int nListLevel ) const;
 
     private:
-        // no copy constructor and no assignment operator
-        SwList( const SwList& );
-        SwList& operator=( const SwList& );
+        SwList( const SwList& ) SAL_DELETED_FUNCTION;
+        SwList& operator=( const SwList& ) SAL_DELETED_FUNCTION;
 
         SwListImpl* mpListImpl;
 };
diff --git a/sw/inc/ndnotxt.hxx b/sw/inc/ndnotxt.hxx
index 33d52c8b5720..584fd5c24baa 100644
--- a/sw/inc/ndnotxt.hxx
+++ b/sw/inc/ndnotxt.hxx
@@ -41,8 +41,8 @@ class SW_DLLPUBLIC SwNoTxtNode : public SwCntntNode
     // graphics-attributes (only called by SwCntntNode).
     virtual void NewAttrSet( SwAttrPool& ) SAL_OVERRIDE;
 
-    SwNoTxtNode( const SwNoTxtNode& );              // Not allowed.
-    SwNoTxtNode &operator=( const SwNoTxtNode& );   // Not allowed.
+    SwNoTxtNode( const SwNoTxtNode& ) SAL_DELETED_FUNCTION;
+    SwNoTxtNode &operator=( const SwNoTxtNode& ) SAL_DELETED_FUNCTION;
 
 protected:
     SwNoTxtNode( const SwNodeIndex &rWhere, const sal_uInt8 nNdType,
diff --git a/sw/inc/ndole.hxx b/sw/inc/ndole.hxx
index 6cd24fcbb581..3091cc03abf9 100644
--- a/sw/inc/ndole.hxx
+++ b/sw/inc/ndole.hxx
@@ -41,8 +41,7 @@ class SW_DLLPUBLIC SwOLEObj
     svt::EmbeddedObjectRef xOLERef;
     OUString aName;
 
-    SwOLEObj( const SwOLEObj& rObj );   /// Not allowed.
-    SwOLEObj();
+    SwOLEObj( const SwOLEObj& rObj ) SAL_DELETED_FUNCTION;
 
     void SetNode( SwOLENode* pNode );
 
@@ -89,8 +88,7 @@ class SW_DLLPUBLIC SwOLENode: public SwNoTxtNode
                 SwGrfFmtColl *pGrfColl,
                 SwAttrSet* pAutoAttr = 0 );
 
-    /// aOLEObj has a private Copy-Ctor. We need one too:
-    SwOLENode( const SwOLENode & );
+    SwOLENode( const SwOLENode & ) SAL_DELETED_FUNCTION;
 
     using SwNoTxtNode::GetGraphic;
 
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index 2b2281918dbb..c6e1731a6556 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -288,9 +288,8 @@ public:
     virtual void dumpAsXml( xmlTextWriterPtr writer = NULL ) const;
 
 private:
-    /// Private constructor because copying is never allowed!!
-    SwNode( const SwNode & rNodes );
-    SwNode & operator= ( const SwNode & rNodes );
+    SwNode( const SwNode & rNodes ) SAL_DELETED_FUNCTION;
+    SwNode & operator= ( const SwNode & rNodes ) SAL_DELETED_FUNCTION;
 };
 
 /// Starts a section of nodes in the document model.
@@ -321,9 +320,8 @@ public:
     virtual void dumpAsXml( xmlTextWriterPtr writer = NULL ) const SAL_OVERRIDE;
 
 private:
-    /// Private constructor because copying is never allowed!!
-    SwStartNode( const SwStartNode & rNode );
-    SwStartNode & operator= ( const SwStartNode & rNode );
+    SwStartNode( const SwStartNode & rNode ) SAL_DELETED_FUNCTION;
+    SwStartNode & operator= ( const SwStartNode & rNode ) SAL_DELETED_FUNCTION;
 };
 
 /// Ends a section of nodes in the document model.
@@ -342,9 +340,8 @@ protected:
     DECL_FIXEDMEMPOOL_NEWDEL(SwEndNode)
 
 private:
-    /// Private constructor because copying is never allowed!!
-    SwEndNode( const SwEndNode & rNode );
-    SwEndNode & operator= ( const SwEndNode & rNode );
+    SwEndNode( const SwEndNode & rNode ) SAL_DELETED_FUNCTION;
+    SwEndNode & operator= ( const SwEndNode & rNode ) SAL_DELETED_FUNCTION;
 };
 
 // SwCntntNode
@@ -484,9 +481,8 @@ public:
     virtual drawinglayer::attribute::SdrAllFillAttributesHelperPtr getSdrAllFillAttributesHelper() const;
 
 private:
-    /// Private constructor because copying is never allowed!!
-    SwCntntNode( const SwCntntNode & rNode );
-    SwCntntNode & operator= ( const SwCntntNode & rNode );
+    SwCntntNode( const SwCntntNode & rNode ) SAL_DELETED_FUNCTION;
+    SwCntntNode & operator= ( const SwCntntNode & rNode ) SAL_DELETED_FUNCTION;
 };
 
 // SwTableNode
@@ -523,9 +519,8 @@ public:
     void RemoveRedlines();
 
 private:
-    /// Private constructor because copying is never allowed!!
-    SwTableNode( const SwTableNode & rNode );
-    SwTableNode & operator= ( const SwTableNode & rNode );
+    SwTableNode( const SwTableNode & rNode ) SAL_DELETED_FUNCTION;
+    SwTableNode & operator= ( const SwTableNode & rNode ) SAL_DELETED_FUNCTION;
 };
 
 class SwSectionNode
diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx
index 23096b33e666..ae8249943b21 100644
--- a/sw/inc/paratr.hxx
+++ b/sw/inc/paratr.hxx
@@ -68,7 +68,7 @@ public:
     SwFmtDrop( const SwFmtDrop & );
 private:
     // @@@ public copy ctor, but no copy assignment?
-    SwFmtDrop & operator= (const SwFmtDrop &);
+    SwFmtDrop & operator= (const SwFmtDrop &) SAL_DELETED_FUNCTION;
 
 protected:
    virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE;
diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx
index 6ff33580bc41..b789ce6ea2e1 100644
--- a/sw/inc/redline.hxx
+++ b/sw/inc/redline.hxx
@@ -35,8 +35,8 @@ class SwView;
 
 class SW_DLLPUBLIC SwRedlineExtraData
 {
-    SwRedlineExtraData( const SwRedlineExtraData& );
-    SwRedlineExtraData& operator=( const SwRedlineExtraData& );
+    SwRedlineExtraData( const SwRedlineExtraData& ) SAL_DELETED_FUNCTION;
+    SwRedlineExtraData& operator=( const SwRedlineExtraData& ) SAL_DELETED_FUNCTION;
 
 protected:
     SwRedlineExtraData() {}
diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index 592eacb8d02f..751f52853c95 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -143,7 +143,7 @@ public:
     SwTable( const SwTable& rTable );       // no copy of the lines !!
 private:
     // @@@ public copy ctor, but no copy assignment?
-    SwTable & operator= (const SwTable &);
+    SwTable & operator= (const SwTable &) SAL_DELETED_FUNCTION;
     // no default ctor.
     SwTable();
     bool OldMerge( SwDoc*, const SwSelBoxes&, SwTableBox*, SwUndoTblMerge* );
@@ -383,9 +383,8 @@ class SW_DLLPUBLIC SwTableBox: public SwClient      //Client of FrmFmt.
     friend void DelBoxNode(SwTableSortBoxes&);  // Delete StartNode* !
     friend class SwXMLTableContext;
 
-    // Not implemented (any more).
-    SwTableBox( const SwTableBox & );
-    SwTableBox &operator=( const SwTableBox &); // Does not exist.
+    SwTableBox( const SwTableBox & ) SAL_DELETED_FUNCTION;
+    SwTableBox &operator=( const SwTableBox &) SAL_DELETED_FUNCTION;
 
     SwTableLines aLines;
     const SwStartNode * pSttNd;
diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx
index 2377f150e92e..6a4866c6b6a4 100644
--- a/sw/inc/tox.hxx
+++ b/sw/inc/tox.hxx
@@ -167,7 +167,7 @@ private:
     TOXTypes        eType;
 
     // @@@ public copy ctor, but no copy assignment?
-    SwTOXType & operator= (const SwTOXType &);
+    SwTOXType & operator= (const SwTOXType &) SAL_DELETED_FUNCTION;
 };
 
 // Structure of the index lines
diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx
index 30bd2ba5b939..7b95c3734fe1 100644
--- a/sw/inc/unochart.hxx
+++ b/sw/inc/unochart.hxx
@@ -79,9 +79,8 @@ class SwChartLockController_Helper
     Timer   aUnlockTimer;   // timer to unlock chart controllers
     bool    bIsLocked;
 
-    // disallow use of d-tor, copy c-tor and assignment operator
-    SwChartLockController_Helper( const SwChartLockController_Helper & );
-    SwChartLockController_Helper & operator = ( const SwChartLockController_Helper & );
+    SwChartLockController_Helper( const SwChartLockController_Helper & ) SAL_DELETED_FUNCTION;
+    SwChartLockController_Helper & operator = ( const SwChartLockController_Helper & ) SAL_DELETED_FUNCTION;
 
     void LockUnlockAllCharts( bool bLock );
     void LockAllCharts()    { LockUnlockAllCharts( true ); };
@@ -142,9 +141,8 @@ class SwChartDataProvider :
     const SwDoc *                           pDoc;
     bool                                bDisposed;
 
-    // disallow use of c-tor and assignment operator
-    SwChartDataProvider( const SwChartDataProvider & );
-    SwChartDataProvider & operator = ( const SwChartDataProvider & );
+    SwChartDataProvider( const SwChartDataProvider & ) SAL_DELETED_FUNCTION;
+    SwChartDataProvider & operator = ( const SwChartDataProvider & ) SAL_DELETED_FUNCTION;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource > SAL_CALL Impl_createDataSource( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments, bool bTestOnly = false )
         throw (::com::sun::star::lang::IllegalArgumentException,
@@ -223,9 +221,8 @@ class SwChartDataSource :
         com::sun::star::uno::Reference<
             com::sun::star::chart2::data::XLabeledDataSequence > > aLDS;
 
-    // disallow use of c-tor and assignment operator
-    SwChartDataSource( const SwChartDataSource & );
-    SwChartDataSource & operator = ( const SwChartDataSource & );
+    SwChartDataSource( const SwChartDataSource & ) SAL_DELETED_FUNCTION;
+    SwChartDataSource & operator = ( const SwChartDataSource & ) SAL_DELETED_FUNCTION;
 
 public:
     SwChartDataSource( const com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::chart2::data::XLabeledDataSequence > > &rLDS );
@@ -278,9 +275,8 @@ class SwChartDataSequence :
 
     bool    bDisposed;
 
-    // disallow use of c-tor and assignment operator
     SwChartDataSequence( const SwChartDataSequence &rObj );
-    SwChartDataSequence & operator = ( const SwChartDataSequence & );
+    SwChartDataSequence & operator = ( const SwChartDataSequence & ) SAL_DELETED_FUNCTION;
 
 protected:
     //SwClient
@@ -381,9 +377,8 @@ class SwChartLabeledDataSequence :
 
     bool    bDisposed;
 
-    // disallow use of c-tor and assignment operator
-    SwChartLabeledDataSequence( const SwChartLabeledDataSequence & );
-    SwChartLabeledDataSequence & operator = ( const SwChartLabeledDataSequence & );
+    SwChartLabeledDataSequence( const SwChartLabeledDataSequence & ) SAL_DELETED_FUNCTION;
+    SwChartLabeledDataSequence & operator = ( const SwChartLabeledDataSequence & ) SAL_DELETED_FUNCTION;
 
     void    SetDataSequence( ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >& rxDest, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >& rxSource );
 
diff --git a/sw/inc/unotextrange.hxx b/sw/inc/unotextrange.hxx
index 583524466530..5ca871a566ff 100644
--- a/sw/inc/unotextrange.hxx
+++ b/sw/inc/unotextrange.hxx
@@ -45,7 +45,7 @@ class SW_DLLPUBLIC SwUnoInternalPaM
 {
 
 private:
-    SwUnoInternalPaM(const SwUnoInternalPaM&);
+    SwUnoInternalPaM(const SwUnoInternalPaM&) SAL_DELETED_FUNCTION;
 
 public:
     SwUnoInternalPaM(SwDoc& rDoc);
diff --git a/sw/source/core/access/parachangetrackinginfo.hxx b/sw/source/core/access/parachangetrackinginfo.hxx
index 02866abad9ae..5eaed9e6fe65 100644
--- a/sw/source/core/access/parachangetrackinginfo.hxx
+++ b/sw/source/core/access/parachangetrackinginfo.hxx
@@ -36,8 +36,8 @@ class SwParaChangeTrackingInfo
         const SwWrongList* getChangeTrackingTextMarkupList( const sal_Int32 nTextMarkupType );
 
     private:
-        SwParaChangeTrackingInfo( const SwParaChangeTrackingInfo& );
-        SwParaChangeTrackingInfo& operator=( const SwParaChangeTrackingInfo& );
+        SwParaChangeTrackingInfo( const SwParaChangeTrackingInfo& ) SAL_DELETED_FUNCTION;
+        SwParaChangeTrackingInfo& operator=( const SwParaChangeTrackingInfo& ) SAL_DELETED_FUNCTION;
 
         const SwTxtFrm& mrTxtFrm;
 
diff --git a/sw/source/core/access/textmarkuphelper.hxx b/sw/source/core/access/textmarkuphelper.hxx
index 1d15b230945b..e38dba18ad92 100644
--- a/sw/source/core/access/textmarkuphelper.hxx
+++ b/sw/source/core/access/textmarkuphelper.hxx
@@ -60,8 +60,8 @@ class SwTextMarkupHelper
                        ::com::sun::star::uno::RuntimeException);
 
     private:
-        SwTextMarkupHelper( const SwTextMarkupHelper& );
-        SwTextMarkupHelper& operator=( const SwTextMarkupHelper& );
+        SwTextMarkupHelper( const SwTextMarkupHelper& ) SAL_DELETED_FUNCTION;
+        SwTextMarkupHelper& operator=( const SwTextMarkupHelper& ) SAL_DELETED_FUNCTION;
 
         const SwAccessiblePortionData& mrPortionData;
 
diff --git a/sw/source/core/docnode/cancellablejob.hxx b/sw/source/core/docnode/cancellablejob.hxx
index a947f4e900f1..8796fd4d8941 100644
--- a/sw/source/core/docnode/cancellablejob.hxx
+++ b/sw/source/core/docnode/cancellablejob.hxx
@@ -38,8 +38,8 @@ public:
     virtual void SAL_CALL cancel() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
 private:
-    CancellableJob( CancellableJob& ); // not defined
-    void operator =( CancellableJob& ); // not defined
+    CancellableJob( CancellableJob& ) SAL_DELETED_FUNCTION;
+    void operator =( CancellableJob& ) SAL_DELETED_FUNCTION;
 
     ::rtl::Reference< ObservableThread > mrThread;
 };
diff --git a/sw/source/core/docnode/swthreadjoiner.cxx b/sw/source/core/docnode/swthreadjoiner.cxx
index 26870bce61e5..a91a6b2ba574 100644
--- a/sw/source/core/docnode/swthreadjoiner.cxx
+++ b/sw/source/core/docnode/swthreadjoiner.cxx
@@ -28,28 +28,28 @@
 
 using namespace ::com::sun::star;
 
-uno::Reference< util::XJobManager > SwThreadJoiner::mpThreadJoiner;
-
 namespace
 {
     class theJoinerMutex : public rtl::Static<osl::Mutex, theJoinerMutex> {};
+
+    uno::Reference< util::XJobManager > pThreadJoiner;
 }
 
 uno::Reference< util::XJobManager >& SwThreadJoiner::GetThreadJoiner()
 {
     osl::MutexGuard aGuard(theJoinerMutex::get());
 
-    if ( !mpThreadJoiner.is() )
+    if ( !pThreadJoiner.is() )
     {
-        mpThreadJoiner = util::JobManager::create( comphelper::getProcessComponentContext() );
+        pThreadJoiner = util::JobManager::create( comphelper::getProcessComponentContext() );
     }
 
-    return mpThreadJoiner;
+    return pThreadJoiner;
 }
 
 void SwThreadJoiner::ReleaseThreadJoiner()
 {
-    mpThreadJoiner.clear();
+    pThreadJoiner.clear();
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/swthreadjoiner.hxx b/sw/source/core/inc/swthreadjoiner.hxx
index fa71445a5c55..a6b329895918 100644
--- a/sw/source/core/inc/swthreadjoiner.hxx
+++ b/sw/source/core/inc/swthreadjoiner.hxx
@@ -22,19 +22,12 @@
 #include <com/sun/star/util/XJobManager.hpp>
 
 /** Testing */
-class SwThreadJoiner
+namespace SwThreadJoiner
 {
-    public:
+    ::com::sun::star::uno::Reference< ::com::sun::star::util::XJobManager >& GetThreadJoiner();
 
-        static ::com::sun::star::uno::Reference< ::com::sun::star::util::XJobManager >& GetThreadJoiner();
-
-        static void ReleaseThreadJoiner();
-
-    private:
-        static ::com::sun::star::uno::Reference< ::com::sun::star::util::XJobManager > mpThreadJoiner;
-
-        SwThreadJoiner();
-};
+    void ReleaseThreadJoiner();
+}
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/unoflatpara.hxx b/sw/source/core/inc/unoflatpara.hxx
index 0d02c4d856ce..a3979706a52b 100644
--- a/sw/source/core/inc/unoflatpara.hxx
+++ b/sw/source/core/inc/unoflatpara.hxx
@@ -134,8 +134,8 @@ public:
         throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
 private:
-    SwXFlatParagraph( const SwXFlatParagraph & ); // not defined
-    SwXFlatParagraph & operator = ( const SwXFlatParagraph & ); // not defined
+    SwXFlatParagraph( const SwXFlatParagraph & ) SAL_DELETED_FUNCTION;
+    SwXFlatParagraph & operator = ( const SwXFlatParagraph & ) SAL_DELETED_FUNCTION;
 
     OUString maExpandText;
 };
@@ -163,8 +163,8 @@ protected:
     virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVERRIDE;
 
 private:
-    SwXFlatParagraphIterator( const SwXFlatParagraphIterator & ); // not defined
-    SwXFlatParagraphIterator & operator =(const SwXFlatParagraphIterator & ); // not defined
+    SwXFlatParagraphIterator( const SwXFlatParagraphIterator & ) SAL_DELETED_FUNCTION;
+    SwXFlatParagraphIterator & operator =(const SwXFlatParagraphIterator & ) SAL_DELETED_FUNCTION;
 
     // container to hold the 'hard' references as long as necessary and valid
     std::set< css::uno::Reference< css::text::XFlatParagraph > >    m_aFlatParaList;
diff --git a/sw/source/core/inc/unotextmarkup.hxx b/sw/source/core/inc/unotextmarkup.hxx
index 2b22a958f033..2904ea9ca6c1 100644
--- a/sw/source/core/inc/unotextmarkup.hxx
+++ b/sw/source/core/inc/unotextmarkup.hxx
@@ -68,8 +68,8 @@ public:
     virtual void SAL_CALL commitMultiTextMarkup( const ::com::sun::star::uno::Sequence< ::com::sun::star::text::TextMarkupDescriptor >& aMarkups ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
 private:
-    SwXTextMarkup( const SwXTextMarkup & ); // not defined
-    SwXTextMarkup & operator =( const SwXTextMarkup & ); // not defined
+    SwXTextMarkup( const SwXTextMarkup & ) SAL_DELETED_FUNCTION;
+    SwXTextMarkup & operator =( const SwXTextMarkup & ) SAL_DELETED_FUNCTION;
 
 protected:
     //SwClient
@@ -97,8 +97,8 @@ public:
     virtual ::com::sun::star::uno::Any SAL_CALL getValueByIndex(::sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE;
 
 private:
-    SwXStringKeyMap(SwXStringKeyMap &); // not defined
-    void operator =(SwXStringKeyMap &); // not defined
+    SwXStringKeyMap(SwXStringKeyMap &) SAL_DELETED_FUNCTION;
+    void operator =(SwXStringKeyMap &) SAL_DELETED_FUNCTION;
 
     virtual ~SwXStringKeyMap() {}
 
diff --git a/sw/source/core/inc/wrong.hxx b/sw/source/core/inc/wrong.hxx
index 8d48da9ca232..03b28a9559b4 100644
--- a/sw/source/core/inc/wrong.hxx
+++ b/sw/source/core/inc/wrong.hxx
@@ -192,9 +192,8 @@ class SwWrongList
     void Insert(sal_uInt16 nWhere, std::vector<SwWrongArea>::iterator startPos, std::vector<SwWrongArea>::iterator endPos);
     void Remove( sal_uInt16 nIdx, sal_uInt16 nLen );
 
-    // forbidden and not implemented
-    SwWrongList& operator= (const SwWrongList &);
-    SwWrongList( const SwWrongList& rCpy );
+    SwWrongList& operator= (const SwWrongList &) SAL_DELETED_FUNCTION;
+    SwWrongList( const SwWrongList& rCpy ) SAL_DELETED_FUNCTION;
 
 public:
     SwWrongList( WrongListType eType );
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index 71db7d9aa809..34cb9400472f 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -395,7 +395,7 @@ class SwTxtPaintInfo : public SwTxtSizeInfo
                    const bool bSmartTag = false,
                    const bool bGrammarCheck = false );
 
-    SwTxtPaintInfo &operator=(const SwTxtPaintInfo&);
+    SwTxtPaintInfo &operator=(const SwTxtPaintInfo&) SAL_DELETED_FUNCTION;
     void _NotifyURL( const SwLinePortion &rPor ) const;
 
 protected:
diff --git a/sw/source/filter/inc/msfilter.hxx b/sw/source/filter/inc/msfilter.hxx
index 4b9e916b415b..dec1cc891b10 100644
--- a/sw/source/filter/inc/msfilter.hxx
+++ b/sw/source/filter/inc/msfilter.hxx
@@ -364,8 +364,7 @@ namespace sw
             explicit SetInDocAndDelete(SwDoc &rDoc) : mrDoc(rDoc) {}
             void operator()(SwFltStackEntry *pEntry);
         private:
-            //No assignment
-            SetInDocAndDelete& operator=(const SetInDocAndDelete&);
+            SetInDocAndDelete& operator=(const SetInDocAndDelete&) SAL_DELETED_FUNCTION;
         };
 
         /**
@@ -384,8 +383,7 @@ namespace sw
                     pEntry->SetEndPos(mrPos);
             }
         private:
-            //No assignment
-            SetEndIfOpen& operator=(const SetEndIfOpen&);
+            SetEndIfOpen& operator=(const SetEndIfOpen&) SAL_DELETED_FUNCTION;
         };
 
         /**
diff --git a/sw/source/filter/inc/wrtswtbl.hxx b/sw/source/filter/inc/wrtswtbl.hxx
index 7231ab1bf40b..9aa2a666eac0 100644
--- a/sw/source/filter/inc/wrtswtbl.hxx
+++ b/sw/source/filter/inc/wrtswtbl.hxx
@@ -102,7 +102,7 @@ class SW_DLLPUBLIC SwWriteTableRow
     // Forbidden and not implemented.
     SwWriteTableRow();
 
-    SwWriteTableRow & operator= (const SwWriteTableRow &);
+    SwWriteTableRow & operator= (const SwWriteTableRow &) SAL_DELETED_FUNCTION;
 
 protected:
     // GCC >= 3.4 needs accessible T (const T&) to pass T as const T& argument.
diff --git a/sw/source/filter/ww8/docxexport.hxx b/sw/source/filter/ww8/docxexport.hxx
index 37816385c5c5..df9251d1ba56 100644
--- a/sw/source/filter/ww8/docxexport.hxx
+++ b/sw/source/filter/ww8/docxexport.hxx
@@ -280,11 +280,9 @@ public:
     void SetFS(::sax_fastparser::FSHelperPtr mpFS);
 
 private:
-    /// No copying.
-    DocxExport( const DocxExport& );
+    DocxExport( const DocxExport& ) SAL_DELETED_FUNCTION;
 
-    /// No copying.
-    DocxExport& operator=( const DocxExport& );
+    DocxExport& operator=( const DocxExport& ) SAL_DELETED_FUNCTION;
 };
 
 #endif // INCLUDED_SW_SOURCE_FILTER_WW8_DOCXEXPORT_HXX
diff --git a/sw/source/filter/ww8/escher.hxx b/sw/source/filter/ww8/escher.hxx
index 5c345615b179..bb291fa062a4 100644
--- a/sw/source/filter/ww8/escher.hxx
+++ b/sw/source/filter/ww8/escher.hxx
@@ -131,9 +131,8 @@ public:
     void PreWriteHyperlinkWithinFly(const SwFrmFmt& rFmt,EscherPropertyContainer& rPropOpt);
 
 private:
-    //No copying
-    SwBasicEscherEx(const SwBasicEscherEx&);
-    SwBasicEscherEx& operator=(const SwBasicEscherEx&);
+    SwBasicEscherEx(const SwBasicEscherEx&) SAL_DELETED_FUNCTION;
+    SwBasicEscherEx& operator=(const SwBasicEscherEx&) SAL_DELETED_FUNCTION;
 };
 
 class SwEscherEx : public SwBasicEscherEx
@@ -173,9 +172,8 @@ public:
     EscherExHostAppData* StartShape(const com::sun::star::uno::Reference<
         com::sun::star::drawing::XShape > &, const Rectangle*) SAL_OVERRIDE {return &aHostData;}
 private:
-    //No copying
-    SwEscherEx(const SwEscherEx&);
-    SwEscherEx &operator=(const SwEscherEx&);
+    SwEscherEx(const SwEscherEx&) SAL_DELETED_FUNCTION;
+    SwEscherEx &operator=(const SwEscherEx&) SAL_DELETED_FUNCTION;
 };
 
 #endif
diff --git a/sw/source/filter/ww8/rtfexport.hxx b/sw/source/filter/ww8/rtfexport.hxx
index 0ee6485cdf86..f19f067cc8aa 100644
--- a/sw/source/filter/ww8/rtfexport.hxx
+++ b/sw/source/filter/ww8/rtfexport.hxx
@@ -197,11 +197,9 @@ public:
     OString* GetStyle(sal_uInt16 nId);
 
 private:
-    /// No copying.
-    RtfExport(const RtfExport&);
+    RtfExport(const RtfExport&) SAL_DELETED_FUNCTION;
 
-    /// No copying.
-    RtfExport& operator=(const RtfExport&);
+    RtfExport& operator=(const RtfExport&) SAL_DELETED_FUNCTION;
 
     void WriteFonts();
     void WriteStyles();
diff --git a/sw/source/filter/ww8/sortedarray.hxx b/sw/source/filter/ww8/sortedarray.hxx
index 0c9606050774..15d48c3e9075 100644
--- a/sw/source/filter/ww8/sortedarray.hxx
+++ b/sw/source/filter/ww8/sortedarray.hxx
@@ -41,9 +41,8 @@ namespace ww
         C *mpWwSprmTab;
         size_t mnNoElems;
 
-        //No copying
-        SortedArray(const SortedArray&);
-        SortedArray& operator=(const SortedArray&);
+        SortedArray(const SortedArray&) SAL_DELETED_FUNCTION;
+        SortedArray& operator=(const SortedArray&) SAL_DELETED_FUNCTION;
     public:
         //Find an entry, return its address if found and 0 if not
         const C *search(C aSrch) const
diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx
index 3d52fecd4e87..c2ff78d49758 100644
--- a/sw/source/filter/ww8/writerhelper.cxx
+++ b/sw/source/filter/ww8/writerhelper.cxx
@@ -292,8 +292,7 @@ namespace sw
 
         DrawingOLEAdaptor::DrawingOLEAdaptor(SdrOle2Obj &rObj,
             SfxObjectShell &rPers)
-            : msOrigPersistName(rObj.GetPersistName()),
-            mxIPRef(rObj.GetObjRef()), mrPers(rPers),
+            : mxIPRef(rObj.GetObjRef()), mrPers(rPers),
             mpGraphic( rObj.GetGraphic() )
         {
             rObj.AbandonObject();
diff --git a/sw/source/filter/ww8/writerhelper.hxx b/sw/source/filter/ww8/writerhelper.hxx
index 178d0c50bf0c..f3865a484b03 100644
--- a/sw/source/filter/ww8/writerhelper.hxx
+++ b/sw/source/filter/ww8/writerhelper.hxx
@@ -872,7 +872,6 @@ namespace sw
         class DrawingOLEAdaptor
         {
         private:
-            OUString msOrigPersistName;
             com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > mxIPRef;
             SfxObjectShell& mrPers;
             const Graphic* mpGraphic;
@@ -908,10 +907,8 @@ namespace sw
             */
             bool TransferToDoc(OUString &rName);
         private:
-            /// No assigning allowed
-            DrawingOLEAdaptor& operator=(const DrawingOLEAdaptor&);
-            /// No copying allowed
-            DrawingOLEAdaptor(const DrawingOLEAdaptor &rDoc);
+            DrawingOLEAdaptor& operator=(const DrawingOLEAdaptor&) SAL_DELETED_FUNCTION;
+            DrawingOLEAdaptor(const DrawingOLEAdaptor &rDoc) SAL_DELETED_FUNCTION;
         };
     }
 }
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 30998ebf584c..4b42c1d1299a 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -859,8 +859,6 @@ WW8_WrPlcPn::WW8_WrPlcPn(WW8Export& rWr, ePLCFT ePl, WW8_FC nStartFc)
     : rWrt(rWr)
     , nFkpStartPage(0)
     , ePlc(ePl)
-    , bWrtWW8(true)
-    , nMark(0)
 {
     WW8_WrFkp* pF = new WW8_WrFkp( ePlc, nStartFc, rWrt.bWrtWW8 );
     aFkps.push_back( pF );
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index a02906379386..ee318b673237 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -237,9 +237,8 @@ class WW8_WrPlcSepx : public MSWordSections
     bool m_bHeaderFooterWritten;
     WW8_WrPlc0* pTxtPos;        // Pos der einzelnen Header / Footer
 
-    // No copy, no assign
-    WW8_WrPlcSepx( const WW8_WrPlcSepx& );
-    WW8_WrPlcSepx& operator=( const WW8_WrPlcSepx& );
+    WW8_WrPlcSepx( const WW8_WrPlcSepx& ) SAL_DELETED_FUNCTION;
+    WW8_WrPlcSepx& operator=( const WW8_WrPlcSepx& ) SAL_DELETED_FUNCTION;
 
 public:
     WW8_WrPlcSepx( MSWordExportBase& rExport );
@@ -377,9 +376,8 @@ public:
     DrawObjVector &GetObjArr() { return maDrawObjs; }
     virtual ~PlcDrawObj();
 private:
-    //No copying
-    PlcDrawObj(const PlcDrawObj&);
-    PlcDrawObj& operator=(const PlcDrawObj&);
+    PlcDrawObj(const PlcDrawObj&) SAL_DELETED_FUNCTION;
+    PlcDrawObj& operator=(const PlcDrawObj&) SAL_DELETED_FUNCTION;
 };
 
 class MainTxtPlcDrawObj : public PlcDrawObj
@@ -391,9 +389,8 @@ private:
         sal_uInt32 nLen) const SAL_OVERRIDE;
     virtual WW8_CP GetCpOffset(const WW8Fib &) const SAL_OVERRIDE;
 private:
-    //No copying
-    MainTxtPlcDrawObj(const MainTxtPlcDrawObj&);
-    MainTxtPlcDrawObj& operator=(const MainTxtPlcDrawObj&);
+    MainTxtPlcDrawObj(const MainTxtPlcDrawObj&) SAL_DELETED_FUNCTION;
+    MainTxtPlcDrawObj& operator=(const MainTxtPlcDrawObj&) SAL_DELETED_FUNCTION;
 };
 
 class HdFtPlcDrawObj : public PlcDrawObj
@@ -405,9 +402,8 @@ private:
         sal_uInt32 nLen) const SAL_OVERRIDE;
     virtual WW8_CP GetCpOffset(const WW8Fib &rFib) const SAL_OVERRIDE;
 private:
-    //No copying
-    HdFtPlcDrawObj(const HdFtPlcDrawObj&);
-    HdFtPlcDrawObj& operator=(const HdFtPlcDrawObj&);
+    HdFtPlcDrawObj(const HdFtPlcDrawObj&) SAL_DELETED_FUNCTION;
+    HdFtPlcDrawObj& operator=(const HdFtPlcDrawObj&) SAL_DELETED_FUNCTION;
 };
 
 typedef ::std::pair<OUString, sal_uLong> aBookmarkPair;
@@ -876,10 +872,8 @@ public:
     static void CorrectTabStopInSet( SfxItemSet& rSet, sal_uInt16 nAbsLeft );
 
 private:
-    /// No copying.
-    MSWordExportBase( const MSWordExportBase& );
-    /// No copying.
-    MSWordExportBase& operator=( const MSWordExportBase& );
+    MSWordExportBase( const MSWordExportBase& ) SAL_DELETED_FUNCTION;
+    MSWordExportBase& operator=( const MSWordExportBase& ) SAL_DELETED_FUNCTION;
 };
 
 /// The writer class that gets called for the WW8 filter.
@@ -936,10 +930,8 @@ public:
     SfxMedium* GetMedia() { return mpMedium; }
 
 private:
-    /// No copying.
-    SwWW8Writer(const SwWW8Writer&);
-    /// No copying.
-    SwWW8Writer& operator=(const SwWW8Writer&);
+    SwWW8Writer(const SwWW8Writer&) SAL_DELETED_FUNCTION;
+    SwWW8Writer& operator=(const SwWW8Writer&) SAL_DELETED_FUNCTION;
 };
 
 /// Exporter of the binary Word file formats.
@@ -1189,18 +1181,15 @@ protected:
     virtual void AppendSection( const SwPageDesc *pPageDesc, const SwSectionFmt* pFmt, sal_uLong nLnNum ) SAL_OVERRIDE;
 
 private:
-    /// No copying.
-    WW8Export(const WW8Export&);
-    /// No copying.
-    WW8Export& operator=(const WW8Export&);
+    WW8Export(const WW8Export&) SAL_DELETED_FUNCTION;
+    WW8Export& operator=(const WW8Export&) SAL_DELETED_FUNCTION;
 };
 
 class WW8_WrPlcSubDoc   // double Plc for Footnotes/Endnotes and Postits
 {
 private:
-    // No copying
-    WW8_WrPlcSubDoc(const WW8_WrPlcSubDoc&);
-    WW8_WrPlcSubDoc& operator=(const WW8_WrPlcSubDoc&);
+    WW8_WrPlcSubDoc(const WW8_WrPlcSubDoc&) SAL_DELETED_FUNCTION;
+    WW8_WrPlcSubDoc& operator=(const WW8_WrPlcSubDoc&) SAL_DELETED_FUNCTION;
 protected:
     std::vector<WW8_CP> aCps;
     std::vector<const void*> aCntnt;                // PTRARR of SwFmtFtn/PostIts/..
@@ -1223,9 +1212,8 @@ class WW8_WrPlcFtnEdn : public WW8_WrPlcSubDoc
 private:
     sal_uInt8 nTyp;
 
-    // No copying
-    WW8_WrPlcFtnEdn(const WW8_WrPlcFtnEdn&);
-    WW8_WrPlcFtnEdn& operator=(WW8_WrPlcFtnEdn &);
+    WW8_WrPlcFtnEdn(const WW8_WrPlcFtnEdn&) SAL_DELETED_FUNCTION;
+    WW8_WrPlcFtnEdn& operator=(WW8_WrPlcFtnEdn &) SAL_DELETED_FUNCTION;
 public:
     WW8_WrPlcFtnEdn( sal_uInt8 nTTyp ) : nTyp( nTTyp ) {}
 
@@ -1250,9 +1238,8 @@ struct WW8_Annotation
 class WW8_WrPlcAnnotations : public WW8_WrPlcSubDoc  // double Plc for Postits
 {
 private:
-    //No copying
-    WW8_WrPlcAnnotations(const WW8_WrPlcAnnotations&);
-    WW8_WrPlcAnnotations& operator=(WW8_WrPlcAnnotations&);
+    WW8_WrPlcAnnotations(const WW8_WrPlcAnnotations&) SAL_DELETED_FUNCTION;
+    WW8_WrPlcAnnotations& operator=(WW8_WrPlcAnnotations&) SAL_DELETED_FUNCTION;
     std::set<const SwRedlineData*> maProcessedRedlines;
 
     std::map<const OUString, WW8_CP> m_aRangeStartPositions;
@@ -1275,9 +1262,8 @@ private:
     std::vector<sal_uInt32> aShapeIds;        // VARARR of ShapeIds for the SwFrmFmts
     virtual const std::vector<sal_uInt32>* GetShapeIdArr() const SAL_OVERRIDE;
 
-    //No copying
-    WW8_WrPlcTxtBoxes(const WW8_WrPlcTxtBoxes&);
-    WW8_WrPlcTxtBoxes& operator=(WW8_WrPlcTxtBoxes&);
+    WW8_WrPlcTxtBoxes(const WW8_WrPlcTxtBoxes&) SAL_DELETED_FUNCTION;
+    WW8_WrPlcTxtBoxes& operator=(WW8_WrPlcTxtBoxes&) SAL_DELETED_FUNCTION;
 public:
     WW8_WrPlcTxtBoxes( sal_uInt8 nTTyp ) : nTyp( nTTyp ) {}
 
@@ -1304,12 +1290,9 @@ private:
     WW8_WrFkpPtrs aFkps;            // PTRARR
     sal_uInt16 nFkpStartPage;
     ePLCFT ePlc;
-    bool bWrtWW8;                   // for writer detection
-    sal_uInt16 nMark;
 
-    //No copying
-    WW8_WrPlcPn(const WW8_WrPlcPn&);
-    WW8_WrPlcPn& operator=(const WW8_WrPlcPn&);
+    WW8_WrPlcPn(const WW8_WrPlcPn&) SAL_DELETED_FUNCTION;
+    WW8_WrPlcPn& operator=(const WW8_WrPlcPn&) SAL_DELETED_FUNCTION;
 public:
     WW8_WrPlcPn( WW8Export& rWrt, ePLCFT ePl, WW8_FC nStartFc );
     ~WW8_WrPlcPn();
@@ -1328,9 +1311,8 @@ private:
     sal_uLong nDataLen;
     sal_uInt16 nStructSiz;
 
-    //No copying
-    WW8_WrPlc1(const WW8_WrPlc1&);
-    WW8_WrPlc1& operator=(const WW8_WrPlc1&);
+    WW8_WrPlc1(const WW8_WrPlc1&) SAL_DELETED_FUNCTION;
+    WW8_WrPlc1& operator=(const WW8_WrPlc1&) SAL_DELETED_FUNCTION;
 protected:
     sal_uInt16 Count() const { return aPos.size(); }
     void Write( SvStream& rStrm );
@@ -1349,9 +1331,8 @@ private:
     sal_uInt8 nTxtTyp;
     sal_uInt16 nResults;
 
-    //No copying
-    WW8_WrPlcFld(const WW8_WrPlcFld&);
-    WW8_WrPlcFld& operator=(const WW8_WrPlcFld&);
+    WW8_WrPlcFld(const WW8_WrPlcFld&) SAL_DELETED_FUNCTION;
+    WW8_WrPlcFld& operator=(const WW8_WrPlcFld&) SAL_DELETED_FUNCTION;
 public:
     WW8_WrPlcFld( sal_uInt16 nStructSz, sal_uInt8 nTTyp )
         : WW8_WrPlc1( nStructSz ), nTxtTyp( nTTyp ), nResults(0)
@@ -1364,9 +1345,8 @@ public:
 class WW8_WrMagicTable : public WW8_WrPlc1
 {
 private:
-    //No copying
-    WW8_WrMagicTable(const WW8_WrMagicTable&);
-    WW8_WrMagicTable& operator=(const WW8_WrMagicTable&);
+    WW8_WrMagicTable(const WW8_WrMagicTable&) SAL_DELETED_FUNCTION;
+    WW8_WrMagicTable& operator=(const WW8_WrMagicTable&) SAL_DELETED_FUNCTION;
 public:
     WW8_WrMagicTable() : WW8_WrPlc1( 4 ) {Append(0,0);}
     void Append( WW8_CP nCp, sal_uLong nData );
@@ -1416,9 +1396,8 @@ private:
     void WritePICBulletFHeader(SvStream& rStrm, const Graphic &rGrf, sal_uInt16 mm, sal_uInt16 nWidth, sal_uInt16 nHeight);
     void WriteGrfForBullet(SvStream& rStrm,  const Graphic &rGrf, sal_uInt16 nWidth, sal_uInt16 nHeight);
 
-    //No copying
-    SwWW8WrGrf(const SwWW8WrGrf&);
-    SwWW8WrGrf& operator=(const SwWW8WrGrf&);
+    SwWW8WrGrf(const SwWW8WrGrf&) SAL_DELETED_FUNCTION;
+    SwWW8WrGrf& operator=(const SwWW8WrGrf&) SAL_DELETED_FUNCTION;
 public:
     SwWW8WrGrf( WW8Export& rW ) : rWrt( rW ), mnIdx( 0 ) {}
     void Insert(const sw::Frame &rFly);
@@ -1434,9 +1413,8 @@ class MSWordAttrIter
 {
 private:
     MSWordAttrIter* pOld;
-    //No copying
-    MSWordAttrIter(const MSWordAttrIter&);
-    MSWordAttrIter& operator=(const MSWordAttrIter&);
+    MSWordAttrIter(const MSWordAttrIter&) SAL_DELETED_FUNCTION;
+    MSWordAttrIter& operator=(const MSWordAttrIter&) SAL_DELETED_FUNCTION;
 protected:
     MSWordExportBase& m_rExport;
 public:
@@ -1466,9 +1444,8 @@ private:
     sal_Int32 SearchNext( sal_Int32 nStartPos );
     void SetCharSet(const EECharAttrib& rTxtAttr, bool bStart);
 
-    //No copying
-    MSWord_SdrAttrIter(const MSWord_SdrAttrIter&);
-    MSWord_SdrAttrIter& operator=(const MSWord_SdrAttrIter&);
+    MSWord_SdrAttrIter(const MSWord_SdrAttrIter&) SAL_DELETED_FUNCTION;
+    MSWord_SdrAttrIter& operator=(const MSWord_SdrAttrIter&) SAL_DELETED_FUNCTION;
 public:
     MSWord_SdrAttrIter( MSWordExportBase& rWr, const EditTextObject& rEditObj,
         sal_uInt8 nType );
@@ -1527,9 +1504,8 @@ private:
 
     void IterToCurrent();
 
-    //No copying
-    SwWW8AttrIter(const SwWW8AttrIter&);
-    SwWW8AttrIter& operator=(const SwWW8AttrIter&);
+    SwWW8AttrIter(const SwWW8AttrIter&) SAL_DELETED_FUNCTION;
+    SwWW8AttrIter& operator=(const SwWW8AttrIter&) SAL_DELETED_FUNCTION;
 public:
     SwWW8AttrIter( MSWordExportBase& rWr, const SwTxtNode& rNd );
 
@@ -1597,9 +1573,8 @@ class MSWordStyles
     void OutputStyle( SwFmt* pFmt, sal_uInt16 nPos );
     void OutputStyle( const SwNumRule* pNumRule, sal_uInt16 nPos );
 
-    // No copying
-    MSWordStyles( const MSWordStyles& );
-    MSWordStyles& operator=( const MSWordStyles& );
+    MSWordStyles( const MSWordStyles& ) SAL_DELETED_FUNCTION;
+    MSWordStyles& operator=( const MSWordStyles& ) SAL_DELETED_FUNCTION;
 
 public:
     MSWordStyles( MSWordExportBase& rExport, bool bListStyles = false );
diff --git a/sw/source/filter/ww8/ww8glsy.hxx b/sw/source/filter/ww8/ww8glsy.hxx
index 06cc79ec8e94..a112803cf227 100644
--- a/sw/source/filter/ww8/ww8glsy.hxx
+++ b/sw/source/filter/ww8/ww8glsy.hxx
@@ -75,9 +75,8 @@ private:
         const ::std::vector<ww::bytes>& rExtra);
     bool HasBareGraphicEnd(SwDoc *pD,SwNodeIndex &rIdx);
 
-    //No copying
-    WW8Glossary(const WW8Glossary&);
-    WW8Glossary& operator=(const WW8Glossary&);
+    WW8Glossary(const WW8Glossary&) SAL_DELETED_FUNCTION;
+    WW8Glossary& operator=(const WW8Glossary&) SAL_DELETED_FUNCTION;
 };
 #endif
 
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index ca6b5face7ae..af6301d28344 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -180,9 +180,8 @@ private:
         WW8aCFmt& aCharFmt, bool& bNewCharFmtCreated,
         const OUString& aPrefix = OUString());
 
-    //No copying
-    WW8ListManager(const WW8ListManager&);
-    WW8ListManager& operator=(const WW8ListManager&);
+    WW8ListManager(const WW8ListManager&) SAL_DELETED_FUNCTION;
+    WW8ListManager& operator=(const WW8ListManager&) SAL_DELETED_FUNCTION;
     sal_uInt16 nLastLFOPosition;
 };
 
@@ -365,9 +364,8 @@ private:
     SwWW8ImplReader& rReader;
     sal_uInt16 nToggleAttrFlags;
     sal_uInt16 nToggleBiDiAttrFlags;
-    //No copying
-    SwWW8FltControlStack(const SwWW8FltControlStack&);
-    SwWW8FltControlStack& operator=(const SwWW8FltControlStack&);
+    SwWW8FltControlStack(const SwWW8FltControlStack&) SAL_DELETED_FUNCTION;
+    SwWW8FltControlStack& operator=(const SwWW8FltControlStack&) SAL_DELETED_FUNCTION;
     const SwNumFmt* GetNumFmtFromStack(const SwPosition &rPos,
         const SwTxtNode &rTxtNode);
 protected:
@@ -427,9 +425,8 @@ public:
     void AddAnchor(const SwPosition& rPos,SwFrmFmt *pFmt);
     void Flush();
 private:
-    //No copying
-    SwWW8FltAnchorStack(const SwWW8FltAnchorStack&);
-    SwWW8FltAnchorStack& operator=(const SwWW8FltAnchorStack&);
+    SwWW8FltAnchorStack(const SwWW8FltAnchorStack&) SAL_DELETED_FUNCTION;
+    SwWW8FltAnchorStack& operator=(const SwWW8FltAnchorStack&) SAL_DELETED_FUNCTION;
 };
 
 //For fields whose handling cannot be fully resolved until we hit the end of
@@ -444,8 +441,7 @@ public:
     Position(const SwPaM &rPaM);
     Position(const Position &rEntry);
 private:
-    //No assignment
-    Position& operator=(const Position&);
+    Position& operator=(const Position&) SAL_DELETED_FUNCTION;
 };
 
 namespace SwWW8
@@ -493,9 +489,8 @@ protected:
     virtual void SetAttrInDoc(const SwPosition& rTmpPos,
         SwFltStackEntry& rEntry) SAL_OVERRIDE;
 private:
-    //No copying
-    SwWW8FltRefStack(const SwWW8FltRefStack&);
-    SwWW8FltRefStack& operator=(const SwWW8FltRefStack&);
+    SwWW8FltRefStack(const SwWW8FltRefStack&) SAL_DELETED_FUNCTION;
+    SwWW8FltRefStack& operator=(const SwWW8FltRefStack&) SAL_DELETED_FUNCTION;
 };
 
 template< typename Type >
@@ -693,9 +688,8 @@ public:
 class WW8FormulaCheckBox : public WW8FormulaControl
 {
 private:
-    //No copying
-    WW8FormulaCheckBox(const WW8FormulaCheckBox&);
-    WW8FormulaCheckBox& operator=(const WW8FormulaCheckBox&);
+    WW8FormulaCheckBox(const WW8FormulaCheckBox&) SAL_DELETED_FUNCTION;
+    WW8FormulaCheckBox& operator=(const WW8FormulaCheckBox&) SAL_DELETED_FUNCTION;
 
 public:
     WW8FormulaCheckBox(SwWW8ImplReader &rR);
@@ -710,9 +704,8 @@ public:
 class WW8FormulaListBox : public WW8FormulaControl
 {
 private:
-    //No copying
-    WW8FormulaListBox(const WW8FormulaListBox&);
-    WW8FormulaListBox& operator=(const WW8FormulaListBox&);
+    WW8FormulaListBox(const WW8FormulaListBox&) SAL_DELETED_FUNCTION;
+    WW8FormulaListBox& operator=(const WW8FormulaListBox&) SAL_DELETED_FUNCTION;
 
 public:
     WW8FormulaListBox(SwWW8ImplReader &rR);
@@ -727,9 +720,8 @@ public:
 class WW8FormulaEditBox : public WW8FormulaControl
 {
 private:
-    //No copying
-    WW8FormulaEditBox(const WW8FormulaEditBox&);
-    WW8FormulaEditBox& operator=(const WW8FormulaEditBox&);
+    WW8FormulaEditBox(const WW8FormulaEditBox&) SAL_DELETED_FUNCTION;
+    WW8FormulaEditBox& operator=(const WW8FormulaEditBox&) SAL_DELETED_FUNCTION;
 public:
     WW8FormulaEditBox(SwWW8ImplReader &rR);
     //no real implementation, return false
@@ -780,9 +772,8 @@ private:
                                   const int _nCalledByGroup,
                                   sal_Int64 nAspect ) const SAL_OVERRIDE;
 
-    //No copying
-    SwMSDffManager(const SwMSDffManager&);
-    SwMSDffManager& operator=(const SwMSDffManager&);
+    SwMSDffManager(const SwMSDffManager&) SAL_DELETED_FUNCTION;
+    SwMSDffManager& operator=(const SwMSDffManager&) SAL_DELETED_FUNCTION;
 public:
     static sal_uInt32 GetFilterFlags();
     static sal_Int32 GetEscherLineMatch(MSO_LineStyle eStyle, MSO_SPT eShapeType,
@@ -894,9 +885,8 @@ private:
     SwFmtPageDesc SetSwFmtPageDesc(mySegIter &rIter, mySegIter &rStart,
         bool bIgnoreCols);
 
-    //No copying
-    wwSectionManager(const wwSectionManager&);
-    wwSectionManager& operator=(const wwSectionManager&);
+    wwSectionManager(const wwSectionManager&) SAL_DELETED_FUNCTION;
+    wwSectionManager& operator=(const wwSectionManager&) SAL_DELETED_FUNCTION;
 public:
     wwSectionManager(SwWW8ImplReader &rReader) : mrReader(rReader), mnDesc(0)
         {};
@@ -964,9 +954,8 @@ private:
     const SwDoc &mrDoc;
     OUString msFileLinkSeed;
     int mnFileSectionNo;
-    //No copying
-    wwSectionNamer(const wwSectionNamer&);
-    wwSectionNamer& operator=(const wwSectionNamer&);
+    wwSectionNamer(const wwSectionNamer&) SAL_DELETED_FUNCTION;
+    wwSectionNamer& operator=(const wwSectionNamer&) SAL_DELETED_FUNCTION;
 public:
     OUString UniqueName();
     wwSectionNamer(const SwDoc &rDoc, const OUString &rSeed)
@@ -1706,9 +1695,8 @@ private:
     // determine object attribute "Layout in Table Cell"
     bool IsObjectLayoutInTableCell( const sal_uInt32 nLayoutInTableCell ) const;
     bool ReadGlobalTemplateSettings( const OUString& sCreatedFrom, const com::sun::star::uno::Reference< com::sun::star::container::XNameContainer >& xPrjNameMap );
-    //No copying
-    SwWW8ImplReader(const SwWW8ImplReader &);
-    SwWW8ImplReader& operator=(const SwWW8ImplReader&);
+    SwWW8ImplReader(const SwWW8ImplReader &) SAL_DELETED_FUNCTION;
+    SwWW8ImplReader& operator=(const SwWW8ImplReader&) SAL_DELETED_FUNCTION;
 public:     // eigentlich private, geht aber leider nur public
     sal_uInt16 GetToggleAttrFlags() const;
     sal_uInt16 GetToggleBiDiAttrFlags() const;
diff --git a/sw/source/filter/ww8/ww8par2.hxx b/sw/source/filter/ww8/ww8par2.hxx
index b1d0896828d0..1108b69d93c6 100644
--- a/sw/source/filter/ww8/ww8par2.hxx
+++ b/sw/source/filter/ww8/ww8par2.hxx
@@ -37,9 +37,8 @@ public:
     WW8DupProperties(SwDoc &rDoc, SwWW8FltControlStack *pStk);
     void Insert(const SwPosition &rPos);
 private:
-    //No copying
-    WW8DupProperties(const WW8DupProperties&);
-    WW8DupProperties& operator=(const WW8DupProperties&);
+    WW8DupProperties(const WW8DupProperties&) SAL_DELETED_FUNCTION;
+    WW8DupProperties& operator=(const WW8DupProperties&) SAL_DELETED_FUNCTION;
     SwWW8FltControlStack* pCtrlStck;
     SfxItemSet aChrSet,aParSet;
 };
@@ -126,9 +125,8 @@ friend class SwWW8ImplReader;
     bool PrepareStyle(SwWW8StyInf &rSI, ww::sti eSti, sal_uInt16 nThisStyle, sal_uInt16 nNextStyle);
     void PostStyle(SwWW8StyInf &rSI, bool bOldNoImp);
 
-    //No copying
-    WW8RStyle(const WW8RStyle&);
-    WW8RStyle& operator=(const WW8RStyle&);
+    WW8RStyle(const WW8RStyle&) SAL_DELETED_FUNCTION;
+    WW8RStyle& operator=(const WW8RStyle&) SAL_DELETED_FUNCTION;
 public:
     WW8RStyle( WW8Fib& rFib, SwWW8ImplReader* pI );
     void Import();
@@ -139,8 +137,7 @@ public:
 class WW8FlySet: public SfxItemSet
 {
 private:
-    //No copying
-    const WW8FlySet& operator=(const WW8FlySet&);
+    const WW8FlySet& operator=(const WW8FlySet&) SAL_DELETED_FUNCTION;
     void Init(const SwWW8ImplReader& rReader, const SwPaM* pPaM);
 public:
     WW8FlySet(SwWW8ImplReader& rReader, const WW8FlyPara* pFW,
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index b114e92e838f..819e3482b5d9 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -267,9 +267,8 @@ public:
     sal_uInt16 GetAktId() const { return nAktId; }
 
 private:
-    //No copying
-    WW8SprmIter(const WW8SprmIter&);
-    WW8SprmIter& operator=(const WW8SprmIter&);
+    WW8SprmIter(const WW8SprmIter&) SAL_DELETED_FUNCTION;
+    WW8SprmIter& operator=(const WW8SprmIter&) SAL_DELETED_FUNCTION;
 };
 
 /* u.a. fuer FKPs auf normale Attr., also ein Attr weniger als Positionen */
@@ -341,9 +340,8 @@ private:
     WW8PLCFpcd& rPLCF;
     long nIdx;
 
-    //No copying
-    WW8PLCFpcd_Iter(const WW8PLCFpcd_Iter&);
-    WW8PLCFpcd_Iter& operator=(const WW8PLCFpcd_Iter&);
+    WW8PLCFpcd_Iter(const WW8PLCFpcd_Iter&) SAL_DELETED_FUNCTION;
+    WW8PLCFpcd_Iter& operator=(const WW8PLCFpcd_Iter&) SAL_DELETED_FUNCTION;
 
 public:
     WW8PLCFpcd_Iter( WW8PLCFpcd& rPLCFpcd, long nStartPos = -1 );
@@ -377,9 +375,8 @@ private:
     WW8_FC nStartFc;
     bool bDirty;
 
-    //No copying
-    WW8PLCFx(const WW8PLCFx&);
-    WW8PLCFx& operator=(const WW8PLCFx&);
+    WW8PLCFx(const WW8PLCFx&) SAL_DELETED_FUNCTION;
+    WW8PLCFx& operator=(const WW8PLCFx&) SAL_DELETED_FUNCTION;
 
 public:
     WW8PLCFx(ww::WordVersion eVersion, bool bSprm)
@@ -420,9 +417,8 @@ private:
                                 // 1 byte param
     sal_uInt16 nGrpprls;            // Attribut Anzahl davon
 
-    //No copying
-    WW8PLCFx_PCDAttrs(const WW8PLCFx_PCDAttrs&);
-    WW8PLCFx_PCDAttrs& operator=(const WW8PLCFx_PCDAttrs&);
+    WW8PLCFx_PCDAttrs(const WW8PLCFx_PCDAttrs&) SAL_DELETED_FUNCTION;
+    WW8PLCFx_PCDAttrs& operator=(const WW8PLCFx_PCDAttrs&) SAL_DELETED_FUNCTION;
 
 public:
     WW8PLCFx_PCDAttrs(ww::WordVersion eVersion, WW8PLCFx_PCD* pPLCFx_PCD,
@@ -444,9 +440,8 @@ private:
     bool bVer67;
     WW8_CP nClipStart;
 
-    //No copying
-    WW8PLCFx_PCD(const WW8PLCFx_PCD&);
-    WW8PLCFx_PCD& operator=(const WW8PLCFx_PCD&);
+    WW8PLCFx_PCD(const WW8PLCFx_PCD&) SAL_DELETED_FUNCTION;
+    WW8PLCFx_PCD& operator=(const WW8PLCFx_PCD&) SAL_DELETED_FUNCTION;
 
 public:
     WW8PLCFx_PCD(ww::WordVersion eVersion, WW8PLCFpcd* pPLCFpcd,
@@ -578,9 +573,8 @@ private:
 
     bool NewFkp();
 
-    //No copying
-    WW8PLCFx_Fc_FKP(const WW8PLCFx_Fc_FKP&);
-    WW8PLCFx_Fc_FKP& operator=(const WW8PLCFx_Fc_FKP&);
+    WW8PLCFx_Fc_FKP(const WW8PLCFx_Fc_FKP&) SAL_DELETED_FUNCTION;
+    WW8PLCFx_Fc_FKP& operator=(const WW8PLCFx_Fc_FKP&) SAL_DELETED_FUNCTION;
 
 protected:
     ePLCFT ePLCF;
@@ -614,9 +608,8 @@ private:
     sal_uInt8 bLineEnd : 1;
     sal_uInt8 bComplex : 1;
 
-    //No copying
-    WW8PLCFx_Cp_FKP(const WW8PLCFx_Cp_FKP&);
-    WW8PLCFx_Cp_FKP& operator=(const WW8PLCFx_Cp_FKP&);
+    WW8PLCFx_Cp_FKP(const WW8PLCFx_Cp_FKP&) SAL_DELETED_FUNCTION;
+    WW8PLCFx_Cp_FKP& operator=(const WW8PLCFx_Cp_FKP&) SAL_DELETED_FUNCTION;
 
 public:
     WW8PLCFx_Cp_FKP( SvStream* pSt, SvStream* pTblSt, SvStream* pDataSt,
@@ -647,9 +640,8 @@ private:
     sal_uInt16 nArrMax;
     sal_uInt16 nSprmSiz;
 
-    //no copying
-    WW8PLCFx_SEPX(const WW8PLCFx_SEPX&);
-    WW8PLCFx_SEPX& operator=(const WW8PLCFx_SEPX&);
+    WW8PLCFx_SEPX(const WW8PLCFx_SEPX&) SAL_DELETED_FUNCTION;
+    WW8PLCFx_SEPX& operator=(const WW8PLCFx_SEPX&) SAL_DELETED_FUNCTION;
 
 public:
     WW8PLCFx_SEPX( SvStream* pSt, SvStream* pTblxySt, const WW8Fib& rFib,
@@ -677,9 +669,8 @@ private:
     WW8PLCF* pRef;
     WW8PLCF* pTxt;
 
-    //No copying
-    WW8PLCFx_SubDoc(const WW8PLCFx_SubDoc&);
-    WW8PLCFx_SubDoc& operator=(const WW8PLCFx_SubDoc&);
+    WW8PLCFx_SubDoc(const WW8PLCFx_SubDoc&) SAL_DELETED_FUNCTION;
+    WW8PLCFx_SubDoc& operator=(const WW8PLCFx_SubDoc&) SAL_DELETED_FUNCTION;
 
 public:
     WW8PLCFx_SubDoc(SvStream* pSt, ww::WordVersion eVersion, WW8_CP nStartCp,
@@ -709,9 +700,8 @@ class WW8PLCFx_FLD : public WW8PLCFx
 private:
     WW8PLCFspecial* pPLCF;
     const WW8Fib& rFib;
-    //No copying
-    WW8PLCFx_FLD(const WW8PLCFx_FLD&);
-    WW8PLCFx_FLD& operator=(const WW8PLCFx_FLD &);
+    WW8PLCFx_FLD(const WW8PLCFx_FLD&) SAL_DELETED_FUNCTION;
+    WW8PLCFx_FLD& operator=(const WW8PLCFx_FLD &) SAL_DELETED_FUNCTION;
 
 public:
     WW8PLCFx_FLD(SvStream* pSt, const WW8Fib& rMyFib, short nType);
@@ -740,9 +730,8 @@ private:
     sal_uInt16 nIsEnd;
     sal_Int32 nBookmarkId; // counter incremented by GetUniqueBookmarkName.
 
-    //No copying
-    WW8PLCFx_Book(const WW8PLCFx_Book&);
-    WW8PLCFx_Book& operator=(const WW8PLCFx_Book&);
+    WW8PLCFx_Book(const WW8PLCFx_Book&) SAL_DELETED_FUNCTION;
+    WW8PLCFx_Book& operator=(const WW8PLCFx_Book&) SAL_DELETED_FUNCTION;
 
 public:
     WW8PLCFx_Book(SvStream* pTblSt,const WW8Fib& rFib);
@@ -779,9 +768,8 @@ private:
     sal_Int32 nIMax;
     bool m_bIsEnd;
 
-    //No copying
-    WW8PLCFx_AtnBook(const WW8PLCFx_AtnBook&);
-    WW8PLCFx_AtnBook& operator=(const WW8PLCFx_AtnBook&);
+    WW8PLCFx_AtnBook(const WW8PLCFx_AtnBook&) SAL_DELETED_FUNCTION;
+    WW8PLCFx_AtnBook& operator=(const WW8PLCFx_AtnBook&) SAL_DELETED_FUNCTION;
 
 public:
     WW8PLCFx_AtnBook(SvStream* pTblSt,const WW8Fib& rFib);
diff --git a/sw/source/filter/ww8/ww8toolbar.hxx b/sw/source/filter/ww8/ww8toolbar.hxx
index 4e7a4fc88af0..e6d80e2b8dd5 100644
--- a/sw/source/filter/ww8/ww8toolbar.hxx
+++ b/sw/source/filter/ww8/ww8toolbar.hxx
@@ -55,8 +55,8 @@ class SwCTB : public TBBase
     sal_Int32 cCtls;
     std::vector< SwTBC > rTBC;
 
-    SwCTB(const SwCTB&);
-    SwCTB& operator = ( const SwCTB&);
+    SwCTB(const SwCTB&) SAL_DELETED_FUNCTION;
+    SwCTB& operator = ( const SwCTB&) SAL_DELETED_FUNCTION;
 
 public:
     SwCTB();
@@ -103,8 +103,8 @@ class Tcg255SubStruct : public TBBase
     friend class Tcg255;
 
     bool mbReadId;
-    Tcg255SubStruct(const Tcg255SubStruct&);
-    Tcg255SubStruct& operator = ( const Tcg255SubStruct&);
+    Tcg255SubStruct(const Tcg255SubStruct&) SAL_DELETED_FUNCTION;
+    Tcg255SubStruct& operator = ( const Tcg255SubStruct&) SAL_DELETED_FUNCTION;
 
 protected:
     sal_uInt8 ch;
@@ -162,8 +162,8 @@ class SwCTBWrapper : public Tcg255SubStruct
     std::vector< SwTBC > rtbdc;
     std::vector< Customization > rCustomizations; // array of Customizations
     std::vector< sal_Int16 > dropDownMenuIndices; // array of indexes of Customization toolbars that are dropped by a menu
-    SwCTBWrapper(const SwCTBWrapper&);
-    SwCTBWrapper& operator = ( const SwCTBWrapper&);
+    SwCTBWrapper(const SwCTBWrapper&) SAL_DELETED_FUNCTION;
+    SwCTBWrapper& operator = ( const SwCTBWrapper&) SAL_DELETED_FUNCTION;
 
 public:
     SwCTBWrapper( bool bReadId = true );
@@ -206,8 +206,8 @@ class PlfMcd : public Tcg255SubStruct
 {
     sal_Int32 iMac;
     std::vector<MCD> rgmcd; // array of MCD's
-    PlfMcd(const PlfMcd&);
-    PlfMcd& operator = ( const PlfMcd&);
+    PlfMcd(const PlfMcd&) SAL_DELETED_FUNCTION;
+    PlfMcd& operator = ( const PlfMcd&) SAL_DELETED_FUNCTION;
 
 public:
     PlfMcd( bool bReadId = true );
@@ -221,8 +221,8 @@ class Acd : public TBBase
 {
     sal_Int16 ibst;
     sal_uInt16 fciBasedOnABC; //  fciBasedOn(13 bits) A(1bit)B(1bit)C(1Bit)
-    Acd(const Acd&);
-    Acd& operator = ( const Acd&);
+    Acd(const Acd&) SAL_DELETED_FUNCTION;
+    Acd& operator = ( const Acd&) SAL_DELETED_FUNCTION;
 
 public:
     Acd();
@@ -237,8 +237,8 @@ class PlfAcd: public Tcg255SubStruct
 {
     sal_Int32 iMac;
     Acd* rgacd;
-    PlfAcd(const PlfAcd&);
-    PlfAcd& operator = ( const PlfAcd&);
+    PlfAcd(const PlfAcd&) SAL_DELETED_FUNCTION;
+    PlfAcd& operator = ( const PlfAcd&) SAL_DELETED_FUNCTION;
 
 public:
     PlfAcd( bool bReadId = true );
@@ -258,8 +258,8 @@ class Kme : public TBBase
     sal_uInt16 kt; //A Kt that specifies the type of action to be taken when the key combination is pressed.
     sal_uInt32 param; //The meaning of this field depends on the value of kt
 
-    Kme(const Kme&);
-    Kme& operator = ( const Kme&);
+    Kme(const Kme&) SAL_DELETED_FUNCTION;
+    Kme& operator = ( const Kme&) SAL_DELETED_FUNCTION;
 
 public:
     Kme();
@@ -274,8 +274,8 @@ class PlfKme : public Tcg255SubStruct
 {
     sal_Int32 iMac;
     Kme* rgkme;
-    PlfKme(const PlfKme&);
-    PlfKme& operator = ( const PlfKme&);
+    PlfKme(const PlfKme&) SAL_DELETED_FUNCTION;
+    PlfKme& operator = ( const PlfKme&) SAL_DELETED_FUNCTION;
 
 public:
     PlfKme( bool bReadId = true );
@@ -300,8 +300,8 @@ class TcgSttbfCore : public TBBase
     sal_uInt16 cData;
     sal_uInt16 cbExtra;
     SBBItem* dataItems;
-    TcgSttbfCore(const TcgSttbfCore&);
-    TcgSttbfCore& operator = ( const TcgSttbfCore&);
+    TcgSttbfCore(const TcgSttbfCore&) SAL_DELETED_FUNCTION;
+    TcgSttbfCore& operator = ( const TcgSttbfCore&) SAL_DELETED_FUNCTION;
 
 public:
     TcgSttbfCore();
@@ -315,8 +315,8 @@ public:
 class TcgSttbf : public Tcg255SubStruct
 {
     TcgSttbfCore sttbf;
-    TcgSttbf(const TcgSttbf&);
-    TcgSttbf& operator = ( const TcgSttbf&);
+    TcgSttbf(const TcgSttbf&) SAL_DELETED_FUNCTION;
+    TcgSttbf& operator = ( const TcgSttbf&) SAL_DELETED_FUNCTION;
 
 public:
     TcgSttbf( bool bReadId = true );
@@ -332,8 +332,8 @@ class Xstz : public TBBase
     Xst xst; //An Xst specifying the string with its pre-pended length.
     sal_uInt16 chTerm;
 
-    Xstz(const Xstz&);
-    Xstz& operator = ( const Xstz&);
+    Xstz(const Xstz&) SAL_DELETED_FUNCTION;
+    Xstz& operator = ( const Xstz&) SAL_DELETED_FUNCTION;
 
 public:
     Xstz();
@@ -348,8 +348,8 @@ class MacroName : public TBBase
 {
     sal_uInt16 ibst; //An unsigned integer that specifies the index of the current entry in the macro name table. MUST NOT be the same as the index of any other entry.
     Xstz xstz;
-    MacroName(const MacroName&);
-    MacroName& operator = ( const MacroName&);
+    MacroName(const MacroName&) SAL_DELETED_FUNCTION;
+    MacroName& operator = ( const MacroName&) SAL_DELETED_FUNCTION;
 
 public:
     MacroName();
@@ -365,8 +365,8 @@ class MacroNames : public Tcg255SubStruct
     sal_uInt16 iMac; //An unsigned integer that specifies the number of MacroName structures in rgNames.
     MacroName* rgNames;
 
-    MacroNames(const MacroNames&);
-    MacroNames& operator = ( const MacroNames&);
+    MacroNames(const MacroNames&) SAL_DELETED_FUNCTION;
+    MacroNames& operator = ( const MacroNames&) SAL_DELETED_FUNCTION;
 
 public:
     MacroNames( bool bReadId = true );
@@ -380,8 +380,8 @@ public:
 class Tcg255 : public TBBase
 {
     std::vector< Tcg255SubStruct* > rgtcgData; // array of sub structures
-    Tcg255(const Tcg255&);
-    Tcg255& operator = ( const Tcg255&);
+    Tcg255(const Tcg255&) SAL_DELETED_FUNCTION;
+    Tcg255& operator = ( const Tcg255&) SAL_DELETED_FUNCTION;
     bool processSubStruct( sal_uInt8 nId, SvStream& );
 
 public:
@@ -398,8 +398,8 @@ class Tcg: public TBBase
 {
     sal_Int8 nTcgVer;
     std::unique_ptr< Tcg255 > tcg;
-    Tcg(const Tcg&);
-    Tcg& operator = ( const Tcg&);
+    Tcg(const Tcg&) SAL_DELETED_FUNCTION;
+    Tcg& operator = ( const Tcg&) SAL_DELETED_FUNCTION;
 
 public:
     Tcg();
diff --git a/sw/source/uibase/inc/swdtflvr.hxx b/sw/source/uibase/inc/swdtflvr.hxx
index 12a6392730be..443a0c59b788 100644
--- a/sw/source/uibase/inc/swdtflvr.hxx
+++ b/sw/source/uibase/inc/swdtflvr.hxx
@@ -130,10 +130,8 @@ class SW_DLLPUBLIC SwTransferable : public TransferableHelper
 
     void SetDataForDragAndDrop( const Point& rSttPos );
 
-                                    // not available
-                                    SwTransferable();
-                                    SwTransferable( const SwTransferable& );
-    SwTransferable&                 operator=( const SwTransferable& );
+                                    SwTransferable( const SwTransferable& ) SAL_DELETED_FUNCTION;
+    SwTransferable&                 operator=( const SwTransferable& ) SAL_DELETED_FUNCTION;
 
 protected:
     virtual void        AddSupportedFormats() SAL_OVERRIDE;
diff --git a/sw/source/uibase/inc/toxmgr.hxx b/sw/source/uibase/inc/toxmgr.hxx
index cd3c0edeb0e4..5dcd3c24879f 100644
--- a/sw/source/uibase/inc/toxmgr.hxx
+++ b/sw/source/uibase/inc/toxmgr.hxx
@@ -61,10 +61,8 @@ class SW_DLLPUBLIC SwTOXDescription
     //TODO: TemplateNames
     //const String* pTemplateName = 0, ???
 
-    // forbidden and not implemented.
-    SwTOXDescription();
-    SwTOXDescription(SwTOXDescription&);
-    SwTOXDescription & operator= (SwTOXDescription&);
+    SwTOXDescription(SwTOXDescription&) SAL_DELETED_FUNCTION;
+    SwTOXDescription & operator= (SwTOXDescription&) SAL_DELETED_FUNCTION;
 
 public:
     // single argument ctors shall be explicit.
@@ -188,10 +186,8 @@ class SwTOXMarkDescription
     OUString*   pPhoneticReadingOfPrimKey;
     OUString*   pPhoneticReadingOfSecKey;
 
-    // forbidden and not implemented.
-    SwTOXMarkDescription();
-    SwTOXMarkDescription(SwTOXMarkDescription&);
-    SwTOXMarkDescription & operator= (SwTOXMarkDescription&);
+    SwTOXMarkDescription(SwTOXMarkDescription&) SAL_DELETED_FUNCTION;
+    SwTOXMarkDescription & operator= (SwTOXMarkDescription&) SAL_DELETED_FUNCTION;
 
 public:
     // single argument ctors shall be explicit.
diff --git a/sw/source/uibase/inc/uinums.hxx b/sw/source/uibase/inc/uinums.hxx
index 16ed7c7f2583..ae2f14446a56 100644
--- a/sw/source/uibase/inc/uinums.hxx
+++ b/sw/source/uibase/inc/uinums.hxx
@@ -46,7 +46,7 @@ class SW_DLLPUBLIC SwNumRulesWithName
         sal_uInt16 nCharPoolId;
         _SwNumFmtsAttrs aItems;
 
-        _SwNumFmtGlobal& operator=( const _SwNumFmtGlobal& );
+        _SwNumFmtGlobal& operator=( const _SwNumFmtGlobal& ) SAL_DELETED_FUNCTION;
 
     public:
         _SwNumFmtGlobal( const SwNumFmt& rFmt );
diff --git a/sw/source/uibase/inc/unomailmerge.hxx b/sw/source/uibase/inc/unomailmerge.hxx
index 212810191735..8e3ac4c37650 100644
--- a/sw/source/uibase/inc/unomailmerge.hxx
+++ b/sw/source/uibase/inc/unomailmerge.hxx
@@ -126,9 +126,8 @@ class SwXMailMerge :
 
     void    launchEvent( const com::sun::star::beans::PropertyChangeEvent &rEvt ) const;
 
-    // disallow use of copy-constructor and assignment-operator for now
-    SwXMailMerge( const SwXMailMerge & );
-    SwXMailMerge & operator = ( const SwXMailMerge & );
+    SwXMailMerge( const SwXMailMerge & ) SAL_DELETED_FUNCTION;
+    SwXMailMerge & operator = ( const SwXMailMerge & ) SAL_DELETED_FUNCTION;
 protected:
     virtual ~SwXMailMerge();
 public: