Replace "SAL_DELETED_FUNCTION" with "= delete" in LIBO_INTERNAL_ONLY code

Change-Id: I328ac7a95ccc87732efae48b567a0556865928f3

33 files changed, 73 insertions, 73 deletions

diff --git a/sw/inc/HandleAnchorNodeChg.hxx b/sw/inc/HandleAnchorNodeChg.hxx
index 17eb50cb0142..d8331acb9cf9 100644
--- a/sw/inc/HandleAnchorNodeChg.hxx
+++ b/sw/inc/HandleAnchorNodeChg.hxx
@@ -64,8 +64,8 @@ private:
     // and that re-creation of fly frames is necessary.
     bool mbAnchorNodeChanged;
 
-    SwHandleAnchorNodeChg( const SwHandleAnchorNodeChg& ) SAL_DELETED_FUNCTION;
-    void operator=( const SwHandleAnchorNodeChg ) SAL_DELETED_FUNCTION;
+    SwHandleAnchorNodeChg( const SwHandleAnchorNodeChg& ) = delete;
+    void operator=( const SwHandleAnchorNodeChg ) = delete;
 };
 #endif
 
diff --git a/sw/inc/SwNodeNum.hxx b/sw/inc/SwNodeNum.hxx
index 64cf8cea492e..7741771a4153 100644
--- a/sw/inc/SwNodeNum.hxx
+++ b/sw/inc/SwNodeNum.hxx
@@ -87,8 +87,8 @@ private:
 
     static void _UnregisterMeAndChildrenDueToRootDelete( SwNodeNum& rNodeNum );
 
-    SwNodeNum( const SwNodeNum& ) SAL_DELETED_FUNCTION;
-    SwNodeNum& operator=( const SwNodeNum& ) SAL_DELETED_FUNCTION;
+    SwNodeNum( const SwNodeNum& ) = delete;
+    SwNodeNum& operator=( const SwNodeNum& ) = delete;
 
     virtual bool IsCountPhantoms() const SAL_OVERRIDE;
 
diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx
index c98638a03a50..436649eb5eb8 100644
--- a/sw/inc/calc.hxx
+++ b/sw/inc/calc.hxx
@@ -178,8 +178,8 @@ class SwCalc
     static OUString  GetColumnName( const OUString& rName );
     OUString  GetDBName( const OUString& rName );
 
-    SwCalc( const SwCalc& ) SAL_DELETED_FUNCTION;
-    SwCalc& operator=( const SwCalc& ) SAL_DELETED_FUNCTION;
+    SwCalc( const SwCalc& ) = delete;
+    SwCalc& operator=( const SwCalc& ) = delete;
 
 public:
         SwCalc( SwDoc& rD );
diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx
index 07b5cca5e5ca..a08ca490cc23 100644
--- a/sw/inc/dcontact.hxx
+++ b/sw/inc/dcontact.hxx
@@ -380,8 +380,8 @@ class SwDrawContact : public SwContact
 
         void _InvalidateObjs( const bool _bUpdateSortedObjsList = false );
 
-        SwDrawContact( const SwDrawContact& ) SAL_DELETED_FUNCTION;
-        SwDrawContact& operator=( const SwDrawContact& ) SAL_DELETED_FUNCTION;
+        SwDrawContact( const SwDrawContact& ) = delete;
+        SwDrawContact& operator=( const SwDrawContact& ) = delete;
 
     protected:
         /// virtuelle Methoden von SwClient
diff --git a/sw/inc/dlelstnr.hxx b/sw/inc/dlelstnr.hxx
index 3eabac864276..261a70a9433f 100644
--- a/sw/inc/dlelstnr.hxx
+++ b/sw/inc/dlelstnr.hxx
@@ -57,8 +57,8 @@ class SwLinguServiceEventListener :
     com::sun::star::uno::Reference<
         com::sun::star::linguistic2::XProofreadingIterator >    xGCIterator;
 
-    SwLinguServiceEventListener(const SwLinguServiceEventListener &) SAL_DELETED_FUNCTION;
-    SwLinguServiceEventListener & operator = (const SwLinguServiceEventListener &) SAL_DELETED_FUNCTION;
+    SwLinguServiceEventListener(const SwLinguServiceEventListener &) = delete;
+    SwLinguServiceEventListener & operator = (const SwLinguServiceEventListener &) = delete;
 
 public:
     SwLinguServiceEventListener();
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 0b25e5f33a84..bf5ced4daeff 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -410,7 +410,7 @@ private:
                                 const SwFrameFormat& rSrcFormat, SwFrameFormat& rDestFormat );
     static SwFormat* FindFormatByName( const SwFormatsBase& rFormatArr, const OUString& rName );
 
-    SwDoc( const SwDoc &) SAL_DELETED_FUNCTION;
+    SwDoc( const SwDoc &) = delete;
 
     // Database fields:
     void AddUsedDBToList( std::vector<OUString>& rDBNameList,
diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx
index e50c3c01b5c2..e1d29247f2e1 100644
--- a/sw/inc/docstyle.hxx
+++ b/sw/inc/docstyle.hxx
@@ -229,7 +229,7 @@ protected:
     virtual ~SwDocStyleSheetPool();
 
 private:
-    SwDocStyleSheetPool( const SwDocStyleSheetPool& ) SAL_DELETED_FUNCTION;
+    SwDocStyleSheetPool( const SwDocStyleSheetPool& ) = delete;
 };
 
 #endif
diff --git a/sw/inc/dpage.hxx b/sw/inc/dpage.hxx
index c7488161744c..e04b06329783 100644
--- a/sw/inc/dpage.hxx
+++ b/sw/inc/dpage.hxx
@@ -28,7 +28,7 @@ class SwDoc;
 
 class SwDPage : public FmFormPage, public SdrObjUserCall
 {
-    SwDPage &operator=(const SwDPage&) SAL_DELETED_FUNCTION;
+    SwDPage &operator=(const SwDPage&) = delete;
 
     SdrPageGridFrameList*   pGridLst;
     SwDoc*                  pDoc;
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 1a1536b60f97..8010898fef90 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -946,8 +946,8 @@ public:
     virtual ~SwEditShell();
 
 private:
-    SwEditShell(const SwEditShell &) SAL_DELETED_FUNCTION;
-    const SwEditShell &operator=(const SwEditShell &) SAL_DELETED_FUNCTION;
+    SwEditShell(const SwEditShell &) = delete;
+    const SwEditShell &operator=(const SwEditShell &) = delete;
 };
 
 inline const sfx2::LinkManager& SwEditShell::GetLinkManager() const
diff --git a/sw/inc/fchrfmt.hxx b/sw/inc/fchrfmt.hxx
index 7e1f9ab54db8..b8f9931c5fb9 100644
--- a/sw/inc/fchrfmt.hxx
+++ b/sw/inc/fchrfmt.hxx
@@ -46,7 +46,7 @@ protected:
 
 private:
     /// @@@ public copy ctor, but no copy assignment?
-    SwFormatCharFormat & operator= (const SwFormatCharFormat &) SAL_DELETED_FUNCTION;
+    SwFormatCharFormat & operator= (const SwFormatCharFormat &) = delete;
 public:
 
     TYPEINFO_OVERRIDE();
diff --git a/sw/inc/finalthreadmanager.hxx b/sw/inc/finalthreadmanager.hxx
index 770434e6155a..11856738d459 100644
--- a/sw/inc/finalthreadmanager.hxx
+++ b/sw/inc/finalthreadmanager.hxx
@@ -62,8 +62,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 &) SAL_DELETED_FUNCTION;
-    void operator =(FinalThreadManager &) SAL_DELETED_FUNCTION;
+    FinalThreadManager(FinalThreadManager &) = delete;
+    void operator =(FinalThreadManager &) = delete;
 
     virtual ~FinalThreadManager();
 
diff --git a/sw/inc/fmtautofmt.hxx b/sw/inc/fmtautofmt.hxx
index 092d6b099158..00b64d83db89 100644
--- a/sw/inc/fmtautofmt.hxx
+++ b/sw/inc/fmtautofmt.hxx
@@ -37,7 +37,7 @@ public:
     SwFormatAutoFormat( const SwFormatAutoFormat& rAttr );
 private:
     /// @@@ public copy ctor, but no copy assignment?
-    SwFormatAutoFormat & operator= (const SwFormatAutoFormat &) SAL_DELETED_FUNCTION;
+    SwFormatAutoFormat & operator= (const SwFormatAutoFormat &) = delete;
 public:
 
     TYPEINFO_OVERRIDE();
diff --git a/sw/inc/fmtcntnt.hxx b/sw/inc/fmtcntnt.hxx
index 77c33f9eaeaa..31406601b350 100644
--- a/sw/inc/fmtcntnt.hxx
+++ b/sw/inc/fmtcntnt.hxx
@@ -31,7 +31,7 @@ class SW_DLLPUBLIC SwFormatContent: public SfxPoolItem
 {
     SwNodeIndex *pStartNode;
 
-    SwFormatContent &operator=( const SwFormatContent & ) SAL_DELETED_FUNCTION;
+    SwFormatContent &operator=( const SwFormatContent & ) = delete;
 
 public:
     SwFormatContent( const SwStartNode* pStartNode = 0 );
diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx
index 5ab04ac1ebba..788b2d678196 100644
--- a/sw/inc/fmtcol.hxx
+++ b/sw/inc/fmtcol.hxx
@@ -46,8 +46,8 @@ protected:
     { SetAuto(false); }
 
 private:
-    SwFormatColl(const SwFormatColl & ) SAL_DELETED_FUNCTION;
-    const SwFormatColl &operator=(const SwFormatColl &) SAL_DELETED_FUNCTION;
+    SwFormatColl(const SwFormatColl & ) = delete;
+    const SwFormatColl &operator=(const SwFormatColl &) = delete;
 };
 
 /// Represents the style of a paragraph.
@@ -56,7 +56,7 @@ class SW_DLLPUBLIC SwTextFormatColl: public SwFormatColl
     friend class SwDoc;
     friend class ::sw::DocumentStylePoolManager;
 
-    SwTextFormatColl(const SwTextFormatColl & rRef) SAL_DELETED_FUNCTION;
+    SwTextFormatColl(const SwTextFormatColl & rRef) = delete;
 
     bool mbStayAssignedToListLevelOfOutlineStyle;
 
@@ -196,7 +196,7 @@ public:
     SwCollCondition( const SwCollCondition& rCpy );
 private:
     /// @@@ public copy ctor, but no copy assignment?
-    SwCollCondition & operator= (const SwCollCondition &) SAL_DELETED_FUNCTION;
+    SwCollCondition & operator= (const SwCollCondition &) = delete;
 public:
 
     bool operator==( const SwCollCondition& rCmp ) const;
diff --git a/sw/inc/fmtflcnt.hxx b/sw/inc/fmtflcnt.hxx
index bcf3c47b52df..72a61013e44b 100644
--- a/sw/inc/fmtflcnt.hxx
+++ b/sw/inc/fmtflcnt.hxx
@@ -34,7 +34,7 @@ class SwFormatFlyCnt : public SfxPoolItem
     friend class SwTextFlyCnt;
     SwTextFlyCnt* pTextAttr;
     SwFrameFormat* pFormat; ///< My Fly/DrawFrame-format.
-    SwFormatFlyCnt& operator=(const SwFormatFlyCnt& rFlyCnt) SAL_DELETED_FUNCTION;
+    SwFormatFlyCnt& operator=(const SwFormatFlyCnt& rFlyCnt) = delete;
 
 public:
     SwFormatFlyCnt( SwFrameFormat *pFrameFormat );
diff --git a/sw/inc/fmtfld.hxx b/sw/inc/fmtfld.hxx
index 0d4f86bf58f1..4934f479fa59 100644
--- a/sw/inc/fmtfld.hxx
+++ b/sw/inc/fmtfld.hxx
@@ -51,7 +51,7 @@ class SW_DLLPUBLIC SwFormatField
     SwTextField* mpTextField; // the TextAttribute
 
     // @@@ copy construction allowed, but copy assignment is not? @@@
-    SwFormatField& operator=(const SwFormatField& rField) SAL_DELETED_FUNCTION;
+    SwFormatField& operator=(const SwFormatField& rField) = delete;
 
 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 6212381221bf..04eb026f5617 100644
--- a/sw/inc/fmtftn.hxx
+++ b/sw/inc/fmtftn.hxx
@@ -47,8 +47,8 @@ class SW_DLLPUBLIC SwFormatFootnote
 
     css::uno::WeakReference<css::text::XFootnote> m_wXFootnote;
 
-    SwFormatFootnote& operator=(const SwFormatFootnote& rFootnote) SAL_DELETED_FUNCTION;
-    SwFormatFootnote( const SwFormatFootnote& ) SAL_DELETED_FUNCTION;
+    SwFormatFootnote& operator=(const SwFormatFootnote& rFootnote) = delete;
+    SwFormatFootnote( const SwFormatFootnote& ) = delete;
 
 public:
     SwFormatFootnote( bool bEndNote = false );
diff --git a/sw/inc/fmtrfmrk.hxx b/sw/inc/fmtrfmrk.hxx
index 3723d745b5df..e9907b425841 100644
--- a/sw/inc/fmtrfmrk.hxx
+++ b/sw/inc/fmtrfmrk.hxx
@@ -40,7 +40,7 @@ class SwFormatRefMark
     friend class SwTextRefMark;
     SwTextRefMark* pTextAttr;
 
-    SwFormatRefMark& operator=(const SwFormatRefMark& rRefMark) SAL_DELETED_FUNCTION;
+    SwFormatRefMark& operator=(const SwFormatRefMark& rRefMark) = delete;
     OUString aRefName;
 
     css::uno::WeakReference<css::text::XTextContent> m_wXReferenceMark;
diff --git a/sw/inc/fmturl.hxx b/sw/inc/fmturl.hxx
index c1534fc9dd6a..561a047ba1d2 100644
--- a/sw/inc/fmturl.hxx
+++ b/sw/inc/fmturl.hxx
@@ -38,7 +38,7 @@ class SW_DLLPUBLIC SwFormatURL: public SfxPoolItem
 
     bool      bIsServerMap;     ///< A ServerSideImageMap with the URL.
 
-    SwFormatURL& operator=( const SwFormatURL& ) SAL_DELETED_FUNCTION;
+    SwFormatURL& operator=( const SwFormatURL& ) = delete;
 
 public:
     SwFormatURL();
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx
index 4e0da75bbf40..88e0c3747ec1 100644
--- a/sw/inc/frmfmt.hxx
+++ b/sw/inc/frmfmt.hxx
@@ -158,8 +158,8 @@ class SW_DLLPUBLIC SwFlyFrameFormat: public SwFrameFormat
        when they get borders (this is done in SwWrtShell::CalcAndGetScale) */
     Point   m_aLastFlyFrmPrtRectPos;
 
-    SwFlyFrameFormat( const SwFlyFrameFormat &rCpy ) SAL_DELETED_FUNCTION;
-    SwFlyFrameFormat &operator=( const SwFlyFrameFormat &rCpy ) SAL_DELETED_FUNCTION;
+    SwFlyFrameFormat( const SwFlyFrameFormat &rCpy ) = delete;
+    SwFlyFrameFormat &operator=( const SwFlyFrameFormat &rCpy ) = delete;
 
 protected:
     SwFlyFrameFormat( SwAttrPool& rPool, const sal_Char* pFormatNm,
@@ -234,8 +234,8 @@ class SW_DLLPUBLIC SwDrawFrameFormat: public SwFrameFormat
     mutable const SdrObject * pSdrObjCached;
     mutable OUString sSdrObjCachedComment;
 
-    SwDrawFrameFormat( const SwDrawFrameFormat &rCpy ) SAL_DELETED_FUNCTION;
-    SwDrawFrameFormat &operator=( const SwDrawFrameFormat &rCpy ) SAL_DELETED_FUNCTION;
+    SwDrawFrameFormat( const SwDrawFrameFormat &rCpy ) = delete;
+    SwDrawFrameFormat &operator=( const SwDrawFrameFormat &rCpy ) = delete;
 
     SwFrameFormat::tLayoutDir meLayoutDir;
 
diff --git a/sw/inc/list.hxx b/sw/inc/list.hxx
index bf4089a959a4..0cb1ba5c9536 100644
--- a/sw/inc/list.hxx
+++ b/sw/inc/list.hxx
@@ -53,8 +53,8 @@ class SwList
         bool IsListLevelMarked( const int nListLevel ) const;
 
     private:
-        SwList( const SwList& ) SAL_DELETED_FUNCTION;
-        SwList& operator=( const SwList& ) SAL_DELETED_FUNCTION;
+        SwList( const SwList& ) = delete;
+        SwList& operator=( const SwList& ) = delete;
 
         SwListImpl* mpListImpl;
 };
diff --git a/sw/inc/ndindex.hxx b/sw/inc/ndindex.hxx
index 0267e16dbff8..167a5af81751 100644
--- a/sw/inc/ndindex.hxx
+++ b/sw/inc/ndindex.hxx
@@ -37,8 +37,8 @@ class SW_DLLPUBLIC SwNodeIndex SAL_FINAL : public sw::Ring<SwNodeIndex>
     SwNode * m_pNode;
 
     // These are not allowed!
-    SwNodeIndex( SwNodes& rNds, sal_uInt16 nIdx ) SAL_DELETED_FUNCTION;
-    SwNodeIndex( SwNodes& rNds, int nIdx ) SAL_DELETED_FUNCTION;
+    SwNodeIndex( SwNodes& rNds, sal_uInt16 nIdx ) = delete;
+    SwNodeIndex( SwNodes& rNds, int nIdx ) = delete;
     void RegisterIndex( SwNodes& rNodes )
     {
         if(!rNodes.vIndices)
diff --git a/sw/inc/ndnotxt.hxx b/sw/inc/ndnotxt.hxx
index ec0f494f6112..02a3adb2fd2f 100644
--- a/sw/inc/ndnotxt.hxx
+++ b/sw/inc/ndnotxt.hxx
@@ -41,8 +41,8 @@ class SW_DLLPUBLIC SwNoTextNode : public SwContentNode
     // graphics-attributes (only called by SwContentNode).
     virtual void NewAttrSet( SwAttrPool& ) SAL_OVERRIDE;
 
-    SwNoTextNode( const SwNoTextNode& ) SAL_DELETED_FUNCTION;
-    SwNoTextNode &operator=( const SwNoTextNode& ) SAL_DELETED_FUNCTION;
+    SwNoTextNode( const SwNoTextNode& ) = delete;
+    SwNoTextNode &operator=( const SwNoTextNode& ) = delete;
 
 protected:
     SwNoTextNode( const SwNodeIndex &rWhere, const sal_uInt8 nNdType,
diff --git a/sw/inc/ndole.hxx b/sw/inc/ndole.hxx
index b2787a393f78..ac3e1699f506 100644
--- a/sw/inc/ndole.hxx
+++ b/sw/inc/ndole.hxx
@@ -41,7 +41,7 @@ class SW_DLLPUBLIC SwOLEObj
     svt::EmbeddedObjectRef xOLERef;
     OUString aName;
 
-    SwOLEObj( const SwOLEObj& rObj ) SAL_DELETED_FUNCTION;
+    SwOLEObj( const SwOLEObj& rObj ) = delete;
 
     void SetNode( SwOLENode* pNode );
 
@@ -88,7 +88,7 @@ class SW_DLLPUBLIC SwOLENode: public SwNoTextNode
                 SwGrfFormatColl *pGrfColl,
                 SwAttrSet* pAutoAttr = 0 );
 
-    SwOLENode( const SwOLENode & ) SAL_DELETED_FUNCTION;
+    SwOLENode( const SwOLENode & ) = delete;
 
     using SwNoTextNode::GetGraphic;
 
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index 0f1d84420faa..a892d7659866 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -292,8 +292,8 @@ public:
     virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const;
 
 private:
-    SwNode( const SwNode & rNodes ) SAL_DELETED_FUNCTION;
-    SwNode & operator= ( const SwNode & rNodes ) SAL_DELETED_FUNCTION;
+    SwNode( const SwNode & rNodes ) = delete;
+    SwNode & operator= ( const SwNode & rNodes ) = delete;
 };
 
 /// Starts a section of nodes in the document model.
@@ -324,8 +324,8 @@ public:
     virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
 
 private:
-    SwStartNode( const SwStartNode & rNode ) SAL_DELETED_FUNCTION;
-    SwStartNode & operator= ( const SwStartNode & rNode ) SAL_DELETED_FUNCTION;
+    SwStartNode( const SwStartNode & rNode ) = delete;
+    SwStartNode & operator= ( const SwStartNode & rNode ) = delete;
 };
 
 /// Ends a section of nodes in the document model.
@@ -344,8 +344,8 @@ protected:
     DECL_FIXEDMEMPOOL_NEWDEL(SwEndNode)
 
 private:
-    SwEndNode( const SwEndNode & rNode ) SAL_DELETED_FUNCTION;
-    SwEndNode & operator= ( const SwEndNode & rNode ) SAL_DELETED_FUNCTION;
+    SwEndNode( const SwEndNode & rNode ) = delete;
+    SwEndNode & operator= ( const SwEndNode & rNode ) = delete;
 };
 
 // SwContentNode
@@ -485,8 +485,8 @@ public:
     virtual drawinglayer::attribute::SdrAllFillAttributesHelperPtr getSdrAllFillAttributesHelper() const;
 
 private:
-    SwContentNode( const SwContentNode & rNode ) SAL_DELETED_FUNCTION;
-    SwContentNode & operator= ( const SwContentNode & rNode ) SAL_DELETED_FUNCTION;
+    SwContentNode( const SwContentNode & rNode ) = delete;
+    SwContentNode & operator= ( const SwContentNode & rNode ) = delete;
 };
 
 // SwTableNode
@@ -523,8 +523,8 @@ public:
     void RemoveRedlines();
 
 private:
-    SwTableNode( const SwTableNode & rNode ) SAL_DELETED_FUNCTION;
-    SwTableNode & operator= ( const SwTableNode & rNode ) SAL_DELETED_FUNCTION;
+    SwTableNode( const SwTableNode & rNode ) = delete;
+    SwTableNode & operator= ( const SwTableNode & rNode ) = delete;
 };
 
 class SwSectionNode
@@ -533,8 +533,8 @@ class SwSectionNode
     friend class SwNodes;
 
 private:
-    SwSectionNode(const SwSectionNode&) SAL_DELETED_FUNCTION;
-    SwSectionNode& operator=(const SwSectionNode&) SAL_DELETED_FUNCTION;
+    SwSectionNode(const SwSectionNode&) = delete;
+    SwSectionNode& operator=(const SwSectionNode&) = delete;
 
     std::unique_ptr<SwSection> const m_pSection;
 
diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx
index 5c9077e2f736..8c32cebc90a1 100644
--- a/sw/inc/pam.hxx
+++ b/sw/inc/pam.hxx
@@ -166,7 +166,7 @@ class SW_DLLPUBLIC SwPaM : public sw::Ring<SwPaM>
 
     SwPaM* MakeRegion( SwMoveFn fnMove, const SwPaM * pOrigRg = 0 );
 
-    SwPaM(SwPaM const& rPaM) SAL_DELETED_FUNCTION;
+    SwPaM(SwPaM const& rPaM) = delete;
 
 public:
     explicit SwPaM( const SwPosition& rPos, SwPaM* pRing = 0 );
diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx
index 6744274e7795..67da97977320 100644
--- a/sw/inc/paratr.hxx
+++ b/sw/inc/paratr.hxx
@@ -68,7 +68,7 @@ public:
     SwFormatDrop( const SwFormatDrop & );
 private:
     // @@@ public copy ctor, but no copy assignment?
-    SwFormatDrop & operator= (const SwFormatDrop &) SAL_DELETED_FUNCTION;
+    SwFormatDrop & operator= (const SwFormatDrop &) = delete;
 
 protected:
    virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE;
diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx
index 9ed11fcb3371..69a26db466b0 100644
--- a/sw/inc/redline.hxx
+++ b/sw/inc/redline.hxx
@@ -36,8 +36,8 @@ class SwView;
 
 class SW_DLLPUBLIC SwRedlineExtraData
 {
-    SwRedlineExtraData( const SwRedlineExtraData& ) SAL_DELETED_FUNCTION;
-    SwRedlineExtraData& operator=( const SwRedlineExtraData& ) SAL_DELETED_FUNCTION;
+    SwRedlineExtraData( const SwRedlineExtraData& ) = delete;
+    SwRedlineExtraData& operator=( const SwRedlineExtraData& ) = delete;
 
 protected:
     SwRedlineExtraData() {}
diff --git a/sw/inc/swcrsr.hxx b/sw/inc/swcrsr.hxx
index c648324fb5f8..58aa03d360f6 100644
--- a/sw/inc/swcrsr.hxx
+++ b/sw/inc/swcrsr.hxx
@@ -69,7 +69,7 @@ class SW_DLLPUBLIC SwCursor : public SwPaM
 
     using SwPaM::Find;
 
-    SwCursor(SwCursor const& rPaM) SAL_DELETED_FUNCTION;
+    SwCursor(SwCursor const& rPaM) = delete;
 
 protected:
     _SwCursor_SavePos* CreateNewSavePos() const;
diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index 821d7a74920b..e37b95232c35 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -145,7 +145,7 @@ public:
     SwTable( const SwTable& rTable );       // no copy of the lines !!
 private:
     // @@@ public copy ctor, but no copy assignment?
-    SwTable & operator= (const SwTable &) SAL_DELETED_FUNCTION;
+    SwTable & operator= (const SwTable &) = delete;
     // no default ctor.
     SwTable();
     bool OldMerge( SwDoc*, const SwSelBoxes&, SwTableBox*, SwUndoTableMerge* );
@@ -388,8 +388,8 @@ class SW_DLLPUBLIC SwTableBox: public SwClient      //Client of FrameFormat.
     friend void DelBoxNode(SwTableSortBoxes&);  // Delete StartNode* !
     friend class SwXMLTableContext;
 
-    SwTableBox( const SwTableBox & ) SAL_DELETED_FUNCTION;
-    SwTableBox &operator=( const SwTableBox &) SAL_DELETED_FUNCTION;
+    SwTableBox( const SwTableBox & ) = delete;
+    SwTableBox &operator=( const SwTableBox &) = delete;
 
     SwTableLines aLines;
     const SwStartNode * pSttNd;
diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx
index ee50c7ae10bf..8e1dfcfc2bed 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 &) SAL_DELETED_FUNCTION;
+    SwTOXType & operator= (const SwTOXType &) = delete;
 };
 
 // Structure of the index lines
diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx
index 678d29456359..72ce273cde97 100644
--- a/sw/inc/unochart.hxx
+++ b/sw/inc/unochart.hxx
@@ -77,8 +77,8 @@ class SwChartLockController_Helper
     Timer   aUnlockTimer;   // timer to unlock chart controllers
     bool    bIsLocked;
 
-    SwChartLockController_Helper( const SwChartLockController_Helper & ) SAL_DELETED_FUNCTION;
-    SwChartLockController_Helper & operator = ( const SwChartLockController_Helper & ) SAL_DELETED_FUNCTION;
+    SwChartLockController_Helper( const SwChartLockController_Helper & ) = delete;
+    SwChartLockController_Helper & operator = ( const SwChartLockController_Helper & ) = delete;
 
     void LockUnlockAllCharts( bool bLock );
     void LockAllCharts()    { LockUnlockAllCharts( true ); };
@@ -139,8 +139,8 @@ class SwChartDataProvider :
     const SwDoc *                           pDoc;
     bool                                bDisposed;
 
-    SwChartDataProvider( const SwChartDataProvider & ) SAL_DELETED_FUNCTION;
-    SwChartDataProvider & operator = ( const SwChartDataProvider & ) SAL_DELETED_FUNCTION;
+    SwChartDataProvider( const SwChartDataProvider & ) = delete;
+    SwChartDataProvider & operator = ( const SwChartDataProvider & ) = delete;
 
     ::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,
@@ -217,8 +217,8 @@ class SwChartDataSource :
         com::sun::star::uno::Reference<
             com::sun::star::chart2::data::XLabeledDataSequence > > aLDS;
 
-    SwChartDataSource( const SwChartDataSource & ) SAL_DELETED_FUNCTION;
-    SwChartDataSource & operator = ( const SwChartDataSource & ) SAL_DELETED_FUNCTION;
+    SwChartDataSource( const SwChartDataSource & ) = delete;
+    SwChartDataSource & operator = ( const SwChartDataSource & ) = delete;
 
 public:
     SwChartDataSource( const com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::chart2::data::XLabeledDataSequence > > &rLDS );
@@ -271,7 +271,7 @@ class SwChartDataSequence :
     bool    bDisposed;
 
     SwChartDataSequence( const SwChartDataSequence &rObj );
-    SwChartDataSequence & operator = ( const SwChartDataSequence & ) SAL_DELETED_FUNCTION;
+    SwChartDataSequence & operator = ( const SwChartDataSequence & ) = delete;
 
 protected:
     //SwClient
@@ -373,8 +373,8 @@ class SwChartLabeledDataSequence :
 
     bool    bDisposed;
 
-    SwChartLabeledDataSequence( const SwChartLabeledDataSequence & ) SAL_DELETED_FUNCTION;
-    SwChartLabeledDataSequence & operator = ( const SwChartLabeledDataSequence & ) SAL_DELETED_FUNCTION;
+    SwChartLabeledDataSequence( const SwChartLabeledDataSequence & ) = delete;
+    SwChartLabeledDataSequence & operator = ( const SwChartLabeledDataSequence & ) = delete;
 
     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 552ac6b14806..6c5ec9d48909 100644
--- a/sw/inc/unotextrange.hxx
+++ b/sw/inc/unotextrange.hxx
@@ -44,7 +44,7 @@ class SW_DLLPUBLIC SwUnoInternalPaM
 {
 
 private:
-    SwUnoInternalPaM(const SwUnoInternalPaM&) SAL_DELETED_FUNCTION;
+    SwUnoInternalPaM(const SwUnoInternalPaM&) = delete;
 
 public:
     SwUnoInternalPaM(SwDoc& rDoc);