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

Change-Id: I328ac7a95ccc87732efae48b567a0556865928f3

636 files changed, 1553 insertions, 1553 deletions

diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx
index d008c46a2eee..c00743bb7747 100644
--- a/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx
@@ -278,8 +278,8 @@ protected:
     }
 
 private:
-    AccessibleBrowseBoxAccess( const AccessibleBrowseBoxAccess& ) SAL_DELETED_FUNCTION;
-    AccessibleBrowseBoxAccess& operator=( const AccessibleBrowseBoxAccess& ) SAL_DELETED_FUNCTION;
+    AccessibleBrowseBoxAccess( const AccessibleBrowseBoxAccess& ) = delete;
+    AccessibleBrowseBoxAccess& operator=( const AccessibleBrowseBoxAccess& ) = delete;
 };
 
 
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
index 80a9e2763f04..1a02a194207f 100644
--- a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
@@ -228,8 +228,8 @@ protected:
     }
 
 private:
-    AccessibleGridControlAccess( const AccessibleGridControlAccess& ) SAL_DELETED_FUNCTION;
-    AccessibleGridControlAccess& operator=( const AccessibleGridControlAccess& ) SAL_DELETED_FUNCTION;
+    AccessibleGridControlAccess( const AccessibleGridControlAccess& ) = delete;
+    AccessibleGridControlAccess& operator=( const AccessibleGridControlAccess& ) = delete;
 };
 
 
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx
index 5ab0de31e552..142847ce28a0 100644
--- a/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx
@@ -338,8 +338,8 @@ protected:
         throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
 private:
-    GridControlAccessibleElement( const GridControlAccessibleElement& ) SAL_DELETED_FUNCTION;
-    GridControlAccessibleElement& operator=( const GridControlAccessibleElement& ) SAL_DELETED_FUNCTION;
+    GridControlAccessibleElement( const GridControlAccessibleElement& ) = delete;
+    GridControlAccessibleElement& operator=( const GridControlAccessibleElement& ) = delete;
 };
 
 // inlines --------------------------------------------------------------------
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlTableCell.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlTableCell.hxx
index e588a5377eab..ac020ebb4ede 100644
--- a/accessibility/inc/accessibility/extended/AccessibleGridControlTableCell.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControlTableCell.hxx
@@ -52,8 +52,8 @@ namespace accessibility
         virtual ~AccessibleGridControlCell();
 
     private:
-        AccessibleGridControlCell( const AccessibleGridControlCell& ) SAL_DELETED_FUNCTION;
-        AccessibleGridControlCell& operator=( const AccessibleGridControlCell& ) SAL_DELETED_FUNCTION;
+        AccessibleGridControlCell( const AccessibleGridControlCell& ) = delete;
+        AccessibleGridControlCell& operator=( const AccessibleGridControlCell& ) = delete;
     };
 
     typedef ::cppu::ImplHelper2 <   css::accessibility::XAccessibleText
diff --git a/accessibility/inc/accessibility/extended/accessiblebrowseboxcell.hxx b/accessibility/inc/accessibility/extended/accessiblebrowseboxcell.hxx
index 8ff40e48d7a5..8115ad382da6 100644
--- a/accessibility/inc/accessibility/extended/accessiblebrowseboxcell.hxx
+++ b/accessibility/inc/accessibility/extended/accessiblebrowseboxcell.hxx
@@ -65,8 +65,8 @@ namespace accessibility
         virtual ~AccessibleBrowseBoxCell();
 
     private:
-        AccessibleBrowseBoxCell( const AccessibleBrowseBoxCell& ) SAL_DELETED_FUNCTION;
-        AccessibleBrowseBoxCell& operator=( const AccessibleBrowseBoxCell& ) SAL_DELETED_FUNCTION;
+        AccessibleBrowseBoxCell( const AccessibleBrowseBoxCell& ) = delete;
+        AccessibleBrowseBoxCell& operator=( const AccessibleBrowseBoxCell& ) = delete;
     };
 
 
diff --git a/accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx b/accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx
index db3fd81f6afe..d1d0875af527 100644
--- a/accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx
+++ b/accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx
@@ -87,8 +87,8 @@ namespace accessibility
         void notifyTranslatedEvent( const css::accessibility::AccessibleEventObject& _rEvent ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
 
     private:
-        EditBrowseBoxTableCell( const EditBrowseBoxTableCell& ) SAL_DELETED_FUNCTION;
-        EditBrowseBoxTableCell& operator=( const EditBrowseBoxTableCell& ) SAL_DELETED_FUNCTION;
+        EditBrowseBoxTableCell( const EditBrowseBoxTableCell& ) = delete;
+        EditBrowseBoxTableCell& operator=( const EditBrowseBoxTableCell& ) = delete;
     };
 
 
@@ -134,8 +134,8 @@ namespace accessibility
         virtual void SAL_CALL disposing() SAL_OVERRIDE;
 
     private:
-        EditBrowseBoxTableCellAccess( const EditBrowseBoxTableCellAccess& ) SAL_DELETED_FUNCTION;
-        EditBrowseBoxTableCellAccess& operator=( const EditBrowseBoxTableCellAccess& ) SAL_DELETED_FUNCTION;
+        EditBrowseBoxTableCellAccess( const EditBrowseBoxTableCellAccess& ) = delete;
+        EditBrowseBoxTableCellAccess& operator=( const EditBrowseBoxTableCellAccess& ) = delete;
     };
 }
 
diff --git a/accessibility/inc/accessibility/extended/listboxaccessible.hxx b/accessibility/inc/accessibility/extended/listboxaccessible.hxx
index 7affba94cc28..ed6e0a29d783 100644
--- a/accessibility/inc/accessibility/extended/listboxaccessible.hxx
+++ b/accessibility/inc/accessibility/extended/listboxaccessible.hxx
@@ -71,8 +71,8 @@ namespace accessibility
         DECL_LINK_TYPED( WindowEventListener, VclWindowEvent&, void );
 
     private:
-        ListBoxAccessibleBase( const ListBoxAccessibleBase& ) SAL_DELETED_FUNCTION;
-        ListBoxAccessibleBase& operator=( const ListBoxAccessibleBase& ) SAL_DELETED_FUNCTION;
+        ListBoxAccessibleBase( const ListBoxAccessibleBase& ) = delete;
+        ListBoxAccessibleBase& operator=( const ListBoxAccessibleBase& ) = delete;
     };
 
 
diff --git a/basctl/source/basicide/breakpoint.hxx b/basctl/source/basicide/breakpoint.hxx
index 5d1981bcf165..926729795cc0 100644
--- a/basctl/source/basicide/breakpoint.hxx
+++ b/basctl/source/basicide/breakpoint.hxx
@@ -51,7 +51,7 @@ struct BreakPoint
 class BreakPointList
 {
 private:
-    void operator =(BreakPointList) SAL_DELETED_FUNCTION;
+    void operator =(BreakPointList) = delete;
     ::std::vector<BreakPoint*> maBreakPoints;
 
 public:
diff --git a/basctl/source/inc/bastypes.hxx b/basctl/source/inc/bastypes.hxx
index 7a98027dbfd5..5f7d627d8543 100644
--- a/basctl/source/inc/bastypes.hxx
+++ b/basctl/source/inc/bastypes.hxx
@@ -301,8 +301,8 @@ bool QueryPassword( const css::uno::Reference< css::script::XLibraryContainer >&
 
 class ModuleInfoHelper
 {
-    ModuleInfoHelper (const ModuleInfoHelper&) SAL_DELETED_FUNCTION;
-    ModuleInfoHelper& operator = (const ModuleInfoHelper&) SAL_DELETED_FUNCTION;
+    ModuleInfoHelper (const ModuleInfoHelper&) = delete;
+    ModuleInfoHelper& operator = (const ModuleInfoHelper&) = delete;
 public:
     static void getObjectName( const css::uno::Reference< css::container::XNameContainer >& rLib, const OUString& rModName, OUString& rObjName );
     static sal_Int32 getModuleType(  const css::uno::Reference< css::container::XNameContainer >& rLib, const OUString& rModName );
diff --git a/basctl/source/inc/dlgedmod.hxx b/basctl/source/inc/dlgedmod.hxx
index 131d51cafb71..453b92567873 100644
--- a/basctl/source/inc/dlgedmod.hxx
+++ b/basctl/source/inc/dlgedmod.hxx
@@ -34,8 +34,8 @@ class DlgEdModel : public SdrModel
     friend class DlgEdPage;
 
 private:
-    DlgEdModel( const DlgEdModel& ) SAL_DELETED_FUNCTION;
-    void operator=(const DlgEdModel& rSrcModel) SAL_DELETED_FUNCTION;
+    DlgEdModel( const DlgEdModel& ) = delete;
+    void operator=(const DlgEdModel& rSrcModel) = delete;
 
 public:
     TYPEINFO_OVERRIDE();
diff --git a/basctl/source/inc/dlgedpage.hxx b/basctl/source/inc/dlgedpage.hxx
index 7376f262ed65..3a3d1097d4de 100644
--- a/basctl/source/inc/dlgedpage.hxx
+++ b/basctl/source/inc/dlgedpage.hxx
@@ -34,7 +34,7 @@ class DlgEdForm;
 
 class DlgEdPage : public SdrPage
 {
-    DlgEdPage& operator=(const DlgEdPage&) SAL_DELETED_FUNCTION;
+    DlgEdPage& operator=(const DlgEdPage&) = delete;
 
 private:
     DlgEdForm*      pDlgEdForm;
diff --git a/basegfx/source/polygon/b2dpolygon.cxx b/basegfx/source/polygon/b2dpolygon.cxx
index d2c0a67824fd..f46c37729939 100644
--- a/basegfx/source/polygon/b2dpolygon.cxx
+++ b/basegfx/source/polygon/b2dpolygon.cxx
@@ -637,7 +637,7 @@ public:
         }
     }
 
-    ImplB2DPolygon& operator=( const ImplB2DPolygon& ) SAL_DELETED_FUNCTION;
+    ImplB2DPolygon& operator=( const ImplB2DPolygon& ) = delete;
 
     sal_uInt32 count() const
     {
diff --git a/basic/source/inc/codegen.hxx b/basic/source/inc/codegen.hxx
index 1b928cca5114..d50994be5e09 100644
--- a/basic/source/inc/codegen.hxx
+++ b/basic/source/inc/codegen.hxx
@@ -66,8 +66,8 @@ class PCodeBuffConvertor
     sal_uInt8* m_pCnvtdBuf;
     S m_nCnvtdSize;
 
-    PCodeBuffConvertor(const PCodeBuffConvertor& ) SAL_DELETED_FUNCTION;
-    PCodeBuffConvertor& operator = ( const PCodeBuffConvertor& ) SAL_DELETED_FUNCTION;
+    PCodeBuffConvertor(const PCodeBuffConvertor& ) = delete;
+    PCodeBuffConvertor& operator = ( const PCodeBuffConvertor& ) = delete;
 public:
     PCodeBuffConvertor( sal_uInt8* pCode, T nSize ): m_nSize( nSize ),  m_pStart( pCode ), m_pCnvtdBuf( NULL ), m_nCnvtdSize( 0 ){ convert(); }
     S GetSize(){ return m_nCnvtdSize; }
diff --git a/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx
index bead0c9873e6..692e5140aefa 100644
--- a/basic/source/inc/sbunoobj.hxx
+++ b/basic/source/inc/sbunoobj.hxx
@@ -192,8 +192,8 @@ class SbUnoProperty : public SbxProperty
     SbxDataType mRealType;
     virtual ~SbUnoProperty();
     bool mbUnoStruct;
-    SbUnoProperty( const SbUnoProperty&) SAL_DELETED_FUNCTION;
-    SbUnoProperty& operator = ( const SbUnoProperty&) SAL_DELETED_FUNCTION;
+    SbUnoProperty( const SbUnoProperty&) = delete;
+    SbUnoProperty& operator = ( const SbUnoProperty&) = delete;
 public:
 
     TYPEINFO_OVERRIDE();
@@ -395,7 +395,7 @@ private:
     VBAConstantsHash aConstHash;
     bool isInited;
     VBAConstantHelper():isInited( false ) {}
-    VBAConstantHelper(const VBAConstantHelper&) SAL_DELETED_FUNCTION;
+    VBAConstantHelper(const VBAConstantHelper&) = delete;
     void init();
 public:
     static VBAConstantHelper& instance();
diff --git a/basic/source/inc/symtbl.hxx b/basic/source/inc/symtbl.hxx
index 2682eee31d19..e4e84fe6a6a6 100644
--- a/basic/source/inc/symtbl.hxx
+++ b/basic/source/inc/symtbl.hxx
@@ -159,7 +159,7 @@ public:
     sal_uInt32     Reference();     // reference symbol in code
 
 private:
-    SbiSymDef( const SbiSymDef& ) SAL_DELETED_FUNCTION;
+    SbiSymDef( const SbiSymDef& ) = delete;
 
 };
 
@@ -202,7 +202,7 @@ public:
     void Match( SbiProcDef* pForward );
 
 private:
-    SbiProcDef( const SbiProcDef& ) SAL_DELETED_FUNCTION;
+    SbiProcDef( const SbiProcDef& ) = delete;
 
 };
 
diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx
index 54214c393dd5..1534faf186e1 100644
--- a/binaryurp/source/bridge.cxx
+++ b/binaryurp/source/bridge.cxx
@@ -107,8 +107,8 @@ public:
     rtl::ByteSequence getTid() throw () { return tid_;}
 
 private:
-    AttachThread(const AttachThread&) SAL_DELETED_FUNCTION;
-    AttachThread& operator=(const AttachThread&) SAL_DELETED_FUNCTION;
+    AttachThread(const AttachThread&) = delete;
+    AttachThread& operator=(const AttachThread&) = delete;
 
     uno_ThreadPool threadPool_;
     rtl::ByteSequence tid_;
@@ -138,8 +138,8 @@ public:
     void clear();
 
 private:
-    PopOutgoingRequest(const PopOutgoingRequest&) SAL_DELETED_FUNCTION;
-    PopOutgoingRequest& operator=(const PopOutgoingRequest&) SAL_DELETED_FUNCTION;
+    PopOutgoingRequest(const PopOutgoingRequest&) = delete;
+    PopOutgoingRequest& operator=(const PopOutgoingRequest&) = delete;
 
     OutgoingRequests & requests_;
     rtl::ByteSequence tid_;
diff --git a/binaryurp/source/bridge.hxx b/binaryurp/source/bridge.hxx
index 1fe1bd6b5e3c..a35f7d16612b 100644
--- a/binaryurp/source/bridge.hxx
+++ b/binaryurp/source/bridge.hxx
@@ -169,8 +169,8 @@ public:
     bool isCurrentContextMode();
 
 private:
-    Bridge(const Bridge&) SAL_DELETED_FUNCTION;
-    Bridge& operator=(const Bridge&) SAL_DELETED_FUNCTION;
+    Bridge(const Bridge&) = delete;
+    Bridge& operator=(const Bridge&) = delete;
 
     virtual ~Bridge();
 
diff --git a/binaryurp/source/bridgefactory.hxx b/binaryurp/source/bridgefactory.hxx
index ac13ace16574..f7103bdd3aeb 100644
--- a/binaryurp/source/bridgefactory.hxx
+++ b/binaryurp/source/bridgefactory.hxx
@@ -75,8 +75,8 @@ public:
     using BridgeFactoryBase::release;
 
 private:
-    BridgeFactory(const BridgeFactory&) SAL_DELETED_FUNCTION;
-    BridgeFactory& operator=(const BridgeFactory&) SAL_DELETED_FUNCTION;
+    BridgeFactory(const BridgeFactory&) = delete;
+    BridgeFactory& operator=(const BridgeFactory&) = delete;
 
     explicit BridgeFactory(
         com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
diff --git a/binaryurp/source/cache.hxx b/binaryurp/source/cache.hxx
index 97e246ec2655..9df738f03ba2 100644
--- a/binaryurp/source/cache.hxx
+++ b/binaryurp/source/cache.hxx
@@ -80,8 +80,8 @@ public:
     }
 
 private:
-    Cache(const Cache&) SAL_DELETED_FUNCTION;
-    Cache& operator=(const Cache&) SAL_DELETED_FUNCTION;
+    Cache(const Cache&) = delete;
+    Cache& operator=(const Cache&) = delete;
 
     typedef std::list<T> LruList; // last recently used list
     typedef typename LruList::iterator LruListIt;
diff --git a/binaryurp/source/incomingreply.hxx b/binaryurp/source/incomingreply.hxx
index 7584ded5c3fa..f051387bc41d 100644
--- a/binaryurp/source/incomingreply.hxx
+++ b/binaryurp/source/incomingreply.hxx
@@ -30,8 +30,8 @@ namespace binaryurp {
 
 struct IncomingReply {
 private:
-    IncomingReply(const IncomingReply&) SAL_DELETED_FUNCTION;
-    IncomingReply& operator=(const IncomingReply&) SAL_DELETED_FUNCTION;
+    IncomingReply(const IncomingReply&) = delete;
+    IncomingReply& operator=(const IncomingReply&) = delete;
 public:
     IncomingReply(
         bool theException, BinaryAny const & theReturnValue,
diff --git a/binaryurp/source/incomingrequest.hxx b/binaryurp/source/incomingrequest.hxx
index 0b8c4d13e249..64b5664bd7b0 100644
--- a/binaryurp/source/incomingrequest.hxx
+++ b/binaryurp/source/incomingrequest.hxx
@@ -40,8 +40,8 @@ namespace binaryurp {
 
 class IncomingRequest {
 private:
-    IncomingRequest(const IncomingRequest&) SAL_DELETED_FUNCTION;
-    IncomingRequest& operator=(const IncomingRequest&) SAL_DELETED_FUNCTION;
+    IncomingRequest(const IncomingRequest&) = delete;
+    IncomingRequest& operator=(const IncomingRequest&) = delete;
 public:
     IncomingRequest(
         rtl::Reference< Bridge > const & bridge, rtl::ByteSequence const & tid,
diff --git a/binaryurp/source/marshal.hxx b/binaryurp/source/marshal.hxx
index da78a787839a..4a20395423f2 100644
--- a/binaryurp/source/marshal.hxx
+++ b/binaryurp/source/marshal.hxx
@@ -68,8 +68,8 @@ public:
         std::vector< unsigned char > * buffer, rtl::ByteSequence const & tid);
 
 private:
-    Marshal(const Marshal&) SAL_DELETED_FUNCTION;
-    Marshal& operator=(const Marshal&) SAL_DELETED_FUNCTION;
+    Marshal(const Marshal&) = delete;
+    Marshal& operator=(const Marshal&) = delete;
 
     void writeValue(
         std::vector< unsigned char > * buffer,
diff --git a/binaryurp/source/outgoingrequests.hxx b/binaryurp/source/outgoingrequests.hxx
index e3c92bd00b91..f774dab7c438 100644
--- a/binaryurp/source/outgoingrequests.hxx
+++ b/binaryurp/source/outgoingrequests.hxx
@@ -45,8 +45,8 @@ public:
     void pop(rtl::ByteSequence const & tid) throw ();
 
 private:
-    OutgoingRequests(const OutgoingRequests&) SAL_DELETED_FUNCTION;
-    OutgoingRequests& operator=(const OutgoingRequests&) SAL_DELETED_FUNCTION;
+    OutgoingRequests(const OutgoingRequests&) = delete;
+    OutgoingRequests& operator=(const OutgoingRequests&) = delete;
 
     typedef std::map< rtl::ByteSequence, std::vector< OutgoingRequest > > Map;
 
diff --git a/binaryurp/source/proxy.hxx b/binaryurp/source/proxy.hxx
index 7a758dd3e23d..7f90f116c137 100644
--- a/binaryurp/source/proxy.hxx
+++ b/binaryurp/source/proxy.hxx
@@ -63,8 +63,8 @@ public:
         OUString * oid);
 
 private:
-    Proxy(const Proxy&) SAL_DELETED_FUNCTION;
-    Proxy& operator=(const Proxy&) SAL_DELETED_FUNCTION;
+    Proxy(const Proxy&) = delete;
+    Proxy& operator=(const Proxy&) = delete;
 
     ~Proxy();
 
diff --git a/binaryurp/source/readerstate.hxx b/binaryurp/source/readerstate.hxx
index 1ce1d5a4b783..879b0851279f 100644
--- a/binaryurp/source/readerstate.hxx
+++ b/binaryurp/source/readerstate.hxx
@@ -32,8 +32,8 @@ namespace binaryurp {
 
 struct ReaderState {
 private:
-    ReaderState(const ReaderState&) SAL_DELETED_FUNCTION;
-    ReaderState& operator=(const ReaderState&) SAL_DELETED_FUNCTION;
+    ReaderState(const ReaderState&) = delete;
+    ReaderState& operator=(const ReaderState&) = delete;
 public:
     ReaderState() {}
 
diff --git a/binaryurp/source/unmarshal.hxx b/binaryurp/source/unmarshal.hxx
index 3c523aa3f637..0cbb1193c9ed 100644
--- a/binaryurp/source/unmarshal.hxx
+++ b/binaryurp/source/unmarshal.hxx
@@ -65,8 +65,8 @@ public:
     void done() const;
 
 private:
-    Unmarshal(const Unmarshal&) SAL_DELETED_FUNCTION;
-    Unmarshal& operator=(const Unmarshal&) SAL_DELETED_FUNCTION;
+    Unmarshal(const Unmarshal&) = delete;
+    Unmarshal& operator=(const Unmarshal&) = delete;
 
     void check(sal_Int32 size) const;
 
diff --git a/binaryurp/source/writerstate.hxx b/binaryurp/source/writerstate.hxx
index 7ae457c46c8e..94207959a5a8 100644
--- a/binaryurp/source/writerstate.hxx
+++ b/binaryurp/source/writerstate.hxx
@@ -32,8 +32,8 @@ namespace binaryurp {
 
 struct WriterState {
 private:
-    WriterState(const WriterState&) SAL_DELETED_FUNCTION;
-    WriterState& operator=(const WriterState&) SAL_DELETED_FUNCTION;
+    WriterState(const WriterState&) = delete;
+    WriterState& operator=(const WriterState&) = delete;
 public:
     WriterState():
         typeCache(cache::size), oidCache(cache::size), tidCache(cache::size) {}
diff --git a/bridges/inc/bridges/cpp_uno/shared/bridge.hxx b/bridges/inc/bridges/cpp_uno/shared/bridge.hxx
index 3e13b2a919aa..9cfa92bcddef 100644
--- a/bridges/inc/bridges/cpp_uno/shared/bridge.hxx
+++ b/bridges/inc/bridges/cpp_uno/shared/bridge.hxx
@@ -77,8 +77,8 @@ public:
     uno_Mapping * getUno2Cpp() { return &aUno2Cpp; }
 
 private:
-    Bridge(Bridge &) SAL_DELETED_FUNCTION;
-    void operator =(const Bridge&) SAL_DELETED_FUNCTION;
+    Bridge(Bridge &) = delete;
+    void operator =(const Bridge&) = delete;
 
     Bridge(
         uno_ExtEnvironment * pCppEnv_, uno_ExtEnvironment * pUnoEnv_,
diff --git a/bridges/inc/bridges/cpp_uno/shared/cppinterfaceproxy.hxx b/bridges/inc/bridges/cpp_uno/shared/cppinterfaceproxy.hxx
index 67ebce4f7d65..4546dbe33b7a 100644
--- a/bridges/inc/bridges/cpp_uno/shared/cppinterfaceproxy.hxx
+++ b/bridges/inc/bridges/cpp_uno/shared/cppinterfaceproxy.hxx
@@ -66,8 +66,8 @@ public:
     static CppInterfaceProxy * castInterfaceToProxy(void * pInterface);
 
 private:
-    CppInterfaceProxy(CppInterfaceProxy &) SAL_DELETED_FUNCTION;
-    void operator =(const CppInterfaceProxy&) SAL_DELETED_FUNCTION;
+    CppInterfaceProxy(CppInterfaceProxy &) = delete;
+    void operator =(const CppInterfaceProxy&) = delete;
 
     CppInterfaceProxy(
         Bridge * pBridge_, uno_Interface * pUnoI_,
diff --git a/bridges/inc/bridges/cpp_uno/shared/unointerfaceproxy.hxx b/bridges/inc/bridges/cpp_uno/shared/unointerfaceproxy.hxx
index 6e8e240c6421..f678765b7826 100644
--- a/bridges/inc/bridges/cpp_uno/shared/unointerfaceproxy.hxx
+++ b/bridges/inc/bridges/cpp_uno/shared/unointerfaceproxy.hxx
@@ -73,8 +73,8 @@ public:
     com::sun::star::uno::XInterface * getCppI() { return pCppI; }
 
 private:
-    UnoInterfaceProxy(UnoInterfaceProxy &) SAL_DELETED_FUNCTION;
-    void operator =(const UnoInterfaceProxy&) SAL_DELETED_FUNCTION;
+    UnoInterfaceProxy(UnoInterfaceProxy &) = delete;
+    void operator =(const UnoInterfaceProxy&) = delete;
 
     UnoInterfaceProxy(
         Bridge * pBridge_, com::sun::star::uno::XInterface * pCppI_,
diff --git a/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx b/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx
index 09246c8e705f..b5d7aaa4f345 100644
--- a/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx
+++ b/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx
@@ -120,8 +120,8 @@ private:
 
     class BaseOffset;
 
-    VtableFactory(VtableFactory &) SAL_DELETED_FUNCTION;
-    void operator =(const VtableFactory&) SAL_DELETED_FUNCTION;
+    VtableFactory(VtableFactory &) = delete;
+    void operator =(const VtableFactory&) = delete;
 
     bool createBlock(Block &block, sal_Int32 slotCount) const;
 
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
index ab601ddff75b..bf9a7bf94d73 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
@@ -47,16 +47,16 @@ namespace CPPU_CURRENT_NAMESPACE {
 namespace {
 
 struct Fake_type_info {
-    virtual ~Fake_type_info() SAL_DELETED_FUNCTION;
+    virtual ~Fake_type_info() = delete;
     char const * name;
 };
 
 struct Fake_class_type_info: Fake_type_info {
-    virtual ~Fake_class_type_info() SAL_DELETED_FUNCTION;
+    virtual ~Fake_class_type_info() = delete;
 };
 
 struct Fake_si_class_type_info: Fake_class_type_info {
-    virtual ~Fake_si_class_type_info() SAL_DELETED_FUNCTION;
+    virtual ~Fake_si_class_type_info() = delete;
     void const * base;
 };
 
diff --git a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
index 6c556cc2a072..ccdf99300207 100644
--- a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
@@ -292,8 +292,8 @@ struct ExceptionType
     }
 
     // Copy assignment is forbidden and not implemented.
-    ExceptionType (const ExceptionType &) SAL_DELETED_FUNCTION;
-    ExceptionType & operator= (const ExceptionType &) SAL_DELETED_FUNCTION;
+    ExceptionType (const ExceptionType &) = delete;
+    ExceptionType & operator= (const ExceptionType &) = delete;
 };
 
 struct RaiseInfo
diff --git a/bridges/source/cpp_uno/shared/guardedarray.hxx b/bridges/source/cpp_uno/shared/guardedarray.hxx
index 842536cd21d2..ad5d6bdaa4c1 100644
--- a/bridges/source/cpp_uno/shared/guardedarray.hxx
+++ b/bridges/source/cpp_uno/shared/guardedarray.hxx
@@ -33,8 +33,8 @@ public:
     T * release() { T * p = pointer; pointer = 0; return p; }
 
 private:
-    GuardedArray(GuardedArray &) SAL_DELETED_FUNCTION;
-    void operator =(GuardedArray) SAL_DELETED_FUNCTION;
+    GuardedArray(GuardedArray &) = delete;
+    void operator =(GuardedArray) = delete;
 
     T * pointer;
 };
diff --git a/bridges/source/jni_uno/jni_base.h b/bridges/source/jni_uno/jni_base.h
index 62474ead2e4a..0855f8b3daed 100644
--- a/bridges/source/jni_uno/jni_base.h
+++ b/bridges/source/jni_uno/jni_base.h
@@ -58,8 +58,8 @@ class JNI_context
     JNIEnv *         m_env;
     jobject          m_class_loader;
 
-    JNI_context( JNI_context & ) SAL_DELETED_FUNCTION;
-    void operator = ( JNI_context ) SAL_DELETED_FUNCTION;
+    JNI_context( JNI_context & ) = delete;
+    void operator = ( JNI_context ) = delete;
 
     void java_exc_occurred() const;
 public:
@@ -121,8 +121,8 @@ class JNI_guarded_context
     : private ::jvmaccess::VirtualMachine::AttachGuard,
       public JNI_context
 {
-    JNI_guarded_context( JNI_guarded_context & ) SAL_DELETED_FUNCTION;
-    void operator = ( JNI_guarded_context ) SAL_DELETED_FUNCTION;
+    JNI_guarded_context( JNI_guarded_context & ) = delete;
+    void operator = ( JNI_guarded_context ) = delete;
 
 public:
     inline explicit JNI_guarded_context(
@@ -229,8 +229,8 @@ class TypeDescr
 {
     typelib_TypeDescription * m_td;
 
-    TypeDescr( TypeDescr & ) SAL_DELETED_FUNCTION;
-    void operator = ( TypeDescr ) SAL_DELETED_FUNCTION;
+    TypeDescr( TypeDescr & ) = delete;
+    void operator = ( TypeDescr ) = delete;
 
 public:
     inline explicit TypeDescr( typelib_TypeDescriptionReference * td_ref );
diff --git a/canvas/source/opengl/ogl_canvashelper.hxx b/canvas/source/opengl/ogl_canvashelper.hxx
index d33e82923d76..fdc8698c9173 100644
--- a/canvas/source/opengl/ogl_canvashelper.hxx
+++ b/canvas/source/opengl/ogl_canvashelper.hxx
@@ -197,7 +197,7 @@ namespace oglcanvas
                                    o3tl::ThreadSafeRefCountingPolicy > RecordVectorT;
 
     private:
-        CanvasHelper( const CanvasHelper& ) SAL_DELETED_FUNCTION;
+        CanvasHelper( const CanvasHelper& ) = delete;
 
         void setupGraphicsState( Action&                                         o_action,
                                  const css::rendering::ViewState&   viewState,
diff --git a/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx b/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx
index a1cbca5c9355..ce5f20cde68d 100644
--- a/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx
+++ b/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx
@@ -42,8 +42,8 @@ public:
     virtual Size LogicToPixel( const Size& rSize ) const SAL_OVERRIDE;
 
 private:
-    AccessibleViewForwarder( AccessibleViewForwarder& ) SAL_DELETED_FUNCTION;
-    AccessibleViewForwarder& operator=( AccessibleViewForwarder& ) SAL_DELETED_FUNCTION;
+    AccessibleViewForwarder( AccessibleViewForwarder& ) = delete;
+    AccessibleViewForwarder& operator=( AccessibleViewForwarder& ) = delete;
 
     AccessibleChartView* m_pAccChartView;
     VclPtr<vcl::Window> m_pWindow;
diff --git a/chart2/source/controller/dialogs/DataBrowser.hxx b/chart2/source/controller/dialogs/DataBrowser.hxx
index a04101b0595a..60cc12b30696 100644
--- a/chart2/source/controller/dialogs/DataBrowser.hxx
+++ b/chart2/source/controller/dialogs/DataBrowser.hxx
@@ -183,7 +183,7 @@ private:
     DECL_LINK_TYPED( SeriesHeaderGotFocus, Control&, void );
     DECL_LINK_TYPED( SeriesHeaderChanged,  impl::SeriesHeaderEdit*, void );
 
-    DataBrowser( const DataBrowser & ) SAL_DELETED_FUNCTION;
+    DataBrowser( const DataBrowser & ) = delete;
 };
 
 } // namespace chart
diff --git a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx
index 611db51fff52..01aab488f4fc 100644
--- a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx
+++ b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx
@@ -59,8 +59,8 @@ private:
     // OPropertyArrayUsageHelper
     virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE;
 
-    ChartTypeUnoDlg(const ChartTypeUnoDlg&) SAL_DELETED_FUNCTION;
-    void operator =(const ChartTypeUnoDlg&) SAL_DELETED_FUNCTION;
+    ChartTypeUnoDlg(const ChartTypeUnoDlg&) = delete;
+    void operator =(const ChartTypeUnoDlg&) = delete;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >           m_xChartModel;
 };
diff --git a/chart2/source/inc/DiagramHelper.hxx b/chart2/source/inc/DiagramHelper.hxx
index 2272d9a20bc0..fa168fb87327 100644
--- a/chart2/source/inc/DiagramHelper.hxx
+++ b/chart2/source/inc/DiagramHelper.hxx
@@ -346,7 +346,7 @@ public:
         , bool bConvertAlsoFromAutoPositioning );
 
 private:
-    DiagramHelper() SAL_DELETED_FUNCTION;
+    DiagramHelper() = delete;
 
 };
 
diff --git a/chart2/source/inc/LifeTime.hxx b/chart2/source/inc/LifeTime.hxx
index 715b57351eb4..687f15a2d4e4 100644
--- a/chart2/source/inc/LifeTime.hxx
+++ b/chart2/source/inc/LifeTime.hxx
@@ -203,8 +203,8 @@ private:
     bool            m_bLongLastingCallRegistered;
 
 private:
-    LifeTimeGuard( const LifeTimeGuard& ) SAL_DELETED_FUNCTION;
-    LifeTimeGuard& operator= ( const LifeTimeGuard& ) SAL_DELETED_FUNCTION;
+    LifeTimeGuard( const LifeTimeGuard& ) = delete;
+    LifeTimeGuard& operator= ( const LifeTimeGuard& ) = delete;
 };
 
 template<class T>
diff --git a/chart2/source/inc/ModifyListenerCallBack.hxx b/chart2/source/inc/ModifyListenerCallBack.hxx
index 60fff63eb7ba..ad1b2b3d2083 100644
--- a/chart2/source/inc/ModifyListenerCallBack.hxx
+++ b/chart2/source/inc/ModifyListenerCallBack.hxx
@@ -43,7 +43,7 @@ public:
     SAL_DLLPRIVATE void stopListening();
 
 private: //methods
-    ModifyListenerCallBack( const ModifyListenerCallBack& ) SAL_DELETED_FUNCTION;
+    ModifyListenerCallBack( const ModifyListenerCallBack& ) = delete;
 
 private: //member
     ModifyListenerCallBack_impl* pModifyListener_impl;
diff --git a/chart2/source/inc/RelativeSizeHelper.hxx b/chart2/source/inc/RelativeSizeHelper.hxx
index a6fa1a665dd5..dfc2df420c10 100644
--- a/chart2/source/inc/RelativeSizeHelper.hxx
+++ b/chart2/source/inc/RelativeSizeHelper.hxx
@@ -41,7 +41,7 @@ public:
         const ::com::sun::star::awt::Size & rNewReferenceSize );
 
 private:
-    RelativeSizeHelper() SAL_DELETED_FUNCTION;
+    RelativeSizeHelper() = delete;
 };
 
 } //  namespace chart
diff --git a/chart2/source/view/inc/VDiagram.hxx b/chart2/source/view/inc/VDiagram.hxx
index 8b4b0e9bc3d4..89eecfa41f31 100644
--- a/chart2/source/view/inc/VDiagram.hxx
+++ b/chart2/source/view/inc/VDiagram.hxx
@@ -78,7 +78,7 @@ private: //methods
     void    adjustAspectRatio3d( const ::com::sun::star::awt::Size& rAvailableSize );
 
 private: //members
-    VDiagram(const VDiagram& rD) SAL_DELETED_FUNCTION;
+    VDiagram(const VDiagram& rD) = delete;
 
     ::com::sun::star::uno::Reference<
                     ::com::sun::star::drawing::XShapes >                    m_xTarget;
diff --git a/codemaker/source/cppumaker/includes.hxx b/codemaker/source/cppumaker/includes.hxx
index c28cfb13c497..e08923c2765b 100644
--- a/codemaker/source/cppumaker/includes.hxx
+++ b/codemaker/source/cppumaker/includes.hxx
@@ -65,8 +65,8 @@ public:
         FileStream & out, OString const & entityName, bool hpp);
 
 private:
-    Includes(Includes &) SAL_DELETED_FUNCTION;
-    void operator =(const Includes&) SAL_DELETED_FUNCTION;
+    Includes(Includes &) = delete;
+    void operator =(const Includes&) = delete;
 
     bool isInterfaceType(OString const & entityName) const;
 
diff --git a/codemaker/source/javamaker/classfile.hxx b/codemaker/source/javamaker/classfile.hxx
index b048a47d08f5..949203dea553 100644
--- a/codemaker/source/javamaker/classfile.hxx
+++ b/codemaker/source/javamaker/classfile.hxx
@@ -130,8 +130,8 @@ public:
         Position getPosition() const;
 
     private:
-        Code(Code &) SAL_DELETED_FUNCTION;
-        void operator =(const Code&) SAL_DELETED_FUNCTION;
+        Code(Code &) = delete;
+        void operator =(const Code&) = delete;
 
         explicit Code(ClassFile & classFile);
 
@@ -181,8 +181,8 @@ public:
 private:
     typedef std::map< rtl::OString, sal_uInt16 > Map;
 
-    ClassFile(ClassFile &) SAL_DELETED_FUNCTION;
-    void operator =(const ClassFile&) SAL_DELETED_FUNCTION;
+    ClassFile(ClassFile &) = delete;
+    void operator =(const ClassFile&) = delete;
 
     sal_uInt16 nextConstantPoolIndex(sal_uInt16 width);
     sal_uInt16 addUtf8Info(rtl::OString const & value);
diff --git a/comphelper/source/container/enumerablemap.cxx b/comphelper/source/container/enumerablemap.cxx
index 0f9f679e04ca..6f409e8ca96c 100644
--- a/comphelper/source/container/enumerablemap.cxx
+++ b/comphelper/source/container/enumerablemap.cxx
@@ -110,7 +110,7 @@ namespace comphelper
         {
         }
     private:
-        MapData& operator=( const MapData& _source ) SAL_DELETED_FUNCTION;
+        MapData& operator=( const MapData& _source ) = delete;
     };
 
 
diff --git a/compilerplugins/clang/store/deletedspecial.cxx b/compilerplugins/clang/store/deletedspecial.cxx
index 6c2d58807a86..b1329229e2fc 100644
--- a/compilerplugins/clang/store/deletedspecial.cxx
+++ b/compilerplugins/clang/store/deletedspecial.cxx
@@ -17,7 +17,7 @@
 // Second-guess that certain private special member function declarations for
 // which no definition can be found are left undefined to prevent them from
 // being implicitly declared.  Such situations are better expressed by marking
-// the function as SAL_DELETED_FUNCTION (it e.g. helps compilers determine
+// the function as = delete (it e.g. helps compilers determine
 // whether class members are unused if all of a class's member definitions are
 // seen in a compilation unit).  (Default constructors for classes with multiple
 // constructors are exempted as they would not be implicitly declared.
diff --git a/configmgr/source/access.hxx b/configmgr/source/access.hxx
index e3cb69199faf..f9006657a17d 100644
--- a/configmgr/source/access.hxx
+++ b/configmgr/source/access.hxx
@@ -474,8 +474,8 @@ protected:
     bool isDisposed() const { return disposed_;}
 
 private:
-    Access(const Access&) SAL_DELETED_FUNCTION;
-    Access& operator=(const Access&) SAL_DELETED_FUNCTION;
+    Access(const Access&) = delete;
+    Access& operator=(const Access&) = delete;
 
     struct ModifiedChild {
         rtl::Reference< ChildAccess > child;
diff --git a/configmgr/source/broadcaster.hxx b/configmgr/source/broadcaster.hxx
index e808dd84f9e1..e0a5fc4ce962 100644
--- a/configmgr/source/broadcaster.hxx
+++ b/configmgr/source/broadcaster.hxx
@@ -78,8 +78,8 @@ public:
     void send();
 
 private:
-    Broadcaster(const Broadcaster&) SAL_DELETED_FUNCTION;
-    Broadcaster& operator=(const Broadcaster&) SAL_DELETED_FUNCTION;
+    Broadcaster(const Broadcaster&) = delete;
+    Broadcaster& operator=(const Broadcaster&) = delete;
 
     struct DisposeNotification {
         css::uno::Reference< css::lang::XEventListener >  listener;
diff --git a/configmgr/source/components.hxx b/configmgr/source/components.hxx
index 43e682e7757e..b28da71f4111 100644
--- a/configmgr/source/components.hxx
+++ b/configmgr/source/components.hxx
@@ -102,8 +102,8 @@ public:
     getExternalValue(OUString const & descriptor);
 
 private:
-    Components(const Components&) SAL_DELETED_FUNCTION;
-    Components& operator=(const Components&) SAL_DELETED_FUNCTION;
+    Components(const Components&) = delete;
+    Components& operator=(const Components&) = delete;
 
     typedef void FileParser(
         OUString const &, int, Data &, Partial const *, Modifications *,
diff --git a/configmgr/source/configurationprovider.cxx b/configmgr/source/configurationprovider.cxx
index 31b87b69edd7..58c3da6e73b8 100644
--- a/configmgr/source/configurationprovider.cxx
+++ b/configmgr/source/configurationprovider.cxx
@@ -110,8 +110,8 @@ public:
     }
 
 private:
-    Service(const Service&) SAL_DELETED_FUNCTION;
-    Service& operator=(const Service&) SAL_DELETED_FUNCTION;
+    Service(const Service&) = delete;
+    Service& operator=(const Service&) = delete;
 
     virtual ~Service() {}
 
@@ -376,8 +376,8 @@ public:
     Factory() {}
 
 private:
-    Factory(const Factory&) SAL_DELETED_FUNCTION;
-    Factory& operator=(const Factory&) SAL_DELETED_FUNCTION;
+    Factory(const Factory&) = delete;
+    Factory& operator=(const Factory&) = delete;
 
     virtual ~Factory() {}
 
diff --git a/configmgr/source/configurationregistry.cxx b/configmgr/source/configurationregistry.cxx
index d1f640e3c112..6fa5450ca5c3 100644
--- a/configmgr/source/configurationregistry.cxx
+++ b/configmgr/source/configurationregistry.cxx
@@ -75,8 +75,8 @@ public:
     explicit Service(css::uno::Reference< css::uno::XComponentContext > const & context);
 
 private:
-    Service(const Service&) SAL_DELETED_FUNCTION;
-    Service& operator=(const Service&) SAL_DELETED_FUNCTION;
+    Service(const Service&) = delete;
+    Service& operator=(const Service&) = delete;
 
     virtual ~Service() {}
 
@@ -158,8 +158,8 @@ public:
         service_(service), value_(value) {}
 
 private:
-    RegistryKey(const RegistryKey&) SAL_DELETED_FUNCTION;
-    RegistryKey& operator=(const RegistryKey&) SAL_DELETED_FUNCTION;
+    RegistryKey(const RegistryKey&) = delete;
+    RegistryKey& operator=(const RegistryKey&) = delete;
 
     virtual ~RegistryKey() {}
 
diff --git a/configmgr/source/data.hxx b/configmgr/source/data.hxx
index 681bf55aa261..e0293b518390 100644
--- a/configmgr/source/data.hxx
+++ b/configmgr/source/data.hxx
@@ -85,8 +85,8 @@ struct Data {
         OUString const & url);
 
 private:
-    Data(const Data&) SAL_DELETED_FUNCTION;
-    Data& operator=(const Data&) SAL_DELETED_FUNCTION;
+    Data(const Data&) = delete;
+    Data& operator=(const Data&) = delete;
 
     typedef config_map< rtl::Reference< ExtensionXcu > >
         ExtensionXcuAdditions;
diff --git a/configmgr/source/modifications.hxx b/configmgr/source/modifications.hxx
index 098992d08fd5..dc97fd3bee07 100644
--- a/configmgr/source/modifications.hxx
+++ b/configmgr/source/modifications.hxx
@@ -52,8 +52,8 @@ public:
     Node const & getRoot() const { return root_;}
 
 private:
-    Modifications(const Modifications&) SAL_DELETED_FUNCTION;
-    Modifications& operator=(const Modifications&) SAL_DELETED_FUNCTION;
+    Modifications(const Modifications&) = delete;
+    Modifications& operator=(const Modifications&) = delete;
 
     Node root_;
 };
diff --git a/configmgr/source/partial.hxx b/configmgr/source/partial.hxx
index d9864a6f4841..e7641e2c974b 100644
--- a/configmgr/source/partial.hxx
+++ b/configmgr/source/partial.hxx
@@ -43,8 +43,8 @@ public:
     Containment contains(Path const & path) const;
 
 private:
-    Partial(const Partial&) SAL_DELETED_FUNCTION;
-    Partial& operator=(const Partial&) SAL_DELETED_FUNCTION;
+    Partial(const Partial&) = delete;
+    Partial& operator=(const Partial&) = delete;
 
     struct Node {
         typedef boost::unordered_map< OUString, Node, OUStringHash > Children;
diff --git a/configmgr/source/readonlyaccess.cxx b/configmgr/source/readonlyaccess.cxx
index afaef972f3ff..8948ce93043e 100644
--- a/configmgr/source/readonlyaccess.cxx
+++ b/configmgr/source/readonlyaccess.cxx
@@ -51,8 +51,8 @@ public:
         context_(context) {}
 
 private:
-    Service(const Service&) SAL_DELETED_FUNCTION;
-    Service& operator=(const Service&) SAL_DELETED_FUNCTION;
+    Service(const Service&) = delete;
+    Service& operator=(const Service&) = delete;
 
     virtual ~Service() {}
 
diff --git a/configmgr/source/readwriteaccess.cxx b/configmgr/source/readwriteaccess.cxx
index e6c4fa07dc5d..d1cc4134562e 100644
--- a/configmgr/source/readwriteaccess.cxx
+++ b/configmgr/source/readwriteaccess.cxx
@@ -53,8 +53,8 @@ public:
         context_(context) {}
 
 private:
-    Service(const Service&) SAL_DELETED_FUNCTION;
-    Service& operator=(const Service&) SAL_DELETED_FUNCTION;
+    Service(const Service&) = delete;
+    Service& operator=(const Service&) = delete;
 
     virtual ~Service() {}
 
diff --git a/configmgr/source/update.cxx b/configmgr/source/update.cxx
index 5d4028559fed..44b9840b612e 100644
--- a/configmgr/source/update.cxx
+++ b/configmgr/source/update.cxx
@@ -68,8 +68,8 @@ public:
     }
 
 private:
-    Service(const Service&) SAL_DELETED_FUNCTION;
-    Service& operator=(const Service&) SAL_DELETED_FUNCTION;
+    Service(const Service&) = delete;
+    Service& operator=(const Service&) = delete;
 
     virtual ~Service() {}
 
diff --git a/configmgr/source/valueparser.hxx b/configmgr/source/valueparser.hxx
index f2c3b3c2e5bb..092d910dcd05 100644
--- a/configmgr/source/valueparser.hxx
+++ b/configmgr/source/valueparser.hxx
@@ -68,8 +68,8 @@ public:
     OString separator_;
 
 private:
-    ValueParser(const ValueParser&) SAL_DELETED_FUNCTION;
-    ValueParser& operator=(const ValueParser&) SAL_DELETED_FUNCTION;
+    ValueParser(const ValueParser&) = delete;
+    ValueParser& operator=(const ValueParser&) = delete;
 
     template< typename T > css::uno::Any convertItems();
 
diff --git a/configmgr/source/writemodfile.cxx b/configmgr/source/writemodfile.cxx
index 056041dea512..d56b284004e1 100644
--- a/configmgr/source/writemodfile.cxx
+++ b/configmgr/source/writemodfile.cxx
@@ -152,7 +152,7 @@ void writeData_(TempFile &handle, char const * begin, sal_Int32 length) {
     handle.writeString(begin, length);
 }
 
-void writeValueContent_(TempFile &, bool) SAL_DELETED_FUNCTION;
+void writeValueContent_(TempFile &, bool) = delete;
     // silence loplugin:salbool
 void writeValueContent_(TempFile &handle, sal_Bool value) {
     if (value) {
diff --git a/configmgr/source/writemodfile.hxx b/configmgr/source/writemodfile.hxx
index 5a80959ac359..ffd1fda316cd 100644
--- a/configmgr/source/writemodfile.hxx
+++ b/configmgr/source/writemodfile.hxx
@@ -44,8 +44,8 @@ struct TempFile {
     void writeString(char const *begin, sal_Int32 length);
 
 private:
-    TempFile(const TempFile&) SAL_DELETED_FUNCTION;
-    TempFile& operator=(const TempFile&) SAL_DELETED_FUNCTION;
+    TempFile(const TempFile&) = delete;
+    TempFile& operator=(const TempFile&) = delete;
 };
 
 void writeData(TempFile &handle, OString const & text);
diff --git a/connectivity/source/cpool/ZPoolCollection.hxx b/connectivity/source/cpool/ZPoolCollection.hxx
index 0ed726c14fe3..522245087ff4 100644
--- a/connectivity/source/cpool/ZPoolCollection.hxx
+++ b/connectivity/source/cpool/ZPoolCollection.hxx
@@ -77,8 +77,8 @@ namespace connectivity
         ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDesktop2>               m_xDesktop;
 
     private:
-        OPoolCollection(const OPoolCollection&) SAL_DELETED_FUNCTION;
-        int operator= (const OPoolCollection&) SAL_DELETED_FUNCTION;
+        OPoolCollection(const OPoolCollection&) = delete;
+        int operator= (const OPoolCollection&) = delete;
 
         explicit OPoolCollection(
             const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext);
diff --git a/connectivity/source/drivers/mork/MorkParser.hxx b/connectivity/source/drivers/mork/MorkParser.hxx
index 411c7544e978..972f9141d3b9 100644
--- a/connectivity/source/drivers/mork/MorkParser.hxx
+++ b/connectivity/source/drivers/mork/MorkParser.hxx
@@ -160,8 +160,8 @@ protected: // Data
     enum { NPColumns, NPValues, NPRows } nowParsing_;
 
 private:
-    MorkParser(const MorkParser &) SAL_DELETED_FUNCTION;
-    MorkParser &operator=(const MorkParser &) SAL_DELETED_FUNCTION;
+    MorkParser(const MorkParser &) = delete;
+    MorkParser &operator=(const MorkParser &) = delete;
 
 };
 
diff --git a/connectivity/source/drivers/postgresql/pq_statics.hxx b/connectivity/source/drivers/postgresql/pq_statics.hxx
index ce70eb696d56..300f3574dff3 100644
--- a/connectivity/source/drivers/postgresql/pq_statics.hxx
+++ b/connectivity/source/drivers/postgresql/pq_statics.hxx
@@ -252,8 +252,8 @@ struct Statics
     BaseTypeMap baseTypeMap;
     Statics(){}
 private:
-    Statics( const Statics & ) SAL_DELETED_FUNCTION;
-    Statics & operator = ( const Statics & ) SAL_DELETED_FUNCTION;
+    Statics( const Statics & ) = delete;
+    Statics & operator = ( const Statics & ) = delete;
 };
 
 Statics & getStatics();
diff --git a/connectivity/source/inc/ParameterSubstitution.hxx b/connectivity/source/inc/ParameterSubstitution.hxx
index ecb2c59e3734..6dc66d6b99a1 100644
--- a/connectivity/source/inc/ParameterSubstitution.hxx
+++ b/connectivity/source/inc/ParameterSubstitution.hxx
@@ -38,8 +38,8 @@ namespace connectivity
         ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >    m_xContext;
         ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XConnection >     m_xConnection;
 
-        ParameterSubstitution( const ParameterSubstitution& ) SAL_DELETED_FUNCTION;
-        ParameterSubstitution& operator=( const ParameterSubstitution& ) SAL_DELETED_FUNCTION;
+        ParameterSubstitution( const ParameterSubstitution& ) = delete;
+        ParameterSubstitution& operator=( const ParameterSubstitution& ) = delete;
     public:
 
         static OUString getImplementationName_Static(  ) throw(::com::sun::star::uno::RuntimeException);
diff --git a/connectivity/source/inc/RowFunctionParser.hxx b/connectivity/source/inc/RowFunctionParser.hxx
index a4f8d7d429b7..5eb3c36ccab9 100644
--- a/connectivity/source/inc/RowFunctionParser.hxx
+++ b/connectivity/source/inc/RowFunctionParser.hxx
@@ -121,8 +121,8 @@ private:
     // supposed to be a singleton
     FunctionParser();
 
-    FunctionParser(const FunctionParser&) SAL_DELETED_FUNCTION;
-    FunctionParser& operator=( const FunctionParser& ) SAL_DELETED_FUNCTION;
+    FunctionParser(const FunctionParser&) = delete;
+    FunctionParser& operator=( const FunctionParser& ) = delete;
 };
 
 
diff --git a/connectivity/source/inc/ado/Aolevariant.hxx b/connectivity/source/inc/ado/Aolevariant.hxx
index 59c7735a7900..9d8f2d608c04 100644
--- a/connectivity/source/inc/ado/Aolevariant.hxx
+++ b/connectivity/source/inc/ado/Aolevariant.hxx
@@ -77,7 +77,7 @@ namespace connectivity
             OLEVariant(const VARIANT& varSrc);
             OLEVariant(const OLEVariant& varSrc)    ;
             OLEVariant(bool x)  ;
-            OLEVariant(sal_Bool) SAL_DELETED_FUNCTION;
+            OLEVariant(sal_Bool) = delete;
             OLEVariant(sal_Int8 n)  ;
             OLEVariant(sal_Int16 n) ;
             OLEVariant(sal_Int32 n) ;
diff --git a/connectivity/source/inc/java/ContextClassLoader.hxx b/connectivity/source/inc/java/ContextClassLoader.hxx
index 6d96a48e3e72..e426e6ca8ce2 100644
--- a/connectivity/source/inc/java/ContextClassLoader.hxx
+++ b/connectivity/source/inc/java/ContextClassLoader.hxx
@@ -64,8 +64,8 @@ namespace connectivity { namespace jdbc
         }
 
     private:
-        ContextClassLoaderScope(ContextClassLoaderScope &) SAL_DELETED_FUNCTION;
-        void operator =(ContextClassLoaderScope &) SAL_DELETED_FUNCTION;
+        ContextClassLoaderScope(ContextClassLoaderScope &) = delete;
+        void operator =(ContextClassLoaderScope &) = delete;
 
         void pop( bool clearExceptions );
 
diff --git a/connectivity/source/inc/java/LocalRef.hxx b/connectivity/source/inc/java/LocalRef.hxx
index 765cbe9318b9..2e0369a384c0 100644
--- a/connectivity/source/inc/java/LocalRef.hxx
+++ b/connectivity/source/inc/java/LocalRef.hxx
@@ -76,8 +76,8 @@ namespace connectivity { namespace jdbc
         bool    is()  const { return m_object != NULL; }
 
     private:
-        LocalRef(LocalRef &) SAL_DELETED_FUNCTION;
-        void operator =(LocalRef &) SAL_DELETED_FUNCTION;
+        LocalRef(LocalRef &) = delete;
+        void operator =(LocalRef &) = delete;
 
     protected:
         JNIEnv& m_environment;
diff --git a/connectivity/source/inc/java/lang/Object.hxx b/connectivity/source/inc/java/lang/Object.hxx
index 0efa942752a2..f3b169e23950 100644
--- a/connectivity/source/inc/java/lang/Object.hxx
+++ b/connectivity/source/inc/java/lang/Object.hxx
@@ -44,8 +44,8 @@ namespace connectivity
     class SDBThreadAttach
     {
         jvmaccess::VirtualMachine::AttachGuard m_aGuard;
-        SDBThreadAttach(SDBThreadAttach&) SAL_DELETED_FUNCTION;
-        SDBThreadAttach& operator= (SDBThreadAttach&) SAL_DELETED_FUNCTION;
+        SDBThreadAttach(SDBThreadAttach&) = delete;
+        SDBThreadAttach& operator= (SDBThreadAttach&) = delete;
     public:
         SDBThreadAttach();
         ~SDBThreadAttach();
@@ -66,8 +66,8 @@ namespace connectivity
 
     class  java_lang_Object
     {
-        java_lang_Object& operator= (java_lang_Object&) SAL_DELETED_FUNCTION;
-        java_lang_Object(java_lang_Object&) SAL_DELETED_FUNCTION;
+        java_lang_Object& operator= (java_lang_Object&) = delete;
+        java_lang_Object(java_lang_Object&) = delete;
 
     protected:
         // The Java handle to this class
diff --git a/cppcanvas/source/inc/implrenderer.hxx b/cppcanvas/source/inc/implrenderer.hxx
index dbf205ddf749..9347e3793a4b 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -206,8 +206,8 @@ static float GetSwapFloat( SvStream& rSt )
             void GraphicStatePop (GraphicStateMap& map, sal_Int32 index, OutDevState& rState);
 
         private:
-            ImplRenderer(const ImplRenderer&) SAL_DELETED_FUNCTION;
-            ImplRenderer& operator=( const ImplRenderer& ) SAL_DELETED_FUNCTION;
+            ImplRenderer(const ImplRenderer&) = delete;
+            ImplRenderer& operator=( const ImplRenderer& ) = delete;
 
             static void updateClipping( const ::basegfx::B2DPolyPolygon&   rClipPoly,
                                  const ActionFactoryParameters&     rParms,
diff --git a/cppcanvas/source/wrapper/implbitmap.hxx b/cppcanvas/source/wrapper/implbitmap.hxx
index 2a21bbd12ce4..f6c75cb4d04d 100644
--- a/cppcanvas/source/wrapper/implbitmap.hxx
+++ b/cppcanvas/source/wrapper/implbitmap.hxx
@@ -55,8 +55,8 @@ namespace cppcanvas
             virtual css::uno::Reference< css::rendering::XBitmap >  getUNOBitmap() const SAL_OVERRIDE;
 
         private:
-            ImplBitmap(const ImplBitmap&) SAL_DELETED_FUNCTION;
-            ImplBitmap& operator=( const ImplBitmap& ) SAL_DELETED_FUNCTION;
+            ImplBitmap(const ImplBitmap&) = delete;
+            ImplBitmap& operator=( const ImplBitmap& ) = delete;
 
             const css::uno::Reference< css::rendering::XBitmap > mxBitmap;
             BitmapCanvasSharedPtr                                mpBitmapCanvas;
diff --git a/cppcanvas/source/wrapper/implbitmapcanvas.hxx b/cppcanvas/source/wrapper/implbitmapcanvas.hxx
index 08ea31f52fa0..cf176ee8ab7f 100644
--- a/cppcanvas/source/wrapper/implbitmapcanvas.hxx
+++ b/cppcanvas/source/wrapper/implbitmapcanvas.hxx
@@ -47,7 +47,7 @@ namespace cppcanvas
             //ImplBitmapCanvas(const ImplBitmapCanvas&);
 
         private:
-            ImplBitmapCanvas& operator=( const ImplBitmapCanvas& ) SAL_DELETED_FUNCTION;
+            ImplBitmapCanvas& operator=( const ImplBitmapCanvas& ) = delete;
 
             const css::uno::Reference< css::rendering::XBitmapCanvas >    mxBitmapCanvas;
             const css::uno::Reference< css::rendering::XBitmap >          mxBitmap;
diff --git a/cppcanvas/source/wrapper/implcanvas.hxx b/cppcanvas/source/wrapper/implcanvas.hxx
index 7c8920cb65e9..f7b971d699aa 100644
--- a/cppcanvas/source/wrapper/implcanvas.hxx
+++ b/cppcanvas/source/wrapper/implcanvas.hxx
@@ -75,7 +75,7 @@ namespace cppcanvas
             //ImplCanvas(const ImplCanvas&);
 
         private:
-            ImplCanvas& operator=( const ImplCanvas& ) SAL_DELETED_FUNCTION;
+            ImplCanvas& operator=( const ImplCanvas& ) = delete;
 
             mutable css::rendering::ViewState                    maViewState;
             boost::optional<basegfx::B2DPolyPolygon>             maClipPolyPolygon;
diff --git a/cppcanvas/source/wrapper/implcustomsprite.hxx b/cppcanvas/source/wrapper/implcustomsprite.hxx
index 4e6674dcffbc..fcf12d7eb5ee 100644
--- a/cppcanvas/source/wrapper/implcustomsprite.hxx
+++ b/cppcanvas/source/wrapper/implcustomsprite.hxx
@@ -44,8 +44,8 @@ namespace cppcanvas
             virtual CanvasSharedPtr getContentCanvas() const SAL_OVERRIDE;
 
         private:
-            ImplCustomSprite(const ImplCustomSprite&) SAL_DELETED_FUNCTION;
-            ImplCustomSprite& operator=( const ImplCustomSprite& ) SAL_DELETED_FUNCTION;
+            ImplCustomSprite(const ImplCustomSprite&) = delete;
+            ImplCustomSprite& operator=( const ImplCustomSprite& ) = delete;
 
             mutable CanvasSharedPtr                                    mpLastCanvas;
             const css::uno::Reference< css::rendering::XCustomSprite > mxCustomSprite;
diff --git a/cppcanvas/source/wrapper/implpolypolygon.hxx b/cppcanvas/source/wrapper/implpolypolygon.hxx
index 606c92e915c0..4db158ac8eab 100644
--- a/cppcanvas/source/wrapper/implpolypolygon.hxx
+++ b/cppcanvas/source/wrapper/implpolypolygon.hxx
@@ -61,8 +61,8 @@ namespace cppcanvas
                 css::rendering::XPolyPolygon2D > getUNOPolyPolygon() const SAL_OVERRIDE;
 
         private:
-            ImplPolyPolygon(const ImplPolyPolygon&) SAL_DELETED_FUNCTION;
-            ImplPolyPolygon& operator= ( const ImplPolyPolygon& ) SAL_DELETED_FUNCTION;
+            ImplPolyPolygon(const ImplPolyPolygon&) = delete;
+            ImplPolyPolygon& operator= ( const ImplPolyPolygon& ) = delete;
 
             const css::uno::Reference< css::rendering::XPolyPolygon2D > mxPolyPoly;
 
diff --git a/cppcanvas/source/wrapper/implsprite.hxx b/cppcanvas/source/wrapper/implsprite.hxx
index e5aeb29c0283..d06931592250 100644
--- a/cppcanvas/source/wrapper/implsprite.hxx
+++ b/cppcanvas/source/wrapper/implsprite.hxx
@@ -57,8 +57,8 @@ namespace cppcanvas
                 css::rendering::XSprite >  getUNOSprite() const SAL_OVERRIDE;
 
         private:
-            ImplSprite(const ImplSprite&) SAL_DELETED_FUNCTION;
-            ImplSprite& operator=( const ImplSprite& ) SAL_DELETED_FUNCTION;
+            ImplSprite(const ImplSprite&) = delete;
+            ImplSprite& operator=( const ImplSprite& ) = delete;
 
             css::uno::Reference< css::rendering::XGraphicDevice >         mxGraphicDevice;
             const css::uno::Reference< css::rendering::XSprite >          mxSprite;
diff --git a/cppcanvas/source/wrapper/implspritecanvas.hxx b/cppcanvas/source/wrapper/implspritecanvas.hxx
index 51374bfcf904..3ba92ee69e74 100644
--- a/cppcanvas/source/wrapper/implspritecanvas.hxx
+++ b/cppcanvas/source/wrapper/implspritecanvas.hxx
@@ -73,7 +73,7 @@ namespace cppcanvas
             typedef std::shared_ptr< TransformationArbiter > TransformationArbiterSharedPtr;
 
         private:
-            ImplSpriteCanvas& operator=( const ImplSpriteCanvas& ) SAL_DELETED_FUNCTION;
+            ImplSpriteCanvas& operator=( const ImplSpriteCanvas& ) = delete;
 
             const css::uno::Reference< css::rendering::XSpriteCanvas > mxSpriteCanvas;
             TransformationArbiterSharedPtr                             mpTransformArbiter;
diff --git a/cppu/qa/test_reference.cxx b/cppu/qa/test_reference.cxx
index 4de516f7840c..055e166749b3 100644
--- a/cppu/qa/test_reference.cxx
+++ b/cppu/qa/test_reference.cxx
@@ -89,12 +89,12 @@ private:
 // intended cases:
 
 struct Base1: public css::uno::XInterface {
-    virtual ~Base1() SAL_DELETED_FUNCTION;
+    virtual ~Base1() = delete;
 };
-struct Base2: public Base1 { virtual ~Base2() SAL_DELETED_FUNCTION; };
-struct Base3: public Base1 { virtual ~Base3() SAL_DELETED_FUNCTION; };
+struct Base2: public Base1 { virtual ~Base2() = delete; };
+struct Base3: public Base1 { virtual ~Base3() = delete; };
 struct Derived: public Base2, public Base3 {
-    virtual ~Derived() SAL_DELETED_FUNCTION;
+    virtual ~Derived() = delete;
 };
 
 // The special case using the conversion operator instead:
diff --git a/cui/source/customize/eventdlg.hxx b/cui/source/customize/eventdlg.hxx
index c1f283f52b57..d415ce84db84 100644
--- a/cui/source/customize/eventdlg.hxx
+++ b/cui/source/customize/eventdlg.hxx
@@ -39,8 +39,8 @@ class SvxEventConfigPage : public _SvxMacroTabPage
 
     DECL_LINK_TYPED(      SelectHdl_Impl, ListBox&, void );
 
-    SvxEventConfigPage (const SvxEventConfigPage &) SAL_DELETED_FUNCTION;
-    SvxEventConfigPage & operator= (const SvxEventConfigPage &) SAL_DELETED_FUNCTION;
+    SvxEventConfigPage (const SvxEventConfigPage &) = delete;
+    SvxEventConfigPage & operator= (const SvxEventConfigPage &) = delete;
 
 public:
 
diff --git a/cui/source/inc/cuisrchdlg.hxx b/cui/source/inc/cuisrchdlg.hxx
index be75242a8238..06ffc6862e20 100644
--- a/cui/source/inc/cuisrchdlg.hxx
+++ b/cui/source/inc/cuisrchdlg.hxx
@@ -39,8 +39,8 @@ class SvxJSearchOptionsDialog : public SfxSingleTabDialog
     sal_Int32                     nInitialTlFlags;
     VclPtr<SvxJSearchOptionsPage> pPage;
 
-    SvxJSearchOptionsDialog( const SvxJSearchOptionsDialog & ) SAL_DELETED_FUNCTION;
-    SvxJSearchOptionsDialog & operator == ( const SvxJSearchOptionsDialog & ) SAL_DELETED_FUNCTION;
+    SvxJSearchOptionsDialog( const SvxJSearchOptionsDialog & ) = delete;
+    SvxJSearchOptionsDialog & operator == ( const SvxJSearchOptionsDialog & ) = delete;
 
 public:
     SvxJSearchOptionsDialog(vcl::Window *pParent,
diff --git a/cui/source/inc/passwdomdlg.hxx b/cui/source/inc/passwdomdlg.hxx
index 59fd9e479a78..75a9f9566104 100644
--- a/cui/source/inc/passwdomdlg.hxx
+++ b/cui/source/inc/passwdomdlg.hxx
@@ -32,8 +32,8 @@ class PasswordToOpenModifyDialog : public SfxModalDialog
 {
     std::unique_ptr< PasswordToOpenModifyDialog_Impl >  m_pImpl;
 
-    PasswordToOpenModifyDialog( const PasswordToOpenModifyDialog & ) SAL_DELETED_FUNCTION;
-    PasswordToOpenModifyDialog & operator = ( const PasswordToOpenModifyDialog & ) SAL_DELETED_FUNCTION;
+    PasswordToOpenModifyDialog( const PasswordToOpenModifyDialog & ) = delete;
+    PasswordToOpenModifyDialog & operator = ( const PasswordToOpenModifyDialog & ) = delete;
 
 public:
     PasswordToOpenModifyDialog( vcl::Window * pParent, sal_uInt16 nMinPasswdLen,
diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx
index a598f2e53575..a80177783dd3 100644
--- a/cui/source/inc/thesdlg.hxx
+++ b/cui/source/inc/thesdlg.hxx
@@ -37,8 +37,8 @@ class LookUpComboBox : public ComboBox
     Idle                        m_aModifyIdle;
     VclPtr<SvxThesaurusDialog>         m_pDialog;
 
-    LookUpComboBox( const LookUpComboBox & ) SAL_DELETED_FUNCTION;
-    LookUpComboBox& operator = ( const LookUpComboBox & ) SAL_DELETED_FUNCTION;
+    LookUpComboBox( const LookUpComboBox & ) = delete;
+    LookUpComboBox& operator = ( const LookUpComboBox & ) = delete;
 
 public:
     LookUpComboBox(vcl::Window *pParent);
@@ -78,8 +78,8 @@ class ThesaurusAlternativesCtrl
     typedef std::map< const SvTreeListEntry *, AlternativesExtraData >  UserDataMap_t;
     UserDataMap_t           m_aUserData;
 
-    ThesaurusAlternativesCtrl( const ThesaurusAlternativesCtrl & ) SAL_DELETED_FUNCTION;
-    ThesaurusAlternativesCtrl & operator = ( const ThesaurusAlternativesCtrl & ) SAL_DELETED_FUNCTION;
+    ThesaurusAlternativesCtrl( const ThesaurusAlternativesCtrl & ) = delete;
+    ThesaurusAlternativesCtrl & operator = ( const ThesaurusAlternativesCtrl & ) = delete;
 
 public:
     ThesaurusAlternativesCtrl(vcl::Window* pParent);
@@ -102,8 +102,8 @@ class ReplaceEdit : public Edit
 {
     VclPtr<Button>       m_pBtn;
 
-    ReplaceEdit( const ReplaceEdit & ) SAL_DELETED_FUNCTION;
-    ReplaceEdit & operator = ( const ReplaceEdit & ) SAL_DELETED_FUNCTION;
+    ReplaceEdit( const ReplaceEdit & ) = delete;
+    ReplaceEdit & operator = ( const ReplaceEdit & ) = delete;
 
 public:
     ReplaceEdit(vcl::Window *pParent);
diff --git a/dbaccess/source/core/api/RowSetRow.hxx b/dbaccess/source/core/api/RowSetRow.hxx
index 203639c97da8..5d3d9c13f373 100644
--- a/dbaccess/source/core/api/RowSetRow.hxx
+++ b/dbaccess/source/core/api/RowSetRow.hxx
@@ -35,8 +35,8 @@ namespace dbaccess
     {
         ORowSetRow                  m_aRow;
 
-        ORowSetOldRowHelper& operator=(const ORowSetOldRowHelper& _rRH) SAL_DELETED_FUNCTION;
-        ORowSetOldRowHelper(const ORowSetOldRowHelper& _rRh) SAL_DELETED_FUNCTION;
+        ORowSetOldRowHelper& operator=(const ORowSetOldRowHelper& _rRH) = delete;
+        ORowSetOldRowHelper(const ORowSetOldRowHelper& _rRh) = delete;
     public:
         ORowSetOldRowHelper(){}
         explicit ORowSetOldRowHelper(const ORowSetRow& _rRow)
diff --git a/dbaccess/source/core/api/querydescriptor.hxx b/dbaccess/source/core/api/querydescriptor.hxx
index bd44067f0a95..9133f7fd5005 100644
--- a/dbaccess/source/core/api/querydescriptor.hxx
+++ b/dbaccess/source/core/api/querydescriptor.hxx
@@ -112,8 +112,8 @@ class OQueryDescriptor : public comphelper::OMutexAndBroadcastHelper
                         ,public ::comphelper::OPropertyArrayUsageHelper< OQueryDescriptor_Base >
                         ,public ODataSettings
 {
-    OQueryDescriptor(const OQueryDescriptor&) SAL_DELETED_FUNCTION;
-    void operator =(const OQueryDescriptor&) SAL_DELETED_FUNCTION;
+    OQueryDescriptor(const OQueryDescriptor&) = delete;
+    void operator =(const OQueryDescriptor&) = delete;
     // helper
     void registerProperties();
 protected:
diff --git a/dbaccess/source/core/inc/DatabaseDataProvider.hxx b/dbaccess/source/core/inc/DatabaseDataProvider.hxx
index c1f43bc93b83..93c1ea9a6d45 100644
--- a/dbaccess/source/core/inc/DatabaseDataProvider.hxx
+++ b/dbaccess/source/core/inc/DatabaseDataProvider.hxx
@@ -207,8 +207,8 @@ private:
     virtual double SAL_CALL getNotANumber()throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual sal_Bool SAL_CALL isNotANumber(double nNumber )throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 private:
-    DatabaseDataProvider(DatabaseDataProvider &) SAL_DELETED_FUNCTION;
-    void operator =(DatabaseDataProvider &) SAL_DELETED_FUNCTION;
+    DatabaseDataProvider(DatabaseDataProvider &) = delete;
+    void operator =(DatabaseDataProvider &) = delete;
 
     virtual ~DatabaseDataProvider() {}
 
diff --git a/dbaccess/source/core/inc/veto.hxx b/dbaccess/source/core/inc/veto.hxx
index db4bfe7aa095..937b01eca234 100644
--- a/dbaccess/source/core/inc/veto.hxx
+++ b/dbaccess/source/core/inc/veto.hxx
@@ -48,8 +48,8 @@ namespace dbaccess
         virtual ~Veto();
 
     private:
-        Veto( const Veto& ) SAL_DELETED_FUNCTION;
-        Veto& operator=( const Veto& ) SAL_DELETED_FUNCTION;
+        Veto( const Veto& ) = delete;
+        Veto& operator=( const Veto& ) = delete;
     };
 
 } // namespace dbaccess
diff --git a/dbaccess/source/core/recovery/storagexmlstream.hxx b/dbaccess/source/core/recovery/storagexmlstream.hxx
index ea0c8b60f838..100c56f5c892 100644
--- a/dbaccess/source/core/recovery/storagexmlstream.hxx
+++ b/dbaccess/source/core/recovery/storagexmlstream.hxx
@@ -54,8 +54,8 @@ namespace dbaccess
         void    characters( const OUString& i_rCharacters ) const;
 
     private:
-        StorageXMLOutputStream( const StorageXMLOutputStream& ) SAL_DELETED_FUNCTION;
-        StorageXMLOutputStream& operator=( const StorageXMLOutputStream& ) SAL_DELETED_FUNCTION;
+        StorageXMLOutputStream( const StorageXMLOutputStream& ) = delete;
+        StorageXMLOutputStream& operator=( const StorageXMLOutputStream& ) = delete;
 
     private:
         ::std::unique_ptr< StorageXMLOutputStream_Data >   m_pData;
@@ -78,8 +78,8 @@ namespace dbaccess
                 );
 
     private:
-        StorageXMLInputStream( const StorageXMLInputStream& ) SAL_DELETED_FUNCTION;
-        StorageXMLInputStream& operator=( const StorageXMLInputStream& ) SAL_DELETED_FUNCTION;
+        StorageXMLInputStream( const StorageXMLInputStream& ) = delete;
+        StorageXMLInputStream& operator=( const StorageXMLInputStream& ) = delete;
 
     private:
         ::std::unique_ptr< StorageXMLInputStream_Data >   m_pData;
diff --git a/dbaccess/source/sdbtools/connection/connectiontools.hxx b/dbaccess/source/sdbtools/connection/connectiontools.hxx
index 65602e6bb845..c7899390860e 100644
--- a/dbaccess/source/sdbtools/connection/connectiontools.hxx
+++ b/dbaccess/source/sdbtools/connection/connectiontools.hxx
@@ -80,8 +80,8 @@ namespace sdbtools
         virtual ~ConnectionTools();
 
     private:
-        ConnectionTools( const ConnectionTools& ) SAL_DELETED_FUNCTION;
-        ConnectionTools& operator=( const ConnectionTools& ) SAL_DELETED_FUNCTION;
+        ConnectionTools( const ConnectionTools& ) = delete;
+        ConnectionTools& operator=( const ConnectionTools& ) = delete;
     };
 
 } // namespace sdbtools
diff --git a/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx b/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx
index 8ef42b9153bf..d6c633be19b9 100644
--- a/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx
+++ b/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx
@@ -64,8 +64,8 @@ namespace sdbtools
         virtual ~DataSourceMetaData();
 
     private:
-        DataSourceMetaData( const DataSourceMetaData& ) SAL_DELETED_FUNCTION;
-        DataSourceMetaData& operator=( const DataSourceMetaData& ) SAL_DELETED_FUNCTION;
+        DataSourceMetaData( const DataSourceMetaData& ) = delete;
+        DataSourceMetaData& operator=( const DataSourceMetaData& ) = delete;
     };
 
 } // namespace sdbtools
diff --git a/dbaccess/source/sdbtools/connection/objectnames.hxx b/dbaccess/source/sdbtools/connection/objectnames.hxx
index 4ac124973f3d..24869b27d936 100644
--- a/dbaccess/source/sdbtools/connection/objectnames.hxx
+++ b/dbaccess/source/sdbtools/connection/objectnames.hxx
@@ -70,8 +70,8 @@ namespace sdbtools
         virtual ~ObjectNames();
 
     private:
-        ObjectNames( const ObjectNames& ) SAL_DELETED_FUNCTION;
-        ObjectNames& operator=( const ObjectNames& ) SAL_DELETED_FUNCTION;
+        ObjectNames( const ObjectNames& ) = delete;
+        ObjectNames& operator=( const ObjectNames& ) = delete;
     };
 
 } // namespace sdbtools
diff --git a/dbaccess/source/sdbtools/connection/tablename.hxx b/dbaccess/source/sdbtools/connection/tablename.hxx
index 795e7d7c3aae..e6102fe916be 100644
--- a/dbaccess/source/sdbtools/connection/tablename.hxx
+++ b/dbaccess/source/sdbtools/connection/tablename.hxx
@@ -76,8 +76,8 @@ namespace sdbtools
         virtual ~TableName();
 
     private:
-        TableName( const TableName& ) SAL_DELETED_FUNCTION;
-        TableName& operator=( const TableName& ) SAL_DELETED_FUNCTION;
+        TableName( const TableName& ) = delete;
+        TableName& operator=( const TableName& ) = delete;
     };
 
 } // namespace sdbtools
diff --git a/dbaccess/source/ui/inc/moduledbu.hxx b/dbaccess/source/ui/inc/moduledbu.hxx
index 636740972b50..d4e7463eb301 100644
--- a/dbaccess/source/ui/inc/moduledbu.hxx
+++ b/dbaccess/source/ui/inc/moduledbu.hxx
@@ -35,7 +35,7 @@ class OModule
     friend class OModuleClient;
 
 private:
-    OModule() SAL_DELETED_FUNCTION; //TODO: get rid of this class
+    OModule() = delete; //TODO: get rid of this class
 
 protected:
     static ::osl::Mutex s_aMutex;       /// access safety
diff --git a/desktop/source/deployment/gui/dp_gui.h b/desktop/source/deployment/gui/dp_gui.h
index 71a97b9b1b3c..787eb7e42634 100644
--- a/desktop/source/deployment/gui/dp_gui.h
+++ b/desktop/source/deployment/gui/dp_gui.h
@@ -75,8 +75,8 @@ public:
     virtual ~SelectedPackage();
 
 private:
-    SelectedPackage(SelectedPackage &) SAL_DELETED_FUNCTION;
-    void operator =(SelectedPackage &) SAL_DELETED_FUNCTION;
+    SelectedPackage(SelectedPackage &) = delete;
+    void operator =(SelectedPackage &) = delete;
 
     css::uno::Reference< css::deployment::XPackage> m_xPackage;
 };
diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx
index 2d7d3e9a13da..820147286636 100644
--- a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx
@@ -41,8 +41,8 @@ public:
     virtual void dispose() SAL_OVERRIDE;
 
 private:
-    DependencyDialog(DependencyDialog &) SAL_DELETED_FUNCTION;
-    void operator =(DependencyDialog &) SAL_DELETED_FUNCTION;
+    DependencyDialog(DependencyDialog &) = delete;
+    void operator =(DependencyDialog &) = delete;
 
     VclPtr<ListBox>  m_list;
 };
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx
index e6aaac9bd783..f880112aea8d 100644
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx
@@ -87,8 +87,8 @@ public:
 
     bool isBusy();
 private:
-    ExtensionCmdQueue(ExtensionCmdQueue &) SAL_DELETED_FUNCTION;
-    void operator =(ExtensionCmdQueue &) SAL_DELETED_FUNCTION;
+    ExtensionCmdQueue(ExtensionCmdQueue &) = delete;
+    void operator =(ExtensionCmdQueue &) = delete;
 
     class Thread;
 
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
index b3298daaedbc..024c43722e75 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
@@ -96,8 +96,8 @@ public:
         css::uno::Sequence< css::uno::Sequence< OUString > > &rItemList );
 
 private:
-    UpdateDialog(UpdateDialog &) SAL_DELETED_FUNCTION;
-    void operator =(UpdateDialog &) SAL_DELETED_FUNCTION;
+    UpdateDialog(UpdateDialog &) = delete;
+    void operator =(UpdateDialog &) = delete;
 
     struct DisabledUpdate;
     struct SpecificError;
@@ -115,8 +115,8 @@ private:
         sal_uInt16 getItemCount() const;
 
     private:
-        explicit CheckListBox(UpdateDialog::CheckListBox &) SAL_DELETED_FUNCTION;
-        void operator =(UpdateDialog::CheckListBox &) SAL_DELETED_FUNCTION;
+        explicit CheckListBox(UpdateDialog::CheckListBox &) = delete;
+        void operator =(UpdateDialog::CheckListBox &) = delete;
 
         virtual void MouseButtonDown(MouseEvent const & event) SAL_OVERRIDE;
         virtual void MouseButtonUp(MouseEvent const & event) SAL_OVERRIDE;
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
index 13bc6d6559fb..2b624ba8bdeb 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
@@ -66,8 +66,8 @@ public:
     virtual short Execute() SAL_OVERRIDE;
 
 private:
-    UpdateInstallDialog(UpdateInstallDialog &) SAL_DELETED_FUNCTION;
-    void operator =(UpdateInstallDialog &) SAL_DELETED_FUNCTION;
+    UpdateInstallDialog(UpdateInstallDialog &) = delete;
+    void operator =(UpdateInstallDialog &) = delete;
 
     class Thread;
     friend class Thread;
diff --git a/desktop/source/deployment/manager/dp_activepackages.hxx b/desktop/source/deployment/manager/dp_activepackages.hxx
index 24449b111382..4f83d0a76c08 100644
--- a/desktop/source/deployment/manager/dp_activepackages.hxx
+++ b/desktop/source/deployment/manager/dp_activepackages.hxx
@@ -83,8 +83,8 @@ public:
     void erase(OUString const & id, OUString const & fileName);
 
 private:
-    ActivePackages(ActivePackages &) SAL_DELETED_FUNCTION;
-    void operator =(ActivePackages &) SAL_DELETED_FUNCTION;
+    ActivePackages(ActivePackages &) = delete;
+    void operator =(ActivePackages &) = delete;
 #if HAVE_FEATURE_EXTENSIONS
     ::dp_misc::PersistentMap m_map;
 #endif
diff --git a/desktop/source/deployment/registry/inc/dp_backenddb.hxx b/desktop/source/deployment/registry/inc/dp_backenddb.hxx
index efe34f1cbad0..36b15f82887e 100644
--- a/desktop/source/deployment/registry/inc/dp_backenddb.hxx
+++ b/desktop/source/deployment/registry/inc/dp_backenddb.hxx
@@ -47,8 +47,8 @@ private:
     css::uno::Reference<css::xml::dom::XDocument> m_doc;
     css::uno::Reference<css::xml::xpath::XXPathAPI> m_xpathApi;
 
-    BackendDb(BackendDb const &) SAL_DELETED_FUNCTION;
-    BackendDb &  operator = (BackendDb const &) SAL_DELETED_FUNCTION;
+    BackendDb(BackendDb const &) = delete;
+    BackendDb &  operator = (BackendDb const &) = delete;
 
 protected:
     const css::uno::Reference<css::uno::XComponentContext> m_xContext;
diff --git a/desktop/source/lib/lokinteractionhandler.hxx b/desktop/source/lib/lokinteractionhandler.hxx
index 6d4aa8231daf..504fc6b7cb44 100644
--- a/desktop/source/lib/lokinteractionhandler.hxx
+++ b/desktop/source/lib/lokinteractionhandler.hxx
@@ -38,8 +38,8 @@ class LOKInteractionHandler: public cppu::WeakImplHelper<com::sun::star::lang::X
                                                          com::sun::star::lang::XInitialization,
                                                          com::sun::star::task::XInteractionHandler2>
 {
-    LOKInteractionHandler(const LOKInteractionHandler&) SAL_DELETED_FUNCTION;
-    LOKInteractionHandler& operator=(const LOKInteractionHandler&) SAL_DELETED_FUNCTION;
+    LOKInteractionHandler(const LOKInteractionHandler&) = delete;
+    LOKInteractionHandler& operator=(const LOKInteractionHandler&) = delete;
 
 public:
     explicit LOKInteractionHandler(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const & rxContext);
diff --git a/desktop/source/splash/unxsplash.hxx b/desktop/source/splash/unxsplash.hxx
index 318829b9af46..1805fee037b0 100644
--- a/desktop/source/splash/unxsplash.hxx
+++ b/desktop/source/splash/unxsplash.hxx
@@ -31,8 +31,8 @@ namespace desktop {
 class  UnxSplashScreen : public ::cppu::WeakImplHelper< css::task::XStatusIndicator, css::lang::XInitialization, css::lang::XServiceInfo >
 {
 private:
-    UnxSplashScreen( const UnxSplashScreen& ) SAL_DELETED_FUNCTION;
-    UnxSplashScreen operator =( const UnxSplashScreen& ) SAL_DELETED_FUNCTION;
+    UnxSplashScreen( const UnxSplashScreen& ) = delete;
+    UnxSplashScreen operator =( const UnxSplashScreen& ) = delete;
 
     virtual ~UnxSplashScreen();
 
diff --git a/editeng/source/editeng/editattr.hxx b/editeng/source/editeng/editattr.hxx
index d34d3c2c4c65..2d17144221c2 100644
--- a/editeng/source/editeng/editattr.hxx
+++ b/editeng/source/editeng/editattr.hxx
@@ -364,7 +364,7 @@ class EditCharAttribField: public EditCharAttrib
     Color*          pTxtColor;
     Color*          pFldColor;
 
-    EditCharAttribField& operator = ( const EditCharAttribField& rAttr ) SAL_DELETED_FUNCTION;
+    EditCharAttribField& operator = ( const EditCharAttribField& rAttr ) = delete;
 
 public:
     EditCharAttribField( const SvxFieldItem& rAttr, sal_uInt16 nPos );
diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx
index 218fc3503049..35544631464b 100644
--- a/editeng/source/editeng/editdoc.hxx
+++ b/editeng/source/editeng/editdoc.hxx
@@ -603,7 +603,7 @@ private:
     bool                bVisible            : 1;    // Belongs to the node!
     bool                bForceRepaint       : 1;
 
-                        ParaPortion( const ParaPortion& ) SAL_DELETED_FUNCTION;
+                        ParaPortion( const ParaPortion& ) = delete;
 
 public:
                         ParaPortion( ContentNode* pNode );
diff --git a/editeng/source/editeng/editobj2.hxx b/editeng/source/editeng/editobj2.hxx
index 2d59974db893..33b709385ac8 100644
--- a/editeng/source/editeng/editobj2.hxx
+++ b/editeng/source/editeng/editobj2.hxx
@@ -51,7 +51,7 @@ private:
     sal_uInt16              nStart;
     sal_uInt16              nEnd;
 
-                        XEditAttribute( const XEditAttribute& rCopyFrom ) SAL_DELETED_FUNCTION;
+                        XEditAttribute( const XEditAttribute& rCopyFrom ) = delete;
 
 public:
     XEditAttribute( const SfxPoolItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
diff --git a/editeng/source/editeng/textconv.hxx b/editeng/source/editeng/textconv.hxx
index 3ed3c4f5d6d1..c52d73071563 100644
--- a/editeng/source/editeng/textconv.hxx
+++ b/editeng/source/editeng/textconv.hxx
@@ -68,8 +68,8 @@ class TextConvWrapper : public editeng::HangulHanjaConversion
                             ESelection *pESelection );
     void        ChangeText_impl( const OUString &rNewText, bool bKeepAttributes );
 
-    TextConvWrapper (const TextConvWrapper &) SAL_DELETED_FUNCTION;
-    TextConvWrapper & operator= (const TextConvWrapper &) SAL_DELETED_FUNCTION;
+    TextConvWrapper (const TextConvWrapper &) = delete;
+    TextConvWrapper & operator= (const TextConvWrapper &) = delete;
 
 protected:
     virtual void    GetNextPortion( OUString& /* [out] */ rNextPortion,
diff --git a/extensions/source/inc/componentmodule.hxx b/extensions/source/inc/componentmodule.hxx
index 162125f357d6..79a6ebf3947f 100644
--- a/extensions/source/inc/componentmodule.hxx
+++ b/extensions/source/inc/componentmodule.hxx
@@ -59,7 +59,7 @@ typedef css::uno::Reference< css::lang::XSingleServiceFactory > (SAL_CALL *Facto
         friend class OModuleResourceClient;
 
     private:
-        OModule() SAL_DELETED_FUNCTION; //TODO: get rid of this class
+        OModule() = delete; //TODO: get rid of this class
 
     protected:
         // resource administration
diff --git a/extensions/source/plugin/inc/plugin/multiplx.hxx b/extensions/source/plugin/inc/plugin/multiplx.hxx
index 352efc23d3ef..05992289fe03 100644
--- a/extensions/source/plugin/inc/plugin/multiplx.hxx
+++ b/extensions/source/plugin/inc/plugin/multiplx.hxx
@@ -158,8 +158,8 @@ private:
     ::cppu::OMultiTypeInterfaceContainerHelper  aListenerHolder;
 
 
-    MRCListenerMultiplexerHelper( const MRCListenerMultiplexerHelper & ) SAL_DELETED_FUNCTION;
-    MRCListenerMultiplexerHelper & operator = ( const MRCListenerMultiplexerHelper & ) SAL_DELETED_FUNCTION;
+    MRCListenerMultiplexerHelper( const MRCListenerMultiplexerHelper & ) = delete;
+    MRCListenerMultiplexerHelper & operator = ( const MRCListenerMultiplexerHelper & ) = delete;
 };
 
 #endif // INCLUDED_EXTENSIONS_SOURCE_PLUGIN_INC_PLUGIN_MULTIPLX_HXX
diff --git a/extensions/source/propctrlr/composeduiupdate.hxx b/extensions/source/propctrlr/composeduiupdate.hxx
index e6292507ce3e..84fd9fe3633d 100644
--- a/extensions/source/propctrlr/composeduiupdate.hxx
+++ b/extensions/source/propctrlr/composeduiupdate.hxx
@@ -184,8 +184,8 @@ namespace pcr
         void    callback_inspectorUIChanged_throw();
 
     private:
-        ComposedPropertyUIUpdate( const ComposedPropertyUIUpdate& ) SAL_DELETED_FUNCTION;
-        ComposedPropertyUIUpdate& operator=( const ComposedPropertyUIUpdate& ) SAL_DELETED_FUNCTION;
+        ComposedPropertyUIUpdate( const ComposedPropertyUIUpdate& ) = delete;
+        ComposedPropertyUIUpdate& operator=( const ComposedPropertyUIUpdate& ) = delete;
     };
 
     class ComposedUIAutoFireGuard
diff --git a/extensions/source/propctrlr/eformshelper.hxx b/extensions/source/propctrlr/eformshelper.hxx
index fac57b717013..2bd8ce785d59 100644
--- a/extensions/source/propctrlr/eformshelper.hxx
+++ b/extensions/source/propctrlr/eformshelper.hxx
@@ -246,8 +246,8 @@ namespace pcr
             impl_toggleBindingPropertyListening_throw( bool _bDoListen, const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxConcreteListenerOrNull );
 
     private:
-        EFormsHelper( const EFormsHelper& ) SAL_DELETED_FUNCTION;
-        EFormsHelper& operator=( const EFormsHelper& ) SAL_DELETED_FUNCTION;
+        EFormsHelper( const EFormsHelper& ) = delete;
+        EFormsHelper& operator=( const EFormsHelper& ) = delete;
     };
 
 
diff --git a/extensions/source/propctrlr/eventhandler.hxx b/extensions/source/propctrlr/eventhandler.hxx
index d633e62f7f49..b6f895d98d19 100644
--- a/extensions/source/propctrlr/eventhandler.hxx
+++ b/extensions/source/propctrlr/eventhandler.hxx
@@ -240,8 +240,8 @@ namespace pcr
         bool    impl_filterMethod_nothrow( const EventDescription& _rEvent ) const;
 
     private:
-        EventHandler( const EventHandler& ) SAL_DELETED_FUNCTION;
-        EventHandler& operator=( const EventHandler& ) SAL_DELETED_FUNCTION;
+        EventHandler( const EventHandler& ) = delete;
+        EventHandler& operator=( const EventHandler& ) = delete;
     };
 
 
diff --git a/extensions/source/propctrlr/formcomponenthandler.hxx b/extensions/source/propctrlr/formcomponenthandler.hxx
index eb69debdc2fd..494dc833d4c1 100644
--- a/extensions/source/propctrlr/formcomponenthandler.hxx
+++ b/extensions/source/propctrlr/formcomponenthandler.hxx
@@ -434,8 +434,8 @@ namespace pcr
         DECL_LINK_TYPED( OnDesignerClosed, SQLCommandDesigner&, void );
 
     private:
-        FormComponentPropertyHandler( const FormComponentPropertyHandler& ) SAL_DELETED_FUNCTION;
-        FormComponentPropertyHandler& operator=( const FormComponentPropertyHandler& ) SAL_DELETED_FUNCTION;
+        FormComponentPropertyHandler( const FormComponentPropertyHandler& ) = delete;
+        FormComponentPropertyHandler& operator=( const FormComponentPropertyHandler& ) = delete;
 
     private:
         using ::comphelper::OPropertyContainer::addPropertyChangeListener;
diff --git a/extensions/source/propctrlr/formcontroller.hxx b/extensions/source/propctrlr/formcontroller.hxx
index de27d389f9a6..768e271535b4 100644
--- a/extensions/source/propctrlr/formcontroller.hxx
+++ b/extensions/source/propctrlr/formcontroller.hxx
@@ -117,8 +117,8 @@ namespace pcr
                         Create(const css::uno::Reference< css::uno::XComponentContext >&);
 
     private:
-        DialogController( const DialogController& ) SAL_DELETED_FUNCTION;
-        DialogController& operator=( const DialogController& ) SAL_DELETED_FUNCTION;
+        DialogController( const DialogController& ) = delete;
+        DialogController& operator=( const DialogController& ) = delete;
     };
 
 } // namespace pcr
diff --git a/extensions/source/propctrlr/formmetadata.hxx b/extensions/source/propctrlr/formmetadata.hxx
index d9ecba20a19c..b982d0dc9db3 100644
--- a/extensions/source/propctrlr/formmetadata.hxx
+++ b/extensions/source/propctrlr/formmetadata.hxx
@@ -95,8 +95,8 @@ namespace pcr
         virtual OUString            SAL_CALL getDescriptionForValue( const css::uno::Any& _rEnumValue ) const SAL_OVERRIDE;
 
     private:
-        DefaultEnumRepresentation( const DefaultEnumRepresentation& ) SAL_DELETED_FUNCTION;
-        DefaultEnumRepresentation& operator=( const DefaultEnumRepresentation& ) SAL_DELETED_FUNCTION;
+        DefaultEnumRepresentation( const DefaultEnumRepresentation& ) = delete;
+        DefaultEnumRepresentation& operator=( const DefaultEnumRepresentation& ) = delete;
     };
 
 
diff --git a/extensions/source/propctrlr/genericpropertyhandler.hxx b/extensions/source/propctrlr/genericpropertyhandler.hxx
index 3ada5af77596..b588ede600ef 100644
--- a/extensions/source/propctrlr/genericpropertyhandler.hxx
+++ b/extensions/source/propctrlr/genericpropertyhandler.hxx
@@ -136,8 +136,8 @@ namespace pcr
                 impl_getEnumConverter( const css::uno::Type& _rEnumType );
 
     private:
-        GenericPropertyHandler( const GenericPropertyHandler& ) SAL_DELETED_FUNCTION;
-        GenericPropertyHandler& operator=( const GenericPropertyHandler& ) SAL_DELETED_FUNCTION;
+        GenericPropertyHandler( const GenericPropertyHandler& ) = delete;
+        GenericPropertyHandler& operator=( const GenericPropertyHandler& ) = delete;
     };
 
 
diff --git a/extensions/source/propctrlr/handlerhelper.hxx b/extensions/source/propctrlr/handlerhelper.hxx
index bc576bd6bf23..82b9f41de475 100644
--- a/extensions/source/propctrlr/handlerhelper.hxx
+++ b/extensions/source/propctrlr/handlerhelper.hxx
@@ -196,8 +196,8 @@ namespace pcr
         }
 
     private:
-        PropertyHandlerHelper( const PropertyHandlerHelper& ) SAL_DELETED_FUNCTION;
-        PropertyHandlerHelper& operator=( const PropertyHandlerHelper& ) SAL_DELETED_FUNCTION;
+        PropertyHandlerHelper( const PropertyHandlerHelper& ) = delete;
+        PropertyHandlerHelper& operator=( const PropertyHandlerHelper& ) = delete;
     };
 
 
diff --git a/extensions/source/propctrlr/propertyhandler.hxx b/extensions/source/propctrlr/propertyhandler.hxx
index fd035e90e82a..e3d7975b140c 100644
--- a/extensions/source/propctrlr/propertyhandler.hxx
+++ b/extensions/source/propctrlr/propertyhandler.hxx
@@ -299,8 +299,8 @@ namespace pcr
         sal_Int16 impl_getDocumentMeasurementUnit_throw() const;
 
     private:
-        PropertyHandler( const PropertyHandler& ) SAL_DELETED_FUNCTION;
-        PropertyHandler& operator=( const PropertyHandler& ) SAL_DELETED_FUNCTION;
+        PropertyHandler( const PropertyHandler& ) = delete;
+        PropertyHandler& operator=( const PropertyHandler& ) = delete;
     };
 
 
diff --git a/extensions/source/propctrlr/propeventtranslation.hxx b/extensions/source/propctrlr/propeventtranslation.hxx
index f52fd56e3c43..d65f921adda7 100644
--- a/extensions/source/propctrlr/propeventtranslation.hxx
+++ b/extensions/source/propctrlr/propeventtranslation.hxx
@@ -61,8 +61,8 @@ namespace pcr
         virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     private:
-        PropertyEventTranslation( const PropertyEventTranslation& ) SAL_DELETED_FUNCTION;
-        PropertyEventTranslation& operator=( const PropertyEventTranslation& ) SAL_DELETED_FUNCTION;
+        PropertyEventTranslation( const PropertyEventTranslation& ) = delete;
+        PropertyEventTranslation& operator=( const PropertyEventTranslation& ) = delete;
     };
 
 
diff --git a/extensions/source/propctrlr/sqlcommanddesign.hxx b/extensions/source/propctrlr/sqlcommanddesign.hxx
index c80fe5638c95..033f92d1a2d1 100644
--- a/extensions/source/propctrlr/sqlcommanddesign.hxx
+++ b/extensions/source/propctrlr/sqlcommanddesign.hxx
@@ -171,8 +171,8 @@ namespace pcr
         bool impl_trySuspendDesigner_nothrow() const;
 
     private:
-        SQLCommandDesigner( const SQLCommandDesigner& ) SAL_DELETED_FUNCTION;
-        SQLCommandDesigner& operator=( const SQLCommandDesigner& ) SAL_DELETED_FUNCTION;
+        SQLCommandDesigner( const SQLCommandDesigner& ) = delete;
+        SQLCommandDesigner& operator=( const SQLCommandDesigner& ) = delete;
     };
 
 
diff --git a/extensions/source/propctrlr/xsddatatypes.hxx b/extensions/source/propctrlr/xsddatatypes.hxx
index 0a7499dfb6b8..75b1058f8030 100644
--- a/extensions/source/propctrlr/xsddatatypes.hxx
+++ b/extensions/source/propctrlr/xsddatatypes.hxx
@@ -80,8 +80,8 @@ namespace pcr
         virtual ~XSDDataType();
 
     private:
-        XSDDataType( const XSDDataType& ) SAL_DELETED_FUNCTION;
-        XSDDataType& operator=( const XSDDataType& ) SAL_DELETED_FUNCTION;
+        XSDDataType( const XSDDataType& ) = delete;
+        XSDDataType& operator=( const XSDDataType& ) = delete;
     };
 
 
diff --git a/extensions/source/resource/oooresourceloader.hxx b/extensions/source/resource/oooresourceloader.hxx
index 9ee90a529b9a..8095f8efd67e 100644
--- a/extensions/source/resource/oooresourceloader.hxx
+++ b/extensions/source/resource/oooresourceloader.hxx
@@ -63,8 +63,8 @@ namespace extensions { namespace resource
         virtual  css::uno::Reference<  css::resource::XResourceBundle> SAL_CALL loadBundle( const OUString& abaseName, const css::lang::Locale& aLocale ) throw (css::resource::MissingResourceException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     private:
-        OpenOfficeResourceLoader( const OpenOfficeResourceLoader& ) SAL_DELETED_FUNCTION;
-        OpenOfficeResourceLoader& operator=( const OpenOfficeResourceLoader& ) SAL_DELETED_FUNCTION;
+        OpenOfficeResourceLoader( const OpenOfficeResourceLoader& ) = delete;
+        OpenOfficeResourceLoader& operator=( const OpenOfficeResourceLoader& ) = delete;
         css::uno::Reference< css::uno::XComponentContext> m_xContext;
         ::osl::Mutex m_aMutex;
         ResourceBundleCache m_aBundleCache;
diff --git a/forms/source/component/entrylisthelper.hxx b/forms/source/component/entrylisthelper.hxx
index b9569936be29..f6588a2c87ea 100644
--- a/forms/source/component/entrylisthelper.hxx
+++ b/forms/source/component/entrylisthelper.hxx
@@ -172,8 +172,8 @@ namespace frm
         void        impl_lock_refreshList( ControlModelLock& _rInstanceLock );
 
     private:
-        OEntryListHelper( const OEntryListHelper& ) SAL_DELETED_FUNCTION;
-        OEntryListHelper& operator=( const OEntryListHelper& ) SAL_DELETED_FUNCTION;
+        OEntryListHelper( const OEntryListHelper& ) = delete;
+        OEntryListHelper& operator=( const OEntryListHelper& ) = delete;
     };
 
 
diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx
index 7b77af450594..88ec9502803d 100644
--- a/forms/source/inc/FormComponent.hxx
+++ b/forms/source/inc/FormComponent.hxx
@@ -139,8 +139,8 @@ namespace frm
         css::uno::Sequence< css::uno::Any >                m_aNewValues;
 
     private:
-        ControlModelLock( const ControlModelLock& ) SAL_DELETED_FUNCTION;
-        ControlModelLock& operator=( const ControlModelLock& ) SAL_DELETED_FUNCTION;
+        ControlModelLock( const ControlModelLock& ) = delete;
+        ControlModelLock& operator=( const ControlModelLock& ) = delete;
     };
 
 
diff --git a/forms/source/inc/InterfaceContainer.hxx b/forms/source/inc/InterfaceContainer.hxx
index 131d0ba9877d..96a5d1717d89 100644
--- a/forms/source/inc/InterfaceContainer.hxx
+++ b/forms/source/inc/InterfaceContainer.hxx
@@ -72,8 +72,8 @@ namespace frm
         virtual ~ElementDescription();
 
     private:
-        ElementDescription( const ElementDescription& ) SAL_DELETED_FUNCTION;
-        ElementDescription& operator=( const ElementDescription& ) SAL_DELETED_FUNCTION;
+        ElementDescription( const ElementDescription& ) = delete;
+        ElementDescription& operator=( const ElementDescription& ) = delete;
     };
 
 typedef std::vector<css::uno::Reference<css::uno::XInterface>> OInterfaceArray;
diff --git a/forms/source/inc/formcontrolfont.hxx b/forms/source/inc/formcontrolfont.hxx
index b0f544ad4a8b..6999c7ef5bc2 100644
--- a/forms/source/inc/formcontrolfont.hxx
+++ b/forms/source/inc/formcontrolfont.hxx
@@ -85,8 +85,8 @@ namespace frm
     private:
 
     private:
-        FontControlModel( const FontControlModel& ) SAL_DELETED_FUNCTION;
-        FontControlModel& operator=( const FontControlModel& ) SAL_DELETED_FUNCTION;
+        FontControlModel( const FontControlModel& ) = delete;
+        FontControlModel& operator=( const FontControlModel& ) = delete;
     };
 
 
diff --git a/forms/source/inc/formnavigation.hxx b/forms/source/inc/formnavigation.hxx
index 0e6db22e34d3..2981955519d0 100644
--- a/forms/source/inc/formnavigation.hxx
+++ b/forms/source/inc/formnavigation.hxx
@@ -209,8 +209,8 @@ namespace frm
         static sal_Int16 getFeatureId( const OUString& _rCompleteURL );
 
     private:
-        OFormNavigationMapper( const OFormNavigationMapper& ) SAL_DELETED_FUNCTION;
-        OFormNavigationMapper& operator=( const OFormNavigationMapper& ) SAL_DELETED_FUNCTION;
+        OFormNavigationMapper( const OFormNavigationMapper& ) = delete;
+        OFormNavigationMapper& operator=( const OFormNavigationMapper& ) = delete;
     };
 
 
diff --git a/forms/source/richtext/richtextengine.hxx b/forms/source/richtext/richtextengine.hxx
index 528a2d37e3a2..e2beb7fc35c9 100644
--- a/forms/source/richtext/richtextengine.hxx
+++ b/forms/source/richtext/richtextengine.hxx
@@ -63,8 +63,8 @@ namespace frm
         explicit RichTextEngine( SfxItemPool* _pPool );
 
     private:
-        RichTextEngine( const RichTextEngine& ) SAL_DELETED_FUNCTION;
-        RichTextEngine& operator=( const RichTextEngine& ) SAL_DELETED_FUNCTION;
+        RichTextEngine( const RichTextEngine& ) = delete;
+        RichTextEngine& operator=( const RichTextEngine& ) = delete;
 
     private:
         DECL_LINK_TYPED( EditEngineStatusChanged, EditStatus&, void );
diff --git a/forms/source/richtext/richtextmodel.hxx b/forms/source/richtext/richtextmodel.hxx
index 7964acaa17f7..0b15405238f6 100644
--- a/forms/source/richtext/richtextmodel.hxx
+++ b/forms/source/richtext/richtextmodel.hxx
@@ -173,8 +173,8 @@ namespace frm
         static  css::uno::Sequence< sal_Int8 > getEditEngineTunnelId();
 
     private:
-        ORichTextModel( const ORichTextModel& ) SAL_DELETED_FUNCTION;
-        ORichTextModel& operator=( const ORichTextModel& ) SAL_DELETED_FUNCTION;
+        ORichTextModel( const ORichTextModel& ) = delete;
+        ORichTextModel& operator=( const ORichTextModel& ) = delete;
     };
 
 
diff --git a/forms/source/richtext/richtextunowrapper.hxx b/forms/source/richtext/richtextunowrapper.hxx
index f2973a842bf1..bc135a5313fa 100644
--- a/forms/source/richtext/richtextunowrapper.hxx
+++ b/forms/source/richtext/richtextunowrapper.hxx
@@ -46,8 +46,8 @@ namespace frm
 
 
     private:
-        ORichTextUnoWrapper( const ORichTextUnoWrapper& ) SAL_DELETED_FUNCTION;
-        ORichTextUnoWrapper& operator=( const ORichTextUnoWrapper& ) SAL_DELETED_FUNCTION;
+        ORichTextUnoWrapper( const ORichTextUnoWrapper& ) = delete;
+        ORichTextUnoWrapper& operator=( const ORichTextUnoWrapper& ) = delete;
     };
 
     class RichTextEditSource : public SvxEditSource
@@ -69,8 +69,8 @@ namespace frm
         virtual ~RichTextEditSource();
 
     private:
-        RichTextEditSource( const RichTextEditSource& _rSource ) SAL_DELETED_FUNCTION;
-        RichTextEditSource& operator=( const RichTextEditSource& ) SAL_DELETED_FUNCTION;
+        RichTextEditSource( const RichTextEditSource& _rSource ) = delete;
+        RichTextEditSource& operator=( const RichTextEditSource& ) = delete;
     };
 
 
diff --git a/forms/source/runtime/formoperations.hxx b/forms/source/runtime/formoperations.hxx
index 0c1b984d3682..d80b5a95e3b6 100644
--- a/forms/source/runtime/formoperations.hxx
+++ b/forms/source/runtime/formoperations.hxx
@@ -341,8 +341,8 @@ namespace frm
         };
 
     private:
-        FormOperations( const FormOperations& ) SAL_DELETED_FUNCTION;
-        FormOperations& operator=( const FormOperations& ) SAL_DELETED_FUNCTION;
+        FormOperations( const FormOperations& ) = delete;
+        FormOperations& operator=( const FormOperations& ) = delete;
 
     public:
         class MethodGuard
diff --git a/forms/source/xforms/datatyperepository.hxx b/forms/source/xforms/datatyperepository.hxx
index cffdb01ce846..bf63fc9a58ff 100644
--- a/forms/source/xforms/datatyperepository.hxx
+++ b/forms/source/xforms/datatyperepository.hxx
@@ -68,8 +68,8 @@ namespace xforms
         virtual sal_Bool SAL_CALL hasElements(  ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     private:
-        ODataTypeRepository( const ODataTypeRepository& ) SAL_DELETED_FUNCTION;
-        ODataTypeRepository& operator=( const ODataTypeRepository& ) SAL_DELETED_FUNCTION;
+        ODataTypeRepository( const ODataTypeRepository& ) = delete;
+        ODataTypeRepository& operator=( const ODataTypeRepository& ) = delete;
 
     private:
         /** locates the type with the given name in our repository, or throws an exception if there is no such type
diff --git a/forms/source/xforms/datatypes.hxx b/forms/source/xforms/datatypes.hxx
index e4ab9cc04aab..07e29f87ae51 100644
--- a/forms/source/xforms/datatypes.hxx
+++ b/forms/source/xforms/datatypes.hxx
@@ -70,8 +70,8 @@ namespace xforms
         sal_Int16   getTypeClass() const    { return m_nTypeClass; }
 
     private:
-        OXSDDataType( const OXSDDataType& ) SAL_DELETED_FUNCTION;
-        OXSDDataType& operator=( const OXSDDataType& ) SAL_DELETED_FUNCTION;
+        OXSDDataType( const OXSDDataType& ) = delete;
+        OXSDDataType& operator=( const OXSDDataType& ) = delete;
 
     protected:
         // create basic data type
diff --git a/formula/source/ui/inc/ModuleHelper.hxx b/formula/source/ui/inc/ModuleHelper.hxx
index 70e292311684..00dca8171167 100644
--- a/formula/source/ui/inc/ModuleHelper.hxx
+++ b/formula/source/ui/inc/ModuleHelper.hxx
@@ -36,7 +36,7 @@ namespace formula
         friend class OModuleClient;
 
     private:
-        OModule() SAL_DELETED_FUNCTION; //TODO: get rid of this class
+        OModule() = delete; //TODO: get rid of this class
 
     protected:
         static sal_Int32    s_nClients;     /// number of registered clients
diff --git a/fpicker/source/aqua/SalAquaFilePicker.hxx b/fpicker/source/aqua/SalAquaFilePicker.hxx
index f018f86df25f..6ed8f76ddc52 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.hxx
+++ b/fpicker/source/aqua/SalAquaFilePicker.hxx
@@ -163,8 +163,8 @@ public:
    }
 
 private:
-    SalAquaFilePicker( const SalAquaFilePicker& ) SAL_DELETED_FUNCTION;
-    SalAquaFilePicker& operator=( const SalAquaFilePicker& ) SAL_DELETED_FUNCTION;
+    SalAquaFilePicker( const SalAquaFilePicker& ) = delete;
+    SalAquaFilePicker& operator=( const SalAquaFilePicker& ) = delete;
 
     virtual void ensureFilterHelper();
 
diff --git a/fpicker/source/aqua/SalAquaFolderPicker.hxx b/fpicker/source/aqua/SalAquaFolderPicker.hxx
index 9de88bd43341..c23ebd21aea1 100644
--- a/fpicker/source/aqua/SalAquaFolderPicker.hxx
+++ b/fpicker/source/aqua/SalAquaFolderPicker.hxx
@@ -101,8 +101,8 @@ public:
         throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
 
 private:
-    SalAquaFolderPicker( const SalAquaFolderPicker& ) SAL_DELETED_FUNCTION;
-    SalAquaFolderPicker& operator=( const SalAquaFolderPicker& ) SAL_DELETED_FUNCTION;
+    SalAquaFolderPicker( const SalAquaFolderPicker& ) = delete;
+    SalAquaFolderPicker& operator=( const SalAquaFolderPicker& ) = delete;
 
     // to instantiate own services
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceMgr;
diff --git a/fpicker/source/office/asyncfilepicker.hxx b/fpicker/source/office/asyncfilepicker.hxx
index 0778d979760c..1deb5869f6f5 100644
--- a/fpicker/source/office/asyncfilepicker.hxx
+++ b/fpicker/source/office/asyncfilepicker.hxx
@@ -90,8 +90,8 @@ namespace svt
     private:
         DECL_LINK_TYPED( OnActionDone, void*, void );
 
-        AsyncPickerAction( const AsyncPickerAction& ) SAL_DELETED_FUNCTION;
-        AsyncPickerAction& operator=( const AsyncPickerAction& ) SAL_DELETED_FUNCTION;
+        AsyncPickerAction( const AsyncPickerAction& ) = delete;
+        AsyncPickerAction& operator=( const AsyncPickerAction& ) = delete;
     };
 
 
diff --git a/fpicker/source/office/fpsmartcontent.hxx b/fpicker/source/office/fpsmartcontent.hxx
index 0e6f0b5fc1d6..06eb103a1e84 100644
--- a/fpicker/source/office/fpsmartcontent.hxx
+++ b/fpicker/source/office/fpsmartcontent.hxx
@@ -61,8 +61,8 @@ namespace svt
         /// checks if the currently bound content is a folder or document
         bool implIs( const OUString& _rURL, Type _eType );
 
-        SmartContent( const SmartContent& _rSource ) SAL_DELETED_FUNCTION;
-        SmartContent& operator=( const SmartContent& _rSource ) SAL_DELETED_FUNCTION;
+        SmartContent( const SmartContent& _rSource ) = delete;
+        SmartContent& operator=( const SmartContent& _rSource ) = delete;
 
     public:
         SmartContent();
diff --git a/framework/inc/helper/shareablemutex.hxx b/framework/inc/helper/shareablemutex.hxx
index 8e846eae2abc..e354ab9e7da3 100644
--- a/framework/inc/helper/shareablemutex.hxx
+++ b/framework/inc/helper/shareablemutex.hxx
@@ -82,7 +82,7 @@ class ShareGuard
         }
 
     private:
-        ShareGuard& operator=( const ShareGuard& ) SAL_DELETED_FUNCTION;
+        ShareGuard& operator=( const ShareGuard& ) = delete;
 
         ShareableMutex& m_rShareMutex;
 };
diff --git a/framework/inc/services/uriabbreviation.hxx b/framework/inc/services/uriabbreviation.hxx
index a0a2e6c9f762..3c2a11279766 100644
--- a/framework/inc/services/uriabbreviation.hxx
+++ b/framework/inc/services/uriabbreviation.hxx
@@ -45,8 +45,8 @@ public:
     virtual OUString SAL_CALL abbreviateString(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XStringWidth > & xStringWidth, ::sal_Int32 nWidth, const OUString & aString) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
 private:
-    UriAbbreviation(UriAbbreviation &) SAL_DELETED_FUNCTION;
-    void operator =(UriAbbreviation &) SAL_DELETED_FUNCTION;
+    UriAbbreviation(UriAbbreviation &) = delete;
+    void operator =(UriAbbreviation &) = delete;
 
     virtual ~UriAbbreviation() {}
 
diff --git a/framework/inc/uiconfiguration/globalsettings.hxx b/framework/inc/uiconfiguration/globalsettings.hxx
index 00b995e1d068..9bddcce46d87 100644
--- a/framework/inc/uiconfiguration/globalsettings.hxx
+++ b/framework/inc/uiconfiguration/globalsettings.hxx
@@ -63,8 +63,8 @@ class GlobalSettings
         bool GetStateInfo( UIElementType eElementType, StateInfo eStateInfo, ::com::sun::star::uno::Any& aValue );
 
     private:
-        GlobalSettings(const GlobalSettings&) SAL_DELETED_FUNCTION;
-        GlobalSettings& operator=(const GlobalSettings& ) SAL_DELETED_FUNCTION;
+        GlobalSettings(const GlobalSettings&) = delete;
+        GlobalSettings& operator=(const GlobalSettings& ) = delete;
 
         ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
 };
diff --git a/framework/inc/uielement/rootitemcontainer.hxx b/framework/inc/uielement/rootitemcontainer.hxx
index a785f6519b68..56d7254a7494 100644
--- a/framework/inc/uielement/rootitemcontainer.hxx
+++ b/framework/inc/uielement/rootitemcontainer.hxx
@@ -125,8 +125,8 @@ class RootItemContainer :   private cppu::BaseMutex,
         static const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > impl_getStaticPropertyDescriptor();
 
     private:
-        RootItemContainer& operator=( const RootItemContainer& ) SAL_DELETED_FUNCTION;
-        RootItemContainer( const RootItemContainer& ) SAL_DELETED_FUNCTION;
+        RootItemContainer& operator=( const RootItemContainer& ) = delete;
+        RootItemContainer( const RootItemContainer& ) = delete;
 
         com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > deepCopyContainer( const com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& rSubContainer );
 
diff --git a/framework/inc/uielement/toolbarmerger.hxx b/framework/inc/uielement/toolbarmerger.hxx
index 0902ff36a9e1..4c47d349d6a1 100644
--- a/framework/inc/uielement/toolbarmerger.hxx
+++ b/framework/inc/uielement/toolbarmerger.hxx
@@ -143,8 +143,8 @@ class ToolBarMerger
                                        const AddonToolbarItem& rAddonToolbarItem );
 
     private:
-        ToolBarMerger( const ToolBarMerger& ) SAL_DELETED_FUNCTION;
-        ToolBarMerger& operator=( const ToolBarMerger& ) SAL_DELETED_FUNCTION;
+        ToolBarMerger( const ToolBarMerger& ) = delete;
+        ToolBarMerger& operator=( const ToolBarMerger& ) = delete;
 };
 
 } // namespace framework
diff --git a/include/avmedia/mediawindow.hxx b/include/avmedia/mediawindow.hxx
index 72e2ecb64a57..04c72964b48a 100644
--- a/include/avmedia/mediawindow.hxx
+++ b/include/avmedia/mediawindow.hxx
@@ -112,8 +112,8 @@ namespace avmedia
         static BitmapEx getEmptyLogo();
 
     private:
-        MediaWindow(const MediaWindow&) SAL_DELETED_FUNCTION;
-        MediaWindow& operator =( const MediaWindow& ) SAL_DELETED_FUNCTION;
+        MediaWindow(const MediaWindow&) = delete;
+        MediaWindow& operator =( const MediaWindow& ) = delete;
 
         css::uno::Reference< css::uno::XInterface >   mxIFace;
         VclPtr<priv::MediaWindowImpl>                 mpImpl;
diff --git a/include/basegfx/color/bcolormodifier.hxx b/include/basegfx/color/bcolormodifier.hxx
index 7cf078ae562d..f495dad5b0ea 100644
--- a/include/basegfx/color/bcolormodifier.hxx
+++ b/include/basegfx/color/bcolormodifier.hxx
@@ -59,8 +59,8 @@ namespace basegfx
     class BASEGFX_DLLPUBLIC SAL_WARN_UNUSED BColorModifier
     {
     private:
-        BColorModifier(const BColorModifier&) SAL_DELETED_FUNCTION;
-        BColorModifier& operator=(const BColorModifier&) SAL_DELETED_FUNCTION;
+        BColorModifier(const BColorModifier&) = delete;
+        BColorModifier& operator=(const BColorModifier&) = delete;
     protected:
         // no one is allowed to incarnate the abstract base class
         // except derivations
diff --git a/include/basegfx/range/b2dconnectedranges.hxx b/include/basegfx/range/b2dconnectedranges.hxx
index 6473b2ddf990..6feb867f1311 100644
--- a/include/basegfx/range/b2dconnectedranges.hxx
+++ b/include/basegfx/range/b2dconnectedranges.hxx
@@ -235,8 +235,8 @@ namespace basegfx
         }
 
     private:
-        B2DConnectedRanges(const B2DConnectedRanges&) SAL_DELETED_FUNCTION;
-        B2DConnectedRanges& operator=( const B2DConnectedRanges& ) SAL_DELETED_FUNCTION;
+        B2DConnectedRanges(const B2DConnectedRanges&) = delete;
+        B2DConnectedRanges& operator=( const B2DConnectedRanges& ) = delete;
 
         /** Current list of disjunct sets of connected components
 
diff --git a/include/basegfx/raster/bpixelraster.hxx b/include/basegfx/raster/bpixelraster.hxx
index 6f2b21b107e8..67eea7d31b15 100644
--- a/include/basegfx/raster/bpixelraster.hxx
+++ b/include/basegfx/raster/bpixelraster.hxx
@@ -31,8 +31,8 @@ namespace basegfx
     class BPixelRaster
     {
     private:
-        BPixelRaster(const BPixelRaster&) SAL_DELETED_FUNCTION;
-        BPixelRaster& operator=(const BPixelRaster&) SAL_DELETED_FUNCTION;
+        BPixelRaster(const BPixelRaster&) = delete;
+        BPixelRaster& operator=(const BPixelRaster&) = delete;
 
     protected:
         sal_uInt32                  mnWidth;
diff --git a/include/basegfx/tools/unopolypolygon.hxx b/include/basegfx/tools/unopolypolygon.hxx
index 3baca23f5025..6159742a7a3f 100644
--- a/include/basegfx/tools/unopolypolygon.hxx
+++ b/include/basegfx/tools/unopolypolygon.hxx
@@ -96,8 +96,8 @@ namespace unotools
         virtual void modifying() const {}
 
     private:
-        UnoPolyPolygon(const UnoPolyPolygon&) SAL_DELETED_FUNCTION;
-        UnoPolyPolygon& operator=(const UnoPolyPolygon&) SAL_DELETED_FUNCTION;
+        UnoPolyPolygon(const UnoPolyPolygon&) = delete;
+        UnoPolyPolygon& operator=(const UnoPolyPolygon&) = delete;
 
         B2DPolyPolygon                        maPolyPoly;
         ::com::sun::star::rendering::FillRule meFillRule;
diff --git a/include/basic/sbmod.hxx b/include/basic/sbmod.hxx
index e0fcfe517e97..fbbf6b4c1899 100644
--- a/include/basic/sbmod.hxx
+++ b/include/basic/sbmod.hxx
@@ -57,8 +57,8 @@ class BASIC_DLLPUBLIC SbModule : public SbxObject
 
     BASIC_DLLPRIVATE void implClearIfVarDependsOnDeletedBasic( SbxVariable* pVar, StarBASIC* pDeletedBasic );
 
-    SbModule(const SbModule&) SAL_DELETED_FUNCTION;
-    SbModule& operator=(const SbModule&) SAL_DELETED_FUNCTION;
+    SbModule(const SbModule&) = delete;
+    SbModule& operator=(const SbModule&) = delete;
 protected:
     com::sun::star::uno::Reference< com::sun::star::script::XInvocation > mxWrapper;
     OUString            aOUSource;
diff --git a/include/canvas/base/cachedprimitivebase.hxx b/include/canvas/base/cachedprimitivebase.hxx
index 4afc2ce14bc4..32e5ecde4ffa 100644
--- a/include/canvas/base/cachedprimitivebase.hxx
+++ b/include/canvas/base/cachedprimitivebase.hxx
@@ -80,8 +80,8 @@ namespace canvas
         virtual ~CachedPrimitiveBase(); // we're a ref-counted UNO class. _We_ destroy ourselves.
 
     private:
-        CachedPrimitiveBase( const CachedPrimitiveBase& ) SAL_DELETED_FUNCTION;
-        CachedPrimitiveBase& operator=( const CachedPrimitiveBase& ) SAL_DELETED_FUNCTION;
+        CachedPrimitiveBase( const CachedPrimitiveBase& ) = delete;
+        CachedPrimitiveBase& operator=( const CachedPrimitiveBase& ) = delete;
 
         /** Actually perform the requested redraw.
 
diff --git a/include/canvas/base/canvasbase.hxx b/include/canvas/base/canvasbase.hxx
index 4d710a537dde..2cb129d90bc1 100644
--- a/include/canvas/base/canvasbase.hxx
+++ b/include/canvas/base/canvasbase.hxx
@@ -465,8 +465,8 @@ namespace canvas
         mutable bool        mbSurfaceDirty;
 
     private:
-        CanvasBase( const CanvasBase& ) SAL_DELETED_FUNCTION;
-        CanvasBase& operator=( const CanvasBase& ) SAL_DELETED_FUNCTION;
+        CanvasBase( const CanvasBase& ) = delete;
+        CanvasBase& operator=( const CanvasBase& ) = delete;
     };
 }
 
diff --git a/include/canvas/base/canvascustomspritehelper.hxx b/include/canvas/base/canvascustomspritehelper.hxx
index fe29f5c5146b..a81a0b6026f0 100644
--- a/include/canvas/base/canvascustomspritehelper.hxx
+++ b/include/canvas/base/canvascustomspritehelper.hxx
@@ -196,8 +196,8 @@ namespace canvas
         void visibilityUpdated() const { mbVisibilityDirty=false; }
 
     private:
-        CanvasCustomSpriteHelper( const CanvasCustomSpriteHelper& ) SAL_DELETED_FUNCTION;
-        CanvasCustomSpriteHelper& operator=( const CanvasCustomSpriteHelper& ) SAL_DELETED_FUNCTION;
+        CanvasCustomSpriteHelper( const CanvasCustomSpriteHelper& ) = delete;
+        CanvasCustomSpriteHelper& operator=( const CanvasCustomSpriteHelper& ) = delete;
 
         /** Called to convert an API polygon to a basegfx polygon
 
diff --git a/include/canvas/base/graphicdevicebase.hxx b/include/canvas/base/graphicdevicebase.hxx
index 83b5adc69fd4..9e34eab460ae 100644
--- a/include/canvas/base/graphicdevicebase.hxx
+++ b/include/canvas/base/graphicdevicebase.hxx
@@ -363,8 +363,8 @@ namespace canvas
         bool              mbDumpScreenContent;
 
     private:
-        GraphicDeviceBase( const GraphicDeviceBase& ) SAL_DELETED_FUNCTION;
-        GraphicDeviceBase& operator=( const GraphicDeviceBase& ) SAL_DELETED_FUNCTION;
+        GraphicDeviceBase( const GraphicDeviceBase& ) = delete;
+        GraphicDeviceBase& operator=( const GraphicDeviceBase& ) = delete;
     };
 }
 
diff --git a/include/codemaker/exceptiontree.hxx b/include/codemaker/exceptiontree.hxx
index 091ff034bf72..9c6b3b919b94 100644
--- a/include/codemaker/exceptiontree.hxx
+++ b/include/codemaker/exceptiontree.hxx
@@ -54,8 +54,8 @@ struct ExceptionTreeNode {
     Children children;
 
 private:
-    ExceptionTreeNode(ExceptionTreeNode &) SAL_DELETED_FUNCTION;
-    void operator =(ExceptionTreeNode) SAL_DELETED_FUNCTION;
+    ExceptionTreeNode(ExceptionTreeNode &) = delete;
+    void operator =(ExceptionTreeNode) = delete;
 
     void clearChildren();
 };
@@ -107,8 +107,8 @@ public:
     ExceptionTreeNode const & getRoot() const { return m_root; }
 
 private:
-    ExceptionTree(ExceptionTree &) SAL_DELETED_FUNCTION;
-    void operator =(const ExceptionTree&) SAL_DELETED_FUNCTION;
+    ExceptionTree(ExceptionTree &) = delete;
+    void operator =(const ExceptionTree&) = delete;
 
     ExceptionTreeNode m_root;
 };
diff --git a/include/codemaker/generatedtypeset.hxx b/include/codemaker/generatedtypeset.hxx
index ca4ad24c68be..f6cb452c1990 100644
--- a/include/codemaker/generatedtypeset.hxx
+++ b/include/codemaker/generatedtypeset.hxx
@@ -60,8 +60,8 @@ public:
     { return m_set.find(type) != m_set.end(); }
 
 private:
-    GeneratedTypeSet(GeneratedTypeSet &) SAL_DELETED_FUNCTION;
-    void operator =(const GeneratedTypeSet&) SAL_DELETED_FUNCTION;
+    GeneratedTypeSet(GeneratedTypeSet &) = delete;
+    void operator =(const GeneratedTypeSet&) = delete;
 
     std::unordered_set< OString, OStringHash > m_set;
 };
diff --git a/include/comphelper/SelectionMultiplex.hxx b/include/comphelper/SelectionMultiplex.hxx
index 14bbcc76734b..8b45f1a7b025 100644
--- a/include/comphelper/SelectionMultiplex.hxx
+++ b/include/comphelper/SelectionMultiplex.hxx
@@ -74,8 +74,8 @@ namespace comphelper
         bool                                    m_bListening        : 1;
         bool                                    m_bAutoSetRelease   : 1;
 
-        OSelectionChangeMultiplexer(const OSelectionChangeMultiplexer&) SAL_DELETED_FUNCTION;
-        OSelectionChangeMultiplexer& operator=(const OSelectionChangeMultiplexer&) SAL_DELETED_FUNCTION;
+        OSelectionChangeMultiplexer(const OSelectionChangeMultiplexer&) = delete;
+        OSelectionChangeMultiplexer& operator=(const OSelectionChangeMultiplexer&) = delete;
     protected:
         virtual ~OSelectionChangeMultiplexer();
     public:
diff --git a/include/comphelper/accessibleeventnotifier.hxx b/include/comphelper/accessibleeventnotifier.hxx
index c401503dba69..0cef8ed1487c 100644
--- a/include/comphelper/accessibleeventnotifier.hxx
+++ b/include/comphelper/accessibleeventnotifier.hxx
@@ -44,8 +44,8 @@ namespace comphelper
         ~AccessibleEventNotifier( );    // never implemented
 
     private:
-        AccessibleEventNotifier( const AccessibleEventNotifier& ) SAL_DELETED_FUNCTION;
-        AccessibleEventNotifier& operator=( const AccessibleEventNotifier& ) SAL_DELETED_FUNCTION;
+        AccessibleEventNotifier( const AccessibleEventNotifier& ) = delete;
+        AccessibleEventNotifier& operator=( const AccessibleEventNotifier& ) = delete;
 
     public:
         /** registers a client of this class, means a broadcaster of AccessibleEvents
diff --git a/include/comphelper/accessiblewrapper.hxx b/include/comphelper/accessiblewrapper.hxx
index 61a315248691..3363fead4766 100644
--- a/include/comphelper/accessiblewrapper.hxx
+++ b/include/comphelper/accessiblewrapper.hxx
@@ -116,8 +116,8 @@ namespace comphelper
         virtual ~OAccessibleWrapper( );
 
     private:
-        OAccessibleWrapper( const OAccessibleWrapper& ) SAL_DELETED_FUNCTION;
-        OAccessibleWrapper& operator=( const OAccessibleWrapper& ) SAL_DELETED_FUNCTION;
+        OAccessibleWrapper( const OAccessibleWrapper& ) = delete;
+        OAccessibleWrapper& operator=( const OAccessibleWrapper& ) = delete;
     };
 
 
@@ -303,8 +303,8 @@ namespace comphelper
         virtual ~OAccessibleContextWrapper();
 
     private:
-        OAccessibleContextWrapper( const OAccessibleContextWrapper& ) SAL_DELETED_FUNCTION;
-        OAccessibleContextWrapper& operator=( const OAccessibleContextWrapper& ) SAL_DELETED_FUNCTION;
+        OAccessibleContextWrapper( const OAccessibleContextWrapper& ) = delete;
+        OAccessibleContextWrapper& operator=( const OAccessibleContextWrapper& ) = delete;
     };
 
 
@@ -390,8 +390,8 @@ namespace comphelper
         virtual ~OWrappedAccessibleChildrenManager( );
 
     private:
-        OWrappedAccessibleChildrenManager( const OWrappedAccessibleChildrenManager& ) SAL_DELETED_FUNCTION;
-        OWrappedAccessibleChildrenManager& operator=( const OWrappedAccessibleChildrenManager& ) SAL_DELETED_FUNCTION;
+        OWrappedAccessibleChildrenManager( const OWrappedAccessibleChildrenManager& ) = delete;
+        OWrappedAccessibleChildrenManager& operator=( const OWrappedAccessibleChildrenManager& ) = delete;
     };
 
 
diff --git a/include/comphelper/asyncnotification.hxx b/include/comphelper/asyncnotification.hxx
index 01d589c8540e..9775347ff46e 100644
--- a/include/comphelper/asyncnotification.hxx
+++ b/include/comphelper/asyncnotification.hxx
@@ -44,8 +44,8 @@ namespace comphelper
         virtual ~AnyEvent();
 
     private:
-        AnyEvent( AnyEvent& ) SAL_DELETED_FUNCTION;
-        void operator=( AnyEvent& ) SAL_DELETED_FUNCTION;
+        AnyEvent( AnyEvent& ) = delete;
+        void operator=( AnyEvent& ) = delete;
     };
 
 
diff --git a/include/comphelper/basicio.hxx b/include/comphelper/basicio.hxx
index c48a313dacc4..3dd8aea727ae 100644
--- a/include/comphelper/basicio.hxx
+++ b/include/comphelper/basicio.hxx
@@ -33,7 +33,7 @@ COMPHELPER_DLLPUBLIC const css::uno::Reference<css::io::XObjectInputStream>& ope
 COMPHELPER_DLLPUBLIC const css::uno::Reference<css::io::XObjectOutputStream>& operator << (const css::uno::Reference<css::io::XObjectOutputStream>& _rxOutStream, bool _bVal);
 void operator <<(
     css::uno::Reference<css::io::XObjectOutputStream> const &, sal_Bool)
-    SAL_DELETED_FUNCTION;
+    = delete;
 
 // OUString
 COMPHELPER_DLLPUBLIC const css::uno::Reference<css::io::XObjectInputStream>& operator >> (const css::uno::Reference<css::io::XObjectInputStream>& _rxInStream, OUString& _rStr);
diff --git a/include/comphelper/componentmodule.hxx b/include/comphelper/componentmodule.hxx
index 024d9b63f551..172b0b2c0072 100644
--- a/include/comphelper/componentmodule.hxx
+++ b/include/comphelper/componentmodule.hxx
@@ -162,8 +162,8 @@ namespace comphelper
         virtual void onLastClient();
 
     private:
-        OModule( const OModule& ) SAL_DELETED_FUNCTION;
-        OModule& operator=( const OModule& ) SAL_DELETED_FUNCTION;
+        OModule( const OModule& ) = delete;
+        OModule& operator=( const OModule& ) = delete;
     };
 
 
diff --git a/include/comphelper/configuration.hxx b/include/comphelper/configuration.hxx
index 8ca6bd7eccfd..b1cdefdf204f 100644
--- a/include/comphelper/configuration.hxx
+++ b/include/comphelper/configuration.hxx
@@ -53,8 +53,8 @@ public:
     void commit() const;
 
 private:
-    ConfigurationChanges(const ConfigurationChanges&) SAL_DELETED_FUNCTION;
-    ConfigurationChanges& operator=(const ConfigurationChanges&) SAL_DELETED_FUNCTION;
+    ConfigurationChanges(const ConfigurationChanges&) = delete;
+    ConfigurationChanges& operator=(const ConfigurationChanges&) = delete;
 
     SAL_DLLPRIVATE ConfigurationChanges(
         com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
@@ -129,8 +129,8 @@ public:
     std::shared_ptr< ConfigurationChanges > createChanges() const;
 
 private:
-    ConfigurationWrapper(const ConfigurationWrapper&) SAL_DELETED_FUNCTION;
-    ConfigurationWrapper& operator=(const ConfigurationWrapper&) SAL_DELETED_FUNCTION;
+    ConfigurationWrapper(const ConfigurationWrapper&) = delete;
+    ConfigurationWrapper& operator=(const ConfigurationWrapper&) = delete;
 
     com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
         context_;
@@ -152,11 +152,11 @@ template< typename T > struct Convert {
     { return value.get< T >(); }
 
 private:
-    Convert(const Convert&) SAL_DELETED_FUNCTION;
-    Convert& operator=(const Convert&) SAL_DELETED_FUNCTION;
+    Convert(const Convert&) = delete;
+    Convert& operator=(const Convert&) = delete;
 
-    Convert() SAL_DELETED_FUNCTION;
-    ~Convert() SAL_DELETED_FUNCTION;
+    Convert() = delete;
+    ~Convert() = delete;
 };
 
 /// @internal
@@ -175,11 +175,11 @@ template< typename T > struct Convert< boost::optional< T > >
     }
 
 private:
-    Convert(const Convert&) SAL_DELETED_FUNCTION;
-    Convert& operator=(const Convert&) SAL_DELETED_FUNCTION;
+    Convert(const Convert&) = delete;
+    Convert& operator=(const Convert&) = delete;
 
-    Convert() SAL_DELETED_FUNCTION;
-    ~Convert() SAL_DELETED_FUNCTION;
+    Convert() = delete;
+    ~Convert() = delete;
 };
 
 }
@@ -228,11 +228,11 @@ template< typename T, typename U > struct ConfigurationProperty
     }
 
 private:
-    ConfigurationProperty(const ConfigurationProperty&) SAL_DELETED_FUNCTION;
-    ConfigurationProperty& operator=(const ConfigurationProperty&) SAL_DELETED_FUNCTION;
+    ConfigurationProperty(const ConfigurationProperty&) = delete;
+    ConfigurationProperty& operator=(const ConfigurationProperty&) = delete;
 
-    ConfigurationProperty() SAL_DELETED_FUNCTION;
-    ~ConfigurationProperty() SAL_DELETED_FUNCTION;
+    ConfigurationProperty() = delete;
+    ~ConfigurationProperty() = delete;
 };
 
 /// A type-safe wrapper around a localized configuration property.
@@ -274,11 +274,11 @@ template< typename T, typename U > struct ConfigurationLocalizedProperty
     }
 
 private:
-    ConfigurationLocalizedProperty(const ConfigurationLocalizedProperty&) SAL_DELETED_FUNCTION;
-    ConfigurationLocalizedProperty& operator=(const ConfigurationLocalizedProperty&) SAL_DELETED_FUNCTION;
+    ConfigurationLocalizedProperty(const ConfigurationLocalizedProperty&) = delete;
+    ConfigurationLocalizedProperty& operator=(const ConfigurationLocalizedProperty&) = delete;
 
-    ConfigurationLocalizedProperty() SAL_DELETED_FUNCTION;
-    ~ConfigurationLocalizedProperty() SAL_DELETED_FUNCTION;
+    ConfigurationLocalizedProperty() = delete;
+    ~ConfigurationLocalizedProperty() = delete;
 };
 
 /// A type-safe wrapper around a configuration group.
@@ -308,11 +308,11 @@ template< typename T > struct ConfigurationGroup {
     }
 
 private:
-    ConfigurationGroup(const ConfigurationGroup&) SAL_DELETED_FUNCTION;
-    ConfigurationGroup& operator=(const ConfigurationGroup&) SAL_DELETED_FUNCTION;
+    ConfigurationGroup(const ConfigurationGroup&) = delete;
+    ConfigurationGroup& operator=(const ConfigurationGroup&) = delete;
 
-    ConfigurationGroup() SAL_DELETED_FUNCTION;
-    ~ConfigurationGroup() SAL_DELETED_FUNCTION;
+    ConfigurationGroup() = delete;
+    ~ConfigurationGroup() = delete;
 };
 
 /// A type-safe wrapper around a configuration set.
@@ -342,11 +342,11 @@ template< typename T > struct ConfigurationSet {
     }
 
 private:
-    ConfigurationSet(const ConfigurationSet&) SAL_DELETED_FUNCTION;
-    ConfigurationSet& operator=(const ConfigurationSet&) SAL_DELETED_FUNCTION;
+    ConfigurationSet(const ConfigurationSet&) = delete;
+    ConfigurationSet& operator=(const ConfigurationSet&) = delete;
 
-    ConfigurationSet() SAL_DELETED_FUNCTION;
-    ~ConfigurationSet() SAL_DELETED_FUNCTION;
+    ConfigurationSet() = delete;
+    ~ConfigurationSet() = delete;
 };
 
 }
diff --git a/include/comphelper/logging.hxx b/include/comphelper/logging.hxx
index dcfe7b37e142..665bc9c52d0c 100644
--- a/include/comphelper/logging.hxx
+++ b/include/comphelper/logging.hxx
@@ -57,7 +57,7 @@ namespace comphelper
         inline OUString convertLogArgToString( sal_Int16   _nValue ) { return OUString::number( _nValue ); }
         inline OUString convertLogArgToString( sal_Unicode _nValue ) { return OUString( _nValue ); }
         inline OUString convertLogArgToString( bool    _bValue ) { return OUString::boolean( _bValue ); }
-        void convertLogArgToString(sal_Bool) SAL_DELETED_FUNCTION;
+        void convertLogArgToString(sal_Bool) = delete;
 
     } } // namespace log::convert
 
diff --git a/include/comphelper/propertycontainerhelper.hxx b/include/comphelper/propertycontainerhelper.hxx
index 430c86ff76f4..1d29cda90952 100644
--- a/include/comphelper/propertycontainerhelper.hxx
+++ b/include/comphelper/propertycontainerhelper.hxx
@@ -186,8 +186,8 @@ private:
     COMPHELPER_DLLPRIVATE PropertiesIterator    searchHandle(sal_Int32 _nHandle);
 
 private:
-    OPropertyContainerHelper( const OPropertyContainerHelper& ) SAL_DELETED_FUNCTION;
-    OPropertyContainerHelper& operator=( const OPropertyContainerHelper& ) SAL_DELETED_FUNCTION;
+    OPropertyContainerHelper( const OPropertyContainerHelper& ) = delete;
+    OPropertyContainerHelper& operator=( const OPropertyContainerHelper& ) = delete;
 };
 
 
diff --git a/include/comphelper/proxyaggregation.hxx b/include/comphelper/proxyaggregation.hxx
index 426ce3efcc8b..39118d03125e 100644
--- a/include/comphelper/proxyaggregation.hxx
+++ b/include/comphelper/proxyaggregation.hxx
@@ -110,8 +110,8 @@ namespace comphelper
         ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes(  ) throw (::com::sun::star::uno::RuntimeException);
 
     private:
-        OProxyAggregation( const OProxyAggregation& ) SAL_DELETED_FUNCTION;
-        OProxyAggregation& operator=( const OProxyAggregation& ) SAL_DELETED_FUNCTION;
+        OProxyAggregation( const OProxyAggregation& ) = delete;
+        OProxyAggregation& operator=( const OProxyAggregation& ) = delete;
     };
 
 
@@ -170,8 +170,8 @@ namespace comphelper
         virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) = 0;
 
     private:
-        OComponentProxyAggregationHelper( const OComponentProxyAggregationHelper& ) SAL_DELETED_FUNCTION;
-        OComponentProxyAggregationHelper& operator=( const OComponentProxyAggregationHelper& ) SAL_DELETED_FUNCTION;
+        OComponentProxyAggregationHelper( const OComponentProxyAggregationHelper& ) = delete;
+        OComponentProxyAggregationHelper& operator=( const OComponentProxyAggregationHelper& ) = delete;
     };
 
 
@@ -208,8 +208,8 @@ namespace comphelper
         void implEnsureDisposeInDtor( );
 
     private:
-        OComponentProxyAggregation( const OComponentProxyAggregation& ) SAL_DELETED_FUNCTION;
-        OComponentProxyAggregation& operator=( const OComponentProxyAggregation& ) SAL_DELETED_FUNCTION;
+        OComponentProxyAggregation( const OComponentProxyAggregation& ) = delete;
+        OComponentProxyAggregation& operator=( const OComponentProxyAggregation& ) = delete;
     };
 
 
diff --git a/include/comphelper/scopeguard.hxx b/include/comphelper/scopeguard.hxx
index 324ad6ce2090..629950ccc151 100644
--- a/include/comphelper/scopeguard.hxx
+++ b/include/comphelper/scopeguard.hxx
@@ -51,8 +51,8 @@ public:
 
 private:
     // noncopyable until we have good reasons...
-    ScopeGuard(const ScopeGuard&) SAL_DELETED_FUNCTION;
-    ScopeGuard& operator=(const ScopeGuard&) SAL_DELETED_FUNCTION;
+    ScopeGuard(const ScopeGuard&) = delete;
+    ScopeGuard& operator=(const ScopeGuard&) = delete;
 
     ::std::function<void ()> m_func;
     exc_handling const m_excHandling;
diff --git a/include/comphelper/solarmutex.hxx b/include/comphelper/solarmutex.hxx
index c50eba29dcda..48453de915e4 100644
--- a/include/comphelper/solarmutex.hxx
+++ b/include/comphelper/solarmutex.hxx
@@ -54,8 +54,8 @@ protected:
 
     virtual ~SolarMutex();
 private:
-    SolarMutex(const SolarMutex&) SAL_DELETED_FUNCTION;
-    SolarMutex& operator=(const SolarMutex&) SAL_DELETED_FUNCTION;
+    SolarMutex(const SolarMutex&) = delete;
+    SolarMutex& operator=(const SolarMutex&) = delete;
 };
 
 }
diff --git a/include/comphelper/syntaxhighlight.hxx b/include/comphelper/syntaxhighlight.hxx
index c2487499c375..77543ed4cb8f 100644
--- a/include/comphelper/syntaxhighlight.hxx
+++ b/include/comphelper/syntaxhighlight.hxx
@@ -72,8 +72,8 @@ class COMPHELPER_DLLPUBLIC SyntaxHighlighter
     HighlighterLanguage eLanguage;
     std::unique_ptr<Tokenizer> m_tokenizer;
 
-    SyntaxHighlighter(const SyntaxHighlighter&) SAL_DELETED_FUNCTION;
-    SyntaxHighlighter& operator=(const SyntaxHighlighter&) SAL_DELETED_FUNCTION;
+    SyntaxHighlighter(const SyntaxHighlighter&) = delete;
+    SyntaxHighlighter& operator=(const SyntaxHighlighter&) = delete;
 public:
     SyntaxHighlighter(HighlighterLanguage language);
     ~SyntaxHighlighter();
diff --git a/include/comphelper/threadpool.hxx b/include/comphelper/threadpool.hxx
index 4a149a89e4be..cfa471b60802 100644
--- a/include/comphelper/threadpool.hxx
+++ b/include/comphelper/threadpool.hxx
@@ -49,8 +49,8 @@ public:
     sal_Int32   getWorkerCount() const { return maWorkers.size(); }
 
 private:
-    ThreadPool(const ThreadPool&) SAL_DELETED_FUNCTION;
-    ThreadPool& operator=(const ThreadPool&) SAL_DELETED_FUNCTION;
+    ThreadPool(const ThreadPool&) = delete;
+    ThreadPool& operator=(const ThreadPool&) = delete;
 
     class ThreadWorker;
     friend class ThreadWorker;
diff --git a/include/comphelper/unique_disposing_ptr.hxx b/include/comphelper/unique_disposing_ptr.hxx
index 89810982d317..6da49fdd2ec7 100644
--- a/include/comphelper/unique_disposing_ptr.hxx
+++ b/include/comphelper/unique_disposing_ptr.hxx
@@ -27,8 +27,8 @@ private:
     std::unique_ptr<T> m_xItem;
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTerminateListener> m_xTerminateListener;
 
-    unique_disposing_ptr(const unique_disposing_ptr&) SAL_DELETED_FUNCTION;
-    unique_disposing_ptr& operator=(const unique_disposing_ptr&) SAL_DELETED_FUNCTION;
+    unique_disposing_ptr(const unique_disposing_ptr&) = delete;
+    unique_disposing_ptr& operator=(const unique_disposing_ptr&) = delete;
 public:
     unique_disposing_ptr( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > &rComponent, T * p = 0 )
         : m_xItem(p)
diff --git a/include/connectivity/ParameterCont.hxx b/include/connectivity/ParameterCont.hxx
index 931398c893e6..72e9d701b1f4 100644
--- a/include/connectivity/ParameterCont.hxx
+++ b/include/connectivity/ParameterCont.hxx
@@ -43,8 +43,8 @@ namespace dbtools
     protected:
         virtual ~OParameterContinuation() { }
     private:
-        OParameterContinuation(const OParameterContinuation&) SAL_DELETED_FUNCTION;
-        void operator =(const OParameterContinuation&) SAL_DELETED_FUNCTION;
+        OParameterContinuation(const OParameterContinuation&) = delete;
+        void operator =(const OParameterContinuation&) = delete;
     };
 } // dbtools
 #endif // INCLUDED_CONNECTIVITY_PARAMETERCONT_HXX
diff --git a/include/connectivity/formattedcolumnvalue.hxx b/include/connectivity/formattedcolumnvalue.hxx
index f946ce264305..74abd30e37af 100644
--- a/include/connectivity/formattedcolumnvalue.hxx
+++ b/include/connectivity/formattedcolumnvalue.hxx
@@ -87,8 +87,8 @@ namespace dbtools
         OUString    getFormattedValue() const;
 
     private:
-        FormattedColumnValue(const FormattedColumnValue&) SAL_DELETED_FUNCTION;
-        FormattedColumnValue& operator=(const FormattedColumnValue&) SAL_DELETED_FUNCTION;
+        FormattedColumnValue(const FormattedColumnValue&) = delete;
+        FormattedColumnValue& operator=(const FormattedColumnValue&) = delete;
         std::unique_ptr< FormattedColumnValue_Data >    m_pData;
     };
 
diff --git a/include/connectivity/parameters.hxx b/include/connectivity/parameters.hxx
index f4908372f40d..9d4a50524ed6 100644
--- a/include/connectivity/parameters.hxx
+++ b/include/connectivity/parameters.hxx
@@ -396,8 +396,8 @@ namespace dbtools
         void    cacheConnectionInfo();
 
     private:
-        ParameterManager( const ParameterManager& ) SAL_DELETED_FUNCTION;
-        ParameterManager& operator=( const ParameterManager& ) SAL_DELETED_FUNCTION;
+        ParameterManager( const ParameterManager& ) = delete;
+        ParameterManager& operator=( const ParameterManager& ) = delete;
     };
 
 
diff --git a/include/connectivity/sqliterator.hxx b/include/connectivity/sqliterator.hxx
index be8274a8e607..4c1e330b42b1 100644
--- a/include/connectivity/sqliterator.hxx
+++ b/include/connectivity/sqliterator.hxx
@@ -129,7 +129,7 @@ namespace connectivity
 
 
       private:
-        OSQLParseTreeIterator(const OSQLParseTreeIterator & rIter) SAL_DELETED_FUNCTION;
+        OSQLParseTreeIterator(const OSQLParseTreeIterator & rIter) = delete;
 
       public:
         OSQLParseTreeIterator(
diff --git a/include/connectivity/statementcomposer.hxx b/include/connectivity/statementcomposer.hxx
index c3f5464fa501..b4d5c1e3d31f 100644
--- a/include/connectivity/statementcomposer.hxx
+++ b/include/connectivity/statementcomposer.hxx
@@ -88,9 +88,9 @@ namespace dbtools
                 getQuery();
 
     private:
-        StatementComposer(const StatementComposer&) SAL_DELETED_FUNCTION;
-        StatementComposer& operator=(const StatementComposer&) SAL_DELETED_FUNCTION;
-        StatementComposer() SAL_DELETED_FUNCTION;
+        StatementComposer(const StatementComposer&) = delete;
+        StatementComposer& operator=(const StatementComposer&) = delete;
+        StatementComposer() = delete;
     };
 
 
diff --git a/include/cppcanvas/basegfxfactory.hxx b/include/cppcanvas/basegfxfactory.hxx
index 5341cd631ebc..8238b502ffbb 100644
--- a/include/cppcanvas/basegfxfactory.hxx
+++ b/include/cppcanvas/basegfxfactory.hxx
@@ -69,9 +69,9 @@ namespace cppcanvas
         static BitmapSharedPtr         createAlphaBitmap( const CanvasSharedPtr&, const ::basegfx::B2ISize& rSize );
 
     private:
-        BaseGfxFactory() SAL_DELETED_FUNCTION;
-        BaseGfxFactory(const BaseGfxFactory&) SAL_DELETED_FUNCTION;
-        BaseGfxFactory& operator=( const BaseGfxFactory& ) SAL_DELETED_FUNCTION;
+        BaseGfxFactory() = delete;
+        BaseGfxFactory(const BaseGfxFactory&) = delete;
+        BaseGfxFactory& operator=( const BaseGfxFactory& ) = delete;
     };
 
 }
diff --git a/include/cppcanvas/vclfactory.hxx b/include/cppcanvas/vclfactory.hxx
index 76b1269dff90..a3c5f63c11ac 100644
--- a/include/cppcanvas/vclfactory.hxx
+++ b/include/cppcanvas/vclfactory.hxx
@@ -87,9 +87,9 @@ namespace cppcanvas
                                                 const Renderer::Parameters&     rParms );
 
     private:
-        VCLFactory() SAL_DELETED_FUNCTION;
-        VCLFactory(const VCLFactory&) SAL_DELETED_FUNCTION;
-        VCLFactory& operator=( const VCLFactory& ) SAL_DELETED_FUNCTION;
+        VCLFactory() = delete;
+        VCLFactory(const VCLFactory&) = delete;
+        VCLFactory& operator=( const VCLFactory& ) = delete;
     };
 
 }
diff --git a/include/drawinglayer/animation/animationtiming.hxx b/include/drawinglayer/animation/animationtiming.hxx
index dd52b6e15cf1..00cc2543380b 100644
--- a/include/drawinglayer/animation/animationtiming.hxx
+++ b/include/drawinglayer/animation/animationtiming.hxx
@@ -35,8 +35,8 @@ namespace drawinglayer
         class DRAWINGLAYER_DLLPUBLIC AnimationEntry
         {
         private:
-            AnimationEntry(const AnimationEntry&) SAL_DELETED_FUNCTION;
-            AnimationEntry& operator=(const AnimationEntry& rCandidate) SAL_DELETED_FUNCTION;
+            AnimationEntry(const AnimationEntry&) = delete;
+            AnimationEntry& operator=(const AnimationEntry& rCandidate) = delete;
 
         public:
             AnimationEntry();
diff --git a/include/editeng/AccessibleEditableTextPara.hxx b/include/editeng/AccessibleEditableTextPara.hxx
index 6d48c27e6d73..5900e23194c6 100644
--- a/include/editeng/AccessibleEditableTextPara.hxx
+++ b/include/editeng/AccessibleEditableTextPara.hxx
@@ -286,8 +286,8 @@ namespace accessibility
         void TextChanged();
 
     private:
-        AccessibleEditableTextPara( const AccessibleEditableTextPara& ) SAL_DELETED_FUNCTION;
-        AccessibleEditableTextPara& operator= ( const AccessibleEditableTextPara& ) SAL_DELETED_FUNCTION;
+        AccessibleEditableTextPara( const AccessibleEditableTextPara& ) = delete;
+        AccessibleEditableTextPara& operator= ( const AccessibleEditableTextPara& ) = delete;
 
         /** Calculate character range of similar attributes
 
diff --git a/include/editeng/AccessibleImageBullet.hxx b/include/editeng/AccessibleImageBullet.hxx
index d4caae753dce..ff0d25004dc6 100644
--- a/include/editeng/AccessibleImageBullet.hxx
+++ b/include/editeng/AccessibleImageBullet.hxx
@@ -148,8 +148,8 @@ namespace accessibility
         void FireEvent(const sal_Int16 nEventId, const ::com::sun::star::uno::Any& rNewValue = ::com::sun::star::uno::Any(), const ::com::sun::star::uno::Any& rOldValue = ::com::sun::star::uno::Any() ) const;
 
     private:
-        AccessibleImageBullet( const AccessibleImageBullet& ) SAL_DELETED_FUNCTION;
-        AccessibleImageBullet& operator= ( const AccessibleImageBullet& ) SAL_DELETED_FUNCTION;
+        AccessibleImageBullet( const AccessibleImageBullet& ) = delete;
+        AccessibleImageBullet& operator= ( const AccessibleImageBullet& ) = delete;
 
         // syntactic sugar for FireEvent
         void GotPropertyEvent( const ::com::sun::star::uno::Any& rNewValue, const sal_Int16 nEventId ) const;
diff --git a/include/editeng/AccessibleStaticTextBase.hxx b/include/editeng/AccessibleStaticTextBase.hxx
index 5682425d8619..b5918f21d44c 100644
--- a/include/editeng/AccessibleStaticTextBase.hxx
+++ b/include/editeng/AccessibleStaticTextBase.hxx
@@ -106,8 +106,8 @@ namespace accessibility
         virtual ~AccessibleStaticTextBase();
 
     private:
-        AccessibleStaticTextBase( const AccessibleStaticTextBase& ) SAL_DELETED_FUNCTION;
-        AccessibleStaticTextBase& operator= ( const AccessibleStaticTextBase& ) SAL_DELETED_FUNCTION;
+        AccessibleStaticTextBase( const AccessibleStaticTextBase& ) = delete;
+        AccessibleStaticTextBase& operator= ( const AccessibleStaticTextBase& ) = delete;
 
     public:
 
diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx
index a35a3424309d..da46fe6f5eba 100644
--- a/include/editeng/editeng.hxx
+++ b/include/editeng/editeng.hxx
@@ -158,8 +158,8 @@ public:
 private:
     ImpEditEngine*  pImpEditEngine;
 
-                                       EditEngine( const EditEngine& ) SAL_DELETED_FUNCTION;
-                       EditEngine&     operator=( const EditEngine& ) SAL_DELETED_FUNCTION;
+                                       EditEngine( const EditEngine& ) = delete;
+                       EditEngine&     operator=( const EditEngine& ) = delete;
     EDITENG_DLLPRIVATE bool            PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pView, vcl::Window* pFrameWin = NULL );
 
     EDITENG_DLLPRIVATE void CursorMoved(ContentNode* pPrevNode);
diff --git a/include/editeng/editobj.hxx b/include/editeng/editobj.hxx
index a11d052bc48d..e07547ce312f 100644
--- a/include/editeng/editobj.hxx
+++ b/include/editeng/editobj.hxx
@@ -64,7 +64,7 @@ class EDITENG_DLLPUBLIC EditTextObject : public SfxItemPoolUser
 
     EditTextObjectImpl* mpImpl;
 
-    EditTextObject&      operator=( const EditTextObject& ) SAL_DELETED_FUNCTION;
+    EditTextObject&      operator=( const EditTextObject& ) = delete;
 
     EditTextObject(); // disabled
 
diff --git a/include/editeng/editview.hxx b/include/editeng/editview.hxx
index 210e816b2132..835e540ec5fc 100644
--- a/include/editeng/editview.hxx
+++ b/include/editeng/editview.hxx
@@ -93,8 +93,8 @@ private:
     ImpEditView*    pImpEditView;
     OUString        aDicNameSingle;
 
-                    EditView( const EditView& ) SAL_DELETED_FUNCTION;
-    EditView&       operator=( const EditView& ) SAL_DELETED_FUNCTION;
+                    EditView( const EditView& ) = delete;
+    EditView&       operator=( const EditView& ) = delete;
 
 public:
                     EditView( EditEngine* pEng, vcl::Window* pWindow );
diff --git a/include/editeng/hangulhanja.hxx b/include/editeng/hangulhanja.hxx
index 1b9abb8e5cbf..0ee9113e140d 100644
--- a/include/editeng/hangulhanja.hxx
+++ b/include/editeng/hangulhanja.hxx
@@ -102,8 +102,8 @@ namespace editeng
         static bool                 m_bTryBothDirectionsSave;
         static ConversionDirection  m_ePrimaryConversionDirectionSave;
 
-        HangulHanjaConversion (const HangulHanjaConversion &) SAL_DELETED_FUNCTION;
-        HangulHanjaConversion & operator= (const HangulHanjaConversion &) SAL_DELETED_FUNCTION;
+        HangulHanjaConversion (const HangulHanjaConversion &) = delete;
+        HangulHanjaConversion & operator= (const HangulHanjaConversion &) = delete;
 
     public:
         HangulHanjaConversion(
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index 69ccb523fbe0..b996ef2cd08e 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -137,7 +137,7 @@ private:
     friend class OutlinerUndoCheckPara;
     friend class OutlinerUndoChangeParaFlags;
 
-    Paragraph& operator=(const Paragraph& rPara ) SAL_DELETED_FUNCTION;
+    Paragraph& operator=(const Paragraph& rPara ) = delete;
 
     ParaFlag            nFlags;
     OUString            aBulText;
@@ -151,7 +151,7 @@ private:
     const OUString& GetText() const { return aBulText; }
 
                         Paragraph( sal_Int16 nDepth );
-                        Paragraph( const Paragraph& ) SAL_DELETED_FUNCTION;
+                        Paragraph( const Paragraph& ) = delete;
                         Paragraph( const ParagraphData& );
                         ~Paragraph();
 
@@ -506,7 +506,7 @@ private:
     sal_Int32           nPos;
     bool                bSimpleClick;
 
-                        EditFieldInfo( const EditFieldInfo& ) SAL_DELETED_FUNCTION;
+                        EditFieldInfo( const EditFieldInfo& ) = delete;
 
     SdrPage*            mpSdrPage;
 
diff --git a/include/editeng/svxacorr.hxx b/include/editeng/svxacorr.hxx
index 0f8a46760607..3e5399df97ab 100644
--- a/include/editeng/svxacorr.hxx
+++ b/include/editeng/svxacorr.hxx
@@ -136,8 +136,8 @@ class EDITENG_DLLPUBLIC SvxAutocorrWordList
     struct Impl;
     Impl* mpImpl;
 
-    SvxAutocorrWordList( const SvxAutocorrWordList& ) SAL_DELETED_FUNCTION;
-    const SvxAutocorrWordList& operator= ( const SvxAutocorrWordList& ) SAL_DELETED_FUNCTION;
+    SvxAutocorrWordList( const SvxAutocorrWordList& ) = delete;
+    const SvxAutocorrWordList& operator= ( const SvxAutocorrWordList& ) = delete;
 
     const SvxAutocorrWord* WordMatches(const SvxAutocorrWord *pFnd,
                                        const OUString &rTxt,
diff --git a/include/editeng/txtrange.hxx b/include/editeng/txtrange.hxx
index 2069152a58c9..09897e0904ee 100644
--- a/include/editeng/txtrange.hxx
+++ b/include/editeng/txtrange.hxx
@@ -57,7 +57,7 @@ class EDITENG_DLLPUBLIC TextRanger
                             // FALSE: Objekt flow (StarWriter);
     bool       bVertical :1;// for vertical writing mode
 
-    TextRanger( const TextRanger& ) SAL_DELETED_FUNCTION;
+    TextRanger( const TextRanger& ) = delete;
     const Rectangle& _GetBoundRect();
 public:
     TextRanger( const basegfx::B2DPolyPolygon& rPolyPolygon,
diff --git a/include/editeng/unoedprx.hxx b/include/editeng/unoedprx.hxx
index 90071d52a5e7..9d61c2b01956 100644
--- a/include/editeng/unoedprx.hxx
+++ b/include/editeng/unoedprx.hxx
@@ -156,8 +156,8 @@ public:
     bool        IsValid() const { return mbEditSourceValid;}
 
 private:
-    SvxEditSourceAdapter( const SvxEditSourceAdapter& ) SAL_DELETED_FUNCTION;
-    SvxEditSourceAdapter& operator= ( const SvxEditSourceAdapter& ) SAL_DELETED_FUNCTION;
+    SvxEditSourceAdapter( const SvxEditSourceAdapter& ) = delete;
+    SvxEditSourceAdapter& operator= ( const SvxEditSourceAdapter& ) = delete;
 
     ::std::unique_ptr< SvxEditSource >    mpAdaptee;
 
diff --git a/include/editeng/unolingu.hxx b/include/editeng/unolingu.hxx
index 06e890081bd4..113d1b35b8ca 100644
--- a/include/editeng/unolingu.hxx
+++ b/include/editeng/unolingu.hxx
@@ -81,8 +81,8 @@ class EDITENG_DLLPUBLIC LinguMgr
     static ::com::sun::star::uno::Reference<
         ::com::sun::star::linguistic2::XDictionary >    GetChangeAll();
 
-    LinguMgr(const LinguMgr &) SAL_DELETED_FUNCTION;
-    LinguMgr & operator = (const LinguMgr &) SAL_DELETED_FUNCTION;
+    LinguMgr(const LinguMgr &) = delete;
+    LinguMgr & operator = (const LinguMgr &) = delete;
 
 public:
 
@@ -146,8 +146,8 @@ private:
     ::com::sun::star::uno::Reference<
         ::com::sun::star::linguistic2::XSearchableDictionaryList >    xDicList;
 
-    SvxDicListChgClamp(const SvxDicListChgClamp &) SAL_DELETED_FUNCTION;
-    SvxDicListChgClamp & operator = (const SvxDicListChgClamp &) SAL_DELETED_FUNCTION;
+    SvxDicListChgClamp(const SvxDicListChgClamp &) = delete;
+    SvxDicListChgClamp & operator = (const SvxDicListChgClamp &) = delete;
 
 public:
     SvxDicListChgClamp( ::com::sun::star::uno::Reference<
diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx
index 4f390f5a73be..97e19871c708 100644
--- a/include/filter/msfilter/escherex.hxx
+++ b/include/filter/msfilter/escherex.hxx
@@ -1338,8 +1338,8 @@ public:
     sal_uInt16 GetHellLayerId() const           { return mnHellLayerId; }
 
 private:
-                        EscherEx( const EscherEx& ) SAL_DELETED_FUNCTION;
-    EscherEx&           operator=( const EscherEx& ) SAL_DELETED_FUNCTION;
+                        EscherEx( const EscherEx& ) = delete;
+    EscherEx&           operator=( const EscherEx& ) = delete;
 
     // prevent C-style cast to former base class EscherGraphicProvider
     operator EscherGraphicProvider&();
diff --git a/include/filter/msfilter/mscodec.hxx b/include/filter/msfilter/mscodec.hxx
index 3f8339910c28..f8f5b728365f 100644
--- a/include/filter/msfilter/mscodec.hxx
+++ b/include/filter/msfilter/mscodec.hxx
@@ -122,8 +122,8 @@ protected:
     sal_Size            mnOffset;       /// Key offset.
 
 private:
-                        MSCodec_Xor95( const MSCodec_Xor95& ) SAL_DELETED_FUNCTION;
-    MSCodec_Xor95&      operator=( const MSCodec_Xor95& ) SAL_DELETED_FUNCTION;
+                        MSCodec_Xor95( const MSCodec_Xor95& ) = delete;
+    MSCodec_Xor95&      operator=( const MSCodec_Xor95& ) = delete;
 
     sal_uInt16          mnKey;          /// Base key from password.
     sal_uInt16          mnHash;         /// Hash value from password.
@@ -346,8 +346,8 @@ public:
     void                GetDigestFromSalt( const sal_uInt8 pSaltData[16], sal_uInt8 pDigest[16] );
 
 private:
-                        MSCodec_Std97( const MSCodec_Std97& ) SAL_DELETED_FUNCTION;
-    MSCodec_Std97&      operator=( const MSCodec_Std97& ) SAL_DELETED_FUNCTION;
+                        MSCodec_Std97( const MSCodec_Std97& ) = delete;
+    MSCodec_Std97&      operator=( const MSCodec_Std97& ) = delete;
 
     rtlCipher           m_hCipher;
     rtlDigest           m_hDigest;
diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx
index 8e6d419318f4..6d2fe9056e84 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -264,7 +264,7 @@ struct MSFILTER_DLLPUBLIC SvxMSDffImportRec
     {   return nShapeId < rEntry.nShapeId;  }
 
 private:
-    SvxMSDffImportRec &operator=(const SvxMSDffImportRec&) SAL_DELETED_FUNCTION;
+    SvxMSDffImportRec &operator=(const SvxMSDffImportRec&) = delete;
 };
 
 /** list of all SvxMSDffImportRec instances of/for a group */
diff --git a/include/filter/msfilter/mstoolbar.hxx b/include/filter/msfilter/mstoolbar.hxx
index 8d3704e3a5d8..efe06121754d 100644
--- a/include/filter/msfilter/mstoolbar.hxx
+++ b/include/filter/msfilter/mstoolbar.hxx
@@ -118,8 +118,8 @@ class MSFILTER_DLLPUBLIC TBCExtraInfo : public TBBase
     sal_Int8 tbcu;
     sal_Int8 tbmg;
 
-    TBCExtraInfo(const TBCExtraInfo&) SAL_DELETED_FUNCTION;
-    TBCExtraInfo& operator = ( const TBCExtraInfo&) SAL_DELETED_FUNCTION;
+    TBCExtraInfo(const TBCExtraInfo&) = delete;
+    TBCExtraInfo& operator = ( const TBCExtraInfo&) = delete;
 public:
     TBCExtraInfo();
     virtual ~TBCExtraInfo(){}
@@ -283,8 +283,8 @@ class MSFILTER_DLLPUBLIC TBCData : public TBBase
     TBCHeader rHeader;
     TBCGeneralInfo controlGeneralInfo;
     std::shared_ptr< TBBase > controlSpecificInfo; // can be one of TBCBSpecific, TBCMenuSpecific or TBCComboDropdow nSpecific depending on the control type specified by TBCHeader.tct
-    TBCData(const TBCData&) SAL_DELETED_FUNCTION;
-    TBCData& operator = ( const TBCData&) SAL_DELETED_FUNCTION;
+    TBCData(const TBCData&) = delete;
+    TBCData& operator = ( const TBCData&) = delete;
 public:
     TBCData( const TBCHeader& Header );
     virtual ~TBCData(){}
diff --git a/include/formula/FormulaCompiler.hxx b/include/formula/FormulaCompiler.hxx
index 6d6ed22dfe54..867d4f161bf3 100644
--- a/include/formula/FormulaCompiler.hxx
+++ b/include/formula/FormulaCompiler.hxx
@@ -66,8 +66,8 @@ typedef std::unordered_map< OUString, OUString, OUStringHash, ::std::equal_to< O
 class FORMULA_DLLPUBLIC FormulaCompiler
 {
 private:
-    FormulaCompiler(const FormulaCompiler&) SAL_DELETED_FUNCTION;
-    FormulaCompiler& operator=(const FormulaCompiler&) SAL_DELETED_FUNCTION;
+    FormulaCompiler(const FormulaCompiler&) = delete;
+    FormulaCompiler& operator=(const FormulaCompiler&) = delete;
 public:
     FormulaCompiler();
     FormulaCompiler(FormulaTokenArray& _rArr);
@@ -85,8 +85,8 @@ public:
         bool                    mbCore      : 1;            /// If mapping was setup by core, not filters
         bool                    mbEnglish   : 1;            /// If English symbols and external names
 
-        OpCodeMap( const OpCodeMap& ) SAL_DELETED_FUNCTION;
-        OpCodeMap& operator=( const OpCodeMap& ) SAL_DELETED_FUNCTION;
+        OpCodeMap( const OpCodeMap& ) = delete;
+        OpCodeMap& operator=( const OpCodeMap& ) = delete;
 
     public:
 
@@ -367,8 +367,8 @@ private:
     {
         FormulaTokenRef  pPrevFac;
         FormulaCompiler* pCompiler;
-        CurrentFactor( const CurrentFactor& ) SAL_DELETED_FUNCTION;
-        CurrentFactor& operator=( const CurrentFactor& ) SAL_DELETED_FUNCTION;
+        CurrentFactor( const CurrentFactor& ) = delete;
+        CurrentFactor& operator=( const CurrentFactor& ) = delete;
     public:
         explicit CurrentFactor( FormulaCompiler* pComp )
             : pPrevFac( pComp->pCurrentFactorToken )
diff --git a/include/formula/token.hxx b/include/formula/token.hxx
index c87a3c525ef9..7bf22618f3fd 100644
--- a/include/formula/token.hxx
+++ b/include/formula/token.hxx
@@ -94,7 +94,7 @@ class FormulaTokenArray;
 class FORMULA_DLLPUBLIC FormulaToken : public IFormulaToken
 {
     OpCode                      eOp;
-            FormulaToken&            operator=( const FormulaToken& ) SAL_DELETED_FUNCTION;
+            FormulaToken&            operator=( const FormulaToken& ) = delete;
 protected:
 
             const StackVar      eType;          // type of data
diff --git a/include/framework/menuconfiguration.hxx b/include/framework/menuconfiguration.hxx
index 7d35c558b8e3..c2350e9d530d 100644
--- a/include/framework/menuconfiguration.hxx
+++ b/include/framework/menuconfiguration.hxx
@@ -76,7 +76,7 @@ private:
     {
     }
 
-    MenuAttributes(const MenuAttributes&) SAL_DELETED_FUNCTION;
+    MenuAttributes(const MenuAttributes&) = delete;
 
 public:
     OUString aTargetFrame;
diff --git a/include/i18nutil/oneToOneMapping.hxx b/include/i18nutil/oneToOneMapping.hxx
index cde6681e2089..76405078c340 100644
--- a/include/i18nutil/oneToOneMapping.hxx
+++ b/include/i18nutil/oneToOneMapping.hxx
@@ -43,8 +43,8 @@ struct UnicodePairWithFlag
 class I18NUTIL_DLLPUBLIC oneToOneMapping
 {
 private:
-    oneToOneMapping(const oneToOneMapping&) SAL_DELETED_FUNCTION;
-    oneToOneMapping& operator=(const oneToOneMapping&) SAL_DELETED_FUNCTION;
+    oneToOneMapping(const oneToOneMapping&) = delete;
+    oneToOneMapping& operator=(const oneToOneMapping&) = delete;
 public:
     oneToOneMapping( OneToOneMappingTable_t *rpTable, const size_t rnSize, const size_t rnUnitSize = sizeof(OneToOneMappingTable_t) );
     virtual ~oneToOneMapping();
@@ -63,8 +63,8 @@ protected:
 class I18NUTIL_DLLPUBLIC oneToOneMappingWithFlag : public oneToOneMapping
 {
 private:
-    oneToOneMappingWithFlag(const oneToOneMappingWithFlag&) SAL_DELETED_FUNCTION;
-    oneToOneMappingWithFlag& operator=(const oneToOneMappingWithFlag&) SAL_DELETED_FUNCTION;
+    oneToOneMappingWithFlag(const oneToOneMappingWithFlag&) = delete;
+    oneToOneMappingWithFlag& operator=(const oneToOneMappingWithFlag&) = delete;
 
     friend class widthfolding;
 
diff --git a/include/jvmaccess/unovirtualmachine.hxx b/include/jvmaccess/unovirtualmachine.hxx
index 5b0e785dec23..7b34b5f71a46 100644
--- a/include/jvmaccess/unovirtualmachine.hxx
+++ b/include/jvmaccess/unovirtualmachine.hxx
@@ -88,8 +88,8 @@ public:
     void * getClassLoader() const { return m_classLoader;}
 
 private:
-    UnoVirtualMachine(UnoVirtualMachine &) SAL_DELETED_FUNCTION;
-    void operator =(UnoVirtualMachine &) SAL_DELETED_FUNCTION;
+    UnoVirtualMachine(UnoVirtualMachine &) = delete;
+    void operator =(UnoVirtualMachine &) = delete;
 
     virtual ~UnoVirtualMachine();
 
diff --git a/include/jvmaccess/virtualmachine.hxx b/include/jvmaccess/virtualmachine.hxx
index 0493e30d4978..b27ce89840bb 100644
--- a/include/jvmaccess/virtualmachine.hxx
+++ b/include/jvmaccess/virtualmachine.hxx
@@ -82,8 +82,8 @@ public:
         inline JNIEnv * getEnvironment() const { return m_pEnvironment; }
 
     private:
-        AttachGuard(AttachGuard &) SAL_DELETED_FUNCTION;
-        void operator =(AttachGuard) SAL_DELETED_FUNCTION;
+        AttachGuard(AttachGuard &) = delete;
+        void operator =(AttachGuard) = delete;
 
         rtl::Reference< VirtualMachine > m_xMachine;
         JNIEnv * m_pEnvironment;
@@ -128,8 +128,8 @@ public:
                    JNIEnv * pMainThreadEnv);
 
 private:
-    VirtualMachine(VirtualMachine &) SAL_DELETED_FUNCTION;
-    void operator =(VirtualMachine) SAL_DELETED_FUNCTION;
+    VirtualMachine(VirtualMachine &) = delete;
+    void operator =(VirtualMachine) = delete;
 
     virtual ~VirtualMachine();
 
diff --git a/include/linguistic/hyphdta.hxx b/include/linguistic/hyphdta.hxx
index 14768ca9700b..af0cb3bd54c2 100644
--- a/include/linguistic/hyphdta.hxx
+++ b/include/linguistic/hyphdta.hxx
@@ -41,8 +41,8 @@ class HyphenatedWord :
     sal_Int16    nLanguage;
     bool         bIsAltSpelling;
 
-    HyphenatedWord(const HyphenatedWord &) SAL_DELETED_FUNCTION;
-    HyphenatedWord & operator = (const HyphenatedWord &) SAL_DELETED_FUNCTION;
+    HyphenatedWord(const HyphenatedWord &) = delete;
+    HyphenatedWord & operator = (const HyphenatedWord &) = delete;
 
 public:
     HyphenatedWord(const OUString &rWord, sal_Int16 nLang, sal_Int16 nHyphenationPos,
@@ -86,8 +86,8 @@ class PossibleHyphens :
     ::com::sun::star::uno::Sequence< sal_Int16 >    aOrigHyphenPos;
     sal_Int16                       nLanguage;
 
-    PossibleHyphens(const PossibleHyphens &) SAL_DELETED_FUNCTION;
-    PossibleHyphens & operator = (const PossibleHyphens &) SAL_DELETED_FUNCTION;
+    PossibleHyphens(const PossibleHyphens &) = delete;
+    PossibleHyphens & operator = (const PossibleHyphens &) = delete;
 
 public:
     PossibleHyphens(const OUString &rWord, sal_Int16 nLang,
diff --git a/include/linguistic/lngprophelp.hxx b/include/linguistic/lngprophelp.hxx
index 75780566766c..ce8c6b73bca3 100644
--- a/include/linguistic/lngprophelp.hxx
+++ b/include/linguistic/lngprophelp.hxx
@@ -75,8 +75,8 @@ class PropertyChgHelper :
     bool    bResIsIgnoreControlCharacters;
     bool    bResIsUseDictionaryList;
 
-    PropertyChgHelper( const PropertyChgHelper & ) SAL_DELETED_FUNCTION;
-    PropertyChgHelper & operator = ( const PropertyChgHelper & ) SAL_DELETED_FUNCTION;
+    PropertyChgHelper( const PropertyChgHelper & ) = delete;
+    PropertyChgHelper & operator = ( const PropertyChgHelper & ) = delete;
 
 protected:
     virtual void    SetDefaultValues();
@@ -146,8 +146,8 @@ public:
 class PropertyHelper_Thes :
     public PropertyChgHelper
 {
-    PropertyHelper_Thes( const PropertyHelper_Thes & ) SAL_DELETED_FUNCTION;
-    PropertyHelper_Thes & operator = ( const PropertyHelper_Thes & ) SAL_DELETED_FUNCTION;
+    PropertyHelper_Thes( const PropertyHelper_Thes & ) = delete;
+    PropertyHelper_Thes & operator = ( const PropertyHelper_Thes & ) = delete;
 
 public:
     PropertyHelper_Thes(
@@ -199,8 +199,8 @@ class LNG_DLLPUBLIC PropertyHelper_Spell :
     bool        bResIsSpellWithDigits;
     bool        bResIsSpellCapitalization;
 
-    PropertyHelper_Spell( const PropertyHelper_Spell & ) SAL_DELETED_FUNCTION;
-    PropertyHelper_Spell & operator = ( const PropertyHelper_Spell & ) SAL_DELETED_FUNCTION;
+    PropertyHelper_Spell( const PropertyHelper_Spell & ) = delete;
+    PropertyHelper_Spell & operator = ( const PropertyHelper_Spell & ) = delete;
 
 protected:
     // PropertyChgHelper
@@ -279,8 +279,8 @@ class PropertyHelper_Hyphen :
             nResHyphMinTrailing,
             nResHyphMinWordLength;
 
-    PropertyHelper_Hyphen( const PropertyHelper_Hyphen & ) SAL_DELETED_FUNCTION;
-    PropertyHelper_Hyphen & operator = ( const PropertyHelper_Hyphen & ) SAL_DELETED_FUNCTION;
+    PropertyHelper_Hyphen( const PropertyHelper_Hyphen & ) = delete;
+    PropertyHelper_Hyphen & operator = ( const PropertyHelper_Hyphen & ) = delete;
 
 protected:
     // PropertyChgHelper
diff --git a/include/oox/core/contexthandler.hxx b/include/oox/core/contexthandler.hxx
index a6de85d3e56b..78e519df4d26 100644
--- a/include/oox/core/contexthandler.hxx
+++ b/include/oox/core/contexthandler.hxx
@@ -98,7 +98,7 @@ protected:
 #endif
 
 private:
-    ContextHandler&     operator=( const ContextHandler& ) SAL_DELETED_FUNCTION;
+    ContextHandler&     operator=( const ContextHandler& ) = delete;
 
 private:
     FragmentBaseDataRef mxBaseData;         ///< Base data of the fragment.
diff --git a/include/oox/core/contexthandler2.hxx b/include/oox/core/contexthandler2.hxx
index 048a2eca11f2..c94bda415ded 100644
--- a/include/oox/core/contexthandler2.hxx
+++ b/include/oox/core/contexthandler2.hxx
@@ -190,7 +190,7 @@ protected:
     void                implEndRecord( sal_Int32 nRecId );
 
 private:
-    ContextHandler2Helper& operator=( const ContextHandler2Helper& ) SAL_DELETED_FUNCTION;
+    ContextHandler2Helper& operator=( const ContextHandler2Helper& ) = delete;
 
     ElementInfo&        pushElementInfo( sal_Int32 nElement );
     void                popElementInfo();
diff --git a/include/oox/drawingml/chart/chartconverter.hxx b/include/oox/drawingml/chart/chartconverter.hxx
index 2be69748e99e..d459f54bc428 100644
--- a/include/oox/drawingml/chart/chartconverter.hxx
+++ b/include/oox/drawingml/chart/chartconverter.hxx
@@ -89,8 +89,8 @@ public:
             const DataSequenceModel& rDataSeq, const OUString& rRole );
 
 private:
-                        ChartConverter( const ChartConverter& ) SAL_DELETED_FUNCTION;
-    ChartConverter&     operator=( const ChartConverter& ) SAL_DELETED_FUNCTION;
+                        ChartConverter( const ChartConverter& ) = delete;
+    ChartConverter&     operator=( const ChartConverter& ) = delete;
 };
 
 
diff --git a/include/oox/dump/dumperbase.hxx b/include/oox/dump/dumperbase.hxx
index f9d3a1b9b34d..8e5355e2069d 100644
--- a/include/oox/dump/dumperbase.hxx
+++ b/include/oox/dump/dumperbase.hxx
@@ -1094,8 +1094,8 @@ public:
     explicit            IndentGuard( const OutputRef& rxOut ) : mrOut( *rxOut ) { mrOut.incIndent(); }
                         ~IndentGuard() { mrOut.decIndent(); }
 private:
-                        IndentGuard( const IndentGuard& ) SAL_DELETED_FUNCTION;
-    IndentGuard&        operator=( const IndentGuard& ) SAL_DELETED_FUNCTION;
+                        IndentGuard( const IndentGuard& ) = delete;
+    IndentGuard&        operator=( const IndentGuard& ) = delete;
 private:
     Output&             mrOut;
 };
@@ -1117,8 +1117,8 @@ public:
                         ~TableGuard() { mrOut.endTable(); }
     void                tab( size_t nCol ) { mrOut.tab( nCol ); }
 private:
-                        TableGuard( const TableGuard& ) SAL_DELETED_FUNCTION;
-    TableGuard&         operator=( const TableGuard& ) SAL_DELETED_FUNCTION;
+                        TableGuard( const TableGuard& ) = delete;
+    TableGuard&         operator=( const TableGuard& ) = delete;
 private:
     Output&             mrOut;
 };
@@ -1133,8 +1133,8 @@ public:
                         ~ItemGuard() { mrOut.endItem(); }
     void                cont() { mrOut.contItem(); }
 private:
-                        ItemGuard( const ItemGuard& ) SAL_DELETED_FUNCTION;
-    ItemGuard&          operator=( const ItemGuard& ) SAL_DELETED_FUNCTION;
+                        ItemGuard( const ItemGuard& ) = delete;
+    ItemGuard&          operator=( const ItemGuard& ) = delete;
 private:
     Output&             mrOut;
 };
@@ -1147,8 +1147,8 @@ public:
     explicit            MultiItemsGuard( const OutputRef& rxOut ) : mrOut( *rxOut ) { mrOut.startMultiItems(); }
                         ~MultiItemsGuard() { mrOut.endMultiItems(); }
 private:
-                        MultiItemsGuard( const MultiItemsGuard& ) SAL_DELETED_FUNCTION;
-    MultiItemsGuard&    operator=( const MultiItemsGuard& ) SAL_DELETED_FUNCTION;
+                        MultiItemsGuard( const MultiItemsGuard& ) = delete;
+    MultiItemsGuard&    operator=( const MultiItemsGuard& ) = delete;
 private:
     Output&             mrOut;
 };
diff --git a/include/oox/helper/binarystreambase.hxx b/include/oox/helper/binarystreambase.hxx
index 9f669a9fff30..4078fc68f5ac 100644
--- a/include/oox/helper/binarystreambase.hxx
+++ b/include/oox/helper/binarystreambase.hxx
@@ -107,8 +107,8 @@ protected:
     explicit            BinaryStreamBase( bool bSeekable ) : mbEof( false ), mbSeekable( bSeekable ) {}
 
 private:
-                        BinaryStreamBase( const BinaryStreamBase& ) SAL_DELETED_FUNCTION;
-    BinaryStreamBase&   operator=( const BinaryStreamBase& ) SAL_DELETED_FUNCTION;
+                        BinaryStreamBase( const BinaryStreamBase& ) = delete;
+    BinaryStreamBase&   operator=( const BinaryStreamBase& ) = delete;
 
 protected:
     bool                mbEof;          ///< End of stream flag.
diff --git a/include/oox/helper/storagebase.hxx b/include/oox/helper/storagebase.hxx
index 52196dab93c1..f073b292de2d 100644
--- a/include/oox/helper/storagebase.hxx
+++ b/include/oox/helper/storagebase.hxx
@@ -138,8 +138,8 @@ protected:
     explicit            StorageBase( const StorageBase& rParentStorage, const OUString& rStorageName, bool bReadOnly );
 
 private:
-                        StorageBase( const StorageBase& ) SAL_DELETED_FUNCTION;
-    StorageBase&        operator=( const StorageBase& ) SAL_DELETED_FUNCTION;
+                        StorageBase( const StorageBase& ) = delete;
+    StorageBase&        operator=( const StorageBase& ) = delete;
 
     /** Returns true, if the object represents a valid storage. */
     virtual bool        implIsStorage() const = 0;
diff --git a/include/oox/ole/vbaproject.hxx b/include/oox/ole/vbaproject.hxx
index 6325b23fe12a..dac147affb23 100644
--- a/include/oox/ole/vbaproject.hxx
+++ b/include/oox/ole/vbaproject.hxx
@@ -153,8 +153,8 @@ protected:
     virtual void        prepareImport();
 
 private:
-                        VbaProject( const VbaProject& ) SAL_DELETED_FUNCTION;
-    VbaProject&         operator=( const VbaProject& ) SAL_DELETED_FUNCTION;
+                        VbaProject( const VbaProject& ) = delete;
+    VbaProject&         operator=( const VbaProject& ) = delete;
 
     /** Returns the Basic or dialog library container. */
     ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer >
diff --git a/include/registry/writer.hxx b/include/registry/writer.hxx
index d1d04dd8f0fa..d7c94faf7dd5 100644
--- a/include/registry/writer.hxx
+++ b/include/registry/writer.hxx
@@ -278,8 +278,8 @@ public:
     }
 
 private:
-    Writer(Writer &) SAL_DELETED_FUNCTION;
-    void operator =(Writer) SAL_DELETED_FUNCTION;
+    Writer(Writer &) = delete;
+    void operator =(Writer) = delete;
 
     void * m_handle;
 };
diff --git a/include/sfx2/Metadatable.hxx b/include/sfx2/Metadatable.hxx
index 0cd51ecf163d..fa265a34a331 100644
--- a/include/sfx2/Metadatable.hxx
+++ b/include/sfx2/Metadatable.hxx
@@ -120,8 +120,8 @@ public:
         ::com::sun::star::rdf::XMetadatable > MakeUnoObject() = 0;
 
 private:
-    Metadatable(const Metadatable&) SAL_DELETED_FUNCTION;
-    Metadatable& operator=(const Metadatable&) SAL_DELETED_FUNCTION;
+    Metadatable(const Metadatable&) = delete;
+    Metadatable& operator=(const Metadatable&) = delete;
 
     friend class MetadatableClipboard;
     friend class MetadatableUndo;
diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx
index 4287d1df9a2a..176e248f6894 100644
--- a/include/sfx2/basedlgs.hxx
+++ b/include/sfx2/basedlgs.hxx
@@ -60,8 +60,8 @@ class SFX2_DLLPUBLIC SfxModalDialog: public ModalDialog
     SfxItemSet*             pOutputSet;
 
 private:
-    SfxModalDialog(SfxModalDialog &) SAL_DELETED_FUNCTION;
-    void operator =(SfxModalDialog &) SAL_DELETED_FUNCTION;
+    SfxModalDialog(SfxModalDialog &) = delete;
+    void operator =(SfxModalDialog &) = delete;
 
     SAL_DLLPRIVATE void SetDialogData_Impl();
     SAL_DLLPRIVATE void GetDialogData_Impl();
@@ -94,8 +94,8 @@ class SFX2_DLLPUBLIC SfxModelessDialog: public ModelessDialog
     Size                    aSize;
     SfxModelessDialog_Impl* pImp;
 
-    SfxModelessDialog(SfxModelessDialog &) SAL_DELETED_FUNCTION;
-    void operator =(SfxModelessDialog &) SAL_DELETED_FUNCTION;
+    SfxModelessDialog(SfxModelessDialog &) = delete;
+    void operator =(SfxModelessDialog &) = delete;
 
     void Init(SfxBindings *pBindinx, SfxChildWindow *pCW);
 
@@ -128,8 +128,8 @@ class SFX2_DLLPUBLIC SfxFloatingWindow: public FloatingWindow
     Size                    aSize;
     SfxFloatingWindow_Impl* pImp;
 
-    SfxFloatingWindow(SfxFloatingWindow &) SAL_DELETED_FUNCTION;
-    void operator =(SfxFloatingWindow &) SAL_DELETED_FUNCTION;
+    SfxFloatingWindow(SfxFloatingWindow &) = delete;
+    void operator =(SfxFloatingWindow &) = delete;
 
 protected:
                             SfxFloatingWindow( SfxBindings *pBindings,
diff --git a/include/sfx2/controlwrapper.hxx b/include/sfx2/controlwrapper.hxx
index 42aaab620fbd..5ef71e41e0bc 100644
--- a/include/sfx2/controlwrapper.hxx
+++ b/include/sfx2/controlwrapper.hxx
@@ -162,8 +162,8 @@ public:
     virtual void        SetControlDontKnow( bool bSet ) = 0;
 
 private:
-                        ControlWrapperBase( const ControlWrapperBase& ) SAL_DELETED_FUNCTION;
-    ControlWrapperBase& operator=( const ControlWrapperBase& ) SAL_DELETED_FUNCTION;
+                        ControlWrapperBase( const ControlWrapperBase& ) = delete;
+    ControlWrapperBase& operator=( const ControlWrapperBase& ) = delete;
 };
 
 
diff --git a/include/sfx2/docfac.hxx b/include/sfx2/docfac.hxx
index ea8d0e8b5060..ccc1baa086c9 100644
--- a/include/sfx2/docfac.hxx
+++ b/include/sfx2/docfac.hxx
@@ -82,8 +82,8 @@ public:
     SAL_DLLPRIVATE sal_uInt16 GetViewNo_Impl( const sal_uInt16 i_nViewId, const sal_uInt16 i_nFallback ) const;
 
 private:
-    SfxObjectFactory(const SfxObjectFactory&) SAL_DELETED_FUNCTION;
-    const SfxObjectFactory& operator=(const SfxObjectFactory &) SAL_DELETED_FUNCTION;
+    SfxObjectFactory(const SfxObjectFactory&) = delete;
+    const SfxObjectFactory& operator=(const SfxObjectFactory &) = delete;
 };
 
 #define SFX_DECL_OBJECTFACTORY()                                            \
diff --git a/include/sfx2/dockwin.hxx b/include/sfx2/dockwin.hxx
index 1933be7cd757..984fa53ae892 100644
--- a/include/sfx2/dockwin.hxx
+++ b/include/sfx2/dockwin.hxx
@@ -47,8 +47,8 @@ private:
     SfxChildWindow*         pMgr;
     SfxDockingWindow_Impl*  pImp;
 
-    SfxDockingWindow(SfxDockingWindow &) SAL_DELETED_FUNCTION;
-    void operator =(SfxDockingWindow &) SAL_DELETED_FUNCTION;
+    SfxDockingWindow(SfxDockingWindow &) = delete;
+    void operator =(SfxDockingWindow &) = delete;
 
 protected:
     SfxChildAlignment   CalcAlignment(const Point& rPos, Rectangle& rRect );
diff --git a/include/sfx2/docstoragemodifylistener.hxx b/include/sfx2/docstoragemodifylistener.hxx
index e2b845ed589f..740f5c3334c0 100644
--- a/include/sfx2/docstoragemodifylistener.hxx
+++ b/include/sfx2/docstoragemodifylistener.hxx
@@ -73,8 +73,8 @@ namespace sfx2
         virtual ~DocumentStorageModifyListener();
 
     private:
-        DocumentStorageModifyListener( const DocumentStorageModifyListener& ) SAL_DELETED_FUNCTION;
-        DocumentStorageModifyListener& operator=( const DocumentStorageModifyListener& ) SAL_DELETED_FUNCTION;
+        DocumentStorageModifyListener( const DocumentStorageModifyListener& ) = delete;
+        DocumentStorageModifyListener& operator=( const DocumentStorageModifyListener& ) = delete;
     };
 
 
diff --git a/include/sfx2/itemconnect.hxx b/include/sfx2/itemconnect.hxx
index ceaea4963b7d..1f10eaa2a6ed 100644
--- a/include/sfx2/itemconnect.hxx
+++ b/include/sfx2/itemconnect.hxx
@@ -206,8 +206,8 @@ protected:
     TriState            GetShowState( bool bKnown ) const;
 
 private:
-                        ItemConnectionBase( const ItemConnectionBase& ) SAL_DELETED_FUNCTION;
-    ItemConnectionBase& operator=( const ItemConnectionBase& ) SAL_DELETED_FUNCTION;
+                        ItemConnectionBase( const ItemConnectionBase& ) = delete;
+    ItemConnectionBase& operator=( const ItemConnectionBase& ) = delete;
 
     ItemConnFlags       mnFlags;    /// Flags for additional options.
 };
diff --git a/include/sfx2/linkmgr.hxx b/include/sfx2/linkmgr.hxx
index 6d4bc03fd6ae..24a23dfa6e02 100644
--- a/include/sfx2/linkmgr.hxx
+++ b/include/sfx2/linkmgr.hxx
@@ -160,8 +160,8 @@ public:
                                 Graphic& rGrf );
 
 private:
-                LinkManager( const LinkManager& ) SAL_DELETED_FUNCTION;
-                LinkManager& operator=( const LinkManager& ) SAL_DELETED_FUNCTION;
+                LinkManager( const LinkManager& ) = delete;
+                LinkManager& operator=( const LinkManager& ) = delete;
 };
 
 // Separator in the link name for the DDE-/File-/Graphics- links
diff --git a/include/sfx2/mnumgr.hxx b/include/sfx2/mnumgr.hxx
index ab0292ccf00e..57dc874ab781 100644
--- a/include/sfx2/mnumgr.hxx
+++ b/include/sfx2/mnumgr.hxx
@@ -75,8 +75,8 @@ private:
     // if we don't delete the pointer that got created in SfxPopupMenuManager::Popup
     static PopupMenu *  pStaticThesSubMenu;
 
-    SfxPopupMenuManager( const SfxPopupMenuManager& ) SAL_DELETED_FUNCTION;
-    SfxPopupMenuManager& operator=( const SfxPopupMenuManager& ) SAL_DELETED_FUNCTION;
+    SfxPopupMenuManager( const SfxPopupMenuManager& ) = delete;
+    SfxPopupMenuManager& operator=( const SfxPopupMenuManager& ) = delete;
 
 public:
                         SfxPopupMenuManager( PopupMenu*, SfxBindings& );
diff --git a/include/sfx2/opengrf.hxx b/include/sfx2/opengrf.hxx
index 69d5295436b8..bde7adbdfd19 100644
--- a/include/sfx2/opengrf.hxx
+++ b/include/sfx2/opengrf.hxx
@@ -46,8 +46,8 @@ public:
     OUString                GetCurrentFilter() const;
     void                    SetCurrentFilter(const OUString&);
 private:
-    SvxOpenGraphicDialog    (const SvxOpenGraphicDialog&) SAL_DELETED_FUNCTION;
-    SvxOpenGraphicDialog& operator = ( const SvxOpenGraphicDialog & ) SAL_DELETED_FUNCTION;
+    SvxOpenGraphicDialog    (const SvxOpenGraphicDialog&) = delete;
+    SvxOpenGraphicDialog& operator = ( const SvxOpenGraphicDialog & ) = delete;
 
     const std::unique_ptr< SvxOpenGrf_Impl >  mpImpl;
 };
diff --git a/include/sfx2/printer.hxx b/include/sfx2/printer.hxx
index dbcb94611c8f..18406941ebd8 100644
--- a/include/sfx2/printer.hxx
+++ b/include/sfx2/printer.hxx
@@ -39,7 +39,7 @@ private:
     SfxPrinter_Impl*        pImpl;
     bool                    bKnown;
 
-    SAL_DLLPRIVATE void operator =(SfxPrinter &) SAL_DELETED_FUNCTION;
+    SAL_DLLPRIVATE void operator =(SfxPrinter &) = delete;
 
 public:
                             SfxPrinter( SfxItemSet *pTheOptions );
diff --git a/include/sfx2/querystatus.hxx b/include/sfx2/querystatus.hxx
index 628fe451e3c6..af071b107cac 100644
--- a/include/sfx2/querystatus.hxx
+++ b/include/sfx2/querystatus.hxx
@@ -42,8 +42,8 @@ class SFX2_DLLPUBLIC SfxQueryStatus
         SfxItemState QueryState( SfxPoolItem*& pPoolItem );
 
     private:
-        SfxQueryStatus( const SfxQueryStatus& ) SAL_DELETED_FUNCTION;
-        SfxQueryStatus& operator=( const SfxQueryStatus& ) SAL_DELETED_FUNCTION;
+        SfxQueryStatus( const SfxQueryStatus& ) = delete;
+        SfxQueryStatus& operator=( const SfxQueryStatus& ) = delete;
 
         com::sun::star::uno::Reference< com::sun::star::frame::XStatusListener >   m_xStatusListener;
         SfxQueryStatus_Impl*                                                       m_pSfxQueryStatusImpl;
diff --git a/include/sfx2/request.hxx b/include/sfx2/request.hxx
index c796d0cd66dc..e9ac976a5025 100644
--- a/include/sfx2/request.hxx
+++ b/include/sfx2/request.hxx
@@ -107,7 +107,7 @@ public:
     void                ForgetAllArgs();
 
 private:
-    const SfxRequest&   operator=(const SfxRequest &) SAL_DELETED_FUNCTION;
+    const SfxRequest&   operator=(const SfxRequest &) = delete;
 };
 
 template<class T> bool checkSfxPoolItem(const SfxPoolItem* pItem)
diff --git a/include/sfx2/sfxstatuslistener.hxx b/include/sfx2/sfxstatuslistener.hxx
index 779a51c41e12..384c3c4293a5 100644
--- a/include/sfx2/sfxstatuslistener.hxx
+++ b/include/sfx2/sfxstatuslistener.hxx
@@ -60,8 +60,8 @@ class SFX2_DLLPUBLIC SfxStatusListener : public ::cppu::WeakImplHelper2<
         virtual void SAL_CALL statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     private:
-        SfxStatusListener( const SfxStatusListener& ) SAL_DELETED_FUNCTION;
-        SfxStatusListener& operator=( const SfxStatusListener& ) SAL_DELETED_FUNCTION;
+        SfxStatusListener( const SfxStatusListener& ) = delete;
+        SfxStatusListener& operator=( const SfxStatusListener& ) = delete;
 
         sal_uInt16                                                                          m_nSlotID;
         ::com::sun::star::util::URL                                                     m_aCommand;
diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx
index 28934216b54c..c9391a0b1749 100644
--- a/include/sfx2/shell.hxx
+++ b/include/sfx2/shell.hxx
@@ -142,8 +142,8 @@ class SFX2_DLLPUBLIC SfxShell: public SfxBroadcaster
     ::svl::IUndoManager*        pUndoMgr;
 
 private:
-                                SfxShell( const SfxShell & ) SAL_DELETED_FUNCTION;
-    SfxShell&                                   operator = ( const SfxShell & ) SAL_DELETED_FUNCTION;
+                                SfxShell( const SfxShell & ) = delete;
+    SfxShell&                                   operator = ( const SfxShell & ) = delete;
 
 protected:
     /**
diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx
index e0a1f0563ada..caa305582d5e 100644
--- a/include/sfx2/tbxctrl.hxx
+++ b/include/sfx2/tbxctrl.hxx
@@ -81,8 +81,8 @@ friend class SfxFrameStatusListener;
 private:
     SfxFrameStatusListener* GetOrCreateStatusListener();
 
-    SfxPopupWindow(SfxPopupWindow &) SAL_DELETED_FUNCTION;
-    void operator =(SfxPopupWindow &) SAL_DELETED_FUNCTION;
+    SfxPopupWindow(SfxPopupWindow &) = delete;
+    void operator =(SfxPopupWindow &) = delete;
     void Delete();
 
 protected:
diff --git a/include/sot/factory.hxx b/include/sot/factory.hxx
index 659dae88214c..03bdea2b4d11 100644
--- a/include/sot/factory.hxx
+++ b/include/sot/factory.hxx
@@ -56,8 +56,8 @@ public:
     bool                Is( const SotFactory * pSuperClass ) const;
 
 private:
-                        SotFactory( const SotFactory & ) SAL_DELETED_FUNCTION;
-    SotFactory &        operator = ( const SotFactory & ) SAL_DELETED_FUNCTION;
+                        SotFactory( const SotFactory & ) = delete;
+    SotFactory &        operator = ( const SotFactory & ) = delete;
 };
 
 #endif // _FACTORY_HXX
diff --git a/include/sot/object.hxx b/include/sot/object.hxx
index 4d140969c286..6699d925e0d2 100644
--- a/include/sot/object.hxx
+++ b/include/sot/object.hxx
@@ -55,8 +55,8 @@ public:
     bool                IsInClose() const { return bInClose; }
 
 private:
-    SotObject & operator = ( const SotObject & ) SAL_DELETED_FUNCTION;
-    SotObject( const SotObject & ) SAL_DELETED_FUNCTION;
+    SotObject & operator = ( const SotObject & ) = delete;
+    SotObject( const SotObject & ) = delete;
 };
 
 #endif // _IFACE_HXX
diff --git a/include/svl/SfxBroadcaster.hxx b/include/svl/SfxBroadcaster.hxx
index fc21f37f0bd4..c44e96ded1b4 100644
--- a/include/svl/SfxBroadcaster.hxx
+++ b/include/svl/SfxBroadcaster.hxx
@@ -34,7 +34,7 @@ class SVL_DLLPUBLIC SfxBroadcaster
 private:
     void                    AddListener( SfxListener& rListener );
     void                    RemoveListener( SfxListener& rListener );
-    const SfxBroadcaster&   operator=(const SfxBroadcaster &) SAL_DELETED_FUNCTION;
+    const SfxBroadcaster&   operator=(const SfxBroadcaster &) = delete;
 
 protected:
     void                    Forward(SfxBroadcaster& rBC, const SfxHint& rHint);
diff --git a/include/svl/broadcast.hxx b/include/svl/broadcast.hxx
index f34c0ad4c12f..934f591c3ba7 100644
--- a/include/svl/broadcast.hxx
+++ b/include/svl/broadcast.hxx
@@ -34,7 +34,7 @@ public:
     typedef std::vector<SvtListener*> ListenersType;
 
 private:
-    const SvtBroadcaster&   operator=(const SvtBroadcaster &) SAL_DELETED_FUNCTION;
+    const SvtBroadcaster&   operator=(const SvtBroadcaster &) = delete;
 
     /**
      * Ensure that the container doesn't contain any duplicated listener
diff --git a/include/svl/filerec.hxx b/include/svl/filerec.hxx
index fad39beded6d..3f7db59cc996 100644
--- a/include/svl/filerec.hxx
+++ b/include/svl/filerec.hxx
@@ -92,8 +92,8 @@ public:
     sal_uInt32      Close( bool bSeekToEndOfRec = true );
 
 private:
-    SfxMiniRecordWriter( const SfxMiniRecordWriter& ) SAL_DELETED_FUNCTION;
-    SfxMiniRecordWriter& operator=(const SfxMiniRecordWriter&) SAL_DELETED_FUNCTION;
+    SfxMiniRecordWriter( const SfxMiniRecordWriter& ) = delete;
+    SfxMiniRecordWriter& operator=(const SfxMiniRecordWriter&) = delete;
 };
 
 /** Reads simple record from a stream
@@ -262,8 +262,8 @@ public:
     inline void         Skip();
 
 private:
-    SfxMiniRecordReader( const SfxMiniRecordReader& ) SAL_DELETED_FUNCTION;
-    SfxMiniRecordReader& operator=(const SfxMiniRecordReader&) SAL_DELETED_FUNCTION;
+    SfxMiniRecordReader( const SfxMiniRecordReader& ) = delete;
+    SfxMiniRecordReader& operator=(const SfxMiniRecordReader&) = delete;
 };
 
 /**
diff --git a/include/svl/inethist.hxx b/include/svl/inethist.hxx
index fd4ff0356274..90a12bbb70fd 100644
--- a/include/svl/inethist.hxx
+++ b/include/svl/inethist.hxx
@@ -51,8 +51,8 @@ class SVL_DLLPUBLIC INetURLHistory : public SfxBroadcaster
 
     /** Not implemented.
     */
-    INetURLHistory (const INetURLHistory&) SAL_DELETED_FUNCTION;
-    INetURLHistory& operator= (const INetURLHistory&) SAL_DELETED_FUNCTION;
+    INetURLHistory (const INetURLHistory&) = delete;
+    INetURLHistory& operator= (const INetURLHistory&) = delete;
 
 public:
     /** GetOrCreate.
diff --git a/include/svl/itempool.hxx b/include/svl/itempool.hxx
index efc1c4a254c1..8098e415572a 100644
--- a/include/svl/itempool.hxx
+++ b/include/svl/itempool.hxx
@@ -221,7 +221,7 @@ public:
     static const SfxItemPool*       GetStoringPool();
 
 private:
-    const SfxItemPool&              operator=(const SfxItemPool &) SAL_DELETED_FUNCTION;
+    const SfxItemPool&              operator=(const SfxItemPool &) = delete;
 
     static const SfxItemPool*       pStoringPool_;
 };
diff --git a/include/svl/itemset.hxx b/include/svl/itemset.hxx
index f706e42fe01a..7203a5eaa876 100644
--- a/include/svl/itemset.hxx
+++ b/include/svl/itemset.hxx
@@ -60,7 +60,7 @@ public:
     SfxItemArray                GetItems_Impl() const { return m_pItems; }
 
 private:
-    const SfxItemSet&           operator=(const SfxItemSet &) SAL_DELETED_FUNCTION;
+    const SfxItemSet&           operator=(const SfxItemSet &) = delete;
 
 protected:
     // Notification-Callback
diff --git a/include/svl/listener.hxx b/include/svl/listener.hxx
index ed809faa4974..8ac8e08e91b3 100644
--- a/include/svl/listener.hxx
+++ b/include/svl/listener.hxx
@@ -31,7 +31,7 @@ class SVL_DLLPUBLIC SvtListener
     typedef std::unordered_set<SvtBroadcaster*> BroadcastersType;
     BroadcastersType maBroadcasters;
 
-    const SvtListener&  operator=(const SvtListener &) SAL_DELETED_FUNCTION;
+    const SvtListener&  operator=(const SvtListener &) = delete;
 
 public:
     class SVL_DLLPUBLIC QueryBase
diff --git a/include/svl/lstner.hxx b/include/svl/lstner.hxx
index 521c1979f9f3..e3ce43ff9cf0 100644
--- a/include/svl/lstner.hxx
+++ b/include/svl/lstner.hxx
@@ -31,7 +31,7 @@ class SVL_DLLPUBLIC SfxListener
     Impl* mpImpl;
 
 private:
-    const SfxListener&  operator=(const SfxListener &) SAL_DELETED_FUNCTION;
+    const SfxListener&  operator=(const SfxListener &) = delete;
 
 public:
     TYPEINFO();
diff --git a/include/svl/macitem.hxx b/include/svl/macitem.hxx
index 8046edaea427..b60c2be13f4f 100644
--- a/include/svl/macitem.hxx
+++ b/include/svl/macitem.hxx
@@ -147,7 +147,7 @@ private:
     SvxMacroTableDtor aMacroTable;
 
     inline SvxMacroItem( const SvxMacroItem& );
-    SvxMacroItem &operator=( const SvxMacroItem & ) SAL_DELETED_FUNCTION;
+    SvxMacroItem &operator=( const SvxMacroItem & ) = delete;
 };
 
 inline SvxMacroItem::SvxMacroItem( const sal_uInt16 nId )
diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx
index ad221b1b9c3e..edd9e2e91136 100644
--- a/include/svl/poolitem.hxx
+++ b/include/svl/poolitem.hxx
@@ -193,7 +193,7 @@ public:
     virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const;
 
 private:
-    SfxPoolItem&             operator=( const SfxPoolItem& ) SAL_DELETED_FUNCTION;
+    SfxPoolItem&             operator=( const SfxPoolItem& ) = delete;
 };
 
 inline void SfxPoolItem::SetRefCount( sal_uLong n )
@@ -250,7 +250,7 @@ inline bool IsInvalidItem(const SfxPoolItem *pItem)
 
 class SVL_DLLPUBLIC SfxVoidItem: public SfxPoolItem
 {
-    SfxVoidItem & operator=( const SfxVoidItem& ) SAL_DELETED_FUNCTION;
+    SfxVoidItem & operator=( const SfxVoidItem& ) = delete;
 public:
                             TYPEINFO_OVERRIDE();
                             explicit SfxVoidItem( sal_uInt16 nWhich );
@@ -274,7 +274,7 @@ class SVL_DLLPUBLIC SfxSetItem: public SfxPoolItem
 {
     SfxItemSet              *pSet;
 
-    SfxSetItem & operator=( const SfxSetItem& ) SAL_DELETED_FUNCTION;
+    SfxSetItem & operator=( const SfxSetItem& ) = delete;
 
 public:
                             TYPEINFO_OVERRIDE();
diff --git a/include/svl/sharedstringpool.hxx b/include/svl/sharedstringpool.hxx
index f44810b419c6..ae958ed220c4 100644
--- a/include/svl/sharedstringpool.hxx
+++ b/include/svl/sharedstringpool.hxx
@@ -29,8 +29,8 @@ class SVL_DLLPUBLIC SharedStringPool
     struct Impl;
     Impl* mpImpl;
 
-    SharedStringPool( const SharedStringPool& ) SAL_DELETED_FUNCTION;
-    SharedStringPool& operator=( const SharedStringPool& ) SAL_DELETED_FUNCTION;
+    SharedStringPool( const SharedStringPool& ) = delete;
+    SharedStringPool& operator=( const SharedStringPool& ) = delete;
 
 public:
     SharedStringPool( const CharClass* pCharClass );
diff --git a/include/svl/svdde.hxx b/include/svl/svdde.hxx
index 65bb65dd56c0..c634ae135000 100644
--- a/include/svl/svdde.hxx
+++ b/include/svl/svdde.hxx
@@ -127,8 +127,8 @@ private:
     friend class    DdeInternal;
     friend class    DdeConnection;
 
-                            DdeTransaction( const DdeTransaction& ) SAL_DELETED_FUNCTION;
-    const DdeTransaction&   operator= ( const DdeTransaction& ) SAL_DELETED_FUNCTION;
+                            DdeTransaction( const DdeTransaction& ) = delete;
+    const DdeTransaction&   operator= ( const DdeTransaction& ) = delete;
 
 };
 
@@ -230,8 +230,8 @@ public:
     const OUString  GetTopicName();
 
 private:
-                            DdeConnection( const DdeConnection& ) SAL_DELETED_FUNCTION;
-    const DdeConnection&    operator= ( const DdeConnection& ) SAL_DELETED_FUNCTION;
+                            DdeConnection( const DdeConnection& ) = delete;
+    const DdeConnection&    operator= ( const DdeConnection& ) = delete;
 };
 
 
@@ -325,8 +325,8 @@ public:
     const std::vector<DdeItem*>& GetItems() const  { return aItems; }
 
 private:
-                    DdeTopic( const DdeTopic& ) SAL_DELETED_FUNCTION;
-    const DdeTopic& operator= ( const DdeTopic& ) SAL_DELETED_FUNCTION;
+                    DdeTopic( const DdeTopic& ) = delete;
+    const DdeTopic& operator= ( const DdeTopic& ) = delete;
 };
 
 
diff --git a/include/svl/undo.hxx b/include/svl/undo.hxx
index bbae41f66cfb..bfb7f617de71 100644
--- a/include/svl/undo.hxx
+++ b/include/svl/undo.hxx
@@ -73,8 +73,8 @@ public:
     virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const;
 
 private:
-    SfxUndoAction( const SfxUndoAction& ) SAL_DELETED_FUNCTION;
-    SfxUndoAction& operator=( const SfxUndoAction& ) SAL_DELETED_FUNCTION;
+    SfxUndoAction( const SfxUndoAction& ) = delete;
+    SfxUndoAction& operator=( const SfxUndoAction& ) = delete;
 };
 
 
diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx
index c1b79e0ddf58..8703a031a05f 100644
--- a/include/svl/zforlist.hxx
+++ b/include/svl/zforlist.hxx
@@ -215,8 +215,8 @@ class SVL_DLLPUBLIC NfCurrencyEntry
     sal_uInt16      nDigits;            /// count of decimal digits
     sal_Unicode     cZeroChar;          /// which character is used for zeros as last decimal digits
 
-                        NfCurrencyEntry( const NfCurrencyEntry& ) SAL_DELETED_FUNCTION;
-    NfCurrencyEntry&    operator=( const NfCurrencyEntry& ) SAL_DELETED_FUNCTION;
+                        NfCurrencyEntry( const NfCurrencyEntry& ) = delete;
+    NfCurrencyEntry&    operator=( const NfCurrencyEntry& ) = delete;
 
 private:
 
diff --git a/include/svtools/acceleratorexecute.hxx b/include/svtools/acceleratorexecute.hxx
index 4b099e0169f5..975b44def6f9 100644
--- a/include/svtools/acceleratorexecute.hxx
+++ b/include/svtools/acceleratorexecute.hxx
@@ -218,8 +218,8 @@ class SVT_DLLPUBLIC AcceleratorExecute : private TMutexInit
          */
         SVT_DLLPRIVATE AcceleratorExecute();
 
-        AcceleratorExecute(const AcceleratorExecute& rCopy) SAL_DELETED_FUNCTION;
-        void operator=(const AcceleratorExecute&)  SAL_DELETED_FUNCTION;
+        AcceleratorExecute(const AcceleratorExecute& rCopy) = delete;
+        void operator=(const AcceleratorExecute&)  = delete;
 
         /** TODO document me */
         SVT_DLLPRIVATE OUString impl_ts_findCommand(const css::awt::KeyEvent& aKey);
diff --git a/include/svtools/contextmenuhelper.hxx b/include/svtools/contextmenuhelper.hxx
index 3333027d4391..2e7d8c0dda72 100644
--- a/include/svtools/contextmenuhelper.hxx
+++ b/include/svtools/contextmenuhelper.hxx
@@ -65,8 +65,8 @@ class SVT_DLLPUBLIC ContextMenuHelper
         // asynchronous link to prevent destruction while on stack
         DECL_STATIC_LINK_TYPED( ContextMenuHelper, ExecuteHdl_Impl, void*, void );
 
-        ContextMenuHelper( const ContextMenuHelper& ) SAL_DELETED_FUNCTION;
-        const ContextMenuHelper& operator=( const ContextMenuHelper& ) SAL_DELETED_FUNCTION;
+        ContextMenuHelper( const ContextMenuHelper& ) = delete;
+        const ContextMenuHelper& operator=( const ContextMenuHelper& ) = delete;
 
         // show context menu and dispatch command automatically
         void            executePopupMenu( const Point& aPos, PopupMenu* pMenu );
diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx
index eedb574af60e..bdecb651e967 100644
--- a/include/svtools/ctrlbox.hxx
+++ b/include/svtools/ctrlbox.hxx
@@ -194,8 +194,8 @@ public:
     }
 
 private:
-                    ColorListBox( const ColorListBox& ) SAL_DELETED_FUNCTION;
-    ColorListBox&   operator =( const ColorListBox& ) SAL_DELETED_FUNCTION;
+                    ColorListBox( const ColorListBox& ) = delete;
+    ColorListBox&   operator =( const ColorListBox& ) = delete;
 };
 
 inline void ColorListBox::SelectEntry( const Color& rColor, bool bSelect )
@@ -345,8 +345,8 @@ protected:
     Color   GetColorDist( sal_Int32  nPos = 0 );
 
 private:
-                    LineListBox( const LineListBox& ) SAL_DELETED_FUNCTION;
-    LineListBox&    operator =( const LineListBox& ) SAL_DELETED_FUNCTION;
+                    LineListBox( const LineListBox& ) = delete;
+    LineListBox&    operator =( const LineListBox& ) = delete;
 };
 
 inline void LineListBox::SetColor( const Color& rColor )
@@ -401,8 +401,8 @@ public:
 private:
     void            InitFontMRUEntriesFile();
 
-                    FontNameBox( const FontNameBox& ) SAL_DELETED_FUNCTION;
-    FontNameBox&    operator =( const FontNameBox& ) SAL_DELETED_FUNCTION;
+                    FontNameBox( const FontNameBox& ) = delete;
+    FontNameBox&    operator =( const FontNameBox& ) = delete;
 };
 
 class SVT_DLLPUBLIC FontStyleBox : public ComboBox
@@ -425,8 +425,8 @@ public:
     void            Fill( const OUString& rName, const FontList* pList );
 
 private:
-                    FontStyleBox( const FontStyleBox& ) SAL_DELETED_FUNCTION;
-    FontStyleBox&   operator =( const FontStyleBox& ) SAL_DELETED_FUNCTION;
+                    FontStyleBox( const FontStyleBox& ) = delete;
+    FontStyleBox&   operator =( const FontStyleBox& ) = delete;
 };
 
 inline void FontStyleBox::SetText( const OUString& rText )
@@ -481,8 +481,8 @@ public:
     virtual sal_Int64   GetValue() const SAL_OVERRIDE;
 
 private:
-                    FontSizeBox( const FontSizeBox& ) SAL_DELETED_FUNCTION;
-    FontSizeBox&    operator =( const FontSizeBox& ) SAL_DELETED_FUNCTION;
+                    FontSizeBox( const FontSizeBox& ) = delete;
+    FontSizeBox&    operator =( const FontSizeBox& ) = delete;
 };
 
 #endif // INCLUDED_SVTOOLS_CTRLBOX_HXX
diff --git a/include/svtools/ctrltool.hxx b/include/svtools/ctrltool.hxx
index 9d5c50119cce..6bec2bd8e25e 100644
--- a/include/svtools/ctrltool.hxx
+++ b/include/svtools/ctrltool.hxx
@@ -195,8 +195,8 @@ public:
     static const sal_IntPtr* GetStdSizeAry() { return aStdSizeAry; }
 
 private:
-                            FontList( const FontList& ) SAL_DELETED_FUNCTION;
-    FontList&               operator =( const FontList& ) SAL_DELETED_FUNCTION;
+                            FontList( const FontList& ) = delete;
+    FontList&               operator =( const FontList& ) = delete;
 };
 
 class SVT_DLLPUBLIC FontSizeNames
diff --git a/include/svtools/dialogcontrolling.hxx b/include/svtools/dialogcontrolling.hxx
index 47ef7497e475..fc3fa11f79a4 100644
--- a/include/svtools/dialogcontrolling.hxx
+++ b/include/svtools/dialogcontrolling.hxx
@@ -118,8 +118,8 @@ namespace svt
         DECL_LINK_TYPED( OnWindowEvent, VclWindowEvent&, void );
 
     private:
-        DialogController( const DialogController& ) SAL_DELETED_FUNCTION;
-        DialogController& operator=( const DialogController& ) SAL_DELETED_FUNCTION;
+        DialogController( const DialogController& ) = delete;
+        DialogController& operator=( const DialogController& ) = delete;
     };
     typedef std::shared_ptr< DialogController > PDialogController;
 
@@ -179,8 +179,8 @@ namespace svt
         void    addController( const PDialogController& _pController );
 
     private:
-        ControlDependencyManager( const ControlDependencyManager& ) SAL_DELETED_FUNCTION;
-        ControlDependencyManager& operator=( const ControlDependencyManager& ) SAL_DELETED_FUNCTION;
+        ControlDependencyManager( const ControlDependencyManager& ) = delete;
+        ControlDependencyManager& operator=( const ControlDependencyManager& ) = delete;
     };
 
 
diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx
index afe8adccbaae..819e7fdd6650 100644
--- a/include/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
@@ -451,8 +451,8 @@ namespace svt
         };
 
     private:
-        EditBrowseBox(EditBrowseBox&) SAL_DELETED_FUNCTION;
-        EditBrowseBox& operator=(EditBrowseBox&) SAL_DELETED_FUNCTION;
+        EditBrowseBox(EditBrowseBox&) = delete;
+        EditBrowseBox& operator=(EditBrowseBox&) = delete;
 
         class BrowserMouseEventPtr
         {
diff --git a/include/svtools/embedhlp.hxx b/include/svtools/embedhlp.hxx
index ff899cd0fd23..b1b33282f05d 100644
--- a/include/svtools/embedhlp.hxx
+++ b/include/svtools/embedhlp.hxx
@@ -50,7 +50,7 @@ class SVT_DLLPUBLIC EmbeddedObjectRef
     SVT_DLLPRIVATE SvStream* GetGraphicStream( bool bUpdate ) const;
     SVT_DLLPRIVATE void GetReplacement( bool bUpdate );
 
-    EmbeddedObjectRef& operator = ( const EmbeddedObjectRef& ) SAL_DELETED_FUNCTION;
+    EmbeddedObjectRef& operator = ( const EmbeddedObjectRef& ) = delete;
 
 public:
     static void DrawPaintReplacement( const Rectangle &rRect, const OUString &rText, OutputDevice *pOut );
diff --git a/include/svtools/javacontext.hxx b/include/svtools/javacontext.hxx
index 20e65873cb54..d636d9e2f4e4 100644
--- a/include/svtools/javacontext.hxx
+++ b/include/svtools/javacontext.hxx
@@ -63,8 +63,8 @@ namespace svt
             throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     private:
-        JavaContext(JavaContext&) SAL_DELETED_FUNCTION;
-        JavaContext& operator = (JavaContext&) SAL_DELETED_FUNCTION;
+        JavaContext(JavaContext&) = delete;
+        JavaContext& operator = (JavaContext&) = delete;
 
         oslInterlockedCount m_aRefCount;
 
diff --git a/include/svtools/javainteractionhandler.hxx b/include/svtools/javainteractionhandler.hxx
index 7b0d00defe40..4346d8fdf222 100644
--- a/include/svtools/javainteractionhandler.hxx
+++ b/include/svtools/javainteractionhandler.hxx
@@ -57,8 +57,8 @@ public:
 
 private:
     oslInterlockedCount m_aRefCount;
-    JavaInteractionHandler(JavaInteractionHandler const&) SAL_DELETED_FUNCTION;
-    JavaInteractionHandler& operator = (JavaInteractionHandler const &) SAL_DELETED_FUNCTION;
+    JavaInteractionHandler(JavaInteractionHandler const&) = delete;
+    JavaInteractionHandler& operator = (JavaInteractionHandler const &) = delete;
     SVT_DLLPRIVATE virtual ~JavaInteractionHandler();
     bool m_bShowErrorsOnce;
     bool m_bJavaDisabled_Handled;
diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx
index 116f0c80d7ba..aaa88c4189e0 100644
--- a/include/svtools/ruler.hxx
+++ b/include/svtools/ruler.hxx
@@ -698,8 +698,8 @@ private:
     SVT_DLLPRIVATE void     ImplDrag( const Point& rPos );
     SVT_DLLPRIVATE void     ImplEndDrag();
 
-    Ruler (const Ruler &) SAL_DELETED_FUNCTION;
-    Ruler& operator= (const Ruler &) SAL_DELETED_FUNCTION;
+    Ruler (const Ruler &) = delete;
+    Ruler& operator= (const Ruler &) = delete;
 
 protected:
     long            GetRulerVirHeight() const { return mnVirHeight;}
diff --git a/include/svtools/scriptedtext.hxx b/include/svtools/scriptedtext.hxx
index 47e1e4a19743..af3b82634e12 100644
--- a/include/svtools/scriptedtext.hxx
+++ b/include/svtools/scriptedtext.hxx
@@ -41,7 +41,7 @@ class SVT_DLLPUBLIC SvtScriptedTextHelper
 private:
     SvtScriptedTextHelper_Impl* mpImpl;             /// Implementation of class functionality.
 
-    SvtScriptedTextHelper&      operator=( const SvtScriptedTextHelper& ) SAL_DELETED_FUNCTION;
+    SvtScriptedTextHelper&      operator=( const SvtScriptedTextHelper& ) = delete;
 
 public:
                                 /** Constructor sets an output device and no fonts.
diff --git a/include/svtools/transfer.hxx b/include/svtools/transfer.hxx
index b58031d8c430..cc8286ef14d7 100644
--- a/include/svtools/transfer.hxx
+++ b/include/svtools/transfer.hxx
@@ -405,8 +405,8 @@ private:
     ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragGestureRecognizer > mxDragGestureRecognizer;
     ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragGestureListener >   mxDragGestureListener;
 
-    DragSourceHelper&   operator=( const DragSourceHelper& rDragSourceHelper ) SAL_DELETED_FUNCTION;
-    bool                operator==( const DragSourceHelper& rDragSourceHelper ) const SAL_DELETED_FUNCTION;
+    DragSourceHelper&   operator=( const DragSourceHelper& rDragSourceHelper ) = delete;
+    bool                operator==( const DragSourceHelper& rDragSourceHelper ) const = delete;
 
 public:
 
@@ -455,9 +455,9 @@ private:
     ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >    mxDropTargetListener;
     DataFlavorExVector*                                                                             mpFormats;
 
-                        DropTargetHelper() SAL_DELETED_FUNCTION;
-    DropTargetHelper&   operator=( const DropTargetHelper& rDropTargetHelper ) SAL_DELETED_FUNCTION;
-    bool                operator==( const DropTargetHelper& rDropTargetHelper ) const SAL_DELETED_FUNCTION;
+                        DropTargetHelper() = delete;
+    DropTargetHelper&   operator=( const DropTargetHelper& rDropTargetHelper ) = delete;
+    bool                operator==( const DropTargetHelper& rDropTargetHelper ) const = delete;
 
     void                ImplConstruct();
 
diff --git a/include/svtools/treelist.hxx b/include/svtools/treelist.hxx
index 26e3f90d63b4..873b9bb822bb 100644
--- a/include/svtools/treelist.hxx
+++ b/include/svtools/treelist.hxx
@@ -127,8 +127,8 @@ class SVT_DLLPUBLIC SvTreeList
     SVT_DLLPRIVATE void ResortChildren( SvTreeListEntry* pParent );
     SVT_DLLPRIVATE void ReverseChildren( SvTreeListEntry* pParent );
 
-    SvTreeList(const SvTreeList&) SAL_DELETED_FUNCTION;
-    SvTreeList& operator= (const SvTreeList&) SAL_DELETED_FUNCTION;
+    SvTreeList(const SvTreeList&) = delete;
+    SvTreeList& operator= (const SvTreeList&) = delete;
 
 protected:
     SvTreeListEntry*        pRootItem;
diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx
index 7215a2c4a0ff..8d41a49bd4ce 100644
--- a/include/svtools/valueset.hxx
+++ b/include/svtools/valueset.hxx
@@ -274,8 +274,8 @@ private:
     DECL_DLLPRIVATE_LINK_TYPED( ImplScrollHdl, ScrollBar*, void );
     DECL_DLLPRIVATE_LINK_TYPED( ImplTimerHdl, Timer*, void );
 
-    ValueSet (const ValueSet &) SAL_DELETED_FUNCTION;
-    ValueSet & operator= (const ValueSet &) SAL_DELETED_FUNCTION;
+    ValueSet (const ValueSet &) = delete;
+    ValueSet & operator= (const ValueSet &) = delete;
 
 protected:
     bool StartDrag( const CommandEvent& rCEvt, vcl::Region& rRegion );
diff --git a/include/svtools/xwindowitem.hxx b/include/svtools/xwindowitem.hxx
index 921ab112ba2b..07fc6f005b37 100644
--- a/include/svtools/xwindowitem.hxx
+++ b/include/svtools/xwindowitem.hxx
@@ -35,7 +35,7 @@ class SVT_DLLPUBLIC XWindowItem : public SfxPoolItem
 {
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >      m_xWin;
 
-    XWindowItem & operator = ( const XWindowItem & ) SAL_DELETED_FUNCTION;
+    XWindowItem & operator = ( const XWindowItem & ) = delete;
 
 public:
     TYPEINFO_OVERRIDE();
diff --git a/include/svx/AccessibleControlShape.hxx b/include/svx/AccessibleControlShape.hxx
index 45b1d0a8897c..e29b5a7a1bdc 100644
--- a/include/svx/AccessibleControlShape.hxx
+++ b/include/svx/AccessibleControlShape.hxx
@@ -193,9 +193,9 @@ private:
     bool        m_bWaitingForControl    : 1;    // if we are created before our control exists, we need to wait for it to appear ...
 
 private:
-    AccessibleControlShape(const AccessibleControlShape&) SAL_DELETED_FUNCTION;
+    AccessibleControlShape(const AccessibleControlShape&) = delete;
 
-    AccessibleControlShape& operator= (const AccessibleControlShape&) SAL_DELETED_FUNCTION;
+    AccessibleControlShape& operator= (const AccessibleControlShape&) = delete;
 };
 
 } // end of namespace accessibility
diff --git a/include/svx/AccessibleGraphicShape.hxx b/include/svx/AccessibleGraphicShape.hxx
index d4b88080ecfe..45dcfa394ab2 100644
--- a/include/svx/AccessibleGraphicShape.hxx
+++ b/include/svx/AccessibleGraphicShape.hxx
@@ -99,9 +99,9 @@ protected:
         throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
 private:
-    AccessibleGraphicShape (const AccessibleGraphicShape&) SAL_DELETED_FUNCTION;
+    AccessibleGraphicShape (const AccessibleGraphicShape&) = delete;
 
-    AccessibleGraphicShape& operator= (const AccessibleGraphicShape&) SAL_DELETED_FUNCTION;
+    AccessibleGraphicShape& operator= (const AccessibleGraphicShape&) = delete;
 };
 
 } // end of namespace accessibility
diff --git a/include/svx/AccessibleOLEShape.hxx b/include/svx/AccessibleOLEShape.hxx
index 5ff85ada3468..082d6f647b20 100644
--- a/include/svx/AccessibleOLEShape.hxx
+++ b/include/svx/AccessibleOLEShape.hxx
@@ -105,9 +105,9 @@ protected:
         throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
 private:
-    AccessibleOLEShape (const AccessibleOLEShape&) SAL_DELETED_FUNCTION;
+    AccessibleOLEShape (const AccessibleOLEShape&) = delete;
 
-    AccessibleOLEShape& operator= (const AccessibleOLEShape&) SAL_DELETED_FUNCTION;
+    AccessibleOLEShape& operator= (const AccessibleOLEShape&) = delete;
 };
 
 } // end of namespace accessibility
diff --git a/include/svx/AccessibleShape.hxx b/include/svx/AccessibleShape.hxx
index 495c3c1bd652..1cfd86c2c0e8 100644
--- a/include/svx/AccessibleShape.hxx
+++ b/include/svx/AccessibleShape.hxx
@@ -459,8 +459,8 @@ protected:
     void UpdateStates();
 
 private:
-    AccessibleShape (const AccessibleShape&) SAL_DELETED_FUNCTION;
-    AccessibleShape& operator= (const AccessibleShape&) SAL_DELETED_FUNCTION;
+    AccessibleShape (const AccessibleShape&) = delete;
+    AccessibleShape& operator= (const AccessibleShape&) = delete;
     //Old accessible name
     OUString aAccName;
 
diff --git a/include/svx/AccessibleShapeInfo.hxx b/include/svx/AccessibleShapeInfo.hxx
index 0c75bc914b9b..1d99e9289d38 100644
--- a/include/svx/AccessibleShapeInfo.hxx
+++ b/include/svx/AccessibleShapeInfo.hxx
@@ -91,7 +91,7 @@ public:
 
     AccessibleShapeInfo (const AccessibleShapeInfo&);
 private:
-    AccessibleShapeInfo& operator= (const AccessibleShapeInfo&) SAL_DELETED_FUNCTION;
+    AccessibleShapeInfo& operator= (const AccessibleShapeInfo&) = delete;
 };
 
 } // end of namespace accessibility
diff --git a/include/svx/ChildrenManager.hxx b/include/svx/ChildrenManager.hxx
index 668574f5f61e..516561198998 100644
--- a/include/svx/ChildrenManager.hxx
+++ b/include/svx/ChildrenManager.hxx
@@ -197,8 +197,8 @@ protected:
     ChildrenManagerImpl* mpImpl;
 
 private:
-    ChildrenManager (const ChildrenManager&) SAL_DELETED_FUNCTION;
-    ChildrenManager& operator= (const ChildrenManager&) SAL_DELETED_FUNCTION;
+    ChildrenManager (const ChildrenManager&) = delete;
+    ChildrenManager& operator= (const ChildrenManager&) = delete;
 };
 
 } // end of namespace accessibility
diff --git a/include/svx/EnhancedCustomShapeFunctionParser.hxx b/include/svx/EnhancedCustomShapeFunctionParser.hxx
index 9f4f464e7133..8f0691001156 100644
--- a/include/svx/EnhancedCustomShapeFunctionParser.hxx
+++ b/include/svx/EnhancedCustomShapeFunctionParser.hxx
@@ -195,8 +195,8 @@ private:
     // supposed to be a singleton
     FunctionParser();
 
-    FunctionParser(const FunctionParser&) SAL_DELETED_FUNCTION;
-    FunctionParser& operator=( const FunctionParser& ) SAL_DELETED_FUNCTION;
+    FunctionParser(const FunctionParser&) = delete;
+    FunctionParser& operator=( const FunctionParser& ) = delete;
 };
 
 }
diff --git a/include/svx/fmmodel.hxx b/include/svx/fmmodel.hxx
index 22600859db21..129bc8042b58 100644
--- a/include/svx/fmmodel.hxx
+++ b/include/svx/fmmodel.hxx
@@ -42,8 +42,8 @@ private:
     bool            m_bOpenInDesignMode : 1;
     bool            m_bAutoControlFocus : 1;
 
-    FmFormModel( const FmFormModel& ) SAL_DELETED_FUNCTION;
-    void operator=(const FmFormModel& rSrcModel) SAL_DELETED_FUNCTION;
+    FmFormModel( const FmFormModel& ) = delete;
+    void operator=(const FmFormModel& rSrcModel) = delete;
 
 public:
     TYPEINFO_OVERRIDE();
diff --git a/include/svx/fmpage.hxx b/include/svx/fmpage.hxx
index 49fb5643c34e..1bf169e81e04 100644
--- a/include/svx/fmpage.hxx
+++ b/include/svx/fmpage.hxx
@@ -40,7 +40,7 @@ class HelpEvent;
 
 class SVX_DLLPUBLIC FmFormPage : public SdrPage
 {
-    FmFormPage& operator=(const FmFormPage&) SAL_DELETED_FUNCTION;
+    FmFormPage& operator=(const FmFormPage&) = delete;
 
     friend class FmFormObj;
     FmFormPageImpl*     m_pImpl;
diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx
index 0fcee6f39b2b..27cb49dc54fc 100644
--- a/include/svx/langbox.hxx
+++ b/include/svx/langbox.hxx
@@ -58,8 +58,8 @@ SVX_DLLPUBLIC OUString    GetDicInfoStr( const OUString& rName, const sal_uInt16
 class SVX_DLLPUBLIC SvxLanguageBoxBase
 {
 private:
-    SvxLanguageBoxBase(const SvxLanguageBoxBase&) SAL_DELETED_FUNCTION;
-    SvxLanguageBoxBase& operator=(const SvxLanguageBoxBase&) SAL_DELETED_FUNCTION;
+    SvxLanguageBoxBase(const SvxLanguageBoxBase&) = delete;
+    SvxLanguageBoxBase& operator=(const SvxLanguageBoxBase&) = delete;
 public:
     explicit SvxLanguageBoxBase( bool bCheck );
     virtual ~SvxLanguageBoxBase();
diff --git a/include/svx/obj3d.hxx b/include/svx/obj3d.hxx
index a4c97f6be210..f7c4125fd1af 100644
--- a/include/svx/obj3d.hxx
+++ b/include/svx/obj3d.hxx
@@ -78,7 +78,7 @@ public:
 
 class E3dObjList : public SdrObjList
 {
-    E3dObjList &operator=(const E3dObjList& rSrcList) SAL_DELETED_FUNCTION;
+    E3dObjList &operator=(const E3dObjList& rSrcList) = delete;
 
 public:
     TYPEINFO_OVERRIDE();
diff --git a/include/svx/rulritem.hxx b/include/svx/rulritem.hxx
index 8c75da3af07a..42863867fd60 100644
--- a/include/svx/rulritem.hxx
+++ b/include/svx/rulritem.hxx
@@ -43,7 +43,7 @@ class SVX_DLLPUBLIC SvxLongLRSpaceItem : public SfxPoolItem
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
 
 private:
-    const SvxLongLRSpaceItem& operator=(const SvxLongLRSpaceItem &) SAL_DELETED_FUNCTION;
+    const SvxLongLRSpaceItem& operator=(const SvxLongLRSpaceItem &) = delete;
 
 public:
     TYPEINFO_OVERRIDE();
@@ -76,7 +76,7 @@ class SVX_DLLPUBLIC SvxLongULSpaceItem : public SfxPoolItem
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
 
 private:
-    const SvxLongULSpaceItem& operator=(const SvxLongULSpaceItem &) SAL_DELETED_FUNCTION;
+    const SvxLongULSpaceItem& operator=(const SvxLongULSpaceItem &) = delete;
 
 public:
     TYPEINFO_OVERRIDE();
@@ -108,7 +108,7 @@ protected:
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
 
 private:
-    const SvxPagePosSizeItem& operator=(const SvxPagePosSizeItem &) SAL_DELETED_FUNCTION;
+    const SvxPagePosSizeItem& operator=(const SvxPagePosSizeItem &) = delete;
 public:
     TYPEINFO_OVERRIDE();
     SvxPagePosSizeItem(const Point &rPos, long lWidth, long lHeight);
@@ -234,7 +234,7 @@ protected:
     virtual bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE;
 
 private:
-    const SvxObjectItem &operator=(const SvxObjectItem &) SAL_DELETED_FUNCTION;
+    const SvxObjectItem &operator=(const SvxObjectItem &) = delete;
 
 public:
     TYPEINFO_OVERRIDE();
diff --git a/include/svx/sdr/overlay/overlaymanager.hxx b/include/svx/sdr/overlay/overlaymanager.hxx
index b7be54cad695..d25613a1fa80 100644
--- a/include/svx/sdr/overlay/overlaymanager.hxx
+++ b/include/svx/sdr/overlay/overlaymanager.hxx
@@ -53,8 +53,8 @@ namespace sdr
             , public salhelper::SimpleReferenceObject
         {
         private:
-            OverlayManager(const OverlayManager&) SAL_DELETED_FUNCTION;
-            OverlayManager& operator=(const OverlayManager&) SAL_DELETED_FUNCTION;
+            OverlayManager(const OverlayManager&) = delete;
+            OverlayManager& operator=(const OverlayManager&) = delete;
 
         protected:
             // the OutputDevice to work on, set on construction and not to be changed
diff --git a/include/svx/sdr/overlay/overlayobject.hxx b/include/svx/sdr/overlay/overlayobject.hxx
index 9b3a7585d0ea..36bd20868354 100644
--- a/include/svx/sdr/overlay/overlayobject.hxx
+++ b/include/svx/sdr/overlay/overlayobject.hxx
@@ -54,8 +54,8 @@ namespace sdr
         class SVX_DLLPUBLIC OverlayObject : public sdr::animation::Event
         {
         private:
-            OverlayObject(const OverlayObject&) SAL_DELETED_FUNCTION;
-            OverlayObject& operator=(const OverlayObject&) SAL_DELETED_FUNCTION;
+            OverlayObject(const OverlayObject&) = delete;
+            OverlayObject& operator=(const OverlayObject&) = delete;
 
             // Manager is allowed access to private Member mpOverlayManager
             friend class                                    OverlayManager;
diff --git a/include/svx/sdr/table/tablecontroller.hxx b/include/svx/sdr/table/tablecontroller.hxx
index 1df8742c0605..59428d9ebdee 100644
--- a/include/svx/sdr/table/tablecontroller.hxx
+++ b/include/svx/sdr/table/tablecontroller.hxx
@@ -114,8 +114,8 @@ public:
     bool isColumnHeader();
     sdr::table::SdrTableObj* GetTableObj() { return dynamic_cast< sdr::table::SdrTableObj* >( mxTableObj.get() ); }
 private:
-    SvxTableController(SvxTableController &) SAL_DELETED_FUNCTION;
-    void operator =(SvxTableController &) SAL_DELETED_FUNCTION;
+    SvxTableController(SvxTableController &) = delete;
+    void operator =(SvxTableController &) = delete;
 
     // internals
     SVX_DLLPRIVATE void ApplyBorderAttr( const SfxItemSet& rAttr );
diff --git a/include/svx/sdrmasterpagedescriptor.hxx b/include/svx/sdrmasterpagedescriptor.hxx
index eec99df167bf..a00a0b96703a 100644
--- a/include/svx/sdrmasterpagedescriptor.hxx
+++ b/include/svx/sdrmasterpagedescriptor.hxx
@@ -47,7 +47,7 @@ namespace sdr
         // ViewContact part
         sdr::contact::ViewContact*                      mpViewContact;
 
-        void operator=(const MasterPageDescriptor& rCandidate) SAL_DELETED_FUNCTION;
+        void operator=(const MasterPageDescriptor& rCandidate) = delete;
 
     protected:
         sdr::contact::ViewContact* CreateObjectSpecificViewContact();
diff --git a/include/svx/sdrpagewindow.hxx b/include/svx/sdrpagewindow.hxx
index 16cce1c9bf28..48845fbc3ed6 100644
--- a/include/svx/sdrpagewindow.hxx
+++ b/include/svx/sdrpagewindow.hxx
@@ -49,8 +49,8 @@ class SVX_DLLPUBLIC SdrPageWindow
 
     Impl* mpImpl;
 
-    SdrPageWindow( const SdrPageWindow& ) SAL_DELETED_FUNCTION;
-    SdrPageWindow& operator= ( const SdrPageWindow& ) SAL_DELETED_FUNCTION;
+    SdrPageWindow( const SdrPageWindow& ) = delete;
+    SdrPageWindow& operator= ( const SdrPageWindow& ) = delete;
 
 public:
     SdrPageWindow(SdrPageView& rNewPageView, SdrPaintWindow& rPaintWindow);
diff --git a/include/svx/shapepropertynotifier.hxx b/include/svx/shapepropertynotifier.hxx
index a12a991c536e..3095872570a7 100644
--- a/include/svx/shapepropertynotifier.hxx
+++ b/include/svx/shapepropertynotifier.hxx
@@ -80,8 +80,8 @@ namespace svx
 
     protected:
         ::cppu::OWeakObject&    getContext() const { return m_rContext; }
-        PropertyValueProvider(const PropertyValueProvider&) SAL_DELETED_FUNCTION;
-        PropertyValueProvider& operator=(const PropertyValueProvider&) SAL_DELETED_FUNCTION;
+        PropertyValueProvider(const PropertyValueProvider&) = delete;
+        PropertyValueProvider& operator=(const PropertyValueProvider&) = delete;
 
     private:
         ::cppu::OWeakObject&    m_rContext;
@@ -129,8 +129,8 @@ namespace svx
         void    disposing();
 
     private:
-        PropertyChangeNotifier(const PropertyChangeNotifier&) SAL_DELETED_FUNCTION;
-        PropertyChangeNotifier& operator=(const PropertyChangeNotifier&) SAL_DELETED_FUNCTION;
+        PropertyChangeNotifier(const PropertyChangeNotifier&) = delete;
+        PropertyChangeNotifier& operator=(const PropertyChangeNotifier&) = delete;
 
         std::unique_ptr< PropertyChangeNotifier_Data >  m_xData;
     };
diff --git a/include/svx/sidebar/SelectionChangeHandler.hxx b/include/svx/sidebar/SelectionChangeHandler.hxx
index 890a72ab3427..00ecc3831690 100644
--- a/include/svx/sidebar/SelectionChangeHandler.hxx
+++ b/include/svx/sidebar/SelectionChangeHandler.hxx
@@ -66,8 +66,8 @@ public:
     void Disconnect();
 
 private:
-    SelectionChangeHandler(const SelectionChangeHandler&) SAL_DELETED_FUNCTION;
-    SelectionChangeHandler& operator=(const SelectionChangeHandler&) SAL_DELETED_FUNCTION;
+    SelectionChangeHandler(const SelectionChangeHandler&) = delete;
+    SelectionChangeHandler& operator=(const SelectionChangeHandler&) = delete;
 
     const std::function<rtl::OUString ()> maSelectionChangeCallback;
     css::uno::Reference<css::frame::XController> mxController;
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index 6379540c2dda..e467525eab3d 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -260,9 +260,9 @@ protected:
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoModel();
 
 private:
-    SdrModel(const SdrModel& rSrcModel) SAL_DELETED_FUNCTION;
-    void operator=(const SdrModel& rSrcModel) SAL_DELETED_FUNCTION;
-    bool operator==(const SdrModel& rCmpModel) const SAL_DELETED_FUNCTION;
+    SdrModel(const SdrModel& rSrcModel) = delete;
+    void operator=(const SdrModel& rSrcModel) = delete;
+    bool operator==(const SdrModel& rCmpModel) const = delete;
     SVX_DLLPRIVATE void ImpPostUndoAction(SdrUndoAction* pUndo);
     SVX_DLLPRIVATE void ImpSetUIUnit();
     SVX_DLLPRIVATE void ImpSetOutlinerDefaults( SdrOutliner* pOutliner, bool bInit = false );
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index 545a3fb61e78..7b498af21124 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -191,9 +191,9 @@ protected:
     sal_uInt16                      nVersion;
 
 private:
-    void operator=(const SdrObjUserData& rData) SAL_DELETED_FUNCTION;
-    bool operator==(const SdrObjUserData& rData) const SAL_DELETED_FUNCTION;
-    bool operator!=(const SdrObjUserData& rData) const SAL_DELETED_FUNCTION;
+    void operator=(const SdrObjUserData& rData) = delete;
+    bool operator==(const SdrObjUserData& rData) const = delete;
+    bool operator!=(const SdrObjUserData& rData) const = delete;
 
 public:
     SdrObjUserData(sal_uInt32 nInv, sal_uInt16 nId, sal_uInt16 nVer);
@@ -265,7 +265,7 @@ private:
     struct Impl;
     Impl* mpImpl;
 
-    SdrObject( const SdrObject& ) SAL_DELETED_FUNCTION;
+    SdrObject( const SdrObject& ) = delete;
 
 public:
     void AddObjectUser(sdr::ObjectUser& rNewUser);
diff --git a/include/svx/svdovirt.hxx b/include/svx/svdovirt.hxx
index 6140c386492c..f3ecc7a47537 100644
--- a/include/svx/svdovirt.hxx
+++ b/include/svx/svdovirt.hxx
@@ -35,7 +35,7 @@
 
 class SVX_DLLPUBLIC SdrVirtObj : public SdrObject
 {
-    SdrVirtObj( const SdrVirtObj& ) SAL_DELETED_FUNCTION;
+    SdrVirtObj( const SdrVirtObj& ) = delete;
 public:
     virtual sdr::properties::BaseProperties& GetProperties() const SAL_OVERRIDE;
 
diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx
index 20a7fce3ad65..470c11a1fbaa 100644
--- a/include/svx/svdpage.hxx
+++ b/include/svx/svdpage.hxx
@@ -76,8 +76,8 @@ public:
 
 class SVX_DLLPUBLIC SdrObjList
 {
-    SdrObjList(const SdrObjList& rSrcList) SAL_DELETED_FUNCTION;
-    SdrObjList &operator=(const SdrObjList& rSrcList) SAL_DELETED_FUNCTION;
+    SdrObjList(const SdrObjList& rSrcList) = delete;
+    SdrObjList &operator=(const SdrObjList& rSrcList) = delete;
 
 private:
     ::std::vector<SdrObject*> maList;
@@ -313,8 +313,8 @@ public:
 class SVX_DLLPUBLIC SdrPageGridFrameList {
     std::vector<SdrPageGridFrame*> aList;
 private:
-    SdrPageGridFrameList(const SdrPageGridFrameList& rSrcList) SAL_DELETED_FUNCTION;
-    void           operator=(const SdrPageGridFrameList& rSrcList) SAL_DELETED_FUNCTION;
+    SdrPageGridFrameList(const SdrPageGridFrameList& rSrcList) = delete;
+    void           operator=(const SdrPageGridFrameList& rSrcList) = delete;
 protected:
     SdrPageGridFrame* GetObject(sal_uInt16 i) const { return aList[i]; }
 public:
@@ -342,7 +342,7 @@ private:
     void ImpRemoveStyleSheet();
     void ImpAddStyleSheet(SfxStyleSheet& rNewStyleSheet);
 
-    SdrPageProperties& operator=(const SdrPageProperties& rCandidate) SAL_DELETED_FUNCTION;
+    SdrPageProperties& operator=(const SdrPageProperties& rCandidate) = delete;
 
 public:
     // construct/destruct
@@ -377,7 +377,7 @@ public:
 */
 class SVX_DLLPUBLIC SdrPage : public SdrObjList, public tools::WeakBase< SdrPage >
 {
-    SdrPage& operator=(const SdrPage& rSrcPage) SAL_DELETED_FUNCTION;
+    SdrPage& operator=(const SdrPage& rSrcPage) = delete;
 
     // start PageUser section
 private:
diff --git a/include/toolkit/awt/animatedimagespeer.hxx b/include/toolkit/awt/animatedimagespeer.hxx
index 1881877ee182..e853cbff7f8a 100644
--- a/include/toolkit/awt/animatedimagespeer.hxx
+++ b/include/toolkit/awt/animatedimagespeer.hxx
@@ -84,8 +84,8 @@ namespace toolkit
         void    impl_updateImages_nolck( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& i_animatedImages );
 
     private:
-        AnimatedImagesPeer(const AnimatedImagesPeer&) SAL_DELETED_FUNCTION;
-        AnimatedImagesPeer& operator=(const AnimatedImagesPeer&) SAL_DELETED_FUNCTION;
+        AnimatedImagesPeer(const AnimatedImagesPeer&) = delete;
+        AnimatedImagesPeer& operator=(const AnimatedImagesPeer&) = delete;
 
         std::unique_ptr< AnimatedImagesPeer_Data >   m_xData;
     };
diff --git a/include/toolkit/awt/vclxspinbutton.hxx b/include/toolkit/awt/vclxspinbutton.hxx
index 1c999a9ba43b..7910c44bafd2 100644
--- a/include/toolkit/awt/vclxspinbutton.hxx
+++ b/include/toolkit/awt/vclxspinbutton.hxx
@@ -80,8 +80,8 @@ namespace toolkit
         void ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent ) SAL_OVERRIDE;
 
     private:
-        VCLXSpinButton( const VCLXSpinButton& ) SAL_DELETED_FUNCTION;
-        VCLXSpinButton& operator=( const VCLXSpinButton& ) SAL_DELETED_FUNCTION;
+        VCLXSpinButton( const VCLXSpinButton& ) = delete;
+        VCLXSpinButton& operator=( const VCLXSpinButton& ) = delete;
     };
 
 
diff --git a/include/toolkit/controls/unocontrols.hxx b/include/toolkit/controls/unocontrols.hxx
index ac295165190b..ed266c4fa84c 100644
--- a/include/toolkit/controls/unocontrols.hxx
+++ b/include/toolkit/controls/unocontrols.hxx
@@ -256,7 +256,7 @@ protected:
     ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const SAL_OVERRIDE;
 
 private:
-        GraphicControlModel& operator=( const GraphicControlModel& ) SAL_DELETED_FUNCTION;
+        GraphicControlModel& operator=( const GraphicControlModel& ) = delete;
 };
 
 
diff --git a/include/tools/config.hxx b/include/tools/config.hxx
index 772c1c7da8f9..f6014f24fd81 100644
--- a/include/tools/config.hxx
+++ b/include/tools/config.hxx
@@ -61,8 +61,8 @@ public:
     void                Flush();
 
 private:
-                        Config( const Config& rConfig ) SAL_DELETED_FUNCTION;
-    Config&             operator = ( const Config& rConfig ) SAL_DELETED_FUNCTION;
+                        Config( const Config& rConfig ) = delete;
+    Config&             operator = ( const Config& rConfig ) = delete;
 };
 
 #endif
diff --git a/include/tools/inetstrm.hxx b/include/tools/inetstrm.hxx
index 7e43b0d912e8..834df8573194 100644
--- a/include/tools/inetstrm.hxx
+++ b/include/tools/inetstrm.hxx
@@ -47,8 +47,8 @@ class TOOLS_DLLPUBLIC INetMIMEMessageStream
     sal_uIntPtr                  nChildIndex;
     INetMIMEMessageStream *pChildStrm;
 
-    INetMIMEMessageStream (const INetMIMEMessageStream& rStrm) SAL_DELETED_FUNCTION;
-    INetMIMEMessageStream& operator= (const INetMIMEMessageStream& rStrm) SAL_DELETED_FUNCTION;
+    INetMIMEMessageStream (const INetMIMEMessageStream& rStrm) = delete;
+    INetMIMEMessageStream& operator= (const INetMIMEMessageStream& rStrm) = delete;
 
     int GetHeaderLine(sal_Char *pData, sal_uIntPtr nSize);
     int GetBodyLine(sal_Char *pData, sal_uIntPtr nSize);
diff --git a/include/tools/resary.hxx b/include/tools/resary.hxx
index e03ec168f78b..4e15feb5ee08 100644
--- a/include/tools/resary.hxx
+++ b/include/tools/resary.hxx
@@ -31,8 +31,8 @@ class TOOLS_DLLPUBLIC ResStringArray
     struct Impl;
     Impl* mpImpl;
 
-    ResStringArray( const ResStringArray& ) SAL_DELETED_FUNCTION;
-    ResStringArray& operator=( const ResStringArray& ) SAL_DELETED_FUNCTION;
+    ResStringArray( const ResStringArray& ) = delete;
+    ResStringArray& operator=( const ResStringArray& ) = delete;
 
 public:
     ResStringArray( const ResId& rResId );
diff --git a/include/tools/resmgr.hxx b/include/tools/resmgr.hxx
index 4c72c17855da..ade174674240 100644
--- a/include/tools/resmgr.hxx
+++ b/include/tools/resmgr.hxx
@@ -127,8 +127,8 @@ private:
     // like ReadString but doesn't call the string hook
     TOOLS_DLLPRIVATE OUString ReadStringWithoutHook();
 
-    ResMgr(const ResMgr&) SAL_DELETED_FUNCTION;
-    ResMgr& operator=(const ResMgr&) SAL_DELETED_FUNCTION;
+    ResMgr(const ResMgr&) = delete;
+    ResMgr& operator=(const ResMgr&) = delete;
 
 public:
     static void         DestroyAllResMgr();  ///< Called upon app shutdown
diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx
index 702734d014b6..19f062ee2e3a 100644
--- a/include/tools/stream.hxx
+++ b/include/tools/stream.hxx
@@ -226,8 +226,8 @@ private:
     // helper methods
     TOOLS_DLLPRIVATE void ImpInit();
 
-                    SvStream ( const SvStream& rStream ) SAL_DELETED_FUNCTION;
-    SvStream&       operator=( const SvStream& rStream ) SAL_DELETED_FUNCTION;
+                    SvStream ( const SvStream& rStream ) = delete;
+    SvStream&       operator=( const SvStream& rStream ) = delete;
 
 protected:
     sal_uInt64      m_nBufFilePos; ///< File position of pBuf[0]
@@ -622,8 +622,8 @@ private:
     sal_uInt16      nLockCounter;
     bool            bIsOpen;
 
-    SvFileStream (const SvFileStream&) SAL_DELETED_FUNCTION;
-    SvFileStream & operator= (const SvFileStream&) SAL_DELETED_FUNCTION;
+    SvFileStream (const SvFileStream&) = delete;
+    SvFileStream & operator= (const SvFileStream&) = delete;
 
     bool LockRange( sal_Size nByteOffset, sal_Size nBytes );
     bool UnlockRange( sal_Size nByteOffset, sal_Size nBytes );
@@ -656,8 +656,8 @@ public:
 
 class TOOLS_DLLPUBLIC SvMemoryStream : public SvStream
 {
-    SvMemoryStream (const SvMemoryStream&) SAL_DELETED_FUNCTION;
-    SvMemoryStream & operator= (const SvMemoryStream&) SAL_DELETED_FUNCTION;
+    SvMemoryStream (const SvMemoryStream&) = delete;
+    SvMemoryStream & operator= (const SvMemoryStream&) = delete;
 
 protected:
     sal_Size        nSize;
diff --git a/include/ucbhelper/commandenvironment.hxx b/include/ucbhelper/commandenvironment.hxx
index 7c5f4f9caa71..7383f03cda87 100644
--- a/include/ucbhelper/commandenvironment.hxx
+++ b/include/ucbhelper/commandenvironment.hxx
@@ -39,8 +39,8 @@ class UCBHELPER_DLLPUBLIC CommandEnvironment :
     CommandEnvironment_Impl* m_pImpl;
 
 private:
-    CommandEnvironment( const CommandEnvironment& ) SAL_DELETED_FUNCTION;
-    CommandEnvironment& operator=( const CommandEnvironment& ) SAL_DELETED_FUNCTION;
+    CommandEnvironment( const CommandEnvironment& ) = delete;
+    CommandEnvironment& operator=( const CommandEnvironment& ) = delete;
 
 public:
     /**
diff --git a/include/unoidl/unoidl.hxx b/include/unoidl/unoidl.hxx
index 9694be73a33d..3c87a7e963d2 100644
--- a/include/unoidl/unoidl.hxx
+++ b/include/unoidl/unoidl.hxx
@@ -36,7 +36,7 @@ public:
     rtl::OUString getUri() const { return uri_; }
 
 private:
-    void operator =(NoSuchFileException) SAL_DELETED_FUNCTION;
+    void operator =(NoSuchFileException) = delete;
 
     rtl::OUString uri_;
 };
@@ -59,7 +59,7 @@ public:
     rtl::OUString getDetail() const { return detail_; }
 
 private:
-    void operator =(FileFormatException) SAL_DELETED_FUNCTION;
+    void operator =(FileFormatException) = delete;
 
     rtl::OUString uri_;
     rtl::OUString detail_;
diff --git a/include/unotools/charclass.hxx b/include/unotools/charclass.hxx
index cff4f869a02d..cdf9d0716794 100644
--- a/include/unotools/charclass.hxx
+++ b/include/unotools/charclass.hxx
@@ -69,8 +69,8 @@ class UNOTOOLS_DLLPUBLIC CharClass
     ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCharacterClassification >    xCC;
     mutable ::osl::Mutex        aMutex;
 
-    CharClass(const CharClass&) SAL_DELETED_FUNCTION;
-    CharClass& operator=(const CharClass&) SAL_DELETED_FUNCTION;
+    CharClass(const CharClass&) = delete;
+    CharClass& operator=(const CharClass&) = delete;
 
 public:
     /// Preferred ctor with service manager specified
diff --git a/include/unotools/configmgr.hxx b/include/unotools/configmgr.hxx
index 7c174f6cd46c..92ae409b3882 100644
--- a/include/unotools/configmgr.hxx
+++ b/include/unotools/configmgr.hxx
@@ -81,8 +81,8 @@ public:
 
 private:
 
-    ConfigManager(const ConfigManager&) SAL_DELETED_FUNCTION;
-    ConfigManager& operator=(const ConfigManager&) SAL_DELETED_FUNCTION;
+    ConfigManager(const ConfigManager&) = delete;
+    ConfigManager& operator=(const ConfigManager&) = delete;
 
     void doStoreConfigItems();
 
diff --git a/include/unotools/digitgroupingiterator.hxx b/include/unotools/digitgroupingiterator.hxx
index 5746b9631300..12f8dc163b3d 100644
--- a/include/unotools/digitgroupingiterator.hxx
+++ b/include/unotools/digitgroupingiterator.hxx
@@ -116,8 +116,8 @@ class DigitGroupingIterator
         setDigits();
     }
 
-    DigitGroupingIterator( const DigitGroupingIterator & ) SAL_DELETED_FUNCTION;
-    DigitGroupingIterator & operator=( const DigitGroupingIterator & ) SAL_DELETED_FUNCTION;
+    DigitGroupingIterator( const DigitGroupingIterator & ) = delete;
+    DigitGroupingIterator & operator=( const DigitGroupingIterator & ) = delete;
 
 public:
 
diff --git a/include/unotools/eventlisteneradapter.hxx b/include/unotools/eventlisteneradapter.hxx
index 778382484745..26c1ef45dba4 100644
--- a/include/unotools/eventlisteneradapter.hxx
+++ b/include/unotools/eventlisteneradapter.hxx
@@ -36,8 +36,8 @@ namespace utl
         friend class OEventListenerImpl;
 
     private:
-        OEventListenerAdapter( const OEventListenerAdapter& _rSource ) SAL_DELETED_FUNCTION;
-        const OEventListenerAdapter& operator=( const OEventListenerAdapter& _rSource ) SAL_DELETED_FUNCTION;
+        OEventListenerAdapter( const OEventListenerAdapter& _rSource ) = delete;
+        const OEventListenerAdapter& operator=( const OEventListenerAdapter& _rSource ) = delete;
 
     protected:
         OEventListenerAdapterImpl*  m_pImpl;
diff --git a/include/unotools/lingucfg.hxx b/include/unotools/lingucfg.hxx
index a17082d13cc7..46a407464871 100644
--- a/include/unotools/lingucfg.hxx
+++ b/include/unotools/lingucfg.hxx
@@ -151,8 +151,8 @@ class UNOTOOLS_DLLPUBLIC SvtLinguConfig: public utl::detail::Options
 
     OUString GetVendorImageUrl_Impl( const OUString &rServiceImplName, const OUString &rImageName ) const;
 
-    SvtLinguConfig( const SvtLinguConfig & ) SAL_DELETED_FUNCTION;
-    SvtLinguConfig & operator = ( const SvtLinguConfig & ) SAL_DELETED_FUNCTION;
+    SvtLinguConfig( const SvtLinguConfig & ) = delete;
+    SvtLinguConfig & operator = ( const SvtLinguConfig & ) = delete;
 
 public:
     SvtLinguConfig();
diff --git a/include/unotools/localedatawrapper.hxx b/include/unotools/localedatawrapper.hxx
index 55106d8ca491..1664ad847fca 100644
--- a/include/unotools/localedatawrapper.hxx
+++ b/include/unotools/localedatawrapper.hxx
@@ -331,8 +331,8 @@ public:
     static  void                outputCheckMessage( const OUString& rMsg );
     static  void                outputCheckMessage( const char* pStr);
 
-    LocaleDataWrapper(const LocaleDataWrapper&) SAL_DELETED_FUNCTION;
-    LocaleDataWrapper& operator=(const LocaleDataWrapper&) SAL_DELETED_FUNCTION;
+    LocaleDataWrapper(const LocaleDataWrapper&) = delete;
+    LocaleDataWrapper& operator=(const LocaleDataWrapper&) = delete;
 
 private:
 
diff --git a/include/unotools/nativenumberwrapper.hxx b/include/unotools/nativenumberwrapper.hxx
index 7c65a826a5d1..a6582d27292b 100644
--- a/include/unotools/nativenumberwrapper.hxx
+++ b/include/unotools/nativenumberwrapper.hxx
@@ -31,8 +31,8 @@ namespace com { namespace sun { namespace star {
 class UNOTOOLS_DLLPUBLIC NativeNumberWrapper
 {
     ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XNativeNumberSupplier >   xNNS;
-                                NativeNumberWrapper( const NativeNumberWrapper& ) SAL_DELETED_FUNCTION;
-            NativeNumberWrapper&    operator=( const NativeNumberWrapper& ) SAL_DELETED_FUNCTION;
+                                NativeNumberWrapper( const NativeNumberWrapper& ) = delete;
+            NativeNumberWrapper&    operator=( const NativeNumberWrapper& ) = delete;
 
 public:
                                 NativeNumberWrapper(
diff --git a/include/unotools/numberformatcodewrapper.hxx b/include/unotools/numberformatcodewrapper.hxx
index 00f647a3b59b..b41233407d41 100644
--- a/include/unotools/numberformatcodewrapper.hxx
+++ b/include/unotools/numberformatcodewrapper.hxx
@@ -34,8 +34,8 @@ class UNOTOOLS_DLLPUBLIC NumberFormatCodeWrapper
     ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XNumberFormatCode >   xNFC;
     ::com::sun::star::lang::Locale          aLocale;
 
-                                NumberFormatCodeWrapper( const NumberFormatCodeWrapper& ) SAL_DELETED_FUNCTION;
-            NumberFormatCodeWrapper&    operator=( const NumberFormatCodeWrapper& ) SAL_DELETED_FUNCTION;
+                                NumberFormatCodeWrapper( const NumberFormatCodeWrapper& ) = delete;
+            NumberFormatCodeWrapper&    operator=( const NumberFormatCodeWrapper& ) = delete;
 
 public:
                                 NumberFormatCodeWrapper(
diff --git a/include/unotools/options.hxx b/include/unotools/options.hxx
index 6c3390c2e4ca..3022f433b435 100644
--- a/include/unotools/options.hxx
+++ b/include/unotools/options.hxx
@@ -81,8 +81,8 @@ public:
     virtual ~Options() = 0;
 
 private:
-    Options(Options &) SAL_DELETED_FUNCTION;
-    void operator =(Options &) SAL_DELETED_FUNCTION;
+    Options(Options &) = delete;
+    void operator =(Options &) = delete;
 
 protected:
     virtual void ConfigurationChanged( ::utl::ConfigurationBroadcaster* p, sal_uInt32 nHint=0 ) SAL_OVERRIDE;
diff --git a/include/unotools/searchopt.hxx b/include/unotools/searchopt.hxx
index a34e4490b56f..df655d74dec5 100644
--- a/include/unotools/searchopt.hxx
+++ b/include/unotools/searchopt.hxx
@@ -28,8 +28,8 @@ class UNOTOOLS_DLLPUBLIC SvtSearchOptions
 {
     SvtSearchOptions_Impl   *pImpl;
 
-    SvtSearchOptions( const SvtSearchOptions & ) SAL_DELETED_FUNCTION;
-    SvtSearchOptions & operator = ( const SvtSearchOptions & ) SAL_DELETED_FUNCTION;
+    SvtSearchOptions( const SvtSearchOptions & ) = delete;
+    SvtSearchOptions & operator = ( const SvtSearchOptions & ) = delete;
 
 public:
     SvtSearchOptions();
diff --git a/include/unotools/sharedunocomponent.hxx b/include/unotools/sharedunocomponent.hxx
index 04df770fbaf8..7226822e942f 100644
--- a/include/unotools/sharedunocomponent.hxx
+++ b/include/unotools/sharedunocomponent.hxx
@@ -63,8 +63,8 @@ namespace utl
         ~DisposableComponent();
 
     private:
-        DisposableComponent( const DisposableComponent& ) SAL_DELETED_FUNCTION;
-        DisposableComponent& operator=( const DisposableComponent& ) SAL_DELETED_FUNCTION;
+        DisposableComponent( const DisposableComponent& ) = delete;
+        DisposableComponent& operator=( const DisposableComponent& ) = delete;
     };
 
     //= CloseableComponent
@@ -103,8 +103,8 @@ namespace utl
         ~CloseableComponent();
 
     private:
-        CloseableComponent( const CloseableComponent& ) SAL_DELETED_FUNCTION;
-        CloseableComponent& operator=( const CloseableComponent& ) SAL_DELETED_FUNCTION;
+        CloseableComponent( const CloseableComponent& ) = delete;
+        CloseableComponent& operator=( const CloseableComponent& ) = delete;
     };
 
     //= SharedUNOComponent
diff --git a/include/unotools/tempfile.hxx b/include/unotools/tempfile.hxx
index 7876c821ec9f..40ff667c0e44 100644
--- a/include/unotools/tempfile.hxx
+++ b/include/unotools/tempfile.hxx
@@ -49,8 +49,8 @@ class UNOTOOLS_DLLPUBLIC TempFile
     bool        bIsDirectory;
     bool        bKillingFileEnabled;
 
-    TempFile( const TempFile& ) SAL_DELETED_FUNCTION;
-    TempFile& operator=(const TempFile&) SAL_DELETED_FUNCTION;
+    TempFile( const TempFile& ) = delete;
+    TempFile& operator=(const TempFile&) = delete;
 
 public:
                     /**
diff --git a/include/unotools/transliterationwrapper.hxx b/include/unotools/transliterationwrapper.hxx
index 840bb408a1f4..9f93477bac13 100644
--- a/include/unotools/transliterationwrapper.hxx
+++ b/include/unotools/transliterationwrapper.hxx
@@ -42,8 +42,8 @@ class UNOTOOLS_DLLPUBLIC TransliterationWrapper
     sal_uInt32 nType;
     mutable bool bFirstCall;
 
-    TransliterationWrapper( const TransliterationWrapper& ) SAL_DELETED_FUNCTION;
-    TransliterationWrapper& operator=( const TransliterationWrapper& ) SAL_DELETED_FUNCTION;
+    TransliterationWrapper( const TransliterationWrapper& ) = delete;
+    TransliterationWrapper& operator=( const TransliterationWrapper& ) = delete;
 
     void loadModuleImpl() const;
     void setLanguageLocaleImpl( sal_uInt16 nLang );
diff --git a/include/vcl/btndlg.hxx b/include/vcl/btndlg.hxx
index cf5206e35d27..692c611c5869 100644
--- a/include/vcl/btndlg.hxx
+++ b/include/vcl/btndlg.hxx
@@ -80,8 +80,8 @@ protected:
     SAL_DLLPRIVATE long ImplGetButtonSize();
 
 private:
-                        ButtonDialog( const ButtonDialog & ) SAL_DELETED_FUNCTION;
-                        ButtonDialog& operator=( const ButtonDialog& ) SAL_DELETED_FUNCTION;
+                        ButtonDialog( const ButtonDialog & ) = delete;
+                        ButtonDialog& operator=( const ButtonDialog& ) = delete;
 
 private:
     std::vector<std::unique_ptr<ImplBtnDlgItem>> m_ItemList;
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index 26b5d8c3b7c0..580cc74ab201 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -120,8 +120,8 @@ public:
     css::uno::Reference<css::frame::XFrame> getFrame() { return m_xFrame; }
 
 private:
-    VclBuilder(const VclBuilder&) SAL_DELETED_FUNCTION;
-    VclBuilder& operator=(const VclBuilder&) SAL_DELETED_FUNCTION;
+    VclBuilder(const VclBuilder&) = delete;
+    VclBuilder& operator=(const VclBuilder&) = delete;
 
     typedef std::map<OUString, std::unique_ptr<osl::Module>> ModuleMap;
 
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx
index 408eda900569..ea1af74d6157 100644
--- a/include/vcl/button.hxx
+++ b/include/vcl/button.hxx
@@ -44,8 +44,8 @@ private:
     /// Command URL (like .uno:Save) in case the button should handle it.
     OUString maCommand;
 
-                                    Button (const Button &) SAL_DELETED_FUNCTION;
-                                    Button & operator= (const Button &) SAL_DELETED_FUNCTION;
+                                    Button (const Button &) = delete;
+                                    Button & operator= (const Button &) = delete;
 public:
     SAL_DLLPRIVATE DrawButtonFlags  ImplGetButtonState() const;
     SAL_DLLPRIVATE DrawButtonFlags& ImplGetButtonState();
@@ -218,8 +218,8 @@ protected:
 private:
     SAL_DLLPRIVATE void            ImplInit( vcl::Window* pParent, WinBits nStyle );
 
-                                   OKButton (const OKButton &) SAL_DELETED_FUNCTION;
-                                   OKButton & operator= (const OKButton &) SAL_DELETED_FUNCTION;
+                                   OKButton (const OKButton &) = delete;
+                                   OKButton & operator= (const OKButton &) = delete;
 
 public:
     explicit        OKButton( vcl::Window* pParent, WinBits nStyle = WB_DEFBUTTON );
@@ -234,8 +234,8 @@ protected:
 private:
     SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle );
 
-                        CancelButton (const CancelButton &) SAL_DELETED_FUNCTION;
-                        CancelButton & operator= (const CancelButton &) SAL_DELETED_FUNCTION;
+                        CancelButton (const CancelButton &) = delete;
+                        CancelButton & operator= (const CancelButton &) = delete;
 
 public:
     explicit        CancelButton( vcl::Window* pParent, WinBits nStyle = 0 );
@@ -261,8 +261,8 @@ protected:
 private:
     SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle );
 
-                        HelpButton( const HelpButton & ) SAL_DELETED_FUNCTION;
-                        HelpButton & operator= ( const HelpButton & ) SAL_DELETED_FUNCTION;
+                        HelpButton( const HelpButton & ) = delete;
+                        HelpButton & operator= ( const HelpButton & ) = delete;
 
 public:
     explicit        HelpButton( vcl::Window* pParent, WinBits nStyle = 0 );
@@ -302,8 +302,8 @@ private:
     SAL_DLLPRIVATE Size     ImplGetRadioImageSize() const;
     SAL_DLLPRIVATE long     ImplGetImageToTextDistance() const;
 
-                            RadioButton(const RadioButton &) SAL_DELETED_FUNCTION;
-                            RadioButton& operator= (const RadioButton &) SAL_DELETED_FUNCTION;
+                            RadioButton(const RadioButton &) = delete;
+                            RadioButton& operator= (const RadioButton &) = delete;
 
 protected:
     using Control::ImplInitSettings;
@@ -426,8 +426,8 @@ private:
     SAL_DLLPRIVATE long         ImplGetImageToTextDistance() const;
     SAL_DLLPRIVATE Size         ImplGetCheckImageSize() const;
 
-                                CheckBox(const CheckBox &) SAL_DELETED_FUNCTION;
-                                CheckBox& operator= (const CheckBox &) SAL_DELETED_FUNCTION;
+                                CheckBox(const CheckBox &) = delete;
+                                CheckBox& operator= (const CheckBox &) = delete;
 
 protected:
     using Control::ImplInitSettings;
@@ -510,8 +510,8 @@ protected:
 private:
     SAL_DLLPRIVATE void     ImplInitStyle();
 
-                            ImageButton( const ImageButton & ) SAL_DELETED_FUNCTION;
-                            ImageButton & operator= ( const ImageButton & ) SAL_DELETED_FUNCTION;
+                            ImageButton( const ImageButton & ) = delete;
+                            ImageButton & operator= ( const ImageButton & ) = delete;
 
 public:
                  ImageButton( vcl::Window* pParent, WinBits nStyle = 0 );
@@ -520,8 +520,8 @@ public:
 
 class VCL_DLLPUBLIC ImageRadioButton : public RadioButton
 {
-                    ImageRadioButton( const ImageRadioButton & ) SAL_DELETED_FUNCTION;
-                    ImageRadioButton & operator= ( const ImageRadioButton & ) SAL_DELETED_FUNCTION;
+                    ImageRadioButton( const ImageRadioButton & ) = delete;
+                    ImageRadioButton & operator= ( const ImageRadioButton & ) = delete;
 
 public:
     explicit        ImageRadioButton( vcl::Window* pParent, WinBits nStyle = 0 );
@@ -529,8 +529,8 @@ public:
 
 class VCL_DLLPUBLIC TriStateBox : public CheckBox
 {
-                    TriStateBox( const TriStateBox & ) SAL_DELETED_FUNCTION;
-                    TriStateBox & operator= ( const TriStateBox & ) SAL_DELETED_FUNCTION;
+                    TriStateBox( const TriStateBox & ) = delete;
+                    TriStateBox & operator= ( const TriStateBox & ) = delete;
 
 public:
     explicit        TriStateBox( vcl::Window* pParent, WinBits nStyle = 0 );
diff --git a/include/vcl/ctrl.hxx b/include/vcl/ctrl.hxx
index 28bf572b54ac..7fe2411d6b21 100644
--- a/include/vcl/ctrl.hxx
+++ b/include/vcl/ctrl.hxx
@@ -47,8 +47,8 @@ private:
 
     SAL_DLLPRIVATE void     ImplInitControlData();
 
-                            Control (const Control &) SAL_DELETED_FUNCTION;
-                            Control & operator= (const Control &) SAL_DELETED_FUNCTION;
+                            Control (const Control &) = delete;
+                            Control & operator= (const Control &) = delete;
 
 protected:
                     Control( WindowType nType );
diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx
index 5fc0708fed02..1ab08d2fb10f 100644
--- a/include/vcl/dialog.hxx
+++ b/include/vcl/dialog.hxx
@@ -55,8 +55,8 @@ private:
 
     virtual void ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE;
 
-    SAL_DLLPRIVATE         Dialog (const Dialog &) SAL_DELETED_FUNCTION;
-    SAL_DLLPRIVATE         Dialog & operator= (const Dialog &) SAL_DELETED_FUNCTION;
+    SAL_DLLPRIVATE         Dialog (const Dialog &) = delete;
+    SAL_DLLPRIVATE         Dialog & operator= (const Dialog &) = delete;
 
     DECL_DLLPRIVATE_LINK_TYPED( ImplAsyncCloseHdl, void*, void );
 
@@ -129,8 +129,8 @@ public:
 // - ModelessDialog -
 class VCL_DLLPUBLIC ModelessDialog : public Dialog
 {
-                    ModelessDialog (const ModelessDialog &) SAL_DELETED_FUNCTION;
-                    ModelessDialog & operator= (const ModelessDialog &) SAL_DELETED_FUNCTION;
+                    ModelessDialog (const ModelessDialog &) = delete;
+                    ModelessDialog & operator= (const ModelessDialog &) = delete;
 
 public:
     explicit        ModelessDialog( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription, Dialog::InitFlag eFlag = Dialog::InitFlag::Default );
@@ -149,8 +149,8 @@ protected:
 
 private:
 
-    SAL_DLLPRIVATE         ModalDialog (const ModalDialog &) SAL_DELETED_FUNCTION;
-    SAL_DLLPRIVATE         ModalDialog & operator= (const ModalDialog &) SAL_DELETED_FUNCTION;
+    SAL_DLLPRIVATE         ModalDialog (const ModalDialog &) = delete;
+    SAL_DLLPRIVATE         ModalDialog & operator= (const ModalDialog &) = delete;
 };
 
 #endif // INCLUDED_VCL_DIALOG_HXX
diff --git a/include/vcl/dockingarea.hxx b/include/vcl/dockingarea.hxx
index a0ce2d674daa..f7cf79fda498 100644
--- a/include/vcl/dockingarea.hxx
+++ b/include/vcl/dockingarea.hxx
@@ -31,8 +31,8 @@ class VCL_DLLPUBLIC DockingAreaWindow : public vcl::Window
 private:
     ImplData*       mpImplData;
 
-                    DockingAreaWindow (const DockingAreaWindow &) SAL_DELETED_FUNCTION;
-                    DockingAreaWindow & operator= (const DockingAreaWindow &) SAL_DELETED_FUNCTION;
+                    DockingAreaWindow (const DockingAreaWindow &) = delete;
+                    DockingAreaWindow & operator= (const DockingAreaWindow &) = delete;
 
 public:
     explicit        DockingAreaWindow( vcl::Window* pParent );
diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx
index 49021e4fd605..b9b51e977082 100644
--- a/include/vcl/dockwin.hxx
+++ b/include/vcl/dockwin.hxx
@@ -262,8 +262,8 @@ private:
     SAL_DLLPRIVATE void setPosSizeOnContainee(Size aSize, Window &rBox);
     DECL_DLLPRIVATE_LINK_TYPED( ImplHandleLayoutTimerHdl, Idle*, void );
 
-                           DockingWindow (const DockingWindow &) SAL_DELETED_FUNCTION;
-                           DockingWindow & operator= (const DockingWindow &) SAL_DELETED_FUNCTION;
+                           DockingWindow (const DockingWindow &) = delete;
+                           DockingWindow & operator= (const DockingWindow &) = delete;
 
 protected:
     using Window::ImplInit;
diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx
index 68c43dde59c9..2ce1a6b2ec67 100644
--- a/include/vcl/floatwin.hxx
+++ b/include/vcl/floatwin.hxx
@@ -115,8 +115,8 @@ private:
     DECL_DLLPRIVATE_LINK_TYPED(  ImplEndPopupModeHdl, void*, void );
     virtual void setPosSizeOnContainee(Size aSize, Window &rBox) SAL_OVERRIDE;
 
-                           FloatingWindow (const FloatingWindow &) SAL_DELETED_FUNCTION;
-                           FloatingWindow & operator= (const FloatingWindow &) SAL_DELETED_FUNCTION;
+                           FloatingWindow (const FloatingWindow &) = delete;
+                           FloatingWindow & operator= (const FloatingWindow &) = delete;
 
 protected:
     using Window::ImplInit;
diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx
index 191a6e73208a..05dfed3608e7 100644
--- a/include/vcl/graphicfilter.hxx
+++ b/include/vcl/graphicfilter.hxx
@@ -172,8 +172,8 @@ class VCL_DLLPUBLIC GraphicDescriptor
     bool            ImpDetectSGV( SvStream& rStm, bool bExtendedInfo );
     bool            ImpDetectEMF( SvStream& rStm, bool bExtendedInfo );
     bool            ImpDetectSVG( SvStream& rStm, bool bExtendedInfo );
-    GraphicDescriptor( const GraphicDescriptor& ) SAL_DELETED_FUNCTION;
-    GraphicDescriptor& operator=( const GraphicDescriptor& ) SAL_DELETED_FUNCTION;
+    GraphicDescriptor( const GraphicDescriptor& ) = delete;
+    GraphicDescriptor& operator=( const GraphicDescriptor& ) = delete;
 
 public:
 
diff --git a/include/vcl/menubtn.hxx b/include/vcl/menubtn.hxx
index 62933f1e45a9..d2672eb9bc47 100644
--- a/include/vcl/menubtn.hxx
+++ b/include/vcl/menubtn.hxx
@@ -47,8 +47,8 @@ private:
     SAL_DLLPRIVATE void    ImplInitMenuButtonData();
     DECL_DLLPRIVATE_LINK_TYPED( ImplMenuTimeoutHdl, Timer*, void );
 
-                           MenuButton( const MenuButton & ) SAL_DELETED_FUNCTION;
-                           MenuButton& operator=( const MenuButton & ) SAL_DELETED_FUNCTION;
+                           MenuButton( const MenuButton & ) = delete;
+                           MenuButton& operator=( const MenuButton & ) = delete;
 
 protected:
     using Window::ImplInit;
diff --git a/include/vcl/metric.hxx b/include/vcl/metric.hxx
index 7a7c7d30c860..ba2393d4123e 100644
--- a/include/vcl/metric.hxx
+++ b/include/vcl/metric.hxx
@@ -212,8 +212,8 @@ private:
     sal_uInt32          mnRefCount;
 
     // prevent assignment and copy construction
-                        FontCharMap( const FontCharMap& ) SAL_DELETED_FUNCTION;
-    void                operator=( const FontCharMap& ) SAL_DELETED_FUNCTION;
+                        FontCharMap( const FontCharMap& ) = delete;
+    void                operator=( const FontCharMap& ) = delete;
 };
 
 inline void intrusive_ptr_add_ref(FontCharMap* pFontCharMap)
diff --git a/include/vcl/morebtn.hxx b/include/vcl/morebtn.hxx
index 01a6e95da5cf..e03f9d4956de 100644
--- a/include/vcl/morebtn.hxx
+++ b/include/vcl/morebtn.hxx
@@ -39,8 +39,8 @@ private:
     MapUnit             meUnit;
     bool                mbState;
 
-                        MoreButton( const MoreButton & ) SAL_DELETED_FUNCTION;
-                        MoreButton& operator=( const MoreButton & ) SAL_DELETED_FUNCTION;
+                        MoreButton( const MoreButton & ) = delete;
+                        MoreButton& operator=( const MoreButton & ) = delete;
     SAL_DLLPRIVATE void ShowState();
 
 protected:
diff --git a/include/vcl/opengl/OpenGLHelper.hxx b/include/vcl/opengl/OpenGLHelper.hxx
index 50783f278eb9..437b4350101a 100644
--- a/include/vcl/opengl/OpenGLHelper.hxx
+++ b/include/vcl/opengl/OpenGLHelper.hxx
@@ -37,7 +37,7 @@
 // All member functions static and VCL_DLLPUBLIC. Basically a glorified namespace.
 struct VCL_DLLPUBLIC OpenGLHelper
 {
-    OpenGLHelper() SAL_DELETED_FUNCTION; // Should not be instantiated
+    OpenGLHelper() = delete; // Should not be instantiated
 
 public:
 
diff --git a/include/vcl/opengl/OpenGLWrapper.hxx b/include/vcl/opengl/OpenGLWrapper.hxx
index 4d3a9e9ab57b..e73aa08466be 100644
--- a/include/vcl/opengl/OpenGLWrapper.hxx
+++ b/include/vcl/opengl/OpenGLWrapper.hxx
@@ -17,7 +17,7 @@
 // All member functions static and VCL_DLLPUBLIC. Basically a glorified namespace.
 struct VCL_DLLPUBLIC OpenGLWrapper
 {
-    OpenGLWrapper() SAL_DELETED_FUNCTION; // Should not be instantiated
+    OpenGLWrapper() = delete; // Should not be instantiated
 
     /**
      * Returns true if VCL has OpenGL rendering enabled
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 20bd81ae197f..f4cbc5f06704 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -351,8 +351,8 @@ private:
     }
 
 private:
-    OutputDevice(const OutputDevice&) SAL_DELETED_FUNCTION;
-    OutputDevice& operator=(const OutputDevice&) SAL_DELETED_FUNCTION;
+    OutputDevice(const OutputDevice&) = delete;
+    OutputDevice& operator=(const OutputDevice&) = delete;
 
     mutable SalGraphics*            mpGraphics;         ///< Graphics context to draw on
     mutable VclPtr<OutputDevice>    mpPrevGraphics;     ///< Previous output device in list
@@ -633,7 +633,7 @@ protected:
 private:
 
     // not implemented; to detect misuses of DrawOutDev(...OutputDevice&);
-    SAL_DLLPRIVATE void         DrawOutDev( const Point&, const Size&, const Point&,  const Size&, const Printer&) SAL_DELETED_FUNCTION;
+    SAL_DLLPRIVATE void         DrawOutDev( const Point&, const Size&, const Point&,  const Size&, const Printer&) = delete;
     ///@}
 
 
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index d382f12cafe7..9d5fafb5efb9 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -236,8 +236,8 @@ private:
 
 private:
     SAL_DLLPRIVATE bool         EndJob();
-                                Printer( const Printer& rPrinter ) SAL_DELETED_FUNCTION;
-                   Printer&     operator =( const Printer& rPrinter ) SAL_DELETED_FUNCTION;
+                                Printer( const Printer& rPrinter ) = delete;
+                   Printer&     operator =( const Printer& rPrinter ) = delete;
 
 public:
     SAL_DLLPRIVATE void         ImplStartPage();
diff --git a/include/vcl/quickselectionengine.hxx b/include/vcl/quickselectionengine.hxx
index d68b4fa8bbe4..2eba2495481f 100644
--- a/include/vcl/quickselectionengine.hxx
+++ b/include/vcl/quickselectionengine.hxx
@@ -80,8 +80,8 @@ namespace vcl
         bool bEnabled;
 
     private:
-        QuickSelectionEngine( const QuickSelectionEngine& ) SAL_DELETED_FUNCTION;
-        QuickSelectionEngine& operator=( const QuickSelectionEngine& ) SAL_DELETED_FUNCTION;
+        QuickSelectionEngine( const QuickSelectionEngine& ) = delete;
+        QuickSelectionEngine& operator=( const QuickSelectionEngine& ) = delete;
     };
 
 
diff --git a/include/vcl/split.hxx b/include/vcl/split.hxx
index 069712aca2cf..7ef3eba0273d 100644
--- a/include/vcl/split.hxx
+++ b/include/vcl/split.hxx
@@ -53,8 +53,8 @@ private:
     SAL_DLLPRIVATE void      ImplRestoreSplitter();
     SAL_DLLPRIVATE void      ImplInitHorVer(bool bNew);
 
-                             Splitter (const Splitter &) SAL_DELETED_FUNCTION;
-                             Splitter& operator= (const Splitter &) SAL_DELETED_FUNCTION;
+                             Splitter (const Splitter &) = delete;
+                             Splitter& operator= (const Splitter &) = delete;
 
 protected:
     using Window::ImplInit;
diff --git a/include/vcl/splitwin.hxx b/include/vcl/splitwin.hxx
index 4cec7d07645b..2e9066be7b89 100644
--- a/include/vcl/splitwin.hxx
+++ b/include/vcl/splitwin.hxx
@@ -120,8 +120,8 @@ private:
                                                 long& rMouseOff, ImplSplitSet** ppFoundSet, sal_uInt16& rFoundPos );
     SAL_DLLPRIVATE void ImplDrawSplitTracking(const Point& rPos);
 
-                        SplitWindow (const SplitWindow &) SAL_DELETED_FUNCTION;
-                        SplitWindow & operator= (const SplitWindow &) SAL_DELETED_FUNCTION;
+                        SplitWindow (const SplitWindow &) = delete;
+                        SplitWindow & operator= (const SplitWindow &) = delete;
 public:
                         SplitWindow( vcl::Window* pParent, WinBits nStyle = 0 );
     virtual             ~SplitWindow();
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index a5fb8fe0e4df..e1d8320404bc 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -1501,8 +1501,8 @@ private:
 class VCL_DLLPUBLIC SolarMutexGuard
 {
 private:
-    SolarMutexGuard( const SolarMutexGuard& ) SAL_DELETED_FUNCTION;
-    const SolarMutexGuard& operator = ( const SolarMutexGuard& ) SAL_DELETED_FUNCTION;
+    SolarMutexGuard( const SolarMutexGuard& ) = delete;
+    const SolarMutexGuard& operator = ( const SolarMutexGuard& ) = delete;
     comphelper::SolarMutex& m_solarMutex;
 
 public:
@@ -1523,8 +1523,8 @@ public:
 
 class VCL_DLLPUBLIC SolarMutexClearableGuard SAL_FINAL
 {
-    SolarMutexClearableGuard( const SolarMutexClearableGuard& ) SAL_DELETED_FUNCTION;
-    const SolarMutexClearableGuard& operator = ( const SolarMutexClearableGuard& ) SAL_DELETED_FUNCTION;
+    SolarMutexClearableGuard( const SolarMutexClearableGuard& ) = delete;
+    const SolarMutexClearableGuard& operator = ( const SolarMutexClearableGuard& ) = delete;
     bool m_bCleared;
 public:
     /** Acquires mutex
@@ -1561,8 +1561,8 @@ protected:
 
 class VCL_DLLPUBLIC SolarMutexResettableGuard SAL_FINAL
 {
-    SolarMutexResettableGuard( const SolarMutexResettableGuard& ) SAL_DELETED_FUNCTION;
-    const SolarMutexResettableGuard& operator = ( const SolarMutexResettableGuard& ) SAL_DELETED_FUNCTION;
+    SolarMutexResettableGuard( const SolarMutexResettableGuard& ) = delete;
+    const SolarMutexResettableGuard& operator = ( const SolarMutexResettableGuard& ) = delete;
     bool m_bCleared;
 public:
     /** Acquires mutex
@@ -1621,8 +1621,8 @@ private:
 #endif
     comphelper::SolarMutex& m_rSolarMutex;
 
-    SolarMutexTryAndBuyGuard(const SolarMutexTryAndBuyGuard&) SAL_DELETED_FUNCTION;
-    SolarMutexTryAndBuyGuard& operator=(const SolarMutexTryAndBuyGuard&) SAL_DELETED_FUNCTION;
+    SolarMutexTryAndBuyGuard(const SolarMutexTryAndBuyGuard&) = delete;
+    SolarMutexTryAndBuyGuard& operator=(const SolarMutexTryAndBuyGuard&) = delete;
 
 public:
 
diff --git a/include/vcl/svgdata.hxx b/include/vcl/svgdata.hxx
index b234c1083de0..84a625e935d1 100644
--- a/include/vcl/svgdata.hxx
+++ b/include/vcl/svgdata.hxx
@@ -57,8 +57,8 @@ private:
     void ensureReplacement();
     void ensureSequenceAndRange();
 
-    SvgData(const SvgData&) SAL_DELETED_FUNCTION;
-    SvgData& operator=(const SvgData&) SAL_DELETED_FUNCTION;
+    SvgData(const SvgData&) = delete;
+    SvgData& operator=(const SvgData&) = delete;
 
 public:
     SvgData(const SvgDataArray& rSvgDataArray, const OUString& rPath);
diff --git a/include/vcl/syschild.hxx b/include/vcl/syschild.hxx
index 928c1861b52a..ec72bf5ecb7c 100644
--- a/include/vcl/syschild.hxx
+++ b/include/vcl/syschild.hxx
@@ -34,8 +34,8 @@ private:
     SAL_DLLPRIVATE void     ImplTestJavaException( void* pEnv );
 
     // Copy assignment is forbidden and not implemented.
-                            SystemChildWindow (const SystemChildWindow &) SAL_DELETED_FUNCTION;
-                            SystemChildWindow & operator= (const SystemChildWindow &) SAL_DELETED_FUNCTION;
+                            SystemChildWindow (const SystemChildWindow &) = delete;
+                            SystemChildWindow & operator= (const SystemChildWindow &) = delete;
 
 public:
     explicit                SystemChildWindow( vcl::Window* pParent, WinBits nStyle = 0 );
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index 732e6f5eb645..5b08217e0a5d 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -229,8 +229,8 @@ private:
     DECL_DLLPRIVATE_LINK_TYPED(    ImplCustomMenuListener, VclMenuEvent&, void );
     DECL_DLLPRIVATE_LINK_TYPED(    ImplDropdownLongClickHdl, Timer*, void );
 
-                                   ToolBox (const ToolBox &) SAL_DELETED_FUNCTION;
-                          ToolBox& operator= (const ToolBox &) SAL_DELETED_FUNCTION;
+                                   ToolBox (const ToolBox &) = delete;
+                          ToolBox& operator= (const ToolBox &) = delete;
 
 public:
     SAL_DLLPRIVATE void            ImplFloatControl( bool bStart, FloatingWindow* pWindow = NULL );
diff --git a/include/vcl/vclptr.hxx b/include/vcl/vclptr.hxx
index 2614886e9723..ce2cd3518e1a 100644
--- a/include/vcl/vclptr.hxx
+++ b/include/vcl/vclptr.hxx
@@ -352,12 +352,12 @@ public:
 
 private:
     // Most likely we don't want this default copy-construtor.
-    ScopedVclPtr (const ScopedVclPtr<reference_type> &) SAL_DELETED_FUNCTION;
+    ScopedVclPtr (const ScopedVclPtr<reference_type> &) = delete;
     // And certainly we don't want a default assignment operator.
-    ScopedVclPtr<reference_type>& operator= (const ScopedVclPtr<reference_type> &) SAL_DELETED_FUNCTION;
+    ScopedVclPtr<reference_type>& operator= (const ScopedVclPtr<reference_type> &) = delete;
     // And disallow reset as that doesn't call disposeAndClear on the original reference
-    void reset() SAL_DELETED_FUNCTION;
-    void reset(reference_type *pBody) SAL_DELETED_FUNCTION;
+    void reset() = delete;
+    void reset(reference_type *pBody) = delete;
 
 protected:
     inline ScopedVclPtr (reference_type * pBody, __sal_NoAcquire)
diff --git a/include/vcl/virdev.hxx b/include/vcl/virdev.hxx
index 669a224741ad..e2e555933f49 100644
--- a/include/vcl/virdev.hxx
+++ b/include/vcl/virdev.hxx
@@ -51,8 +51,8 @@ private:
                                                 const basebmp::RawMemorySharedArray &pAlphaBuffer,
                                                 const bool bTopDown );
 
-    VirtualDevice (const VirtualDevice &) SAL_DELETED_FUNCTION;
-    VirtualDevice & operator= (const VirtualDevice &) SAL_DELETED_FUNCTION;
+    VirtualDevice (const VirtualDevice &) = delete;
+    VirtualDevice & operator= (const VirtualDevice &) = delete;
 
     /** Used for alpha VDev, to set areas to opaque
 
diff --git a/include/vcl/wrkwin.hxx b/include/vcl/wrkwin.hxx
index 467e54ad4e9b..0a8b3cd1249a 100644
--- a/include/vcl/wrkwin.hxx
+++ b/include/vcl/wrkwin.hxx
@@ -62,8 +62,8 @@ private:
     SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle, const ::com::sun::star::uno::Any& aSystemWorkWindowToken );
 
 private:
-    WorkWindow( const WorkWindow& rWin ) SAL_DELETED_FUNCTION;
-    WorkWindow&  operator =( const WorkWindow& rWin ) SAL_DELETED_FUNCTION;
+    WorkWindow( const WorkWindow& rWin ) = delete;
+    WorkWindow&  operator =( const WorkWindow& rWin ) = delete;
 
 protected:
     explicit        WorkWindow( WindowType nType );
diff --git a/include/xmloff/DocumentSettingsContext.hxx b/include/xmloff/DocumentSettingsContext.hxx
index f39cc200a6ca..af57413061bd 100644
--- a/include/xmloff/DocumentSettingsContext.hxx
+++ b/include/xmloff/DocumentSettingsContext.hxx
@@ -47,8 +47,8 @@ public:
     virtual void EndElement() SAL_OVERRIDE;
 
 private:
-    XMLDocumentSettingsContext( const XMLDocumentSettingsContext& ) SAL_DELETED_FUNCTION;
-    XMLDocumentSettingsContext& operator=( const XMLDocumentSettingsContext& ) SAL_DELETED_FUNCTION;
+    XMLDocumentSettingsContext( const XMLDocumentSettingsContext& ) = delete;
+    XMLDocumentSettingsContext& operator=( const XMLDocumentSettingsContext& ) = delete;
 };
 
 #endif
diff --git a/include/xmloff/SchXMLExportHelper.hxx b/include/xmloff/SchXMLExportHelper.hxx
index 3585d64d1a03..36f8d402a061 100644
--- a/include/xmloff/SchXMLExportHelper.hxx
+++ b/include/xmloff/SchXMLExportHelper.hxx
@@ -56,8 +56,8 @@ public:
     void SetDestinationShellID( const OUString& rShellID );
 
 private:
-    SchXMLExportHelper(SchXMLExportHelper &) SAL_DELETED_FUNCTION;
-    void operator =(SchXMLExportHelper &) SAL_DELETED_FUNCTION;
+    SchXMLExportHelper(SchXMLExportHelper &) = delete;
+    void operator =(SchXMLExportHelper &) = delete;
 
 private:
     SchXMLExportHelper_Impl* m_pImpl;
diff --git a/include/xmloff/XMLCharContext.hxx b/include/xmloff/XMLCharContext.hxx
index a07c8136b183..63fb6ff00aee 100644
--- a/include/xmloff/XMLCharContext.hxx
+++ b/include/xmloff/XMLCharContext.hxx
@@ -25,8 +25,8 @@
 
 class XMLOFF_DLLPUBLIC XMLCharContext : public SvXMLImportContext
 {
-    XMLCharContext(const XMLCharContext&) SAL_DELETED_FUNCTION;
-    void operator =(const XMLCharContext&) SAL_DELETED_FUNCTION;
+    XMLCharContext(const XMLCharContext&) = delete;
+    void operator =(const XMLCharContext&) = delete;
 protected:
     sal_Int16   m_nControl;
     sal_uInt16  m_nCount;
diff --git a/include/xmloff/prhdlfac.hxx b/include/xmloff/prhdlfac.hxx
index e5d608c8cf37..515a69cfbfe7 100644
--- a/include/xmloff/prhdlfac.hxx
+++ b/include/xmloff/prhdlfac.hxx
@@ -41,8 +41,8 @@ class XMLOFF_DLLPUBLIC XMLPropertyHandlerFactory : public salhelper::SimpleRefer
     struct Impl;
     Impl* mpImpl;
 
-    XMLPropertyHandlerFactory( const XMLPropertyHandlerFactory& ) SAL_DELETED_FUNCTION;
-    XMLPropertyHandlerFactory& operator= ( const XMLPropertyHandlerFactory& ) SAL_DELETED_FUNCTION;
+    XMLPropertyHandlerFactory( const XMLPropertyHandlerFactory& ) = delete;
+    XMLPropertyHandlerFactory& operator= ( const XMLPropertyHandlerFactory& ) = delete;
 
 public:
     XMLPropertyHandlerFactory();
diff --git a/include/xmloff/prstylei.hxx b/include/xmloff/prstylei.hxx
index 8ce29d50ed2b..db250e1f69b3 100644
--- a/include/xmloff/prstylei.hxx
+++ b/include/xmloff/prstylei.hxx
@@ -54,8 +54,8 @@ private:
     static OldFillStyleDefinitionSet maFooterSet;
     static OldFillStyleDefinitionSet maParaSet;
 
-    XMLPropStyleContext(XMLPropStyleContext &) SAL_DELETED_FUNCTION;
-    void operator =(XMLPropStyleContext &) SAL_DELETED_FUNCTION;
+    XMLPropStyleContext(XMLPropStyleContext &) = delete;
+    void operator =(XMLPropStyleContext &) = delete;
 
 protected:
 
diff --git a/include/xmloff/txtimp.hxx b/include/xmloff/txtimp.hxx
index 9783a9bed237..d507e508f926 100644
--- a/include/xmloff/txtimp.hxx
+++ b/include/xmloff/txtimp.hxx
@@ -368,8 +368,8 @@ enum XMLTextType
 class XMLOFF_DLLPUBLIC XMLTextImportHelper : public salhelper::SimpleReferenceObject
 {
 private:
-    XMLTextImportHelper(const XMLTextImportHelper&) SAL_DELETED_FUNCTION;
-    XMLTextImportHelper& operator=(const XMLTextImportHelper&) SAL_DELETED_FUNCTION;
+    XMLTextImportHelper(const XMLTextImportHelper&) = delete;
+    XMLTextImportHelper& operator=(const XMLTextImportHelper&) = delete;
 
     struct Impl;
     std::unique_ptr<Impl> m_xImpl;
diff --git a/include/xmloff/txtparae.hxx b/include/xmloff/txtparae.hxx
index 96c2afc48174..68e23c66ac13 100644
--- a/include/xmloff/txtparae.hxx
+++ b/include/xmloff/txtparae.hxx
@@ -673,7 +673,7 @@ public:
     void PopTextListsHelper();
 
 private:
-        XMLTextParagraphExport(XMLTextParagraphExport &) SAL_DELETED_FUNCTION;
+        XMLTextParagraphExport(XMLTextParagraphExport &) = delete;
 };
 
 inline const XMLTextListAutoStylePool&
diff --git a/include/xmloff/xmlimppr.hxx b/include/xmloff/xmlimppr.hxx
index 59807ecd0216..9011c21a3645 100644
--- a/include/xmloff/xmlimppr.hxx
+++ b/include/xmloff/xmlimppr.hxx
@@ -57,8 +57,8 @@ class XMLOFF_DLLPUBLIC SvXMLImportPropertyMapper : public salhelper::SimpleRefer
 
     SvXMLImport& rImport;   // access to error handling
 
-    SvXMLImportPropertyMapper(SvXMLImportPropertyMapper &) SAL_DELETED_FUNCTION;
-    void operator =(SvXMLImportPropertyMapper &) SAL_DELETED_FUNCTION;
+    SvXMLImportPropertyMapper(SvXMLImportPropertyMapper &) = delete;
+    void operator =(SvXMLImportPropertyMapper &) = delete;
 
 protected:
 
diff --git a/include/xmloff/xmlprmap.hxx b/include/xmloff/xmlprmap.hxx
index 569adfa6552b..7fc7a720a27f 100644
--- a/include/xmloff/xmlprmap.hxx
+++ b/include/xmloff/xmlprmap.hxx
@@ -39,8 +39,8 @@ class XMLOFF_DLLPUBLIC XMLPropertySetMapper : public salhelper::SimpleReferenceO
 
     Impl* mpImpl;
 
-    XMLPropertySetMapper( const XMLPropertySetMapper& ) SAL_DELETED_FUNCTION;
-    XMLPropertySetMapper& operator= ( const XMLPropertySetMapper& ) SAL_DELETED_FUNCTION;
+    XMLPropertySetMapper( const XMLPropertySetMapper& ) = delete;
+    XMLPropertySetMapper& operator= ( const XMLPropertySetMapper& ) = delete;
 
 public:
     /** The last element of the XMLPropertyMapEntry-array must contain NULL-values.
diff --git a/include/xmloff/xmlstyle.hxx b/include/xmloff/xmlstyle.hxx
index 7c24399ac7c3..92fa85c4a4ec 100644
--- a/include/xmloff/xmlstyle.hxx
+++ b/include/xmloff/xmlstyle.hxx
@@ -183,8 +183,8 @@ class XMLOFF_DLLPUBLIC SvXMLStylesContext : public SvXMLImportContext
 
     SAL_DLLPRIVATE const SvXMLTokenMap& GetStyleStylesElemTokenMap();
 
-    SvXMLStylesContext(SvXMLStylesContext &) SAL_DELETED_FUNCTION;
-    void operator =(SvXMLStylesContext &) SAL_DELETED_FUNCTION;
+    SvXMLStylesContext(SvXMLStylesContext &) = delete;
+    void operator =(SvXMLStylesContext &) = delete;
 
 protected:
 
diff --git a/include/xmloff/xmluconv.hxx b/include/xmloff/xmluconv.hxx
index 94f8c43f18b8..74bc8143c519 100644
--- a/include/xmloff/xmluconv.hxx
+++ b/include/xmloff/xmluconv.hxx
@@ -78,8 +78,8 @@ public:
 class XMLOFF_DLLPUBLIC SvXMLUnitConverter
 {
 private:
-    SvXMLUnitConverter(const SvXMLUnitConverter&) SAL_DELETED_FUNCTION;
-    SvXMLUnitConverter& operator=(const SvXMLUnitConverter&) SAL_DELETED_FUNCTION;
+    SvXMLUnitConverter(const SvXMLUnitConverter&) = delete;
+    SvXMLUnitConverter& operator=(const SvXMLUnitConverter&) = delete;
 
     struct Impl;
     ::std::unique_ptr<Impl> m_pImpl;
diff --git a/include/xmlreader/xmlreader.hxx b/include/xmlreader/xmlreader.hxx
index 27a4be2aa425..5d46b1cc706e 100644
--- a/include/xmlreader/xmlreader.hxx
+++ b/include/xmlreader/xmlreader.hxx
@@ -68,8 +68,8 @@ public:
     const OUString& getUrl() const { return fileUrl_;}
 
 private:
-    XmlReader(const XmlReader&) SAL_DELETED_FUNCTION;
-    XmlReader& operator=(const XmlReader&) SAL_DELETED_FUNCTION;
+    XmlReader(const XmlReader&) = delete;
+    XmlReader& operator=(const XmlReader&) = delete;
 
     typedef std::vector< Span > NamespaceIris;
 
diff --git a/jvmfwk/source/elements.hxx b/jvmfwk/source/elements.hxx
index 2fc9a3f3066e..d1a741945fa6 100644
--- a/jvmfwk/source/elements.hxx
+++ b/jvmfwk/source/elements.hxx
@@ -263,8 +263,8 @@ public:
 class MergedSettings
 {
 private:
-    const MergedSettings& operator = (MergedSettings&) SAL_DELETED_FUNCTION;
-    MergedSettings(MergedSettings&) SAL_DELETED_FUNCTION;
+    const MergedSettings& operator = (MergedSettings&) = delete;
+    MergedSettings(MergedSettings&) = delete;
 
     void merge(const NodeJava & share, const NodeJava & user);
 
diff --git a/jvmfwk/source/libxmlutil.hxx b/jvmfwk/source/libxmlutil.hxx
index c83a72240f0d..c9a8f66c59b7 100644
--- a/jvmfwk/source/libxmlutil.hxx
+++ b/jvmfwk/source/libxmlutil.hxx
@@ -28,8 +28,8 @@ namespace jfw
 class CXPathObjectPtr
 {
     xmlXPathObject* _object;
-    CXPathObjectPtr & operator = (const CXPathObjectPtr&) SAL_DELETED_FUNCTION;
-    CXPathObjectPtr(const CXPathObjectPtr&) SAL_DELETED_FUNCTION;
+    CXPathObjectPtr & operator = (const CXPathObjectPtr&) = delete;
+    CXPathObjectPtr(const CXPathObjectPtr&) = delete;
 public:
     CXPathObjectPtr();
     ~CXPathObjectPtr();
@@ -45,8 +45,8 @@ class CXPathContextPtr
 {
     xmlXPathContext* _object;
 
-    CXPathContextPtr(const jfw::CXPathContextPtr&) SAL_DELETED_FUNCTION;
-    CXPathContextPtr & operator = (const CXPathContextPtr&) SAL_DELETED_FUNCTION;
+    CXPathContextPtr(const jfw::CXPathContextPtr&) = delete;
+    CXPathContextPtr & operator = (const CXPathContextPtr&) = delete;
 public:
     CXPathContextPtr();
     CXPathContextPtr(xmlXPathContextPtr aContext);
@@ -61,7 +61,7 @@ class CXmlDocPtr
 {
     xmlDoc* _object;
 
-    CXmlDocPtr(const CXmlDocPtr&) SAL_DELETED_FUNCTION;
+    CXmlDocPtr(const CXmlDocPtr&) = delete;
 
 public:
     CXmlDocPtr & operator = (const CXmlDocPtr&);
@@ -80,8 +80,8 @@ class CXmlCharPtr
 {
     xmlChar* _object;
 
-    CXmlCharPtr(const CXmlCharPtr&) SAL_DELETED_FUNCTION;
-    CXmlCharPtr & operator = (const CXmlCharPtr&) SAL_DELETED_FUNCTION;
+    CXmlCharPtr(const CXmlCharPtr&) = delete;
+    CXmlCharPtr & operator = (const CXmlCharPtr&) = delete;
 public:
     CXmlCharPtr();
     CXmlCharPtr(xmlChar* aDoc);
diff --git a/lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx b/lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx
index d7bb068ce831..7ea77a11f39a 100644
--- a/lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx
+++ b/lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx
@@ -74,8 +74,8 @@ class Hyphenator :
     linguistic::PropertyHelper_Hyphenation* pPropHelper;
     bool                                    bDisposing;
 
-    Hyphenator(const Hyphenator &) SAL_DELETED_FUNCTION;
-    Hyphenator & operator = (const Hyphenator &) SAL_DELETED_FUNCTION;
+    Hyphenator(const Hyphenator &) = delete;
+    Hyphenator & operator = (const Hyphenator &) = delete;
 
     linguistic::PropertyHelper_Hyphenation& GetPropHelper_Impl();
     linguistic::PropertyHelper_Hyphenation& GetPropHelper()
diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx b/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
index 5a53fd388a06..7e76d2335e34 100644
--- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
+++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
@@ -72,8 +72,8 @@ class MacSpellChecker :
     linguistic::PropertyHelper_Spell *      pPropHelper;
     bool                                    bDisposing;
 
-    MacSpellChecker(const MacSpellChecker &) SAL_DELETED_FUNCTION;
-    MacSpellChecker & operator = (const MacSpellChecker &) SAL_DELETED_FUNCTION;
+    MacSpellChecker(const MacSpellChecker &) = delete;
+    MacSpellChecker & operator = (const MacSpellChecker &) = delete;
 
     linguistic::PropertyHelper_Spell &  GetPropHelper_Impl();
     linguistic::PropertyHelper_Spell &  GetPropHelper()
diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.hxx b/lingucomponent/source/spellcheck/spell/sspellimp.hxx
index ffbff58c59d9..b503a11397a4 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.hxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.hxx
@@ -65,8 +65,8 @@ class SpellChecker :
     linguistic::PropertyHelper_Spelling*    pPropHelper;
     bool                                    bDisposing;
 
-    SpellChecker(const SpellChecker &) SAL_DELETED_FUNCTION;
-    SpellChecker & operator = (const SpellChecker &) SAL_DELETED_FUNCTION;
+    SpellChecker(const SpellChecker &) = delete;
+    SpellChecker & operator = (const SpellChecker &) = delete;
 
     linguistic::PropertyHelper_Spelling&  GetPropHelper_Impl();
     linguistic::PropertyHelper_Spelling&  GetPropHelper()
diff --git a/lingucomponent/source/thesaurus/libnth/nthesdta.hxx b/lingucomponent/source/thesaurus/libnth/nthesdta.hxx
index 28e2f2f3da8a..e8c0ef5978ed 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesdta.hxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesdta.hxx
@@ -40,8 +40,8 @@ class Meaning :
         sal_Bool                bIsGermanPreReform;
 #endif
 
-    Meaning(const Meaning &) SAL_DELETED_FUNCTION;
-    Meaning & operator = (const Meaning &) SAL_DELETED_FUNCTION;
+    Meaning(const Meaning &) = delete;
+    Meaning & operator = (const Meaning &) = delete;
 
 public:
     Meaning(const OUString &rTerm);
diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.hxx b/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
index f88dc2897072..0b89869b11cc 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
@@ -81,8 +81,8 @@ class Thesaurus :
     OUString  prevTerm;
     sal_Int16 prevLocale;
 
-    Thesaurus(const Thesaurus &) SAL_DELETED_FUNCTION;
-    Thesaurus & operator = (const Thesaurus &) SAL_DELETED_FUNCTION;
+    Thesaurus(const Thesaurus &) = delete;
+    Thesaurus & operator = (const Thesaurus &) = delete;
 
     linguistic::PropertyHelper_Thesaurus&   GetPropHelper_Impl();
     linguistic::PropertyHelper_Thesaurus&   GetPropHelper()
diff --git a/linguistic/inc/iprcache.hxx b/linguistic/inc/iprcache.hxx
index 095055479cd4..9b15b68362c2 100644
--- a/linguistic/inc/iprcache.hxx
+++ b/linguistic/inc/iprcache.hxx
@@ -52,8 +52,8 @@ class FlushListener :
     css::uno::Reference< css::linguistic2::XLinguProperties >             xPropSet;
     SpellCache&                                                           mrSpellCache;
 
-    FlushListener(const FlushListener &) SAL_DELETED_FUNCTION;
-    FlushListener & operator = (const FlushListener &) SAL_DELETED_FUNCTION;
+    FlushListener(const FlushListener &) = delete;
+    FlushListener & operator = (const FlushListener &) = delete;
 
 public:
     FlushListener( SpellCache& rFO ) : mrSpellCache(rFO) {}
@@ -84,8 +84,8 @@ class SpellCache
     typedef std::map< LanguageType, WordList_t >    LangWordList_t;
     LangWordList_t  aWordLists;
 
-    SpellCache(const SpellCache &) SAL_DELETED_FUNCTION;
-    SpellCache & operator = (const SpellCache &) SAL_DELETED_FUNCTION;
+    SpellCache(const SpellCache &) = delete;
+    SpellCache & operator = (const SpellCache &) = delete;
 
 public:
     SpellCache();
diff --git a/linguistic/source/convdiclist.hxx b/linguistic/source/convdiclist.hxx
index 8945e85ed5f0..cfcce7ac1b8f 100644
--- a/linguistic/source/convdiclist.hxx
+++ b/linguistic/source/convdiclist.hxx
@@ -64,8 +64,8 @@ class ConvDicList :
 
     bool                                    bDisposing;
 
-    ConvDicList( const ConvDicList & ) SAL_DELETED_FUNCTION;
-    ConvDicList & operator = (const ConvDicList &) SAL_DELETED_FUNCTION;
+    ConvDicList( const ConvDicList & ) = delete;
+    ConvDicList & operator = (const ConvDicList &) = delete;
 
     ConvDicNameContainer &  GetNameContainer();
 
diff --git a/linguistic/source/dicimp.hxx b/linguistic/source/dicimp.hxx
index c871cee7517d..b21f8f1d005e 100644
--- a/linguistic/source/dicimp.hxx
+++ b/linguistic/source/dicimp.hxx
@@ -58,8 +58,8 @@ class DictionaryNeo :
     bool                                                        bIsActive;
     bool                                                        bIsReadonly;
 
-    DictionaryNeo(const DictionaryNeo &) SAL_DELETED_FUNCTION;
-    DictionaryNeo & operator = (const DictionaryNeo &) SAL_DELETED_FUNCTION;
+    DictionaryNeo(const DictionaryNeo &) = delete;
+    DictionaryNeo & operator = (const DictionaryNeo &) = delete;
 
     void                    launchEvent(sal_Int16 nEvent,
         ::com::sun::star::uno::Reference<
@@ -187,8 +187,8 @@ class DicEntry :
                     aReplacement;   // including hyphen positions represented by "="
     bool            bIsNegativ;
 
-    DicEntry(const DicEntry &) SAL_DELETED_FUNCTION;
-    DicEntry & operator = (const DicEntry &) SAL_DELETED_FUNCTION;
+    DicEntry(const DicEntry &) = delete;
+    DicEntry & operator = (const DicEntry &) = delete;
 
     static void            splitDicFileWord(const OUString &rDicFileWord,
                                      OUString &rDicWord,
diff --git a/linguistic/source/dlistimp.hxx b/linguistic/source/dlistimp.hxx
index 78a772950eab..252cb90f4697 100644
--- a/linguistic/source/dlistimp.hxx
+++ b/linguistic/source/dlistimp.hxx
@@ -70,8 +70,8 @@ class DicList :
     bool    bDisposing;
     bool    bInCreation;
 
-    DicList( const DicList & ) SAL_DELETED_FUNCTION;
-    DicList & operator = (const DicList &) SAL_DELETED_FUNCTION;
+    DicList( const DicList & ) = delete;
+    DicList & operator = (const DicList &) = delete;
 
     void                _CreateDicList();
     DictionaryVec_t &   GetOrCreateDicList()
diff --git a/linguistic/source/gciterator.hxx b/linguistic/source/gciterator.hxx
index 9467de83d314..8f8d289e1bc8 100644
--- a/linguistic/source/gciterator.hxx
+++ b/linguistic/source/gciterator.hxx
@@ -141,8 +141,8 @@ class GrammarCheckingIterator:
 
     ::com::sun::star::uno::Reference< ::com::sun::star::util::XChangesBatch >   GetUpdateAccess() const;
 
-    GrammarCheckingIterator( const GrammarCheckingIterator & ) SAL_DELETED_FUNCTION;
-    GrammarCheckingIterator & operator = ( const GrammarCheckingIterator & ) SAL_DELETED_FUNCTION;
+    GrammarCheckingIterator( const GrammarCheckingIterator & ) = delete;
+    GrammarCheckingIterator & operator = ( const GrammarCheckingIterator & ) = delete;
 
 public:
 
diff --git a/linguistic/source/hhconvdic.hxx b/linguistic/source/hhconvdic.hxx
index b4ca5b943e97..ab9d02735e1e 100644
--- a/linguistic/source/hhconvdic.hxx
+++ b/linguistic/source/hhconvdic.hxx
@@ -33,8 +33,8 @@
 class HHConvDic :
     public ConvDic
 {
-    HHConvDic(const HHConvDic &) SAL_DELETED_FUNCTION;
-    HHConvDic & operator = (const HHConvDic &) SAL_DELETED_FUNCTION;
+    HHConvDic(const HHConvDic &) = delete;
+    HHConvDic & operator = (const HHConvDic &) = delete;
 
 public:
     HHConvDic( const OUString &rName, const OUString &rMainURL );
diff --git a/linguistic/source/hyphdsp.hxx b/linguistic/source/hyphdsp.hxx
index 8360e32ffcc6..76c8718a3f96 100644
--- a/linguistic/source/hyphdsp.hxx
+++ b/linguistic/source/hyphdsp.hxx
@@ -60,8 +60,8 @@ class HyphenatorDispatcher :
 
     LngSvcMgr      &rMgr;
 
-    HyphenatorDispatcher(const HyphenatorDispatcher &) SAL_DELETED_FUNCTION;
-    HyphenatorDispatcher & operator = (const HyphenatorDispatcher &) SAL_DELETED_FUNCTION;
+    HyphenatorDispatcher(const HyphenatorDispatcher &) = delete;
+    HyphenatorDispatcher & operator = (const HyphenatorDispatcher &) = delete;
 
     inline ::com::sun::star::uno::Reference<
         ::com::sun::star::linguistic2::XLinguProperties >
diff --git a/linguistic/source/lngopt.hxx b/linguistic/source/lngopt.hxx
index 6bedca00cf4c..3b7edae17cfa 100644
--- a/linguistic/source/lngopt.hxx
+++ b/linguistic/source/lngopt.hxx
@@ -84,8 +84,8 @@ class LinguProps :
 
     bool                                        bDisposing;
 
-    LinguProps(const LinguProps &) SAL_DELETED_FUNCTION;
-    LinguProps & operator = (const LinguProps &) SAL_DELETED_FUNCTION;
+    LinguProps(const LinguProps &) = delete;
+    LinguProps & operator = (const LinguProps &) = delete;
 
     void    launchEvent( const ::com::sun::star::beans::PropertyChangeEvent &rEvt ) const;
 
diff --git a/linguistic/source/lngsvcmgr.hxx b/linguistic/source/lngsvcmgr.hxx
index 1d43f1646996..efe51b83dbd6 100644
--- a/linguistic/source/lngsvcmgr.hxx
+++ b/linguistic/source/lngsvcmgr.hxx
@@ -109,8 +109,8 @@ class LngSvcMgr :
 
     bool bDisposing;
 
-    LngSvcMgr(const LngSvcMgr &) SAL_DELETED_FUNCTION;
-    LngSvcMgr & operator = (const LngSvcMgr &) SAL_DELETED_FUNCTION;
+    LngSvcMgr(const LngSvcMgr &) = delete;
+    LngSvcMgr & operator = (const LngSvcMgr &) = delete;
 
     void    GetAvailableSpellSvcs_Impl();
     void    GetAvailableGrammarSvcs_Impl();
diff --git a/linguistic/source/spelldsp.hxx b/linguistic/source/spelldsp.hxx
index 1b99c7d0aa4d..092a2e76f6ac 100644
--- a/linguistic/source/spelldsp.hxx
+++ b/linguistic/source/spelldsp.hxx
@@ -65,8 +65,8 @@ class SpellCheckerDispatcher :
     mutable linguistic::SpellCache      *pCache; // Spell Cache (holds known words)
     CharClass                   * pCharClass;
 
-    SpellCheckerDispatcher(const SpellCheckerDispatcher &) SAL_DELETED_FUNCTION;
-    SpellCheckerDispatcher & operator = (const SpellCheckerDispatcher &) SAL_DELETED_FUNCTION;
+    SpellCheckerDispatcher(const SpellCheckerDispatcher &) = delete;
+    SpellCheckerDispatcher & operator = (const SpellCheckerDispatcher &) = delete;
 
     inline linguistic::SpellCache &  GetCache() const;
 
diff --git a/linguistic/source/thesdsp.hxx b/linguistic/source/thesdsp.hxx
index f16ee02bf101..de0eed89ac47 100644
--- a/linguistic/source/thesdsp.hxx
+++ b/linguistic/source/thesdsp.hxx
@@ -58,8 +58,8 @@ class ThesaurusDispatcher :
     ::com::sun::star::uno::Reference<
         ::com::sun::star::linguistic2::XLinguProperties >     xPropSet;
 
-    ThesaurusDispatcher(const ThesaurusDispatcher &) SAL_DELETED_FUNCTION;
-    ThesaurusDispatcher & operator = (const ThesaurusDispatcher &) SAL_DELETED_FUNCTION;
+    ThesaurusDispatcher(const ThesaurusDispatcher &) = delete;
+    ThesaurusDispatcher & operator = (const ThesaurusDispatcher &) = delete;
 
     inline ::com::sun::star::uno::Reference<
         ::com::sun::star::linguistic2::XLinguProperties >
diff --git a/lotuswordpro/source/filter/lwpbackgroundoverride.hxx b/lotuswordpro/source/filter/lwpbackgroundoverride.hxx
index 7f382ba976db..c0d25d7720e1 100644
--- a/lotuswordpro/source/filter/lwpbackgroundoverride.hxx
+++ b/lotuswordpro/source/filter/lwpbackgroundoverride.hxx
@@ -89,7 +89,7 @@ protected:
     LwpBackgroundOverride(LwpBackgroundOverride const& rOther);
 
 private:
-    LwpBackgroundOverride& operator=(LwpBackgroundOverride const& rOther) SAL_DELETED_FUNCTION;
+    LwpBackgroundOverride& operator=(LwpBackgroundOverride const& rOther) = delete;
 
 private:
     LwpBackgroundStuff  m_aStuff;
diff --git a/lotuswordpro/source/filter/lwpbreaksoverride.hxx b/lotuswordpro/source/filter/lwpbreaksoverride.hxx
index fcbf1bd9af81..dbf7a2ecac9f 100644
--- a/lotuswordpro/source/filter/lwpbreaksoverride.hxx
+++ b/lotuswordpro/source/filter/lwpbreaksoverride.hxx
@@ -130,7 +130,7 @@ protected:
     LwpBreaksOverride(LwpBreaksOverride const& rOther);
 
 private:
-    LwpBreaksOverride& operator=(const LwpBreaksOverride& rOther) SAL_DELETED_FUNCTION;
+    LwpBreaksOverride& operator=(const LwpBreaksOverride& rOther) = delete;
 
 private:
     LwpAtomHolder       *m_pNextStyle;
diff --git a/lotuswordpro/source/filter/lwpcharborderoverride.hxx b/lotuswordpro/source/filter/lwpcharborderoverride.hxx
index 4bca82b2f0df..29c9c9277ddd 100644
--- a/lotuswordpro/source/filter/lwpcharborderoverride.hxx
+++ b/lotuswordpro/source/filter/lwpcharborderoverride.hxx
@@ -80,7 +80,7 @@ protected:
     LwpCharacterBorderOverride(LwpCharacterBorderOverride const& rOther);
 
 private:
-    LwpCharacterBorderOverride& operator=(LwpCharacterBorderOverride const& rOther) SAL_DELETED_FUNCTION;
+    LwpCharacterBorderOverride& operator=(LwpCharacterBorderOverride const& rOther) = delete;
 
 private:
     LwpBorderStuff* m_pBorderStuff;
diff --git a/lotuswordpro/source/filter/lwpnumberingoverride.hxx b/lotuswordpro/source/filter/lwpnumberingoverride.hxx
index 4065587a7f41..300522f1e250 100644
--- a/lotuswordpro/source/filter/lwpnumberingoverride.hxx
+++ b/lotuswordpro/source/filter/lwpnumberingoverride.hxx
@@ -91,7 +91,7 @@ protected:
     LwpNumberingOverride(LwpNumberingOverride const& rOther);
 
 private:
-    LwpNumberingOverride& operator=(LwpNumberingOverride const& rOther) SAL_DELETED_FUNCTION;
+    LwpNumberingOverride& operator=(LwpNumberingOverride const& rOther) = delete;
 
     sal_uInt16  m_nLevel;
     sal_uInt16  m_nPosition;
diff --git a/lotuswordpro/source/filter/lwpoverride.hxx b/lotuswordpro/source/filter/lwpoverride.hxx
index ec59247b0b97..417ea56d376e 100644
--- a/lotuswordpro/source/filter/lwpoverride.hxx
+++ b/lotuswordpro/source/filter/lwpoverride.hxx
@@ -94,7 +94,7 @@ protected:
     explicit LwpOverride(LwpOverride const& rOther);
 
 private:
-    LwpOverride& operator=(LwpOverride const& rOther) SAL_DELETED_FUNCTION;
+    LwpOverride& operator=(LwpOverride const& rOther) = delete;
 
 protected:
     sal_uInt16  m_nValues;
@@ -115,7 +115,7 @@ protected:
     LwpTextLanguageOverride(LwpTextLanguageOverride const& rOther);
 
 private:
-    LwpTextLanguageOverride& operator=(LwpTextLanguageOverride const& rOther) SAL_DELETED_FUNCTION;
+    LwpTextLanguageOverride& operator=(LwpTextLanguageOverride const& rOther) = delete;
 
 private:
     sal_uInt16  m_nLanguage;
@@ -138,7 +138,7 @@ protected:
     LwpTextAttributeOverride(LwpTextAttributeOverride const& rOther);
 
 private:
-    LwpTextAttributeOverride& operator=(LwpTextAttributeOverride const& rOther) SAL_DELETED_FUNCTION;
+    LwpTextAttributeOverride& operator=(LwpTextAttributeOverride const& rOther) = delete;
 
 private:
     enum{
@@ -166,7 +166,7 @@ protected:
     LwpKinsokuOptsOverride(LwpKinsokuOptsOverride const& rOther);
 
 private:
-    LwpKinsokuOptsOverride& operator=(LwpKinsokuOptsOverride const& rOther) SAL_DELETED_FUNCTION;
+    LwpKinsokuOptsOverride& operator=(LwpKinsokuOptsOverride const& rOther) = delete;
 
 private:
     sal_uInt16  m_nLevels;
@@ -206,7 +206,7 @@ protected:
     LwpBulletOverride(LwpBulletOverride const& rOther);
 
 private:
-    LwpBulletOverride& operator=(LwpBulletOverride const& rOther) SAL_DELETED_FUNCTION;
+    LwpBulletOverride& operator=(LwpBulletOverride const& rOther) = delete;
 
 private:
     enum
@@ -301,7 +301,7 @@ protected:
     LwpAlignmentOverride(LwpAlignmentOverride const& rOther);
 
 private:
-    LwpAlignmentOverride& operator=(LwpAlignmentOverride const& rOther) SAL_DELETED_FUNCTION;
+    LwpAlignmentOverride& operator=(LwpAlignmentOverride const& rOther) = delete;
 
 private:
     enum
@@ -346,7 +346,7 @@ protected:
     LwpSpacingCommonOverride(LwpSpacingCommonOverride const& rOther);
 
 private:
-    LwpSpacingCommonOverride& operator=(LwpSpacingCommonOverride const& rOther) SAL_DELETED_FUNCTION;
+    LwpSpacingCommonOverride& operator=(LwpSpacingCommonOverride const& rOther) = delete;
 
 protected:
     enum
@@ -381,7 +381,7 @@ protected:
     LwpSpacingOverride(LwpSpacingOverride const& rOther);
 
 private:
-    LwpSpacingOverride& operator=(LwpSpacingOverride const& rOther) SAL_DELETED_FUNCTION;
+    LwpSpacingOverride& operator=(LwpSpacingOverride const& rOther) = delete;
 
 private:
     LwpSpacingCommonOverride*   m_pSpacing;
@@ -430,7 +430,7 @@ protected:
     LwpIndentOverride(LwpIndentOverride const& rOther);
 
 private:
-    LwpIndentOverride& operator=(LwpIndentOverride const& rOther) SAL_DELETED_FUNCTION;
+    LwpIndentOverride& operator=(LwpIndentOverride const& rOther) = delete;
 
 private:
     enum
@@ -490,7 +490,7 @@ protected:
     LwpAmikakeOverride(LwpAmikakeOverride const& rOther);
 
 private:
-    LwpAmikakeOverride& operator=(LwpAmikakeOverride const& rOther) SAL_DELETED_FUNCTION;
+    LwpAmikakeOverride& operator=(LwpAmikakeOverride const& rOther) = delete;
 
 private:
     LwpBackgroundStuff* m_pBackgroundStuff;
diff --git a/lotuswordpro/source/filter/lwpparaborderoverride.hxx b/lotuswordpro/source/filter/lwpparaborderoverride.hxx
index add66ef6caa0..737261c6a023 100644
--- a/lotuswordpro/source/filter/lwpparaborderoverride.hxx
+++ b/lotuswordpro/source/filter/lwpparaborderoverride.hxx
@@ -138,7 +138,7 @@ protected:
     LwpParaBorderOverride(LwpParaBorderOverride const& rOther);
 
 private:
-    LwpParaBorderOverride& operator=(LwpParaBorderOverride const& rOther) SAL_DELETED_FUNCTION;
+    LwpParaBorderOverride& operator=(LwpParaBorderOverride const& rOther) = delete;
 
 protected:
     enum
diff --git a/lotuswordpro/source/filter/lwptaboverride.hxx b/lotuswordpro/source/filter/lwptaboverride.hxx
index 7c0d8c57b312..bb1f8089a8d0 100644
--- a/lotuswordpro/source/filter/lwptaboverride.hxx
+++ b/lotuswordpro/source/filter/lwptaboverride.hxx
@@ -96,7 +96,7 @@ protected:
     LwpTabOverride(LwpTabOverride const& rOther);
 
 private:
-    LwpTabOverride& operator=(LwpTabOverride const& rOther) SAL_DELETED_FUNCTION;
+    LwpTabOverride& operator=(LwpTabOverride const& rOther) = delete;
 
 private:
     LwpObjectID m_aTabRackID;
diff --git a/oox/source/shape/ShapeContextHandler.hxx b/oox/source/shape/ShapeContextHandler.hxx
index ca9aecf713e4..8aba74a45967 100644
--- a/oox/source/shape/ShapeContextHandler.hxx
+++ b/oox/source/shape/ShapeContextHandler.hxx
@@ -145,8 +145,8 @@ public:
         throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
 private:
-    ShapeContextHandler(ShapeContextHandler &) SAL_DELETED_FUNCTION;
-    void operator =(ShapeContextHandler &) SAL_DELETED_FUNCTION;
+    ShapeContextHandler(ShapeContextHandler &) = delete;
+    void operator =(ShapeContextHandler &) = delete;
 
     ::sal_uInt32 mnStartToken;
     css::awt::Point maPosition;
diff --git a/pyuno/inc/pyuno/pyuno.hxx b/pyuno/inc/pyuno/pyuno.hxx
index ae8f16eed2b8..cc7b2bb4a1b5 100644
--- a/pyuno/inc/pyuno/pyuno.hxx
+++ b/pyuno/inc/pyuno/pyuno.hxx
@@ -268,8 +268,8 @@ public:
 class LO_DLLPUBLIC_PYUNO PyThreadAttach
 {
     PyThreadState *tstate;
-    PyThreadAttach ( const PyThreadAttach & ) SAL_DELETED_FUNCTION;
-    PyThreadAttach & operator = ( const PyThreadAttach & ) SAL_DELETED_FUNCTION;
+    PyThreadAttach ( const PyThreadAttach & ) = delete;
+    PyThreadAttach & operator = ( const PyThreadAttach & ) = delete;
 public:
 
     /** Creates a new python threadstate and acquires the global interpreter lock.
@@ -295,8 +295,8 @@ public:
 class LO_DLLPUBLIC_PYUNO PyThreadDetach
 {
     PyThreadState *tstate;
-    PyThreadDetach ( const PyThreadDetach & ) SAL_DELETED_FUNCTION;
-    PyThreadDetach & operator = ( const PyThreadDetach & ) SAL_DELETED_FUNCTION;
+    PyThreadDetach ( const PyThreadDetach & ) = delete;
+    PyThreadDetach & operator = ( const PyThreadDetach & ) = delete;
 
 public:
     /** Releases the global interpreter lock.
diff --git a/registry/tools/options.hxx b/registry/tools/options.hxx
index 86f3597577f8..2c08a71cacfb 100644
--- a/registry/tools/options.hxx
+++ b/registry/tools/options.hxx
@@ -33,8 +33,8 @@ class Options
 {
     std::string m_program;
 
-    Options (Options const &) SAL_DELETED_FUNCTION;
-    Options & operator= (Options const &) SAL_DELETED_FUNCTION;
+    Options (Options const &) = delete;
+    Options & operator= (Options const &) = delete;
 
 public:
     explicit Options (char const * program);
diff --git a/reportdesign/inc/ModuleHelper.hxx b/reportdesign/inc/ModuleHelper.hxx
index e88971bb45c5..55b58bab9937 100644
--- a/reportdesign/inc/ModuleHelper.hxx
+++ b/reportdesign/inc/ModuleHelper.hxx
@@ -37,7 +37,7 @@ namespace rptui
         friend class OModuleClient;
 
     private:
-        OModule() SAL_DELETED_FUNCTION; //TODO: get rid of this class
+        OModule() = delete; //TODO: get rid of this class
 
     protected:
         static sal_Int32    s_nClients;     /// number of registered clients
diff --git a/reportdesign/inc/PropertyForward.hxx b/reportdesign/inc/PropertyForward.hxx
index a9c61b71ece3..1e8daa88fb67 100644
--- a/reportdesign/inc/PropertyForward.hxx
+++ b/reportdesign/inc/PropertyForward.hxx
@@ -49,8 +49,8 @@ namespace rptui
         ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>        m_xDest;
         ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo>    m_xDestInfo;
         bool                                                                        m_bInChange;
-        OPropertyMediator(OPropertyMediator&) SAL_DELETED_FUNCTION;
-        void operator =(OPropertyMediator&) SAL_DELETED_FUNCTION;
+        OPropertyMediator(OPropertyMediator&) = delete;
+        void operator =(OPropertyMediator&) = delete;
     protected:
         virtual ~OPropertyMediator();
 
diff --git a/reportdesign/inc/ReportDefinition.hxx b/reportdesign/inc/ReportDefinition.hxx
index adad74da4c79..2d6e7a565418 100644
--- a/reportdesign/inc/ReportDefinition.hxx
+++ b/reportdesign/inc/ReportDefinition.hxx
@@ -91,8 +91,8 @@ namespace reportdesign
         std::shared_ptr<OReportDefinitionImpl>                                  m_pImpl;
 
     private:
-        OReportDefinition(const OReportDefinition&) SAL_DELETED_FUNCTION;
-        OReportDefinition& operator=(const OReportDefinition&) SAL_DELETED_FUNCTION;
+        OReportDefinition(const OReportDefinition&) = delete;
+        OReportDefinition& operator=(const OReportDefinition&) = delete;
 
         void setSection(     const OUString& _sProperty
                             ,const bool& _bOn
diff --git a/reportdesign/inc/RptModel.hxx b/reportdesign/inc/RptModel.hxx
index d3a606240033..793ab26683ff 100644
--- a/reportdesign/inc/RptModel.hxx
+++ b/reportdesign/inc/RptModel.hxx
@@ -49,8 +49,8 @@ private:
 
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoModel() SAL_OVERRIDE;
 
-    OReportModel( const OReportModel& ) SAL_DELETED_FUNCTION;
-    void operator=(const OReportModel& rSrcModel) SAL_DELETED_FUNCTION;
+    OReportModel( const OReportModel& ) = delete;
+    void operator=(const OReportModel& rSrcModel) = delete;
 
 public:
     TYPEINFO_OVERRIDE();
diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx
index a9eff84462ea..76b01b31faa3 100644
--- a/reportdesign/inc/RptObject.hxx
+++ b/reportdesign/inc/RptObject.hxx
@@ -53,8 +53,8 @@ typedef ::std::multimap< sal_Int16, OUString, ::std::less< sal_Int16 > > IndexTo
     private:
         DlgEdHintKind   eHintKind;
 
-        DlgEdHint(DlgEdHint&) SAL_DELETED_FUNCTION;
-        void operator =(DlgEdHint&) SAL_DELETED_FUNCTION;
+        DlgEdHint(DlgEdHint&) = delete;
+        void operator =(DlgEdHint&) = delete;
     public:
         DlgEdHint( DlgEdHintKind eHint );
         virtual ~DlgEdHint();
diff --git a/reportdesign/inc/RptPage.hxx b/reportdesign/inc/RptPage.hxx
index e45a9064da48..40df189b9354 100644
--- a/reportdesign/inc/RptPage.hxx
+++ b/reportdesign/inc/RptPage.hxx
@@ -34,7 +34,7 @@ class OReportModel;
 
 class REPORTDESIGN_DLLPUBLIC OReportPage : public SdrPage
 {
-    OReportPage& operator=(const OReportPage&) SAL_DELETED_FUNCTION;
+    OReportPage& operator=(const OReportPage&) = delete;
 
     OReportModel&           rModel;
     ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > m_xSection;
diff --git a/reportdesign/inc/UndoActions.hxx b/reportdesign/inc/UndoActions.hxx
index 1190412646e8..c6cb8b9ade86 100644
--- a/reportdesign/inc/UndoActions.hxx
+++ b/reportdesign/inc/UndoActions.hxx
@@ -61,8 +61,8 @@ namespace rptui
     class REPORTDESIGN_DLLPUBLIC OGroupHelper
     {
         ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup > m_xGroup;
-        OGroupHelper(const OGroupHelper&) SAL_DELETED_FUNCTION;
-        OGroupHelper& operator=(const OGroupHelper&) SAL_DELETED_FUNCTION;
+        OGroupHelper(const OGroupHelper&) = delete;
+        OGroupHelper& operator=(const OGroupHelper&) = delete;
     public:
         OGroupHelper(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup >& _xGroup)
             :m_xGroup(_xGroup)
@@ -169,8 +169,8 @@ namespace rptui
 
     class REPORTDESIGN_DLLPUBLIC OUndoContainerAction: public OCommentUndoAction
     {
-        OUndoContainerAction(OUndoContainerAction&) SAL_DELETED_FUNCTION;
-        void operator =(OUndoContainerAction&) SAL_DELETED_FUNCTION;
+        OUndoContainerAction(OUndoContainerAction&) = delete;
+        void operator =(OUndoContainerAction&) = delete;
     protected:
         ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
                         m_xElement;     // object not owned by the action
diff --git a/reportdesign/inc/UndoEnv.hxx b/reportdesign/inc/UndoEnv.hxx
index 78a36c5c602f..687923e5b13c 100644
--- a/reportdesign/inc/UndoEnv.hxx
+++ b/reportdesign/inc/UndoEnv.hxx
@@ -42,8 +42,8 @@ namespace rptui
     {
         const ::std::unique_ptr<OXUndoEnvironmentImpl> m_pImpl;
 
-        OXUndoEnvironment(const OXUndoEnvironment&) SAL_DELETED_FUNCTION;
-        OXUndoEnvironment& operator=(const OXUndoEnvironment&) SAL_DELETED_FUNCTION;
+        OXUndoEnvironment(const OXUndoEnvironment&) = delete;
+        OXUndoEnvironment& operator=(const OXUndoEnvironment&) = delete;
 
     protected:
         virtual ~OXUndoEnvironment();
diff --git a/reportdesign/inc/conditionalexpression.hxx b/reportdesign/inc/conditionalexpression.hxx
index 6ffaad730e83..4e581f2dac0c 100644
--- a/reportdesign/inc/conditionalexpression.hxx
+++ b/reportdesign/inc/conditionalexpression.hxx
@@ -98,8 +98,8 @@ namespace rptui
         static size_t  getKnownConditionalExpressions( ConditionalExpressions& _out_rCondExp );
 
     private:
-        ConditionalExpressionFactory( const ConditionalExpressionFactory& ) SAL_DELETED_FUNCTION;
-        ConditionalExpressionFactory& operator=( const ConditionalExpressionFactory& ) SAL_DELETED_FUNCTION;
+        ConditionalExpressionFactory( const ConditionalExpressionFactory& ) = delete;
+        ConditionalExpressionFactory& operator=( const ConditionalExpressionFactory& ) = delete;
     };
 
 } // namespace rptui
diff --git a/reportdesign/source/core/inc/FixedLine.hxx b/reportdesign/source/core/inc/FixedLine.hxx
index 52c30227730e..57016148b839 100644
--- a/reportdesign/source/core/inc/FixedLine.hxx
+++ b/reportdesign/source/core/inc/FixedLine.hxx
@@ -52,8 +52,8 @@ namespace reportdesign
         ::sal_Int32             m_LineWidth;
 
     private:
-        OFixedLine(const OFixedLine&) SAL_DELETED_FUNCTION;
-        OFixedLine& operator=(const OFixedLine&) SAL_DELETED_FUNCTION;
+        OFixedLine(const OFixedLine&) = delete;
+        OFixedLine& operator=(const OFixedLine&) = delete;
 
         template <typename T> void set(  const OUString& _sProperty
                                         ,const T& _Value
diff --git a/reportdesign/source/core/inc/FixedText.hxx b/reportdesign/source/core/inc/FixedText.hxx
index 8a5ce95df61d..c5103de0efac 100644
--- a/reportdesign/source/core/inc/FixedText.hxx
+++ b/reportdesign/source/core/inc/FixedText.hxx
@@ -47,8 +47,8 @@ namespace reportdesign
         OReportControlModel                 m_aProps;
         OUString                     m_sLabel;
     private:
-        OFixedText(const OFixedText&) SAL_DELETED_FUNCTION;
-        OFixedText& operator=(const OFixedText&) SAL_DELETED_FUNCTION;
+        OFixedText(const OFixedText&) = delete;
+        OFixedText& operator=(const OFixedText&) = delete;
 
         template <typename T> void set(  const OUString& _sProperty
                                         ,const T& _Value
diff --git a/reportdesign/source/core/inc/FormatCondition.hxx b/reportdesign/source/core/inc/FormatCondition.hxx
index d70ce5a4d587..8017fb196c70 100644
--- a/reportdesign/source/core/inc/FormatCondition.hxx
+++ b/reportdesign/source/core/inc/FormatCondition.hxx
@@ -45,8 +45,8 @@ namespace reportdesign
         OUString            m_sFormula;
         bool                m_bEnabled;
     private:
-        OFormatCondition(const OFormatCondition&) SAL_DELETED_FUNCTION;
-        OFormatCondition& operator=(const OFormatCondition&) SAL_DELETED_FUNCTION;
+        OFormatCondition(const OFormatCondition&) = delete;
+        OFormatCondition& operator=(const OFormatCondition&) = delete;
 
         template <typename T> void set(  const OUString& _sProperty
                                         ,const T& _Value
diff --git a/reportdesign/source/core/inc/FormattedField.hxx b/reportdesign/source/core/inc/FormattedField.hxx
index 1b25ce0e6bd6..3569a4577b37 100644
--- a/reportdesign/source/core/inc/FormattedField.hxx
+++ b/reportdesign/source/core/inc/FormattedField.hxx
@@ -50,8 +50,8 @@ namespace reportdesign
         ::sal_Int32                                     m_nFormatKey;
 
     private:
-        OFormattedField(const OFormattedField&) SAL_DELETED_FUNCTION;
-        OFormattedField& operator=(const OFormattedField&) SAL_DELETED_FUNCTION;
+        OFormattedField(const OFormattedField&) = delete;
+        OFormattedField& operator=(const OFormattedField&) = delete;
 
         template <typename T> void set(  const OUString& _sProperty
                                         ,const T& _Value
diff --git a/reportdesign/source/core/inc/Function.hxx b/reportdesign/source/core/inc/Function.hxx
index ca221f096678..fab6042468a4 100644
--- a/reportdesign/source/core/inc/Function.hxx
+++ b/reportdesign/source/core/inc/Function.hxx
@@ -48,8 +48,8 @@ namespace reportdesign
         bool     m_bPreEvaluated;
         bool     m_bDeepTraversing;
     private:
-        OFunction(const OFunction&) SAL_DELETED_FUNCTION;
-        OFunction& operator=(const OFunction&) SAL_DELETED_FUNCTION;
+        OFunction(const OFunction&) = delete;
+        OFunction& operator=(const OFunction&) = delete;
 
         template <typename T> void set(  const OUString& _sProperty
                                         ,const T& _Value
diff --git a/reportdesign/source/core/inc/Functions.hxx b/reportdesign/source/core/inc/Functions.hxx
index c835c7e1a8b8..c756ac972737 100644
--- a/reportdesign/source/core/inc/Functions.hxx
+++ b/reportdesign/source/core/inc/Functions.hxx
@@ -43,8 +43,8 @@ namespace reportdesign
         ::com::sun::star::uno::WeakReference< ::com::sun::star::report::XFunctionsSupplier >    m_xParent;
         TFunctions                                                                              m_aFunctions;
     private:
-        OFunctions& operator=(const OFunctions&) SAL_DELETED_FUNCTION;
-        OFunctions(const OFunctions&) SAL_DELETED_FUNCTION;
+        OFunctions& operator=(const OFunctions&) = delete;
+        OFunctions(const OFunctions&) = delete;
         void checkIndex(sal_Int32 _nIndex);
     protected:
         // TODO: VirtualFunctionFinder: This is virtual function!
diff --git a/reportdesign/source/core/inc/Group.hxx b/reportdesign/source/core/inc/Group.hxx
index c63c68152ce4..fb928fa73d71 100644
--- a/reportdesign/source/core/inc/Group.hxx
+++ b/reportdesign/source/core/inc/Group.hxx
@@ -51,8 +51,8 @@ namespace reportdesign
         ::rptshared::GroupProperties                                                    m_aProps;
 
     private:
-        OGroup& operator=(const OGroup&) SAL_DELETED_FUNCTION;
-        OGroup(const OGroup&) SAL_DELETED_FUNCTION;
+        OGroup& operator=(const OGroup&) = delete;
+        OGroup(const OGroup&) = delete;
 
         template <typename T> void set(  const OUString& _sProperty
                                         ,const T& _Value
diff --git a/reportdesign/source/core/inc/Groups.hxx b/reportdesign/source/core/inc/Groups.hxx
index 7099aaa5c177..caf9978a390b 100644
--- a/reportdesign/source/core/inc/Groups.hxx
+++ b/reportdesign/source/core/inc/Groups.hxx
@@ -42,8 +42,8 @@ namespace reportdesign
         ::com::sun::star::uno::WeakReference< ::com::sun::star::report::XReportDefinition >     m_xParent;
         TGroups                                                                                 m_aGroups;
     private:
-        OGroups& operator=(const OGroups&) SAL_DELETED_FUNCTION;
-        OGroups(const OGroups&) SAL_DELETED_FUNCTION;
+        OGroups& operator=(const OGroups&) = delete;
+        OGroups(const OGroups&) = delete;
         void checkIndex(sal_Int32 _nIndex);
     protected:
         // TODO: VirtualFunctionFinder: This is virtual function!
diff --git a/reportdesign/source/core/inc/ImageControl.hxx b/reportdesign/source/core/inc/ImageControl.hxx
index dc63e19ce5f1..882681ee3f23 100644
--- a/reportdesign/source/core/inc/ImageControl.hxx
+++ b/reportdesign/source/core/inc/ImageControl.hxx
@@ -47,8 +47,8 @@ namespace reportdesign
         sal_Int16                           m_nScaleMode;
         bool                                m_bPreserveIRI;
     private:
-        OImageControl(const OImageControl&) SAL_DELETED_FUNCTION;
-        OImageControl& operator=(const OImageControl&) SAL_DELETED_FUNCTION;
+        OImageControl(const OImageControl&) = delete;
+        OImageControl& operator=(const OImageControl&) = delete;
 
         template <typename T> void set(  const OUString& _sProperty
                                         ,const T& _Value
diff --git a/reportdesign/source/core/inc/ReportControlModel.hxx b/reportdesign/source/core/inc/ReportControlModel.hxx
index ab4a60f32365..391cc0884023 100644
--- a/reportdesign/source/core/inc/ReportControlModel.hxx
+++ b/reportdesign/source/core/inc/ReportControlModel.hxx
@@ -79,8 +79,8 @@ namespace reportdesign
     class OReportControlModel
     {
         void checkIndex(sal_Int32 _nIndex);
-        OReportControlModel(OReportControlModel&) SAL_DELETED_FUNCTION;
-        void operator =(OReportControlModel&) SAL_DELETED_FUNCTION;
+        OReportControlModel(OReportControlModel&) = delete;
+        void operator =(OReportControlModel&) = delete;
     public:
         ::cppu::OInterfaceContainerHelper                   aContainerListeners;
         OReportComponentProperties                          aComponent;
diff --git a/reportdesign/source/core/inc/ReportDrawPage.hxx b/reportdesign/source/core/inc/ReportDrawPage.hxx
index 2104bcaf222f..e91b0c6bb390 100644
--- a/reportdesign/source/core/inc/ReportDrawPage.hxx
+++ b/reportdesign/source/core/inc/ReportDrawPage.hxx
@@ -28,8 +28,8 @@ namespace reportdesign
     class OReportDrawPage : public SvxDrawPage
     {
         ::com::sun::star::uno::WeakReference< ::com::sun::star::report::XSection > m_xSection;
-        OReportDrawPage(const OReportDrawPage&) SAL_DELETED_FUNCTION;
-        void operator =(const OReportDrawPage&) SAL_DELETED_FUNCTION;
+        OReportDrawPage(const OReportDrawPage&) = delete;
+        void operator =(const OReportDrawPage&) = delete;
     protected:
         virtual SdrObject *_CreateSdrObject( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & xShape )
             throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/reportdesign/source/core/inc/ReportEngineJFree.hxx b/reportdesign/source/core/inc/ReportEngineJFree.hxx
index ec8153ff43f4..5de09e82997f 100644
--- a/reportdesign/source/core/inc/ReportEngineJFree.hxx
+++ b/reportdesign/source/core/inc/ReportEngineJFree.hxx
@@ -52,8 +52,8 @@ namespace reportdesign
         ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >             m_xActiveConnection;
         ::sal_Int32                                                                         m_nMaxRows;
     private:
-        OReportEngineJFree(const OReportEngineJFree&) SAL_DELETED_FUNCTION;
-        OReportEngineJFree& operator=(const OReportEngineJFree&) SAL_DELETED_FUNCTION;
+        OReportEngineJFree(const OReportEngineJFree&) = delete;
+        OReportEngineJFree& operator=(const OReportEngineJFree&) = delete;
         template <typename T> void set(  const OUString& _sProperty
                                         ,const T& _Value
                                         ,T& _member)
diff --git a/reportdesign/source/core/inc/ReportUndoFactory.hxx b/reportdesign/source/core/inc/ReportUndoFactory.hxx
index 32ba20b5c093..0d4cf81a7a8f 100644
--- a/reportdesign/source/core/inc/ReportUndoFactory.hxx
+++ b/reportdesign/source/core/inc/ReportUndoFactory.hxx
@@ -30,8 +30,8 @@ namespace rptui
         OModuleClient       m_aModuleClient;
         ::std::unique_ptr<SdrUndoFactory> m_pUndoFactory;
 
-        OReportUndoFactory(const OReportUndoFactory&) SAL_DELETED_FUNCTION;
-        OReportUndoFactory& operator=(const OReportUndoFactory&) SAL_DELETED_FUNCTION;
+        OReportUndoFactory(const OReportUndoFactory&) = delete;
+        OReportUndoFactory& operator=(const OReportUndoFactory&) = delete;
     public:
         OReportUndoFactory();
         virtual ~OReportUndoFactory();
diff --git a/reportdesign/source/core/inc/RptObjectListener.hxx b/reportdesign/source/core/inc/RptObjectListener.hxx
index 353941a13a34..465f397f057d 100644
--- a/reportdesign/source/core/inc/RptObjectListener.hxx
+++ b/reportdesign/source/core/inc/RptObjectListener.hxx
@@ -38,8 +38,8 @@ class OObjectListener: public TPropertyChangeListenerHelper
 {
 private:
     OObjectBase*        m_pObject;
-    OObjectListener(const OObjectListener&) SAL_DELETED_FUNCTION;
-    void operator =(const OObjectListener&) SAL_DELETED_FUNCTION;
+    OObjectListener(const OObjectListener&) = delete;
+    void operator =(const OObjectListener&) = delete;
 protected:
     virtual ~OObjectListener();
 public:
diff --git a/reportdesign/source/core/inc/Section.hxx b/reportdesign/source/core/inc/Section.hxx
index 96aeb472dfdc..70d25699d3e3 100644
--- a/reportdesign/source/core/inc/Section.hxx
+++ b/reportdesign/source/core/inc/Section.hxx
@@ -74,8 +74,8 @@ namespace reportdesign
         bool                                                                                m_bInInsertNotify;
 
     private:
-        OSection(const OSection&) SAL_DELETED_FUNCTION;
-        OSection& operator=(const OSection&) SAL_DELETED_FUNCTION;
+        OSection(const OSection&) = delete;
+        OSection& operator=(const OSection&) = delete;
 
         template <typename T> void set(  const OUString& _sProperty
                                         ,const T& _Value
diff --git a/reportdesign/source/core/inc/Shape.hxx b/reportdesign/source/core/inc/Shape.hxx
index ab852e0bc299..f988f7426289 100644
--- a/reportdesign/source/core/inc/Shape.hxx
+++ b/reportdesign/source/core/inc/Shape.hxx
@@ -57,8 +57,8 @@ namespace reportdesign
                                                                         m_CustomShapeGeometry;
 
     private:
-        OShape(const OShape&) SAL_DELETED_FUNCTION;
-        OShape& operator=(const OShape&) SAL_DELETED_FUNCTION;
+        OShape(const OShape&) = delete;
+        OShape& operator=(const OShape&) = delete;
 
         template <typename T> void set(  const OUString& _sProperty
                                         ,const T& _Value
diff --git a/reportdesign/source/filter/xml/xmlAutoStyle.hxx b/reportdesign/source/filter/xml/xmlAutoStyle.hxx
index abcfdac91f0b..fe38992c655f 100644
--- a/reportdesign/source/filter/xml/xmlAutoStyle.hxx
+++ b/reportdesign/source/filter/xml/xmlAutoStyle.hxx
@@ -40,8 +40,8 @@ namespace rptxml
                 const SvXMLNamespaceMap& rNamespaceMap
                 ) const SAL_OVERRIDE;
 
-        OXMLAutoStylePoolP(const OXMLAutoStylePoolP&) SAL_DELETED_FUNCTION;
-        void operator =(const OXMLAutoStylePoolP&) SAL_DELETED_FUNCTION;
+        OXMLAutoStylePoolP(const OXMLAutoStylePoolP&) = delete;
+        void operator =(const OXMLAutoStylePoolP&) = delete;
     public:
         explicit OXMLAutoStylePoolP(ORptExport& rXMLExport);
         virtual ~OXMLAutoStylePoolP();
diff --git a/reportdesign/source/filter/xml/xmlCell.hxx b/reportdesign/source/filter/xml/xmlCell.hxx
index 4973d8fe401e..bec3281dfb84 100644
--- a/reportdesign/source/filter/xml/xmlCell.hxx
+++ b/reportdesign/source/filter/xml/xmlCell.hxx
@@ -37,8 +37,8 @@ namespace rptxml
         bool            m_bContainsShape;
 
         ORptFilter& GetOwnImport();
-        OXMLCell(const OXMLCell&) SAL_DELETED_FUNCTION;
-        OXMLCell& operator =(const OXMLCell&) SAL_DELETED_FUNCTION;
+        OXMLCell(const OXMLCell&) = delete;
+        OXMLCell& operator =(const OXMLCell&) = delete;
     public:
 
         OXMLCell( ORptFilter& rImport
diff --git a/reportdesign/source/filter/xml/xmlColumn.hxx b/reportdesign/source/filter/xml/xmlColumn.hxx
index 7cb14adb653e..f67ed760e2b6 100644
--- a/reportdesign/source/filter/xml/xmlColumn.hxx
+++ b/reportdesign/source/filter/xml/xmlColumn.hxx
@@ -32,8 +32,8 @@ namespace rptxml
         ORptFilter& GetOwnImport();
 
         void fillStyle(const OUString& _sStyleName);
-        OXMLRowColumn(const OXMLRowColumn&) SAL_DELETED_FUNCTION;
-        void operator =(const OXMLRowColumn&) SAL_DELETED_FUNCTION;
+        OXMLRowColumn(const OXMLRowColumn&) = delete;
+        void operator =(const OXMLRowColumn&) = delete;
     public:
 
         OXMLRowColumn( ORptFilter& rImport
diff --git a/reportdesign/source/filter/xml/xmlCondPrtExpr.hxx b/reportdesign/source/filter/xml/xmlCondPrtExpr.hxx
index 58f78db1edef..fc77d154fb98 100644
--- a/reportdesign/source/filter/xml/xmlCondPrtExpr.hxx
+++ b/reportdesign/source/filter/xml/xmlCondPrtExpr.hxx
@@ -28,8 +28,8 @@ namespace rptxml
     class OXMLCondPrtExpr : public SvXMLImportContext
     {
         ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >   m_xComponent;
-        OXMLCondPrtExpr(const OXMLCondPrtExpr&) SAL_DELETED_FUNCTION;
-        void operator =(const OXMLCondPrtExpr&) SAL_DELETED_FUNCTION;
+        OXMLCondPrtExpr(const OXMLCondPrtExpr&) = delete;
+        void operator =(const OXMLCondPrtExpr&) = delete;
     public:
 
         OXMLCondPrtExpr( ORptFilter& _rImport
diff --git a/reportdesign/source/filter/xml/xmlControlProperty.hxx b/reportdesign/source/filter/xml/xmlControlProperty.hxx
index 5e6bde3430c9..9220a5517721 100644
--- a/reportdesign/source/filter/xml/xmlControlProperty.hxx
+++ b/reportdesign/source/filter/xml/xmlControlProperty.hxx
@@ -40,8 +40,8 @@ namespace rptxml
 
         ORptFilter& GetOwnImport();
         static ::com::sun::star::uno::Any convertString(const ::com::sun::star::uno::Type& _rExpectedType, const OUString& _rReadCharacters);
-        OXMLControlProperty(const OXMLControlProperty&) SAL_DELETED_FUNCTION;
-        void operator =(const OXMLControlProperty&) SAL_DELETED_FUNCTION;
+        OXMLControlProperty(const OXMLControlProperty&) = delete;
+        void operator =(const OXMLControlProperty&) = delete;
     public:
 
         OXMLControlProperty( ORptFilter& rImport
diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx
index a5b0a531515f..83e8f40c39fe 100644
--- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx
+++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx
@@ -74,8 +74,8 @@ private:
 
     void exportTableRows();
 private:
-    ExportDocumentHandler(ExportDocumentHandler &) SAL_DELETED_FUNCTION;
-    void operator =(ExportDocumentHandler &) SAL_DELETED_FUNCTION;
+    ExportDocumentHandler(ExportDocumentHandler &) = delete;
+    void operator =(ExportDocumentHandler &) = delete;
 
     virtual ~ExportDocumentHandler();
 
diff --git a/reportdesign/source/filter/xml/xmlFixedContent.hxx b/reportdesign/source/filter/xml/xmlFixedContent.hxx
index 462dc19b00aa..6e7f115de678 100644
--- a/reportdesign/source/filter/xml/xmlFixedContent.hxx
+++ b/reportdesign/source/filter/xml/xmlFixedContent.hxx
@@ -40,8 +40,8 @@ namespace rptxml
                     const OUString& rLocalName,
                     const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
     private:
-        OXMLFixedContent(const OXMLFixedContent&) SAL_DELETED_FUNCTION;
-        OXMLFixedContent& operator =(const OXMLFixedContent&) SAL_DELETED_FUNCTION;
+        OXMLFixedContent(const OXMLFixedContent&) = delete;
+        OXMLFixedContent& operator =(const OXMLFixedContent&) = delete;
     public:
 
         OXMLFixedContent( ORptFilter& rImport, sal_uInt16 nPrfx,
diff --git a/reportdesign/source/filter/xml/xmlFormatCondition.hxx b/reportdesign/source/filter/xml/xmlFormatCondition.hxx
index 18d46fead2f9..16806ec38ed2 100644
--- a/reportdesign/source/filter/xml/xmlFormatCondition.hxx
+++ b/reportdesign/source/filter/xml/xmlFormatCondition.hxx
@@ -30,8 +30,8 @@ namespace rptxml
         ORptFilter& m_rImport;
         OUString m_sStyleName;
         ::com::sun::star::uno::Reference< ::com::sun::star::report::XFormatCondition >  m_xComponent;
-        OXMLFormatCondition(const OXMLFormatCondition&) SAL_DELETED_FUNCTION;
-        void operator =(const OXMLFormatCondition&) SAL_DELETED_FUNCTION;
+        OXMLFormatCondition(const OXMLFormatCondition&) = delete;
+        void operator =(const OXMLFormatCondition&) = delete;
     public:
 
         OXMLFormatCondition( ORptFilter& rImport, sal_uInt16 nPrfx,
diff --git a/reportdesign/source/filter/xml/xmlFormattedField.hxx b/reportdesign/source/filter/xml/xmlFormattedField.hxx
index f96f332d227a..d3ae6d7e5dd8 100644
--- a/reportdesign/source/filter/xml/xmlFormattedField.hxx
+++ b/reportdesign/source/filter/xml/xmlFormattedField.hxx
@@ -27,8 +27,8 @@ namespace rptxml
     class ORptFilter;
     class OXMLFormattedField : public OXMLReportElementBase
     {
-        OXMLFormattedField(const OXMLFormattedField&) SAL_DELETED_FUNCTION;
-        void operator =(const OXMLFormattedField&) SAL_DELETED_FUNCTION;
+        OXMLFormattedField(const OXMLFormattedField&) = delete;
+        void operator =(const OXMLFormattedField&) = delete;
     public:
 
         OXMLFormattedField( ORptFilter& rImport
diff --git a/reportdesign/source/filter/xml/xmlHelper.hxx b/reportdesign/source/filter/xml/xmlHelper.hxx
index 67748d5e676a..31da0c0d2ebe 100644
--- a/reportdesign/source/filter/xml/xmlHelper.hxx
+++ b/reportdesign/source/filter/xml/xmlHelper.hxx
@@ -38,8 +38,8 @@ namespace rptxml
 {
     class OPropertyHandlerFactory : public ::xmloff::OControlPropertyHandlerFactory
     {
-        OPropertyHandlerFactory(const OPropertyHandlerFactory&) SAL_DELETED_FUNCTION;
-        void operator =(const OPropertyHandlerFactory&) SAL_DELETED_FUNCTION;
+        OPropertyHandlerFactory(const OPropertyHandlerFactory&) = delete;
+        void operator =(const OPropertyHandlerFactory&) = delete;
     protected:
         mutable ::std::unique_ptr<XMLConstantsPropertyHandler>    m_pDisplayHandler;
         mutable ::std::unique_ptr<XMLPropertyHandler>             m_pTextAlignHandler;
diff --git a/reportdesign/source/filter/xml/xmlImage.hxx b/reportdesign/source/filter/xml/xmlImage.hxx
index 7c12c48ec4bf..3acfe1d391d4 100644
--- a/reportdesign/source/filter/xml/xmlImage.hxx
+++ b/reportdesign/source/filter/xml/xmlImage.hxx
@@ -27,8 +27,8 @@ namespace rptxml
     class ORptFilter;
     class OXMLImage : public OXMLReportElementBase
     {
-        OXMLImage(const OXMLImage&) SAL_DELETED_FUNCTION;
-        void operator =(const OXMLImage&) SAL_DELETED_FUNCTION;
+        OXMLImage(const OXMLImage&) = delete;
+        void operator =(const OXMLImage&) = delete;
     public:
 
         OXMLImage( ORptFilter& rImport, sal_uInt16 nPrfx,
diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx
index 6b1a638ab5af..d19292916cf1 100644
--- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx
+++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx
@@ -71,8 +71,8 @@ private:
     virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
 private:
-    ImportDocumentHandler(ImportDocumentHandler &) SAL_DELETED_FUNCTION;
-    void operator =(ImportDocumentHandler &) SAL_DELETED_FUNCTION;
+    ImportDocumentHandler(ImportDocumentHandler &) = delete;
+    void operator =(ImportDocumentHandler &) = delete;
 
     virtual ~ImportDocumentHandler();
 
diff --git a/reportdesign/source/filter/xml/xmlMasterFields.hxx b/reportdesign/source/filter/xml/xmlMasterFields.hxx
index 837669fc37b0..e32179a53e94 100644
--- a/reportdesign/source/filter/xml/xmlMasterFields.hxx
+++ b/reportdesign/source/filter/xml/xmlMasterFields.hxx
@@ -27,8 +27,8 @@ namespace rptxml
     class OXMLMasterFields : public SvXMLImportContext
     {
         IMasterDetailFieds* m_pReport;
-        OXMLMasterFields(const OXMLMasterFields&) SAL_DELETED_FUNCTION;
-        void operator =(const OXMLMasterFields&) SAL_DELETED_FUNCTION;
+        OXMLMasterFields(const OXMLMasterFields&) = delete;
+        void operator =(const OXMLMasterFields&) = delete;
     public:
 
         OXMLMasterFields( ORptFilter& rImport, sal_uInt16 nPrfx,
diff --git a/reportdesign/source/filter/xml/xmlPropertyHandler.hxx b/reportdesign/source/filter/xml/xmlPropertyHandler.hxx
index fcec77843e66..f1492f2224af 100644
--- a/reportdesign/source/filter/xml/xmlPropertyHandler.hxx
+++ b/reportdesign/source/filter/xml/xmlPropertyHandler.hxx
@@ -28,8 +28,8 @@ namespace rptxml
     class OXMLRptPropHdlFactory : public XMLPropertyHandlerFactory
     {
     private:
-        OXMLRptPropHdlFactory(const OXMLRptPropHdlFactory&) SAL_DELETED_FUNCTION;
-        void operator =(const OXMLRptPropHdlFactory&) SAL_DELETED_FUNCTION;
+        OXMLRptPropHdlFactory(const OXMLRptPropHdlFactory&) = delete;
+        void operator =(const OXMLRptPropHdlFactory&) = delete;
     public:
         OXMLRptPropHdlFactory();
         virtual ~OXMLRptPropHdlFactory();
diff --git a/reportdesign/source/filter/xml/xmlReport.hxx b/reportdesign/source/filter/xml/xmlReport.hxx
index c517246fe042..ab88f2e7efae 100644
--- a/reportdesign/source/filter/xml/xmlReport.hxx
+++ b/reportdesign/source/filter/xml/xmlReport.hxx
@@ -30,8 +30,8 @@ namespace rptxml
         ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition > m_xComponent;
         ::std::vector< OUString> m_aMasterFields;
         ::std::vector< OUString> m_aDetailFields;
-        OXMLReport(const OXMLReport&) SAL_DELETED_FUNCTION;
-        void operator =(const OXMLReport&) SAL_DELETED_FUNCTION;
+        OXMLReport(const OXMLReport&) = delete;
+        void operator =(const OXMLReport&) = delete;
     public:
 
         OXMLReport( ORptFilter& rImport, sal_uInt16 nPrfx,
diff --git a/reportdesign/source/filter/xml/xmlReportElement.hxx b/reportdesign/source/filter/xml/xmlReportElement.hxx
index a3f1fa961b5d..5708f034da38 100644
--- a/reportdesign/source/filter/xml/xmlReportElement.hxx
+++ b/reportdesign/source/filter/xml/xmlReportElement.hxx
@@ -29,8 +29,8 @@ namespace rptxml
     {
         ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportControlModel >   m_xComponent;
         ORptFilter& GetOwnImport();
-        OXMLReportElement(const OXMLReportElement&) SAL_DELETED_FUNCTION;
-        void operator =(const OXMLReportElement&) SAL_DELETED_FUNCTION;
+        OXMLReportElement(const OXMLReportElement&) = delete;
+        void operator =(const OXMLReportElement&) = delete;
     public:
 
         OXMLReportElement( ORptFilter& rImport, sal_uInt16 nPrfx,
diff --git a/reportdesign/source/filter/xml/xmlReportElementBase.hxx b/reportdesign/source/filter/xml/xmlReportElementBase.hxx
index bf2025fe1df0..5c7571e30ba7 100644
--- a/reportdesign/source/filter/xml/xmlReportElementBase.hxx
+++ b/reportdesign/source/filter/xml/xmlReportElementBase.hxx
@@ -39,8 +39,8 @@ namespace rptxml
 
     class OXMLReportElementBase : public SvXMLImportContext
     {
-        OXMLReportElementBase(const OXMLReportElementBase&) SAL_DELETED_FUNCTION;
-        void operator =(const OXMLReportElementBase&) SAL_DELETED_FUNCTION;
+        OXMLReportElementBase(const OXMLReportElementBase&) = delete;
+        void operator =(const OXMLReportElementBase&) = delete;
     protected:
         ORptFilter&   m_rImport;
         OXMLTable*    m_pContainer;
diff --git a/reportdesign/source/filter/xml/xmlSection.hxx b/reportdesign/source/filter/xml/xmlSection.hxx
index 676009029a20..51ef60396902 100644
--- a/reportdesign/source/filter/xml/xmlSection.hxx
+++ b/reportdesign/source/filter/xml/xmlSection.hxx
@@ -32,8 +32,8 @@ namespace rptxml
         ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >              m_xSection;
         ORptFilter& GetOwnImport();
 
-        OXMLSection(const OXMLSection&) SAL_DELETED_FUNCTION;
-        void operator =(const OXMLSection&) SAL_DELETED_FUNCTION;
+        OXMLSection(const OXMLSection&) = delete;
+        void operator =(const OXMLSection&) = delete;
     public:
 
         OXMLSection( ORptFilter& rImport
diff --git a/reportdesign/source/filter/xml/xmlStyleImport.hxx b/reportdesign/source/filter/xml/xmlStyleImport.hxx
index cdef154f4b3a..44b058bdffef 100644
--- a/reportdesign/source/filter/xml/xmlStyleImport.hxx
+++ b/reportdesign/source/filter/xml/xmlStyleImport.hxx
@@ -47,8 +47,8 @@ namespace rptxml
 
         ORptFilter& GetOwnImport() const { return m_rImport;}
 
-        OControlStyleContext(const OControlStyleContext&) SAL_DELETED_FUNCTION;
-        void operator =(const OControlStyleContext&) SAL_DELETED_FUNCTION;
+        OControlStyleContext(const OControlStyleContext&) = delete;
+        void operator =(const OControlStyleContext&) = delete;
     protected:
 
         virtual void SetAttribute( sal_uInt16 nPrefixKey,
@@ -102,8 +102,8 @@ namespace rptxml
 
         ORptFilter& GetOwnImport() const { return m_rImport;}
 
-        OReportStylesContext(const OReportStylesContext&) SAL_DELETED_FUNCTION;
-        void operator =(const OReportStylesContext&) SAL_DELETED_FUNCTION;
+        OReportStylesContext(const OReportStylesContext&) = delete;
+        void operator =(const OReportStylesContext&) = delete;
     protected:
 
         // Create a style context.
diff --git a/reportdesign/source/filter/xml/xmlSubDocument.hxx b/reportdesign/source/filter/xml/xmlSubDocument.hxx
index 80e312e9db56..0a90a866837b 100644
--- a/reportdesign/source/filter/xml/xmlSubDocument.hxx
+++ b/reportdesign/source/filter/xml/xmlSubDocument.hxx
@@ -36,8 +36,8 @@ namespace rptxml
         sal_Int32       m_nCurrentCount;
         bool            m_bContainsShape;
 
-        OXMLSubDocument(const OXMLSubDocument&) SAL_DELETED_FUNCTION;
-        void operator =(const OXMLSubDocument&) SAL_DELETED_FUNCTION;
+        OXMLSubDocument(const OXMLSubDocument&) = delete;
+        void operator =(const OXMLSubDocument&) = delete;
 
         virtual SvXMLImportContext* _CreateChildContext( sal_uInt16 nPrefix,
                     const OUString& rLocalName,
diff --git a/reportdesign/source/filter/xml/xmlTable.hxx b/reportdesign/source/filter/xml/xmlTable.hxx
index ebcb55a55640..bdec3a15bcaa 100644
--- a/reportdesign/source/filter/xml/xmlTable.hxx
+++ b/reportdesign/source/filter/xml/xmlTable.hxx
@@ -50,8 +50,8 @@ namespace rptxml
         sal_Int32                                                                           m_nColumnIndex;
         ORptFilter& GetOwnImport();
 
-        OXMLTable(const OXMLTable&) SAL_DELETED_FUNCTION;
-        void operator =(const OXMLTable&) SAL_DELETED_FUNCTION;
+        OXMLTable(const OXMLTable&) = delete;
+        void operator =(const OXMLTable&) = delete;
     public:
 
         OXMLTable( ORptFilter& rImport
diff --git a/reportdesign/source/ui/inc/AddField.hxx b/reportdesign/source/ui/inc/AddField.hxx
index 77c296611c03..f30e34d9d61e 100644
--- a/reportdesign/source/ui/inc/AddField.hxx
+++ b/reportdesign/source/ui/inc/AddField.hxx
@@ -74,8 +74,8 @@ class  OAddFieldWindow  :public FloatingWindow
     DECL_LINK_TYPED( OnSelectHdl, SvTreeListBox*, void );
     DECL_LINK_TYPED( OnSortAction, ToolBox*, void );
 
-    OAddFieldWindow(const OAddFieldWindow&) SAL_DELETED_FUNCTION;
-    void operator =(const OAddFieldWindow&) SAL_DELETED_FUNCTION;
+    OAddFieldWindow(const OAddFieldWindow&) = delete;
+    void operator =(const OAddFieldWindow&) = delete;
 public:
     OAddFieldWindow(vcl::Window* pParent
                     , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xRowSet);
diff --git a/reportdesign/source/ui/inc/ColorListener.hxx b/reportdesign/source/ui/inc/ColorListener.hxx
index 3088e0857201..8d7b82d30e4b 100644
--- a/reportdesign/source/ui/inc/ColorListener.hxx
+++ b/reportdesign/source/ui/inc/ColorListener.hxx
@@ -29,8 +29,8 @@ namespace rptui
 {
     class OColorListener : public vcl::Window, public SfxListener
     {
-        OColorListener(const OColorListener&) SAL_DELETED_FUNCTION;
-        void operator =(const OColorListener&) SAL_DELETED_FUNCTION;
+        OColorListener(const OColorListener&) = delete;
+        void operator =(const OColorListener&) = delete;
     protected:
         OModuleClient                       m_aModuleClient;
         Link<OColorListener&,void>          m_aCollapsedLink;
diff --git a/reportdesign/source/ui/inc/DataProviderHandler.hxx b/reportdesign/source/ui/inc/DataProviderHandler.hxx
index b89e7d26a0b7..ccd36cea3580 100644
--- a/reportdesign/source/ui/inc/DataProviderHandler.hxx
+++ b/reportdesign/source/ui/inc/DataProviderHandler.hxx
@@ -89,8 +89,8 @@ namespace rptui
     protected:
         virtual ~DataProviderHandler() {}
     private:
-        DataProviderHandler(DataProviderHandler &) SAL_DELETED_FUNCTION;
-        void operator =(DataProviderHandler &) SAL_DELETED_FUNCTION;
+        DataProviderHandler(DataProviderHandler &) = delete;
+        void operator =(DataProviderHandler &) = delete;
 
 
         bool impl_dialogLinkedFields_nothrow( ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const;
diff --git a/reportdesign/source/ui/inc/DateTime.hxx b/reportdesign/source/ui/inc/DateTime.hxx
index 84e3127f8784..4d6f5b6914de 100644
--- a/reportdesign/source/ui/inc/DateTime.hxx
+++ b/reportdesign/source/ui/inc/DateTime.hxx
@@ -71,8 +71,8 @@ class ODateTimeDialog : public ModalDialog
     sal_Int32 getFormatKey(bool _bDate) const;
 
     DECL_LINK_TYPED( CBClickHdl, Button*, void );
-    ODateTimeDialog(const ODateTimeDialog&) SAL_DELETED_FUNCTION;
-    void operator =(const ODateTimeDialog&) SAL_DELETED_FUNCTION;
+    ODateTimeDialog(const ODateTimeDialog&) = delete;
+    void operator =(const ODateTimeDialog&) = delete;
 
     // fill methods
     void InsertEntry(sal_Int16 _nNumberFormatId);
diff --git a/reportdesign/source/ui/inc/DefaultInspection.hxx b/reportdesign/source/ui/inc/DefaultInspection.hxx
index 61601eb249d5..5c39bd17a652 100644
--- a/reportdesign/source/ui/inc/DefaultInspection.hxx
+++ b/reportdesign/source/ui/inc/DefaultInspection.hxx
@@ -53,8 +53,8 @@ namespace rptui
         /// access to property meta data
         ::std::unique_ptr< OPropertyInfoService >                                               m_pInfoService;
 
-        DefaultComponentInspectorModel(const DefaultComponentInspectorModel&) SAL_DELETED_FUNCTION;
-        DefaultComponentInspectorModel& operator=(const DefaultComponentInspectorModel&) SAL_DELETED_FUNCTION;
+        DefaultComponentInspectorModel(const DefaultComponentInspectorModel&) = delete;
+        DefaultComponentInspectorModel& operator=(const DefaultComponentInspectorModel&) = delete;
     protected:
         virtual ~DefaultComponentInspectorModel();
 
diff --git a/reportdesign/source/ui/inc/DesignView.hxx b/reportdesign/source/ui/inc/DesignView.hxx
index 3825ac3a118d..95f1cdb26360 100644
--- a/reportdesign/source/ui/inc/DesignView.hxx
+++ b/reportdesign/source/ui/inc/DesignView.hxx
@@ -82,8 +82,8 @@ namespace rptui
 
         void ImplInitSettings();
 
-        ODesignView(ODesignView&) SAL_DELETED_FUNCTION;
-        void operator =(ODesignView&) SAL_DELETED_FUNCTION;
+        ODesignView(ODesignView&) = delete;
+        void operator =(ODesignView&) = delete;
     protected:
         // return the Rectangle where I can paint myself
         virtual void resizeDocumentView(Rectangle& rRect) SAL_OVERRIDE;
diff --git a/reportdesign/source/ui/inc/EndMarker.hxx b/reportdesign/source/ui/inc/EndMarker.hxx
index 7c050a5ba52a..27d234dca968 100644
--- a/reportdesign/source/ui/inc/EndMarker.hxx
+++ b/reportdesign/source/ui/inc/EndMarker.hxx
@@ -28,8 +28,8 @@ namespace rptui
      */
     class OEndMarker : public OColorListener
     {
-        OEndMarker(OEndMarker&) SAL_DELETED_FUNCTION;
-        void operator =(OEndMarker&) SAL_DELETED_FUNCTION;
+        OEndMarker(OEndMarker&) = delete;
+        void operator =(OEndMarker&) = delete;
     protected:
         virtual void ImplInitSettings() SAL_OVERRIDE;
     public:
diff --git a/reportdesign/source/ui/inc/GeometryHandler.hxx b/reportdesign/source/ui/inc/GeometryHandler.hxx
index 592305371eac..e96a01c2520d 100644
--- a/reportdesign/source/ui/inc/GeometryHandler.hxx
+++ b/reportdesign/source/ui/inc/GeometryHandler.hxx
@@ -276,8 +276,8 @@ namespace rptui
     protected:
         virtual ~GeometryHandler();
     private:
-        GeometryHandler(GeometryHandler &) SAL_DELETED_FUNCTION;
-        void operator =(GeometryHandler &) SAL_DELETED_FUNCTION;
+        GeometryHandler(GeometryHandler &) = delete;
+        void operator =(GeometryHandler &) = delete;
 
         // override WeakComponentImplHelperBase::disposing()
         // This function is called upon disposing the component,
diff --git a/reportdesign/source/ui/inc/GroupsSorting.hxx b/reportdesign/source/ui/inc/GroupsSorting.hxx
index 4b9ed07e75ba..386883acf50a 100644
--- a/reportdesign/source/ui/inc/GroupsSorting.hxx
+++ b/reportdesign/source/ui/inc/GroupsSorting.hxx
@@ -135,8 +135,8 @@ private:
     *
     */
     void fillColumns();
-    OGroupsSortingDialog(OGroupsSortingDialog&) SAL_DELETED_FUNCTION;
-    void operator =(OGroupsSortingDialog&) SAL_DELETED_FUNCTION;
+    OGroupsSortingDialog(OGroupsSortingDialog&) = delete;
+    void operator =(OGroupsSortingDialog&) = delete;
 protected:
     // OPropertyChangeListener
     virtual void    _propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& _rEvent) throw( css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/reportdesign/source/ui/inc/Navigator.hxx b/reportdesign/source/ui/inc/Navigator.hxx
index 5410de2cdb9e..65c77ee6d99e 100644
--- a/reportdesign/source/ui/inc/Navigator.hxx
+++ b/reportdesign/source/ui/inc/Navigator.hxx
@@ -30,8 +30,8 @@ namespace rptui
     {
         OModuleClient       m_aModuleClient;
         ::std::unique_ptr<ONavigatorImpl> m_pImpl;
-        ONavigator(const ONavigator&) SAL_DELETED_FUNCTION;
-        void operator =(const ONavigator&) SAL_DELETED_FUNCTION;
+        ONavigator(const ONavigator&) = delete;
+        void operator =(const ONavigator&) = delete;
     public:
            ONavigator( vcl::Window* pParent
                     ,OReportController& _rController);
diff --git a/reportdesign/source/ui/inc/PageNumber.hxx b/reportdesign/source/ui/inc/PageNumber.hxx
index 43a1915d8e81..fdbd11dbef2c 100644
--- a/reportdesign/source/ui/inc/PageNumber.hxx
+++ b/reportdesign/source/ui/inc/PageNumber.hxx
@@ -50,8 +50,8 @@ class OPageNumberDialog :   public ModalDialog
     ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition>
                                             m_xHoldAlive;
 
-    OPageNumberDialog(const OPageNumberDialog&) SAL_DELETED_FUNCTION;
-    void operator =(const OPageNumberDialog&) SAL_DELETED_FUNCTION;
+    OPageNumberDialog(const OPageNumberDialog&) = delete;
+    void operator =(const OPageNumberDialog&) = delete;
 public:
     OPageNumberDialog( vcl::Window* pParent
                         ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition>& _xHoldAlive
diff --git a/reportdesign/source/ui/inc/ReportComponentHandler.hxx b/reportdesign/source/ui/inc/ReportComponentHandler.hxx
index fae48f2b83cd..9d83a985c9cf 100644
--- a/reportdesign/source/ui/inc/ReportComponentHandler.hxx
+++ b/reportdesign/source/ui/inc/ReportComponentHandler.hxx
@@ -83,8 +83,8 @@ namespace rptui
     protected:
         virtual ~ReportComponentHandler() {}
     private:
-        ReportComponentHandler(ReportComponentHandler &) SAL_DELETED_FUNCTION;
-        void operator =(ReportComponentHandler &) SAL_DELETED_FUNCTION;
+        ReportComponentHandler(ReportComponentHandler &) = delete;
+        void operator =(ReportComponentHandler &) = delete;
 
 
 
diff --git a/reportdesign/source/ui/inc/ReportControllerObserver.hxx b/reportdesign/source/ui/inc/ReportControllerObserver.hxx
index 735a149ca047..ff480fb58b4f 100644
--- a/reportdesign/source/ui/inc/ReportControllerObserver.hxx
+++ b/reportdesign/source/ui/inc/ReportControllerObserver.hxx
@@ -53,8 +53,8 @@ namespace rptui
         FixedTextColor           m_aFixedTextColor;
 
         // do not allow copy
-        OXReportControllerObserver(const OXReportControllerObserver&) SAL_DELETED_FUNCTION;
-        OXReportControllerObserver& operator=(const OXReportControllerObserver&) SAL_DELETED_FUNCTION;
+        OXReportControllerObserver(const OXReportControllerObserver&) = delete;
+        OXReportControllerObserver& operator=(const OXReportControllerObserver&) = delete;
         virtual  ~OXReportControllerObserver(); // UNO Object must have private destructor!
     public:
         OXReportControllerObserver(const OReportController& _rController);
diff --git a/reportdesign/source/ui/inc/ReportSection.hxx b/reportdesign/source/ui/inc/ReportSection.hxx
index b60680822433..2bd6733ad52e 100644
--- a/reportdesign/source/ui/inc/ReportSection.hxx
+++ b/reportdesign/source/ui/inc/ReportSection.hxx
@@ -61,8 +61,8 @@ namespace rptui
         */
         void impl_adjustObjectSizePosition(sal_Int32 i_nPaperWidth,sal_Int32 i_nLeftMargin,sal_Int32 i_nRightMargin);
 
-        OReportSection(OReportSection&) SAL_DELETED_FUNCTION;
-        void operator =(OReportSection&) SAL_DELETED_FUNCTION;
+        OReportSection(OReportSection&) = delete;
+        void operator =(OReportSection&) = delete;
     protected:
         // DropTargetHelper overridables
         virtual sal_Int8    AcceptDrop( const AcceptDropEvent& _rEvt ) SAL_OVERRIDE;
diff --git a/reportdesign/source/ui/inc/ReportWindow.hxx b/reportdesign/source/ui/inc/ReportWindow.hxx
index fd9eaabff3eb..257add2e83f3 100644
--- a/reportdesign/source/ui/inc/ReportWindow.hxx
+++ b/reportdesign/source/ui/inc/ReportWindow.hxx
@@ -57,8 +57,8 @@ namespace rptui
         sal_Int32 GetTotalHeight() const;
         sal_Int32 impl_getRealPixelWidth() const;
 
-        OReportWindow(OReportWindow&) SAL_DELETED_FUNCTION;
-        void operator =(OReportWindow&) SAL_DELETED_FUNCTION;
+        OReportWindow(OReportWindow&) = delete;
+        void operator =(OReportWindow&) = delete;
     protected:
         virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
         // OPropertyChangeListener
diff --git a/reportdesign/source/ui/inc/RptUndo.hxx b/reportdesign/source/ui/inc/RptUndo.hxx
index f82a716e5376..150a646331f2 100644
--- a/reportdesign/source/ui/inc/RptUndo.hxx
+++ b/reportdesign/source/ui/inc/RptUndo.hxx
@@ -35,8 +35,8 @@ namespace rptui
      */
     class OSectionUndo : public OCommentUndoAction
     {
-        OSectionUndo(const OSectionUndo&) SAL_DELETED_FUNCTION;
-        void operator =(const OSectionUndo&) SAL_DELETED_FUNCTION;
+        OSectionUndo(const OSectionUndo&) = delete;
+        void operator =(const OSectionUndo&) = delete;
     protected:
         ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape> >
                                                     m_aControls;
@@ -72,8 +72,8 @@ namespace rptui
 
         void    implReInsert( ) SAL_OVERRIDE;
         void    implReRemove( ) SAL_OVERRIDE;
-        OReportSectionUndo(const OReportSectionUndo&) SAL_DELETED_FUNCTION;
-        void operator =(const OReportSectionUndo&) SAL_DELETED_FUNCTION;
+        OReportSectionUndo(const OReportSectionUndo&) = delete;
+        void operator =(const OReportSectionUndo&) = delete;
     public:
         TYPEINFO_OVERRIDE();
         //OReportSectionUndo(    const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection
@@ -99,8 +99,8 @@ namespace rptui
 
         void    implReInsert( ) SAL_OVERRIDE;
         void    implReRemove( ) SAL_OVERRIDE;
-        OGroupSectionUndo(const OGroupSectionUndo&) SAL_DELETED_FUNCTION;
-        void operator =(const OGroupSectionUndo&) SAL_DELETED_FUNCTION;
+        OGroupSectionUndo(const OGroupSectionUndo&) = delete;
+        void operator =(const OGroupSectionUndo&) = delete;
     public:
         TYPEINFO_OVERRIDE();
         //OGroupSectionUndo(     const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection
diff --git a/reportdesign/source/ui/inc/ScrollHelper.hxx b/reportdesign/source/ui/inc/ScrollHelper.hxx
index 54a88b051e0a..195d1166cfa2 100644
--- a/reportdesign/source/ui/inc/ScrollHelper.hxx
+++ b/reportdesign/source/ui/inc/ScrollHelper.hxx
@@ -61,8 +61,8 @@ namespace rptui
         void ImplInitSettings();
         void impl_initScrollBar( ScrollBar& _rScrollBar ) const;
 
-        OScrollWindowHelper(OScrollWindowHelper&) SAL_DELETED_FUNCTION;
-        void operator =(OScrollWindowHelper&) SAL_DELETED_FUNCTION;
+        OScrollWindowHelper(OScrollWindowHelper&) = delete;
+        void operator =(OScrollWindowHelper&) = delete;
     protected:
         virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
         // window
diff --git a/reportdesign/source/ui/inc/SectionView.hxx b/reportdesign/source/ui/inc/SectionView.hxx
index c8f14e26ee4b..581523d408f8 100644
--- a/reportdesign/source/ui/inc/SectionView.hxx
+++ b/reportdesign/source/ui/inc/SectionView.hxx
@@ -38,8 +38,8 @@ private:
     VclPtr<OReportSection>     m_pSectionWindow;
 
     void ObjectRemovedInAliveMode( const SdrObject* pObject );
-    OSectionView(const OSectionView&) SAL_DELETED_FUNCTION;
-    void operator =(const OSectionView&) SAL_DELETED_FUNCTION;
+    OSectionView(const OSectionView&) = delete;
+    void operator =(const OSectionView&) = delete;
 public:
     TYPEINFO_OVERRIDE();
 
diff --git a/reportdesign/source/ui/inc/SectionWindow.hxx b/reportdesign/source/ui/inc/SectionWindow.hxx
index 41bdb042a8fa..cc8245eae261 100644
--- a/reportdesign/source/ui/inc/SectionWindow.hxx
+++ b/reportdesign/source/ui/inc/SectionWindow.hxx
@@ -55,8 +55,8 @@ namespace rptui
         ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> m_pSectionMulti;
         ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> m_pGroupMulti;
 
-        OSectionWindow(OSectionWindow&) SAL_DELETED_FUNCTION;
-        void operator =(OSectionWindow&) SAL_DELETED_FUNCTION;
+        OSectionWindow(OSectionWindow&) = delete;
+        void operator =(OSectionWindow&) = delete;
 
         /** set the title of the group header or footer
         *
diff --git a/reportdesign/source/ui/inc/StartMarker.hxx b/reportdesign/source/ui/inc/StartMarker.hxx
index 0fe0bc64bd99..d5bcc555ca66 100644
--- a/reportdesign/source/ui/inc/StartMarker.hxx
+++ b/reportdesign/source/ui/inc/StartMarker.hxx
@@ -48,8 +48,8 @@ namespace rptui
         virtual void ImplInitSettings() SAL_OVERRIDE;
         virtual void ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE;
 
-        OStartMarker(OStartMarker&) SAL_DELETED_FUNCTION;
-        void operator =(OStartMarker&) SAL_DELETED_FUNCTION;
+        OStartMarker(OStartMarker&) = delete;
+        void operator =(OStartMarker&) = delete;
     public:
         OStartMarker(OSectionWindow* _pParent,const OUString& _sColorEntry);
         virtual ~OStartMarker();
diff --git a/reportdesign/source/ui/inc/ViewsWindow.hxx b/reportdesign/source/ui/inc/ViewsWindow.hxx
index 4950ec9a55c5..9a900a89c274 100644
--- a/reportdesign/source/ui/inc/ViewsWindow.hxx
+++ b/reportdesign/source/ui/inc/ViewsWindow.hxx
@@ -124,8 +124,8 @@ namespace rptui
         static void collectBoundResizeRect(const TRectangleMap& _rSortRectangles,sal_Int32 _nControlModification,bool _bAlignAtSection,bool _bBoundRects,Rectangle& _rBound,Rectangle& _rResize);
         void impl_resizeSectionWindow(OSectionWindow& _rSectionWindow,Point& _rStartPoint,bool _bSet);
 
-        OViewsWindow(OViewsWindow&) SAL_DELETED_FUNCTION;
-        void operator =(OViewsWindow&) SAL_DELETED_FUNCTION;
+        OViewsWindow(OViewsWindow&) = delete;
+        void operator =(OViewsWindow&) = delete;
     protected:
         virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
         // Window overrides
diff --git a/reportdesign/source/ui/inc/dlgedfunc.hxx b/reportdesign/source/ui/inc/dlgedfunc.hxx
index 527654eb001f..4d47ef04698f 100644
--- a/reportdesign/source/ui/inc/dlgedfunc.hxx
+++ b/reportdesign/source/ui/inc/dlgedfunc.hxx
@@ -38,8 +38,8 @@ class OSectionView;
 
 class DlgEdFunc /* : public LinkHdl */
 {
-    DlgEdFunc(const DlgEdFunc&) SAL_DELETED_FUNCTION;
-    void operator =(const DlgEdFunc&) SAL_DELETED_FUNCTION;
+    DlgEdFunc(const DlgEdFunc&) = delete;
+    void operator =(const DlgEdFunc&) = delete;
 protected:
     VclPtr<OReportSection> m_pParent;
     OSectionView&   m_rView;
diff --git a/reportdesign/source/ui/inc/dlgpage.hxx b/reportdesign/source/ui/inc/dlgpage.hxx
index 1b577a482569..98876703ca13 100644
--- a/reportdesign/source/ui/inc/dlgpage.hxx
+++ b/reportdesign/source/ui/inc/dlgpage.hxx
@@ -31,8 +31,8 @@ namespace rptui
 class ORptPageDialog : public SfxTabDialog
 {
 private:
-    ORptPageDialog(const ORptPageDialog&) SAL_DELETED_FUNCTION;
-    void operator =(const ORptPageDialog&) SAL_DELETED_FUNCTION;
+    ORptPageDialog(const ORptPageDialog&) = delete;
+    void operator =(const ORptPageDialog&) = delete;
 
     sal_uInt16 m_nCharBgdId;
 public:
diff --git a/reportdesign/source/ui/inc/metadata.hxx b/reportdesign/source/ui/inc/metadata.hxx
index 0506dfcd3357..4b8465056ef5 100644
--- a/reportdesign/source/ui/inc/metadata.hxx
+++ b/reportdesign/source/ui/inc/metadata.hxx
@@ -37,8 +37,8 @@ namespace rptui
     class OPropertyInfoService
         :public OModuleClient
     {
-        OPropertyInfoService(const OPropertyInfoService&) SAL_DELETED_FUNCTION;
-        void operator =(const OPropertyInfoService&) SAL_DELETED_FUNCTION;
+        OPropertyInfoService(const OPropertyInfoService&) = delete;
+        void operator =(const OPropertyInfoService&) = delete;
     protected:
         static sal_uInt16               s_nCount;
         static OPropertyInfoImpl*       s_pPropertyInfos;
diff --git a/reportdesign/source/ui/inc/propbrw.hxx b/reportdesign/source/ui/inc/propbrw.hxx
index 811d57c2c389..c71bb668aadb 100644
--- a/reportdesign/source/ui/inc/propbrw.hxx
+++ b/reportdesign/source/ui/inc/propbrw.hxx
@@ -62,8 +62,8 @@ private:
     OSectionView*       m_pView;
     bool            m_bInitialStateChange;
 
-    PropBrw(PropBrw&) SAL_DELETED_FUNCTION;
-    void operator =(PropBrw&) SAL_DELETED_FUNCTION;
+    PropBrw(PropBrw&) = delete;
+    void operator =(PropBrw&) = delete;
 protected:
 
     virtual void Resize() SAL_OVERRIDE;
diff --git a/reportdesign/source/ui/inc/toolboxcontroller.hxx b/reportdesign/source/ui/inc/toolboxcontroller.hxx
index 810de524f4bd..968cf5436cef 100644
--- a/reportdesign/source/ui/inc/toolboxcontroller.hxx
+++ b/reportdesign/source/ui/inc/toolboxcontroller.hxx
@@ -45,8 +45,8 @@ namespace rptui
         TToolbarHelper  m_pToolbarController;
         sal_uInt16      m_nToolBoxId;
         sal_uInt16      m_nSlotId;
-        OToolboxController(const OToolboxController&) SAL_DELETED_FUNCTION;
-        void operator =(const OToolboxController&) SAL_DELETED_FUNCTION;
+        OToolboxController(const OToolboxController&) = delete;
+        void operator =(const OToolboxController&) = delete;
     public:
         OToolboxController(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB);
         virtual ~OToolboxController();
diff --git a/sc/inc/attarray.hxx b/sc/inc/attarray.hxx
index c555a12a433d..1b0a646d5ee9 100644
--- a/sc/inc/attarray.hxx
+++ b/sc/inc/attarray.hxx
@@ -95,8 +95,8 @@ friend class ScHorizontalAttrIterator;
     void RemoveCellCharAttribs( SCROW nStartRow, SCROW nEndRow,
                               const ScPatternAttr* pPattern, ScEditDataArray* pDataArray );
 
-    ScAttrArray(const ScAttrArray&) SAL_DELETED_FUNCTION;
-    ScAttrArray& operator=(const ScAttrArray&) SAL_DELETED_FUNCTION;
+    ScAttrArray(const ScAttrArray&) = delete;
+    ScAttrArray& operator=(const ScAttrArray&) = delete;
 
 public:
             ScAttrArray( SCCOL nNewCol, SCTAB nNewTab, ScDocument* pDoc );
diff --git a/sc/inc/bulkdatahint.hxx b/sc/inc/bulkdatahint.hxx
index f5361ac3452f..450a19f08931 100644
--- a/sc/inc/bulkdatahint.hxx
+++ b/sc/inc/bulkdatahint.hxx
@@ -23,8 +23,8 @@ class BulkDataHint : public SfxSimpleHint
     struct Impl;
     Impl* mpImpl;
 
-    BulkDataHint( const BulkDataHint& ) SAL_DELETED_FUNCTION;
-    BulkDataHint& operator= ( const BulkDataHint& ) SAL_DELETED_FUNCTION;
+    BulkDataHint( const BulkDataHint& ) = delete;
+    BulkDataHint& operator= ( const BulkDataHint& ) = delete;
 
 public:
     BulkDataHint( ScDocument& rDoc, const ColumnSpanSet* pSpans );
diff --git a/sc/inc/cellvalues.hxx b/sc/inc/cellvalues.hxx
index 83f8f784f1bc..6aaf32673868 100644
--- a/sc/inc/cellvalues.hxx
+++ b/sc/inc/cellvalues.hxx
@@ -42,8 +42,8 @@ class CellValues
 {
     CellValuesImpl* mpImpl;
 
-    CellValues( const CellValues& ) SAL_DELETED_FUNCTION;
-    CellValues& operator= ( const CellValues& ) SAL_DELETED_FUNCTION;
+    CellValues( const CellValues& ) = delete;
+    CellValues& operator= ( const CellValues& ) = delete;
 
 public:
     CellValues();
@@ -88,8 +88,8 @@ class TableValues
 
     Impl* mpImpl;
 
-    TableValues( const TableValues& ) SAL_DELETED_FUNCTION;
-    TableValues& operator= ( const TableValues& ) SAL_DELETED_FUNCTION;
+    TableValues( const TableValues& ) = delete;
+    TableValues& operator= ( const TableValues& ) = delete;
 
 public:
 
diff --git a/sc/inc/chart2uno.hxx b/sc/inc/chart2uno.hxx
index 6dbebe699a33..2f72a6ea4be5 100644
--- a/sc/inc/chart2uno.hxx
+++ b/sc/inc/chart2uno.hxx
@@ -373,7 +373,7 @@ private:
     DECL_LINK_TYPED( ValueListenerHdl, const SfxHint&, void );
 
 private:
-    ScChart2DataSequence(const ScChart2DataSequence& r) SAL_DELETED_FUNCTION;
+    ScChart2DataSequence(const ScChart2DataSequence& r) = delete;
 
     class ExternalRefListener : public ScExternalRefManager::LinkListener
     {
@@ -386,7 +386,7 @@ private:
         const std::unordered_set<sal_uInt16>& getAllFileIds() { return maFileIds;}
 
     private:
-        ExternalRefListener(const ExternalRefListener& r) SAL_DELETED_FUNCTION;
+        ExternalRefListener(const ExternalRefListener& r) = delete;
 
         ScChart2DataSequence&       mrParent;
         std::unordered_set<sal_uInt16> maFileIds;
diff --git a/sc/inc/chartarr.hxx b/sc/inc/chartarr.hxx
index 4cefe81aad3a..0a60e4036b0e 100644
--- a/sc/inc/chartarr.hxx
+++ b/sc/inc/chartarr.hxx
@@ -39,7 +39,7 @@ class ScMemChart
     OUString* pColText;
     OUString* pRowText;
 
-    ScMemChart(const ScMemChart& rMemChart) SAL_DELETED_FUNCTION;
+    ScMemChart(const ScMemChart& rMemChart) = delete;
 
 public:
     ScMemChart(SCCOL nCols, SCROW nRows);
diff --git a/sc/inc/chartlis.hxx b/sc/inc/chartlis.hxx
index b634b91602e9..c42385ed1acc 100644
--- a/sc/inc/chartlis.hxx
+++ b/sc/inc/chartlis.hxx
@@ -52,7 +52,7 @@ public:
         std::unordered_set<sal_uInt16>& getAllFileIds() { return maFileIds;}
 
     private:
-        ExternalRefListener(const ExternalRefListener& r) SAL_DELETED_FUNCTION;
+        ExternalRefListener(const ExternalRefListener& r) = delete;
 
         ScChartListener& mrParent;
         std::unordered_set<sal_uInt16> maFileIds;
@@ -71,7 +71,7 @@ private:
     bool            bDirty:1;
     bool            bSeriesRangesScheduled:1;
 
-    ScChartListener& operator=( const ScChartListener& ) SAL_DELETED_FUNCTION;
+    ScChartListener& operator=( const ScChartListener& ) = delete;
 
 public:
     ScChartListener( const OUString& rName, ScDocument* pDoc,
@@ -147,7 +147,7 @@ private:
 
                     DECL_LINK_TYPED(TimerHdl, Idle *, void);
 
-    ScChartListenerCollection& operator=( const ScChartListenerCollection& ) SAL_DELETED_FUNCTION;
+    ScChartListenerCollection& operator=( const ScChartListenerCollection& ) = delete;
 
 public:
     ScChartListenerCollection( ScDocument* pDoc );
diff --git a/sc/inc/chartlock.hxx b/sc/inc/chartlock.hxx
index 1853bc9da09a..e7680397568e 100644
--- a/sc/inc/chartlock.hxx
+++ b/sc/inc/chartlock.hxx
@@ -44,7 +44,7 @@ private:
     std::vector< ::com::sun::star::uno::WeakReference<
         ::com::sun::star::frame::XModel > > maChartModels;
 
-    ScChartLockGuard( const ScChartLockGuard& ) SAL_DELETED_FUNCTION;
+    ScChartLockGuard( const ScChartLockGuard& ) = delete;
 };
 
 /** Use this to lock all charts in the calc for a little time.
@@ -68,7 +68,7 @@ private:
 
     DECL_LINK_TYPED(TimeoutHdl, Timer *, void);
 
-    ScTemporaryChartLock( const ScTemporaryChartLock& ) SAL_DELETED_FUNCTION;
+    ScTemporaryChartLock( const ScTemporaryChartLock& ) = delete;
 };
 
 #endif
diff --git a/sc/inc/chartpos.hxx b/sc/inc/chartpos.hxx
index c3693b0d91cc..33eba6a1b88d 100644
--- a/sc/inc/chartpos.hxx
+++ b/sc/inc/chartpos.hxx
@@ -48,8 +48,8 @@ class ScChartPositionMap
                                     );
                                 ~ScChartPositionMap();  //! deletes all ScAddress*
 
-                                ScChartPositionMap( const ScChartPositionMap& ) SAL_DELETED_FUNCTION;
-            ScChartPositionMap& operator=( const ScChartPositionMap& ) SAL_DELETED_FUNCTION;
+                                ScChartPositionMap( const ScChartPositionMap& ) = delete;
+            ScChartPositionMap& operator=( const ScChartPositionMap& ) = delete;
 
 public:
             SCCOL               GetColCount() const { return nColCount; }
diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx
index 88bdb277a4f8..34941bc06197 100644
--- a/sc/inc/chgtrack.hxx
+++ b/sc/inc/chgtrack.hxx
@@ -96,8 +96,8 @@ class ScChangeAction;
 
 class ScChangeActionLinkEntry
 {
-    ScChangeActionLinkEntry( const ScChangeActionLinkEntry& ) SAL_DELETED_FUNCTION;
-    ScChangeActionLinkEntry& operator=( const ScChangeActionLinkEntry& ) SAL_DELETED_FUNCTION;
+    ScChangeActionLinkEntry( const ScChangeActionLinkEntry& ) = delete;
+    ScChangeActionLinkEntry& operator=( const ScChangeActionLinkEntry& ) = delete;
 
 protected:
 
@@ -206,8 +206,8 @@ class ScChangeAction
     friend class ScChangeActionMove;
     friend class ScChangeActionContent;
 
-    ScChangeAction( const ScChangeAction& ) SAL_DELETED_FUNCTION;
-    ScChangeAction& operator=( const ScChangeAction& ) SAL_DELETED_FUNCTION;
+    ScChangeAction( const ScChangeAction& ) = delete;
+    ScChangeAction& operator=( const ScChangeAction& ) = delete;
 
 protected:
 
@@ -914,8 +914,8 @@ class ScChangeTrack : public utl::ConfigurationListener
     bool bUseFixDateTime:1;
     bool bTimeNanoSeconds:1;
 
-    ScChangeTrack( const ScChangeTrack& ) SAL_DELETED_FUNCTION;
-    ScChangeTrack& operator=( const ScChangeTrack& ) SAL_DELETED_FUNCTION;
+    ScChangeTrack( const ScChangeTrack& ) = delete;
+    ScChangeTrack& operator=( const ScChangeTrack& ) = delete;
 
     static  SCROW               InitContentRowsPerSlot();
 
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 6d41babaf63c..7817df6fb38f 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -158,8 +158,8 @@ friend class sc::EditTextIterator;
 friend class sc::CellValues;
 friend class sc::TableValues;
 
-    ScColumn(const ScColumn&) SAL_DELETED_FUNCTION;
-    ScColumn& operator= (const ScColumn&) SAL_DELETED_FUNCTION;
+    ScColumn(const ScColumn&) = delete;
+    ScColumn& operator= (const ScColumn&) = delete;
 
     bool ParseString(
         ScCellValue& rCell,
diff --git a/sc/inc/compare.hxx b/sc/inc/compare.hxx
index e04b5dbf60b8..19e2a4155e97 100644
--- a/sc/inc/compare.hxx
+++ b/sc/inc/compare.hxx
@@ -56,8 +56,8 @@ struct CompareOptions
 
     CompareOptions( ScDocument* pDoc, const ScQueryEntry& rEntry, bool bReg );
 private:
-    CompareOptions( const CompareOptions & ) SAL_DELETED_FUNCTION;
-    CompareOptions& operator=( const CompareOptions & ) SAL_DELETED_FUNCTION;
+    CompareOptions( const CompareOptions & ) = delete;
+    CompareOptions& operator=( const CompareOptions & ) = delete;
 };
 
 /** @param pOptions
diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx
index 839c5b0080ae..a5ed2927728b 100644
--- a/sc/inc/conditio.hxx
+++ b/sc/inc/conditio.hxx
@@ -449,7 +449,7 @@ private:
         comphelper::UniquePtrValueLess<ScConditionalFormat>> ConditionalFormatContainer;
     ConditionalFormatContainer m_ConditionalFormats;
 
-    void operator =(ScConditionalFormatList const &) SAL_DELETED_FUNCTION;
+    void operator =(ScConditionalFormatList const &) = delete;
 
 public:
     ScConditionalFormatList() {}
diff --git a/sc/inc/dapiuno.hxx b/sc/inc/dapiuno.hxx
index 20105b09259c..a6e5bd362776 100644
--- a/sc/inc/dapiuno.hxx
+++ b/sc/inc/dapiuno.hxx
@@ -415,7 +415,7 @@ protected:
     ScFieldIdentifier   maFieldId;
 
 private:
-    ScDataPilotChildObjBase& operator=( const ScDataPilotChildObjBase& ) SAL_DELETED_FUNCTION;
+    ScDataPilotChildObjBase& operator=( const ScDataPilotChildObjBase& ) = delete;
 };
 
 typedef ::cppu::WeakImplHelper
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 7c70ae6ab0f3..5f2406d497a4 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1878,7 +1878,7 @@ public:
     std::set<Color> GetDocColors();
 
 private:
-    ScDocument(const ScDocument& r) SAL_DELETED_FUNCTION;
+    ScDocument(const ScDocument& r) = delete;
 
     void                FindMaxRotCol( SCTAB nTab, RowInfo* pRowInfo, SCSIZE nArrCount,
                                         SCCOL nX1, SCCOL nX2 ) const;
diff --git a/sc/inc/dpdimsave.hxx b/sc/inc/dpdimsave.hxx
index f3bc3b24006a..b05769398d73 100644
--- a/sc/inc/dpdimsave.hxx
+++ b/sc/inc/dpdimsave.hxx
@@ -202,7 +202,7 @@ private:
     typedef ::std::vector< ScDPSaveGroupDimension >         ScDPSaveGroupDimVec;
     typedef ::std::map<OUString, ScDPSaveNumGroupDimension> ScDPSaveNumGroupDimMap;
 
-    ScDPDimensionSaveData& operator=( const ScDPDimensionSaveData& ) SAL_DELETED_FUNCTION;
+    ScDPDimensionSaveData& operator=( const ScDPDimensionSaveData& ) = delete;
 
     ScDPSaveGroupDimVec maGroupDims;
     ScDPSaveNumGroupDimMap maNumGroupDims;
diff --git a/sc/inc/dpfilteredcache.hxx b/sc/inc/dpfilteredcache.hxx
index 857ab7661d27..848b1d5751ca 100644
--- a/sc/inc/dpfilteredcache.hxx
+++ b/sc/inc/dpfilteredcache.hxx
@@ -150,7 +150,7 @@ public:
 #endif
 
 private:
-    ScDPFilteredCache(const ScDPFilteredCache&) SAL_DELETED_FUNCTION;
+    ScDPFilteredCache(const ScDPFilteredCache&) = delete;
 
     /**
      * Check if a given row meets all specified criteria.
diff --git a/sc/inc/drawpage.hxx b/sc/inc/drawpage.hxx
index 25734349cab7..424b943723fa 100644
--- a/sc/inc/drawpage.hxx
+++ b/sc/inc/drawpage.hxx
@@ -26,7 +26,7 @@ class ScDrawLayer;
 
 class ScDrawPage: public FmFormPage
 {
-    ScDrawPage& operator=(const ScDrawPage&) SAL_DELETED_FUNCTION;
+    ScDrawPage& operator=(const ScDrawPage&) = delete;
 
 public:
     explicit ScDrawPage(ScDrawLayer& rNewModel, bool bMasterPage = false);
diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx
index f7e3819cf0d2..cbd5061c1c86 100644
--- a/sc/inc/externalrefmgr.hxx
+++ b/sc/inc/externalrefmgr.hxx
@@ -75,8 +75,8 @@ public:
     void SetDoReferesh(bool b);
 
 private:
-    ScExternalRefLink() SAL_DELETED_FUNCTION;
-    ScExternalRefLink(const ScExternalRefLink&) SAL_DELETED_FUNCTION;
+    ScExternalRefLink() = delete;
+    ScExternalRefLink(const ScExternalRefLink&) = delete;
 
     sal_uInt16  mnFileId;
     OUString    maFilterName;
@@ -709,7 +709,7 @@ public:
     void enableDocTimer( bool bEnable );
 
 private:
-    ScExternalRefManager(const ScExternalRefManager&) SAL_DELETED_FUNCTION;
+    ScExternalRefManager(const ScExternalRefManager&) = delete;
 
     void refreshAllRefCells(sal_uInt16 nFileId);
 
diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index 3deb9e30583d..61478f16b99e 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -147,7 +147,7 @@ private:
     bool UpdateReferenceOnCopy(
         const sc::RefUpdateContext& rCxt, ScDocument* pUndoDoc, const ScAddress* pUndoCellPos );
 
-    ScFormulaCell( const ScFormulaCell& ) SAL_DELETED_FUNCTION;
+    ScFormulaCell( const ScFormulaCell& ) = delete;
 public:
 
     enum CompareState { NotEqual = 0, EqualInvariant, EqualRelativeRef };
diff --git a/sc/inc/linkuno.hxx b/sc/inc/linkuno.hxx
index 9789dc5e8dbb..63306cc64d28 100644
--- a/sc/inc/linkuno.hxx
+++ b/sc/inc/linkuno.hxx
@@ -513,7 +513,7 @@ public:
             throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
 private:
-    ScExternalSheetCacheObj(const ScExternalSheetCacheObj&) SAL_DELETED_FUNCTION;
+    ScExternalSheetCacheObj(const ScExternalSheetCacheObj&) = delete;
 
 private:
     ScDocShell* mpDocShell;
@@ -607,7 +607,7 @@ public:
     virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
 private:
-    ScExternalDocLinksObj(const ScExternalDocLinksObj&) SAL_DELETED_FUNCTION;
+    ScExternalDocLinksObj(const ScExternalDocLinksObj&) = delete;
 
 private:
     ScDocShell*                         mpDocShell;
diff --git a/sc/inc/listenerquery.hxx b/sc/inc/listenerquery.hxx
index 960ad9cd9232..796116e56d1a 100644
--- a/sc/inc/listenerquery.hxx
+++ b/sc/inc/listenerquery.hxx
@@ -52,8 +52,8 @@ class QueryRange : public SvtListener::QueryBase
     struct Impl;
     Impl* mpImpl;
 
-    QueryRange( const QueryRange& ) SAL_DELETED_FUNCTION;
-    QueryRange& operator= ( const QueryRange& ) SAL_DELETED_FUNCTION;
+    QueryRange( const QueryRange& ) = delete;
+    QueryRange& operator= ( const QueryRange& ) = delete;
 
 public:
     QueryRange();
diff --git a/sc/inc/lookupcache.hxx b/sc/inc/lookupcache.hxx
index 8c566a463d7d..a3f9bbc83d79 100644
--- a/sc/inc/lookupcache.hxx
+++ b/sc/inc/lookupcache.hxx
@@ -74,7 +74,7 @@ public:
                 delete mpStr;
         }
 
-        QueryCriteria & operator=( const QueryCriteria & r ) SAL_DELETED_FUNCTION;
+        QueryCriteria & operator=( const QueryCriteria & r ) = delete;
 
     public:
 
@@ -190,8 +190,8 @@ private:
     ScRange         maRange;
     ScDocument *    mpDoc;
 
-    ScLookupCache( const ScLookupCache & ) SAL_DELETED_FUNCTION;
-    ScLookupCache & operator=( const ScLookupCache & ) SAL_DELETED_FUNCTION;
+    ScLookupCache( const ScLookupCache & ) = delete;
+    ScLookupCache & operator=( const ScLookupCache & ) = delete;
 
 };
 
diff --git a/sc/inc/patattr.hxx b/sc/inc/patattr.hxx
index efb2a67c9ad8..432357c3356e 100644
--- a/sc/inc/patattr.hxx
+++ b/sc/inc/patattr.hxx
@@ -144,8 +144,8 @@ class ScFontToSubsFontConverter_AutoPtr
                                             DestroyFontToSubsFontConverter( h );
                                     }
 
-                                ScFontToSubsFontConverter_AutoPtr( const ScFontToSubsFontConverter_AutoPtr& ) SAL_DELETED_FUNCTION;
-    ScFontToSubsFontConverter_AutoPtr& operator=( const ScFontToSubsFontConverter_AutoPtr& ) SAL_DELETED_FUNCTION;
+                                ScFontToSubsFontConverter_AutoPtr( const ScFontToSubsFontConverter_AutoPtr& ) = delete;
+    ScFontToSubsFontConverter_AutoPtr& operator=( const ScFontToSubsFontConverter_AutoPtr& ) = delete;
 
 public:
                                 ScFontToSubsFontConverter_AutoPtr()
diff --git a/sc/inc/postit.hxx b/sc/inc/postit.hxx
index 98a89f7329c5..8640e480e33b 100644
--- a/sc/inc/postit.hxx
+++ b/sc/inc/postit.hxx
@@ -142,8 +142,8 @@ public:
     void                UpdateCaptionPos( const ScAddress& rPos );
 
 private:
-                        ScPostIt( const ScPostIt& ) SAL_DELETED_FUNCTION;
-    ScPostIt&           operator=( const ScPostIt& ) SAL_DELETED_FUNCTION;
+                        ScPostIt( const ScPostIt& ) = delete;
+    ScPostIt&           operator=( const ScPostIt& ) = delete;
 
     /** Creates the caption object from initial caption data if existing. */
     void                CreateCaptionFromInitData( const ScAddress& rPos ) const;
diff --git a/sc/inc/progress.hxx b/sc/inc/progress.hxx
index e9bd5afef8e7..4b6acb861e44 100644
--- a/sc/inc/progress.hxx
+++ b/sc/inc/progress.hxx
@@ -53,8 +53,8 @@ private:
 
             SfxProgress*    pProgress;
 
-                            ScProgress( const ScProgress& ) SAL_DELETED_FUNCTION;
-            ScProgress&     operator=( const ScProgress& ) SAL_DELETED_FUNCTION;
+                            ScProgress( const ScProgress& ) = delete;
+            ScProgress&     operator=( const ScProgress& ) = delete;
 
     static  void            CalcGlobalPercent( sal_uLong nVal )
                                 {
diff --git a/sc/inc/scmatrix.hxx b/sc/inc/scmatrix.hxx
index f54028db74e8..affae039dfe9 100644
--- a/sc/inc/scmatrix.hxx
+++ b/sc/inc/scmatrix.hxx
@@ -122,8 +122,8 @@ class SC_DLLPUBLIC ScMatrix
     // only delete via Delete()
     ~ScMatrix();
 
-    ScMatrix( const ScMatrix& ) SAL_DELETED_FUNCTION;
-    ScMatrix& operator=( const ScMatrix&) SAL_DELETED_FUNCTION;
+    ScMatrix( const ScMatrix& ) = delete;
+    ScMatrix& operator=( const ScMatrix&) = delete;
 
 public:
     enum Op { Add, Sub, Mul, Div };
diff --git a/sc/inc/token.hxx b/sc/inc/token.hxx
index e13039c9e73f..d6c8a9824a05 100644
--- a/sc/inc/token.hxx
+++ b/sc/inc/token.hxx
@@ -416,8 +416,8 @@ class SingleDoubleRefModifier
     ScSingleRefData*  pS;
     ScComplexRefData*   pD;
 
-                SingleDoubleRefModifier( const SingleDoubleRefModifier& ) SAL_DELETED_FUNCTION;
-        SingleDoubleRefModifier& operator=( const SingleDoubleRefModifier& ) SAL_DELETED_FUNCTION;
+                SingleDoubleRefModifier( const SingleDoubleRefModifier& ) = delete;
+        SingleDoubleRefModifier& operator=( const SingleDoubleRefModifier& ) = delete;
 
 public:
         SingleDoubleRefModifier( formula::FormulaToken& rT )
diff --git a/sc/inc/unitconv.hxx b/sc/inc/unitconv.hxx
index 94bc16a8eba7..2afa84dbf04a 100644
--- a/sc/inc/unitconv.hxx
+++ b/sc/inc/unitconv.hxx
@@ -27,7 +27,7 @@ class ScUnitConverterData
 {
     OUString maIndexString;
     double mfValue;
-    ScUnitConverterData& operator=( const ScUnitConverterData& ) SAL_DELETED_FUNCTION;
+    ScUnitConverterData& operator=( const ScUnitConverterData& ) = delete;
 
 public:
     ScUnitConverterData( const OUString& rFromUnit,
diff --git a/sc/source/core/inc/bcaslot.hxx b/sc/source/core/inc/bcaslot.hxx
index e51cfb40fe3c..27ff119e8125 100644
--- a/sc/source/core/inc/bcaslot.hxx
+++ b/sc/source/core/inc/bcaslot.hxx
@@ -279,8 +279,8 @@ private:
     private:
         ScBroadcastAreaSlot**   ppSlots;
 
-        TableSlots( const TableSlots& ) SAL_DELETED_FUNCTION;
-        TableSlots& operator=( const TableSlots& ) SAL_DELETED_FUNCTION;
+        TableSlots( const TableSlots& ) = delete;
+        TableSlots& operator=( const TableSlots& ) = delete;
     };
 
     typedef ::std::map< SCTAB, TableSlots* > TableSlotsMap;
diff --git a/sc/source/core/inc/jumpmatrix.hxx b/sc/source/core/inc/jumpmatrix.hxx
index 62b6a58e05aa..9d280833e0c8 100644
--- a/sc/source/core/inc/jumpmatrix.hxx
+++ b/sc/source/core/inc/jumpmatrix.hxx
@@ -89,8 +89,8 @@ class ScJumpMatrix
     /** Flush different types or non-consecutive buffers. */
     void FlushBufferOtherThan( BufferType eType, SCSIZE nC, SCSIZE nR );
 
-    ScJumpMatrix( const ScJumpMatrix& ) SAL_DELETED_FUNCTION;
-    ScJumpMatrix& operator=( const ScJumpMatrix& ) SAL_DELETED_FUNCTION;
+    ScJumpMatrix( const ScJumpMatrix& ) = delete;
+    ScJumpMatrix& operator=( const ScJumpMatrix& ) = delete;
 
 public:
     ScJumpMatrix( SCSIZE nColsP, SCSIZE nRowsP );
diff --git a/sc/source/filter/inc/biffhelper.hxx b/sc/source/filter/inc/biffhelper.hxx
index 33d8bd202884..3a0c39c6ad0b 100644
--- a/sc/source/filter/inc/biffhelper.hxx
+++ b/sc/source/filter/inc/biffhelper.hxx
@@ -627,8 +627,8 @@ public:
     static bool         skipRecordBlock( BiffInputStream& rStrm, sal_uInt16 nEndRecId );
 
 private:
-                        BiffHelper() SAL_DELETED_FUNCTION;
-                        ~BiffHelper() SAL_DELETED_FUNCTION;
+                        BiffHelper() = delete;
+                        ~BiffHelper() = delete;
 };
 
 /** BIFF12 stream operator for an OUString, reads 32-bit string length and Unicode array. */
diff --git a/sc/source/filter/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxx
index dce1cd4cc85f..57838a58cd9a 100644
--- a/sc/source/filter/inc/xestream.hxx
+++ b/sc/source/filter/inc/xestream.hxx
@@ -252,8 +252,8 @@ class XclXmlUtils
 {
     XclXmlUtils();
     ~XclXmlUtils();
-    XclXmlUtils(const XclXmlUtils&) SAL_DELETED_FUNCTION;
-    XclXmlUtils& operator=(const XclXmlUtils&) SAL_DELETED_FUNCTION;
+    XclXmlUtils(const XclXmlUtils&) = delete;
+    XclXmlUtils& operator=(const XclXmlUtils&) = delete;
 public:
     static void                     GetFormulaTypeAndValue( ScFormulaCell& rCell, const char*& sType, OUString& rValue);
     static OUString          GetStreamName( const char* sStreamDir, const char* sStream, sal_Int32 nId );
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index 0b5fdcdecc95..9ae154bdc4d0 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -457,8 +457,8 @@ class SC_DLLPUBLIC ScDocShellModificator
             bool            bAutoCalcShellDisabled;
             bool            bIdleEnabled;
 
-                            ScDocShellModificator( const ScDocShellModificator& ) SAL_DELETED_FUNCTION;
-    ScDocShellModificator&  operator=( const ScDocShellModificator& ) SAL_DELETED_FUNCTION;
+                            ScDocShellModificator( const ScDocShellModificator& ) = delete;
+    ScDocShellModificator&  operator=( const ScDocShellModificator& ) = delete;
 
 public:
                             ScDocShellModificator( ScDocShell& );
diff --git a/sc/source/ui/inc/reffact.hxx b/sc/source/ui/inc/reffact.hxx
index ae843fc95f7d..5be200c9569f 100644
--- a/sc/source/ui/inc/reffact.hxx
+++ b/sc/source/ui/inc/reffact.hxx
@@ -56,84 +56,84 @@ class ScDescriptiveStatisticsDialogWrapper :
     public ChildWindowWrapper<SID_DESCRIPTIVE_STATISTICS_DIALOG>
 {
 private:
-    ScDescriptiveStatisticsDialogWrapper() SAL_DELETED_FUNCTION;
+    ScDescriptiveStatisticsDialogWrapper() = delete;
 };
 
 class ScSamplingDialogWrapper :
     public ChildWindowWrapper<SID_SAMPLING_DIALOG>
 {
 private:
-    ScSamplingDialogWrapper() SAL_DELETED_FUNCTION;
+    ScSamplingDialogWrapper() = delete;
 };
 
 class ScRandomNumberGeneratorDialogWrapper :
     public ChildWindowWrapper<SID_RANDOM_NUMBER_GENERATOR_DIALOG>
 {
 private:
-    ScRandomNumberGeneratorDialogWrapper() SAL_DELETED_FUNCTION;
+    ScRandomNumberGeneratorDialogWrapper() = delete;
 };
 
 class ScAnalysisOfVarianceDialogWrapper :
     public ChildWindowWrapper<SID_ANALYSIS_OF_VARIANCE_DIALOG>
 {
 private:
-    ScAnalysisOfVarianceDialogWrapper() SAL_DELETED_FUNCTION;
+    ScAnalysisOfVarianceDialogWrapper() = delete;
 };
 
 class ScCorrelationDialogWrapper :
     public ChildWindowWrapper<SID_CORRELATION_DIALOG>
 {
 private:
-    ScCorrelationDialogWrapper() SAL_DELETED_FUNCTION;
+    ScCorrelationDialogWrapper() = delete;
 };
 
 class ScCovarianceDialogWrapper :
     public ChildWindowWrapper<SID_COVARIANCE_DIALOG>
 {
 private:
-    ScCovarianceDialogWrapper() SAL_DELETED_FUNCTION;
+    ScCovarianceDialogWrapper() = delete;
 };
 
 class ScExponentialSmoothingDialogWrapper :
     public ChildWindowWrapper<SID_EXPONENTIAL_SMOOTHING_DIALOG>
 {
 private:
-    ScExponentialSmoothingDialogWrapper() SAL_DELETED_FUNCTION;
+    ScExponentialSmoothingDialogWrapper() = delete;
 };
 
 class ScMovingAverageDialogWrapper :
     public ChildWindowWrapper<SID_MOVING_AVERAGE_DIALOG>
 {
 private:
-    ScMovingAverageDialogWrapper() SAL_DELETED_FUNCTION;
+    ScMovingAverageDialogWrapper() = delete;
 };
 
 class ScTTestDialogWrapper :
     public ChildWindowWrapper<SID_TTEST_DIALOG>
 {
 private:
-    ScTTestDialogWrapper() SAL_DELETED_FUNCTION;
+    ScTTestDialogWrapper() = delete;
 };
 
 class ScFTestDialogWrapper :
     public ChildWindowWrapper<SID_FTEST_DIALOG>
 {
 private:
-    ScFTestDialogWrapper() SAL_DELETED_FUNCTION;
+    ScFTestDialogWrapper() = delete;
 };
 
 class ScZTestDialogWrapper :
     public ChildWindowWrapper<SID_ZTEST_DIALOG>
 {
 private:
-    ScZTestDialogWrapper() SAL_DELETED_FUNCTION;
+    ScZTestDialogWrapper() = delete;
 };
 
 class ScChiSquareTestDialogWrapper :
     public ChildWindowWrapper<SID_CHI_SQUARE_TEST_DIALOG>
 {
 private:
-    ScChiSquareTestDialogWrapper() SAL_DELETED_FUNCTION;
+    ScChiSquareTestDialogWrapper() = delete;
 };
 
 class ScAcceptChgDlgWrapper: public SfxChildWindow
diff --git a/sc/source/ui/inc/undobase.hxx b/sc/source/ui/inc/undobase.hxx
index 67ecb454d784..7d6326e55bf5 100644
--- a/sc/source/ui/inc/undobase.hxx
+++ b/sc/source/ui/inc/undobase.hxx
@@ -36,7 +36,7 @@ class ScDBData;
 
 class ScSimpleUndo: public SfxUndoAction
 {
-    ScSimpleUndo(const ScSimpleUndo&) SAL_DELETED_FUNCTION;
+    ScSimpleUndo(const ScSimpleUndo&) = delete;
 
 public:
     typedef boost::ptr_map<SCTAB,sc::ColumnSpanSet> DataSpansType;
diff --git a/sc/source/ui/unoobj/celllistsource.hxx b/sc/source/ui/unoobj/celllistsource.hxx
index e42f92c922b3..5df49eefa6cb 100644
--- a/sc/source/ui/unoobj/celllistsource.hxx
+++ b/sc/source/ui/unoobj/celllistsource.hxx
@@ -143,8 +143,8 @@ namespace calc
         void    notifyModified();
 
     private:
-        OCellListSource( const OCellListSource& ) SAL_DELETED_FUNCTION;
-        OCellListSource& operator=( const OCellListSource& ) SAL_DELETED_FUNCTION;
+        OCellListSource( const OCellListSource& ) = delete;
+        OCellListSource& operator=( const OCellListSource& ) = delete;
     };
 
 }   // namespace calc
diff --git a/sc/source/ui/unoobj/cellvaluebinding.hxx b/sc/source/ui/unoobj/cellvaluebinding.hxx
index 612ad1c6dd61..8b23bb56d4f2 100644
--- a/sc/source/ui/unoobj/cellvaluebinding.hxx
+++ b/sc/source/ui/unoobj/cellvaluebinding.hxx
@@ -138,8 +138,8 @@ namespace calc
         void    setBooleanFormat();
 
     private:
-        OCellValueBinding( const OCellValueBinding& ) SAL_DELETED_FUNCTION;
-        OCellValueBinding& operator=( const OCellValueBinding& ) SAL_DELETED_FUNCTION;
+        OCellValueBinding( const OCellValueBinding& ) = delete;
+        OCellValueBinding& operator=( const OCellValueBinding& ) = delete;
     };
 
 }   // namespace calc
diff --git a/scripting/source/dlgprov/DialogModelProvider.hxx b/scripting/source/dlgprov/DialogModelProvider.hxx
index c225cd86cff6..88385e6f0cf2 100644
--- a/scripting/source/dlgprov/DialogModelProvider.hxx
+++ b/scripting/source/dlgprov/DialogModelProvider.hxx
@@ -74,8 +74,8 @@ private:
     virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
 private:
-    DialogModelProvider(const DialogModelProvider &) SAL_DELETED_FUNCTION;
-    DialogModelProvider& operator=(const DialogModelProvider &) SAL_DELETED_FUNCTION;
+    DialogModelProvider(const DialogModelProvider &) = delete;
+    DialogModelProvider& operator=(const DialogModelProvider &) = delete;
 
     // destructor is private and will be called indirectly by the release call    virtual ~DialogModelProvider() {}
 
diff --git a/sd/inc/helper/simplereferencecomponent.hxx b/sd/inc/helper/simplereferencecomponent.hxx
index 3bb1de4d471f..6993a6255fd6 100644
--- a/sd/inc/helper/simplereferencecomponent.hxx
+++ b/sd/inc/helper/simplereferencecomponent.hxx
@@ -78,13 +78,13 @@ protected:
 private:
     oslInterlockedCount m_nCount;
 
-    SimpleReferenceComponent(SimpleReferenceComponent &) SAL_DELETED_FUNCTION;
+    SimpleReferenceComponent(SimpleReferenceComponent &) = delete;
 
-    void operator =(SimpleReferenceComponent) SAL_DELETED_FUNCTION;
+    void operator =(SimpleReferenceComponent) = delete;
 
-    static void * operator new[](std::size_t) SAL_DELETED_FUNCTION;
+    static void * operator new[](std::size_t) = delete;
 
-    static void operator delete[](void * pPtr) SAL_DELETED_FUNCTION;
+    static void operator delete[](void * pPtr) = delete;
 
     bool mbDisposed;
 };
diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx
index cf5191d2bb7d..99d49ac8de01 100644
--- a/sd/inc/sdpage.hxx
+++ b/sd/inc/sdpage.hxx
@@ -92,7 +92,7 @@ namespace sd {
 
 class SD_DLLPUBLIC SdPage : public FmFormPage, public SdrObjUserCall
 {
-    SdPage& operator=(const SdPage&) SAL_DELETED_FUNCTION;
+    SdPage& operator=(const SdPage&) = delete;
 
 friend class SdGenericDrawPage;
 friend class SdDrawPage;
diff --git a/sd/inc/stlsheet.hxx b/sd/inc/stlsheet.hxx
index d1e64baa7f61..575758fdd23a 100644
--- a/sd/inc/stlsheet.hxx
+++ b/sd/inc/stlsheet.hxx
@@ -149,7 +149,7 @@ protected:
     std::unique_ptr< ModifyListenerForewarder > mpModifyListenerForewarder;
 
 private:
-    SdStyleSheet& operator=( const SdStyleSheet& ) SAL_DELETED_FUNCTION;
+    SdStyleSheet& operator=( const SdStyleSheet& ) = delete;
 };
 
 typedef rtl::Reference< SdStyleSheet > SdStyleSheetRef;
diff --git a/sd/source/ui/inc/AccessibleOutlineEditSource.hxx b/sd/source/ui/inc/AccessibleOutlineEditSource.hxx
index 72b9b8a534b4..b2d65a7bc2e5 100644
--- a/sd/source/ui/inc/AccessibleOutlineEditSource.hxx
+++ b/sd/source/ui/inc/AccessibleOutlineEditSource.hxx
@@ -73,8 +73,8 @@ namespace accessibility
         virtual void        Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE;
 
     private:
-        AccessibleOutlineEditSource( const AccessibleOutlineEditSource& ) SAL_DELETED_FUNCTION;
-        AccessibleOutlineEditSource& operator=( const AccessibleOutlineEditSource& ) SAL_DELETED_FUNCTION;
+        AccessibleOutlineEditSource( const AccessibleOutlineEditSource& ) = delete;
+        AccessibleOutlineEditSource& operator=( const AccessibleOutlineEditSource& ) = delete;
 
         DECL_LINK_TYPED( NotifyHdl, EENotify&, void );
 
diff --git a/sd/source/ui/inc/AccessiblePageShape.hxx b/sd/source/ui/inc/AccessiblePageShape.hxx
index 8781db72eb34..aa851e84fa63 100644
--- a/sd/source/ui/inc/AccessiblePageShape.hxx
+++ b/sd/source/ui/inc/AccessiblePageShape.hxx
@@ -150,8 +150,8 @@ private:
     ::com::sun::star::uno::Reference<
         ::com::sun::star::drawing::XDrawPage> mxPage;
 
-    AccessiblePageShape (const AccessiblePageShape&) SAL_DELETED_FUNCTION;
-    AccessibleShape& operator= (const AccessiblePageShape&) SAL_DELETED_FUNCTION;
+    AccessiblePageShape (const AccessiblePageShape&) = delete;
+    AccessibleShape& operator= (const AccessiblePageShape&) = delete;
 };
 
 } // end of namespace accessibility
diff --git a/sd/source/ui/inc/AccessiblePresentationShape.hxx b/sd/source/ui/inc/AccessiblePresentationShape.hxx
index ddf5b39ffa45..d118a61d8b20 100644
--- a/sd/source/ui/inc/AccessiblePresentationShape.hxx
+++ b/sd/source/ui/inc/AccessiblePresentationShape.hxx
@@ -58,9 +58,9 @@ public:
     OUString GetStyle() SAL_OVERRIDE;
 
 private:
-    AccessiblePresentationShape (const AccessiblePresentationShape&) SAL_DELETED_FUNCTION;
+    AccessiblePresentationShape (const AccessiblePresentationShape&) = delete;
 
-    AccessiblePresentationShape& operator= (const AccessiblePresentationShape&) SAL_DELETED_FUNCTION;
+    AccessiblePresentationShape& operator= (const AccessiblePresentationShape&) = delete;
 };
 
 } // end of namespace accessibility
diff --git a/sd/source/ui/inc/AccessibleViewForwarder.hxx b/sd/source/ui/inc/AccessibleViewForwarder.hxx
index 704dba20bd42..7b050f72f13c 100644
--- a/sd/source/ui/inc/AccessibleViewForwarder.hxx
+++ b/sd/source/ui/inc/AccessibleViewForwarder.hxx
@@ -87,8 +87,8 @@ protected:
     OutputDevice& mrDevice;
 
 private:
-    AccessibleViewForwarder (AccessibleViewForwarder&) SAL_DELETED_FUNCTION;
-    AccessibleViewForwarder& operator= (AccessibleViewForwarder&) SAL_DELETED_FUNCTION;
+    AccessibleViewForwarder (AccessibleViewForwarder&) = delete;
+    AccessibleViewForwarder& operator= (AccessibleViewForwarder&) = delete;
 };
 
 } // end of namespace accessibility
diff --git a/sd/source/ui/inc/MasterPageObserver.hxx b/sd/source/ui/inc/MasterPageObserver.hxx
index 057ef8e99ab1..55f603fa7b3e 100644
--- a/sd/source/ui/inc/MasterPageObserver.hxx
+++ b/sd/source/ui/inc/MasterPageObserver.hxx
@@ -82,9 +82,9 @@ private:
     MasterPageObserver();
     virtual ~MasterPageObserver();
 
-    MasterPageObserver (const MasterPageObserver&) SAL_DELETED_FUNCTION;
+    MasterPageObserver (const MasterPageObserver&) = delete;
 
-    MasterPageObserver& operator= (const MasterPageObserver&) SAL_DELETED_FUNCTION;
+    MasterPageObserver& operator= (const MasterPageObserver&) = delete;
 };
 
 /** Objects of this class are sent to listeners of the MasterPageObserver
diff --git a/sd/source/ui/inc/WindowUpdater.hxx b/sd/source/ui/inc/WindowUpdater.hxx
index 626dda1bbe34..2ba2764c59e8 100644
--- a/sd/source/ui/inc/WindowUpdater.hxx
+++ b/sd/source/ui/inc/WindowUpdater.hxx
@@ -114,9 +114,9 @@ private:
     /// The document rendered in the output devices.
     SdDrawDocument* mpDocument;
 
-    WindowUpdater (const WindowUpdater& rUpdater) SAL_DELETED_FUNCTION;
+    WindowUpdater (const WindowUpdater& rUpdater) = delete;
 
-    WindowUpdater operator= (const WindowUpdater& rUpdater) SAL_DELETED_FUNCTION;
+    WindowUpdater operator= (const WindowUpdater& rUpdater) = delete;
 
     /** Type and data member for a list of devices that have to be kept
         up-to-date.
diff --git a/sd/source/ui/inc/filedlg.hxx b/sd/source/ui/inc/filedlg.hxx
index eec497eb91c6..538c935fe4c8 100644
--- a/sd/source/ui/inc/filedlg.hxx
+++ b/sd/source/ui/inc/filedlg.hxx
@@ -40,8 +40,8 @@ class SD_DLLPUBLIC SdOpenSoundFileDialog
 {
     const std::unique_ptr< SdFileDialog_Imp > mpImpl;
 
-    SdOpenSoundFileDialog (const SdOpenSoundFileDialog &) SAL_DELETED_FUNCTION;
-    SdOpenSoundFileDialog & operator= (const SdOpenSoundFileDialog &) SAL_DELETED_FUNCTION;
+    SdOpenSoundFileDialog (const SdOpenSoundFileDialog &) = delete;
+    SdOpenSoundFileDialog & operator= (const SdOpenSoundFileDialog &) = delete;
 
 public:
                             SdOpenSoundFileDialog();
diff --git a/sd/source/ui/inc/framework/FrameworkHelper.hxx b/sd/source/ui/inc/framework/FrameworkHelper.hxx
index 36dfe6d8a220..19711d689d74 100644
--- a/sd/source/ui/inc/framework/FrameworkHelper.hxx
+++ b/sd/source/ui/inc/framework/FrameworkHelper.hxx
@@ -318,10 +318,10 @@ private:
         mxDisposeListener;
 
     FrameworkHelper (ViewShellBase& rBase);
-    FrameworkHelper (const FrameworkHelper& rHelper) SAL_DELETED_FUNCTION;
+    FrameworkHelper (const FrameworkHelper& rHelper) = delete;
     virtual ~FrameworkHelper();
     class Deleter; friend class Deleter;
-    FrameworkHelper& operator= (const FrameworkHelper& rHelper) SAL_DELETED_FUNCTION;
+    FrameworkHelper& operator= (const FrameworkHelper& rHelper) = delete;
 
     void Initialize();
 
diff --git a/sd/source/ui/inc/framework/ModuleController.hxx b/sd/source/ui/inc/framework/ModuleController.hxx
index 6edab02a4e24..5f2861dee2c2 100644
--- a/sd/source/ui/inc/framework/ModuleController.hxx
+++ b/sd/source/ui/inc/framework/ModuleController.hxx
@@ -97,7 +97,7 @@ private:
     ModuleController (
         const css::uno::Reference<css::uno::XComponentContext>& rxContext)
         throw (std::exception);
-    ModuleController (const ModuleController&) SAL_DELETED_FUNCTION;
+    ModuleController (const ModuleController&) = delete;
     virtual ~ModuleController() throw();
 
     /** Load a list of URL to service mappings from the
diff --git a/sd/source/ui/inc/sdxfer.hxx b/sd/source/ui/inc/sdxfer.hxx
index 539031147709..5b6910d3b8eb 100644
--- a/sd/source/ui/inc/sdxfer.hxx
+++ b/sd/source/ui/inc/sdxfer.hxx
@@ -138,8 +138,8 @@ private:
     bool                            mbIsUnoObj                  : 1;
     ::std::vector<std::shared_ptr<UserData> > maUserData;
 
-                                    SdTransferable( const SdTransferable& ) SAL_DELETED_FUNCTION;
-    SdTransferable&                 operator=( const SdTransferable& ) SAL_DELETED_FUNCTION;
+                                    SdTransferable( const SdTransferable& ) = delete;
+    SdTransferable&                 operator=( const SdTransferable& ) = delete;
 
     void                            CreateObjectReplacement( SdrObject* pObj );
     void                            CreateData();
diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx
index 5b5f7dc92c7d..573bbf465024 100644
--- a/sd/source/ui/inc/slideshow.hxx
+++ b/sd/source/ui/inc/slideshow.hxx
@@ -201,8 +201,8 @@ private:
     void CreateController( ViewShell* pViewSh, ::sd::View* pView, vcl::Window* pParentWindow );
     WorkWindow *GetWorkWindow();
 
-    SlideShow(const SlideShow&) SAL_DELETED_FUNCTION;
-    SlideShow& operator=( const SlideShow& ) SAL_DELETED_FUNCTION;
+    SlideShow(const SlideShow&) = delete;
+    SlideShow& operator=( const SlideShow& ) = delete;
 
     SvxItemPropertySet  maPropSet;
 
diff --git a/sd/source/ui/inc/smarttag.hxx b/sd/source/ui/inc/smarttag.hxx
index 291c600a1cdb..fc3d996b1b98 100644
--- a/sd/source/ui/inc/smarttag.hxx
+++ b/sd/source/ui/inc/smarttag.hxx
@@ -85,8 +85,8 @@ protected:
     bool mbSelected;
 
 private:
-    SmartTag( const SmartTag& ) SAL_DELETED_FUNCTION;
-    SmartTag& operator=( const SmartTag& ) SAL_DELETED_FUNCTION;
+    SmartTag( const SmartTag& ) = delete;
+    SmartTag& operator=( const SmartTag& ) = delete;
 };
 
 typedef rtl::Reference< SmartTag > SmartTagReference;
@@ -142,8 +142,8 @@ public:
     void CheckPossibilities();
 
 private:
-    SmartTagSet( const SmartTagSet& ) SAL_DELETED_FUNCTION;
-    SmartTagSet& operator=( const SmartTagSet& ) SAL_DELETED_FUNCTION;
+    SmartTagSet( const SmartTagSet& ) = delete;
+    SmartTagSet& operator=( const SmartTagSet& ) = delete;
 
     /** adds a new smart tag to this set */
     void add( const SmartTagReference& xTag );
diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx b/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
index 778b97dfbea4..7c01cc775bc2 100644
--- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
+++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
@@ -98,9 +98,9 @@ private:
     */
     void LateInit();
 
-    RecentlyUsedMasterPages (const RecentlyUsedMasterPages&) SAL_DELETED_FUNCTION;
+    RecentlyUsedMasterPages (const RecentlyUsedMasterPages&) = delete;
 
-    RecentlyUsedMasterPages& operator= (const RecentlyUsedMasterPages&) SAL_DELETED_FUNCTION;
+    RecentlyUsedMasterPages& operator= (const RecentlyUsedMasterPages&) = delete;
 
     void SendEvent();
     DECL_LINK_TYPED(MasterPageChangeListener, MasterPageObserverEvent&, void);
diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx
index 21a23ecc3f6c..557a0f609a02 100644
--- a/sd/source/ui/slideshow/slideshowimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowimpl.hxx
@@ -231,8 +231,8 @@ public:
     void mouseButtonUp(const MouseEvent& rMEvt);
 
 private:
-    SlideshowImpl(SlideshowImpl &) SAL_DELETED_FUNCTION;
-    void operator =(SlideshowImpl &) SAL_DELETED_FUNCTION;
+    SlideshowImpl(SlideshowImpl &) = delete;
+    void operator =(SlideshowImpl &) = delete;
 
     virtual ~SlideshowImpl();
 
diff --git a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx
index 412971e995c6..d807070e8112 100644
--- a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx
+++ b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx
@@ -135,9 +135,9 @@ private:
     bool mbIsMouseOver : 1;
     bool mbHasTransition : 1;
 
-    PageDescriptor (const PageDescriptor& rDescriptor) SAL_DELETED_FUNCTION;
+    PageDescriptor (const PageDescriptor& rDescriptor) = delete;
 
-    PageDescriptor& operator= (const PageDescriptor& rDescriptor) SAL_DELETED_FUNCTION;
+    PageDescriptor& operator= (const PageDescriptor& rDescriptor) = delete;
 };
 
 } } } // end of namespace ::sd::slidesorter::model
diff --git a/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx b/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx
index b503109e019a..8f26b7bb002a 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx
@@ -65,8 +65,8 @@ private:
     FontProvider();
     virtual ~FontProvider();
 
-    FontProvider (const FontProvider&) SAL_DELETED_FUNCTION;
-    FontProvider& operator= (const FontProvider&) SAL_DELETED_FUNCTION;
+    FontProvider (const FontProvider&) = delete;
+    FontProvider& operator= (const FontProvider&) = delete;
 };
 
 } } } // end of namespace ::sd::slidesorter::view
diff --git a/sfx2/source/appl/imestatuswindow.hxx b/sfx2/source/appl/imestatuswindow.hxx
index 6b7a882c3af1..ba965fd2fff0 100644
--- a/sfx2/source/appl/imestatuswindow.hxx
+++ b/sfx2/source/appl/imestatuswindow.hxx
@@ -88,8 +88,8 @@ public:
     using ImeStatusWindow_Impl::operator delete;
 
 private:
-    ImeStatusWindow(ImeStatusWindow &) SAL_DELETED_FUNCTION;
-    void operator =(const ImeStatusWindow&) SAL_DELETED_FUNCTION;
+    ImeStatusWindow(ImeStatusWindow &) = delete;
+    void operator =(const ImeStatusWindow&) = delete;
 
     virtual ~ImeStatusWindow();
 
diff --git a/sfx2/source/inc/statcach.hxx b/sfx2/source/inc/statcach.hxx
index b5163ba098e8..01552194d9bb 100644
--- a/sfx2/source/inc/statcach.hxx
+++ b/sfx2/source/inc/statcach.hxx
@@ -76,7 +76,7 @@ friend class BindDispatch_Impl;
     bool                bItemDirty;     // Validity of pLastItem
 
 private:
-                            SfxStateCache( const SfxStateCache& rOrig ) SAL_DELETED_FUNCTION;
+                            SfxStateCache( const SfxStateCache& rOrig ) = delete;
     void                    SetState_Impl( SfxItemState, const SfxPoolItem*, bool bMaybeDirty=false );
 
 public:
diff --git a/sfx2/source/menu/thessubmenu.hxx b/sfx2/source/menu/thessubmenu.hxx
index a08947f8c841..08a0cd4ea891 100644
--- a/sfx2/source/menu/thessubmenu.hxx
+++ b/sfx2/source/menu/thessubmenu.hxx
@@ -33,8 +33,8 @@ class SfxThesSubMenuHelper
     css::uno::Reference< css::linguistic2::XThesaurus >             m_xThesarus;
 
 private:
-    SfxThesSubMenuHelper( const SfxThesSubMenuHelper & ) SAL_DELETED_FUNCTION;
-    SfxThesSubMenuHelper & operator = ( const SfxThesSubMenuHelper & ) SAL_DELETED_FUNCTION;
+    SfxThesSubMenuHelper( const SfxThesSubMenuHelper & ) = delete;
+    SfxThesSubMenuHelper & operator = ( const SfxThesSubMenuHelper & ) = delete;
 
 public:
     SfxThesSubMenuHelper();
diff --git a/shell/inc/internal/xml_parser.hxx b/shell/inc/internal/xml_parser.hxx
index 44094e5d9383..a24d6bf3b65f 100644
--- a/shell/inc/internal/xml_parser.hxx
+++ b/shell/inc/internal/xml_parser.hxx
@@ -113,8 +113,8 @@ private:
     XML_Parser xml_parser_;
 
 private:
-    xml_parser(const xml_parser&) SAL_DELETED_FUNCTION;
-    xml_parser& operator=(const xml_parser&) SAL_DELETED_FUNCTION;
+    xml_parser(const xml_parser&) = delete;
+    xml_parser& operator=(const xml_parser&) = delete;
 };
 
 #endif
diff --git a/shell/source/sessioninstall/SyncDbusSessionHelper.hxx b/shell/source/sessioninstall/SyncDbusSessionHelper.hxx
index 04d9776abefc..6a1877b713f4 100644
--- a/shell/source/sessioninstall/SyncDbusSessionHelper.hxx
+++ b/shell/source/sessioninstall/SyncDbusSessionHelper.hxx
@@ -52,8 +52,8 @@ namespace shell { namespace sessioninstall
                 { throw ::com::sun::star::uno::RuntimeException(); } // not implemented
 
         private:
-            SyncDbusSessionHelper( const SyncDbusSessionHelper& ) SAL_DELETED_FUNCTION;
-            SyncDbusSessionHelper& operator=( const SyncDbusSessionHelper& ) SAL_DELETED_FUNCTION;
+            SyncDbusSessionHelper( const SyncDbusSessionHelper& ) = delete;
+            SyncDbusSessionHelper& operator=( const SyncDbusSessionHelper& ) = delete;
     };
 }}
 
diff --git a/shell/source/tools/lngconvex/cmdline.hxx b/shell/source/tools/lngconvex/cmdline.hxx
index cd1b2f3d1bd7..9cbc34e5e343 100644
--- a/shell/source/tools/lngconvex/cmdline.hxx
+++ b/shell/source/tools/lngconvex/cmdline.hxx
@@ -74,8 +74,8 @@ private:
 
 // prevent copy and assignment
 private:
-    CommandLine(const CommandLine&) SAL_DELETED_FUNCTION;
-    CommandLine& operator=(const CommandLine&) SAL_DELETED_FUNCTION;
+    CommandLine(const CommandLine&) = delete;
+    CommandLine& operator=(const CommandLine&) = delete;
 };
 
 #endif
diff --git a/starmath/inc/parse.hxx b/starmath/inc/parse.hxx
index 0ae01efa7f6e..0ae45d3f7e00 100644
--- a/starmath/inc/parse.hxx
+++ b/starmath/inc/parse.hxx
@@ -50,8 +50,8 @@ class SmParser
     //! locale where '.' is decimal separator!
     ::com::sun::star::lang::Locale m_aDotLoc;
 
-    SmParser(const SmParser&) SAL_DELETED_FUNCTION;
-    SmParser& operator=(const SmParser&) SAL_DELETED_FUNCTION;
+    SmParser(const SmParser&) = delete;
+    SmParser& operator=(const SmParser&) = delete;
 
 #if OSL_DEBUG_LEVEL > 1
     bool            IsDelimiter( const OUString &rTxt, sal_Int32 nPos );
diff --git a/starmath/source/accessibility.hxx b/starmath/source/accessibility.hxx
index d547f8b0c7c2..82c45acee0da 100644
--- a/starmath/source/accessibility.hxx
+++ b/starmath/source/accessibility.hxx
@@ -72,8 +72,8 @@ class SmGraphicAccessible :
 
     VclPtr<SmGraphicWindow>             pWin;
 
-    SmGraphicAccessible( const SmGraphicAccessible & ) SAL_DELETED_FUNCTION;
-    SmGraphicAccessible & operator = ( const SmGraphicAccessible & ) SAL_DELETED_FUNCTION;
+    SmGraphicAccessible( const SmGraphicAccessible & ) = delete;
+    SmGraphicAccessible & operator = ( const SmGraphicAccessible & ) = delete;
 
 protected:
     SmDocShell *    GetDoc_Impl();
@@ -162,8 +162,8 @@ class SmViewForwarder :
 {
     SmEditAccessible &          rEditAcc;
 
-    SmViewForwarder( const SmViewForwarder & ) SAL_DELETED_FUNCTION;
-    SmViewForwarder & operator = ( const SmViewForwarder & ) SAL_DELETED_FUNCTION;
+    SmViewForwarder( const SmViewForwarder & ) = delete;
+    SmViewForwarder & operator = ( const SmViewForwarder & ) = delete;
 
 public:
     explicit SmViewForwarder( SmEditAccessible &rAcc );
@@ -184,8 +184,8 @@ class SmTextForwarder :     /* analog to SvxEditEngineForwarder */
 
     DECL_LINK_TYPED( NotifyHdl, EENotify&, void );
 
-    SmTextForwarder( const SmTextForwarder & ) SAL_DELETED_FUNCTION;
-    SmTextForwarder & operator = ( const SmTextForwarder & ) SAL_DELETED_FUNCTION;
+    SmTextForwarder( const SmTextForwarder & ) = delete;
+    SmTextForwarder & operator = ( const SmTextForwarder & ) = delete;
 
 public:
     SmTextForwarder( SmEditAccessible& rAcc, SmEditSource & rSource );
@@ -250,8 +250,8 @@ class SmEditViewForwarder :     /* analog to SvxEditEngineViewForwarder */
 {
     SmEditAccessible&       rEditAcc;
 
-    SmEditViewForwarder( const SmEditViewForwarder & ) SAL_DELETED_FUNCTION;
-    SmEditViewForwarder & operator = ( const SmEditViewForwarder & ) SAL_DELETED_FUNCTION;
+    SmEditViewForwarder( const SmEditViewForwarder & ) = delete;
+    SmEditViewForwarder & operator = ( const SmEditViewForwarder & ) = delete;
 
 public:
     explicit SmEditViewForwarder( SmEditAccessible& rAcc );
@@ -282,7 +282,7 @@ class SmEditSource :
     SmEditAccessible&       rEditAcc;
 
     SmEditSource( const SmEditSource &rSrc );
-    SmEditSource & operator = ( const SmEditSource & ) SAL_DELETED_FUNCTION;
+    SmEditSource & operator = ( const SmEditSource & ) = delete;
 
 public:
             SmEditSource( SmEditWindow *pWin, SmEditAccessible &rAcc );
@@ -317,8 +317,8 @@ class SmEditAccessible :
     ::accessibility::AccessibleTextHelper    *pTextHelper;
     VclPtr<SmEditWindow>                    pWin;
 
-    SmEditAccessible( const SmEditAccessible & ) SAL_DELETED_FUNCTION;
-    SmEditAccessible & operator = ( const SmEditAccessible & ) SAL_DELETED_FUNCTION;
+    SmEditAccessible( const SmEditAccessible & ) = delete;
+    SmEditAccessible & operator = ( const SmEditAccessible & ) = delete;
 
 public:
     explicit SmEditAccessible( SmEditWindow *pEditWin );
diff --git a/starmath/source/cfgitem.hxx b/starmath/source/cfgitem.hxx
index 8bdfc668c3cc..bfc6d37a6d55 100644
--- a/starmath/source/cfgitem.hxx
+++ b/starmath/source/cfgitem.hxx
@@ -70,8 +70,8 @@ class SmFontFormatList
     std::deque<SmFntFmtListEntry> aEntries;
     bool                    bModified;
 
-    SmFontFormatList(const SmFontFormatList&) SAL_DELETED_FUNCTION;
-    SmFontFormatList& operator=(const SmFontFormatList&) SAL_DELETED_FUNCTION;
+    SmFontFormatList(const SmFontFormatList&) = delete;
+    SmFontFormatList& operator=(const SmFontFormatList&) = delete;
 
 public:
     SmFontFormatList();
@@ -102,8 +102,8 @@ class SmMathConfig : public utl::ConfigItem, public SfxBroadcaster
     bool                              bIsFormatModified;
     SmFontPickList                    vFontPickList[7];
 
-    SmMathConfig(const SmMathConfig&) SAL_DELETED_FUNCTION;
-    SmMathConfig& operator=(const SmMathConfig&) SAL_DELETED_FUNCTION;
+    SmMathConfig(const SmMathConfig&) = delete;
+    SmMathConfig& operator=(const SmMathConfig&) = delete;
 
     void    StripFontFormatList( const std::vector< SmSym > &rSymbols );
 
diff --git a/starmath/source/tmpdevice.hxx b/starmath/source/tmpdevice.hxx
index 34638da946e1..6c10666d1980 100644
--- a/starmath/source/tmpdevice.hxx
+++ b/starmath/source/tmpdevice.hxx
@@ -28,8 +28,8 @@ class SmTmpDevice
 {
     OutputDevice  &rOutDev;
 
-    SmTmpDevice(const SmTmpDevice&) SAL_DELETED_FUNCTION;
-    SmTmpDevice& operator=(const SmTmpDevice&) SAL_DELETED_FUNCTION;
+    SmTmpDevice(const SmTmpDevice&) = delete;
+    SmTmpDevice& operator=(const SmTmpDevice&) = delete;
 
     Color   Impl_GetColor( const Color& rColor );
 
diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx b/stoc/source/invocation_adapterfactory/iafactory.cxx
index 301f62d66c0d..690ecb5e712b 100644
--- a/stoc/source/invocation_adapterfactory/iafactory.cxx
+++ b/stoc/source/invocation_adapterfactory/iafactory.cxx
@@ -166,8 +166,8 @@ struct AdapterImpl
         FactoryImpl * pFactory );
 
     // Copy assignment is forbidden and not implemented.
-    AdapterImpl (const AdapterImpl &) SAL_DELETED_FUNCTION;
-    AdapterImpl & operator= (const AdapterImpl &) SAL_DELETED_FUNCTION;
+    AdapterImpl (const AdapterImpl &) = delete;
+    AdapterImpl & operator= (const AdapterImpl &) = delete;
 };
 
 inline AdapterImpl::~AdapterImpl()
diff --git a/stoc/source/javavm/interact.hxx b/stoc/source/javavm/interact.hxx
index 8339c8abb322..16f03cf71fdb 100644
--- a/stoc/source/javavm/interact.hxx
+++ b/stoc/source/javavm/interact.hxx
@@ -51,8 +51,8 @@ public:
 private:
     class RetryContinuation;
 
-    InteractionRequest(InteractionRequest &) SAL_DELETED_FUNCTION;
-    void operator =(const InteractionRequest&) SAL_DELETED_FUNCTION;
+    InteractionRequest(InteractionRequest &) = delete;
+    void operator =(const InteractionRequest&) = delete;
 
     virtual ~InteractionRequest();
 
diff --git a/stoc/source/javavm/javavm.hxx b/stoc/source/javavm/javavm.hxx
index 4de0d00aa485..4b4c5cd280fb 100644
--- a/stoc/source/javavm/javavm.hxx
+++ b/stoc/source/javavm/javavm.hxx
@@ -119,8 +119,8 @@ public:
         throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
 private:
-    JavaVirtualMachine(JavaVirtualMachine &) SAL_DELETED_FUNCTION;
-    void operator =(const JavaVirtualMachine&) SAL_DELETED_FUNCTION;
+    JavaVirtualMachine(JavaVirtualMachine &) = delete;
+    void operator =(const JavaVirtualMachine&) = delete;
 
     virtual ~JavaVirtualMachine();
 
diff --git a/stoc/source/uriproc/UriReference.hxx b/stoc/source/uriproc/UriReference.hxx
index e3d8ffe0cc5f..81eb4a5524ba 100644
--- a/stoc/source/uriproc/UriReference.hxx
+++ b/stoc/source/uriproc/UriReference.hxx
@@ -88,8 +88,8 @@ public:
     bool m_hasFragment;
 
 private:
-    UriReference(UriReference &) SAL_DELETED_FUNCTION;
-    void operator =(UriReference) SAL_DELETED_FUNCTION;
+    UriReference(UriReference &) = delete;
+    void operator =(UriReference) = delete;
 
     void appendSchemeSpecificPart(OUStringBuffer & buffer) const;
 };
diff --git a/store/source/object.hxx b/store/source/object.hxx
index b44d83bef675..d59d9485adba 100644
--- a/store/source/object.hxx
+++ b/store/source/object.hxx
@@ -52,8 +52,8 @@ private:
     /** The IStoreHandle TypeId.
      */
     static const sal_uInt32 m_nTypeId;
-    OStoreObject (const OStoreObject&) SAL_DELETED_FUNCTION;
-    OStoreObject& operator= (const OStoreObject&) SAL_DELETED_FUNCTION;
+    OStoreObject (const OStoreObject&) = delete;
+    OStoreObject& operator= (const OStoreObject&) = delete;
 };
 
 /** Template helper function as dynamic_cast replacement.
diff --git a/store/source/storbios.hxx b/store/source/storbios.hxx
index 0380b134485e..2f8a4db0b295 100644
--- a/store/source/storbios.hxx
+++ b/store/source/storbios.hxx
@@ -219,8 +219,8 @@ private:
     storeError saveObjectAt_Impl (
         OStorePageObject & rPage, sal_uInt32 nAddr);
 
-    OStorePageBIOS (const OStorePageBIOS&) SAL_DELETED_FUNCTION;
-    OStorePageBIOS& operator= (const OStorePageBIOS&) SAL_DELETED_FUNCTION;
+    OStorePageBIOS (const OStorePageBIOS&) = delete;
+    OStorePageBIOS& operator= (const OStorePageBIOS&) = delete;
 };
 
 inline OStorePageBIOS::operator osl::Mutex& (void) const
diff --git a/store/source/stordir.hxx b/store/source/stordir.hxx
index 43ba3dc2badf..5deea4f3cb73 100644
--- a/store/source/stordir.hxx
+++ b/store/source/stordir.hxx
@@ -98,8 +98,8 @@ private:
     sal_uInt32                 m_nPath;
     rtl_TextToUnicodeConverter m_hTextCvt;
 
-    OStoreDirectory_Impl (const OStoreDirectory_Impl&) SAL_DELETED_FUNCTION;
-    OStoreDirectory_Impl& operator= (const OStoreDirectory_Impl&) SAL_DELETED_FUNCTION;
+    OStoreDirectory_Impl (const OStoreDirectory_Impl&) = delete;
+    OStoreDirectory_Impl& operator= (const OStoreDirectory_Impl&) = delete;
 };
 
 template<> inline OStoreDirectory_Impl*
diff --git a/store/source/storlckb.hxx b/store/source/storlckb.hxx
index 4fffb471dd04..0ab9237c0c8b 100644
--- a/store/source/storlckb.hxx
+++ b/store/source/storlckb.hxx
@@ -134,8 +134,8 @@ private:
 
     bool m_bWriteable;
 
-    OStoreLockBytes (const OStoreLockBytes&) SAL_DELETED_FUNCTION;
-    OStoreLockBytes& operator= (const OStoreLockBytes&) SAL_DELETED_FUNCTION;
+    OStoreLockBytes (const OStoreLockBytes&) = delete;
+    OStoreLockBytes& operator= (const OStoreLockBytes&) = delete;
 };
 
 template<> inline OStoreLockBytes*
diff --git a/store/source/storpage.hxx b/store/source/storpage.hxx
index f57d720076d6..687b38b943e8 100644
--- a/store/source/storpage.hxx
+++ b/store/source/storpage.hxx
@@ -184,8 +184,8 @@ private:
     */
     storeError remove_Impl (entry & rEntry);
 
-    OStorePageManager (const OStorePageManager&) SAL_DELETED_FUNCTION;
-    OStorePageManager& operator= (const OStorePageManager&) SAL_DELETED_FUNCTION;
+    OStorePageManager (const OStorePageManager&) = delete;
+    OStorePageManager& operator= (const OStorePageManager&) = delete;
 };
 
 inline bool OStorePageManager::isValid() const
diff --git a/svl/source/fsstor/fsstorage.cxx b/svl/source/fsstor/fsstorage.cxx
index 704f2f67111c..cbe3664b9c15 100644
--- a/svl/source/fsstor/fsstorage.cxx
+++ b/svl/source/fsstor/fsstorage.cxx
@@ -88,8 +88,8 @@ struct FSStorage_Impl
     ~FSStorage_Impl();
 
     // Copy assignment is forbidden and not implemented.
-    FSStorage_Impl (const FSStorage_Impl &) SAL_DELETED_FUNCTION;
-    FSStorage_Impl & operator= (const FSStorage_Impl &) SAL_DELETED_FUNCTION;
+    FSStorage_Impl (const FSStorage_Impl &) = delete;
+    FSStorage_Impl & operator= (const FSStorage_Impl &) = delete;
 };
 
 FSStorage_Impl::~FSStorage_Impl()
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index 930bf92ca77c..6d85ca198f81 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -86,8 +86,8 @@ SfxStyleSheetHint::SfxStyleSheetHint
 class SfxStyleSheetBasePool_Impl
 {
 private:
-    SfxStyleSheetBasePool_Impl(const SfxStyleSheetBasePool_Impl&) SAL_DELETED_FUNCTION;
-    SfxStyleSheetBasePool_Impl& operator=(const SfxStyleSheetBasePool_Impl&) SAL_DELETED_FUNCTION;
+    SfxStyleSheetBasePool_Impl(const SfxStyleSheetBasePool_Impl&) = delete;
+    SfxStyleSheetBasePool_Impl& operator=(const SfxStyleSheetBasePool_Impl&) = delete;
 public:
     SfxStyleSheetIteratorPtr pIter;
 
diff --git a/svl/source/numbers/zforfind.hxx b/svl/source/numbers/zforfind.hxx
index 4dab5cb27d2a..cbadd292b1e9 100644
--- a/svl/source/numbers/zforfind.hxx
+++ b/svl/source/numbers/zforfind.hxx
@@ -185,8 +185,8 @@ private:
     sal_uInt16  nDatePatternNumbers;
 
     // Copy assignment is forbidden and not implemented.
-    ImpSvNumberInputScan (const ImpSvNumberInputScan &) SAL_DELETED_FUNCTION;
-    ImpSvNumberInputScan & operator= (const ImpSvNumberInputScan &) SAL_DELETED_FUNCTION;
+    ImpSvNumberInputScan (const ImpSvNumberInputScan &) = delete;
+    ImpSvNumberInputScan & operator= (const ImpSvNumberInputScan &) = delete;
 
     void Reset();                               // Reset all variables before start of analysis
 
diff --git a/svl/source/numbers/zforscan.hxx b/svl/source/numbers/zforscan.hxx
index 8a9b75ca91c6..82535fd1e84a 100644
--- a/svl/source/numbers/zforscan.hxx
+++ b/svl/source/numbers/zforscan.hxx
@@ -194,8 +194,8 @@ private: // Private section
     sal_uInt8 nNatNumModifier;                  // Thai T speciality
 
     // Copy assignment is forbidden and not implemented.
-    ImpSvNumberformatScan (const ImpSvNumberformatScan &) SAL_DELETED_FUNCTION;
-    ImpSvNumberformatScan & operator= (const ImpSvNumberformatScan &) SAL_DELETED_FUNCTION;
+    ImpSvNumberformatScan (const ImpSvNumberformatScan &) = delete;
+    ImpSvNumberformatScan & operator= (const ImpSvNumberformatScan &) = delete;
 
     void InitKeywords() const;
     void InitSpecialKeyword( NfKeywordIndex eIdx ) const;
diff --git a/svl/source/undo/undo.cxx b/svl/source/undo/undo.cxx
index cdc14a00483b..b843d5cc8445 100644
--- a/svl/source/undo/undo.cxx
+++ b/svl/source/undo/undo.cxx
@@ -259,8 +259,8 @@ struct SVL_DLLPRIVATE SfxUndoManager_Data
     }
 
     // Copy assignment is forbidden and not implemented.
-    SfxUndoManager_Data (const SfxUndoManager_Data &) SAL_DELETED_FUNCTION;
-    SfxUndoManager_Data & operator= (const SfxUndoManager_Data &) SAL_DELETED_FUNCTION;
+    SfxUndoManager_Data (const SfxUndoManager_Data &) = delete;
+    SfxUndoManager_Data & operator= (const SfxUndoManager_Data &) = delete;
 };
 
 namespace svl { namespace undo { namespace impl
diff --git a/svtools/inc/table/tablecontrol.hxx b/svtools/inc/table/tablecontrol.hxx
index 004cd48dcec4..8c1521910200 100644
--- a/svtools/inc/table/tablecontrol.hxx
+++ b/svtools/inc/table/tablecontrol.hxx
@@ -174,8 +174,8 @@ namespace svt { namespace table
         DECL_DLLPRIVATE_LINK_TYPED( ImplSelectHdl, LinkParamNone*, void );
 
     private:
-        TableControl( const TableControl& ) SAL_DELETED_FUNCTION;
-        TableControl& operator=( const TableControl& ) SAL_DELETED_FUNCTION;
+        TableControl( const TableControl& ) = delete;
+        TableControl& operator=( const TableControl& ) = delete;
     };
 
 
diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx
index 66d0708fce55..1b3053911d14 100644
--- a/svtools/source/contnr/imivctl.hxx
+++ b/svtools/source/contnr/imivctl.hxx
@@ -317,8 +317,8 @@ class SvxIconChoiceCtrl_Impl
     bool                IsMnemonicChar( sal_Unicode cChar, sal_uLong& rPos ) const;
 
     // Copy assignment is forbidden and not implemented.
-    SvxIconChoiceCtrl_Impl (const SvxIconChoiceCtrl_Impl &) SAL_DELETED_FUNCTION;
-    SvxIconChoiceCtrl_Impl & operator= (const SvxIconChoiceCtrl_Impl &) SAL_DELETED_FUNCTION;
+    SvxIconChoiceCtrl_Impl (const SvxIconChoiceCtrl_Impl &) = delete;
+    SvxIconChoiceCtrl_Impl & operator= (const SvxIconChoiceCtrl_Impl &) = delete;
 
 public:
 
diff --git a/svtools/source/control/scriptedtext.cxx b/svtools/source/control/scriptedtext.cxx
index 565a5b551141..f74ba8c5f276 100644
--- a/svtools/source/control/scriptedtext.cxx
+++ b/svtools/source/control/scriptedtext.cxx
@@ -49,7 +49,7 @@ private:
     Size                        maTextSize;         /// The size the text will take in the current output device.
 
                                 /** Assignment operator not implemented to prevent usage. */
-    SvtScriptedTextHelper_Impl& operator=( const SvtScriptedTextHelper_Impl& ) SAL_DELETED_FUNCTION;
+    SvtScriptedTextHelper_Impl& operator=( const SvtScriptedTextHelper_Impl& ) = delete;
 
                                 /** Gets the font of the given script type. */
     const vcl::Font&            GetFont( sal_uInt16 _nScript ) const;
diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx
index 62fc3085d893..b0e383fa4ce0 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.cxx
@@ -501,8 +501,8 @@ void AssignmentPersistentData::ImplCommit()
         }
 
         // Copy assignment is forbidden and not implemented.
-        AddressBookSourceDialogData (const AddressBookSourceDialogData &) SAL_DELETED_FUNCTION;
-        AddressBookSourceDialogData & operator= (const AddressBookSourceDialogData &) SAL_DELETED_FUNCTION;
+        AddressBookSourceDialogData (const AddressBookSourceDialogData &) = delete;
+        AddressBookSourceDialogData & operator= (const AddressBookSourceDialogData &) = delete;
     };
 
 
diff --git a/svtools/source/graphic/descriptor.hxx b/svtools/source/graphic/descriptor.hxx
index 94142a4d24cf..37f3ba049e5c 100644
--- a/svtools/source/graphic/descriptor.hxx
+++ b/svtools/source/graphic/descriptor.hxx
@@ -112,9 +112,9 @@ private:
     bool                    mbAlpha;
     bool                    mbAnimated;
 
-    GraphicDescriptor( const GraphicDescriptor& rDescriptor ) SAL_DELETED_FUNCTION;
+    GraphicDescriptor( const GraphicDescriptor& rDescriptor ) = delete;
 
-    GraphicDescriptor& operator=( const GraphicDescriptor& ) SAL_DELETED_FUNCTION;
+    GraphicDescriptor& operator=( const GraphicDescriptor& ) = delete;
 
     void implCreate( SvStream& rIStm, const OUString* pPath );
 };
diff --git a/svtools/source/graphic/grfcache.cxx b/svtools/source/graphic/grfcache.cxx
index 1aa1ecbffe75..9d0e6c58ed1c 100644
--- a/svtools/source/graphic/grfcache.cxx
+++ b/svtools/source/graphic/grfcache.cxx
@@ -393,8 +393,8 @@ private:
     static bool IsCacheableAsBitmap( const GDIMetaFile& rMtf, OutputDevice* pOut, const Size& rSz );
 
     // Copy assignment is forbidden and not implemented.
-    GraphicDisplayCacheEntry (const GraphicDisplayCacheEntry &) SAL_DELETED_FUNCTION;
-    GraphicDisplayCacheEntry & operator= (const GraphicDisplayCacheEntry &) SAL_DELETED_FUNCTION;
+    GraphicDisplayCacheEntry (const GraphicDisplayCacheEntry &) = delete;
+    GraphicDisplayCacheEntry & operator= (const GraphicDisplayCacheEntry &) = delete;
 
 public:
 
diff --git a/svx/inc/sdr/contact/viewcontactofunocontrol.hxx b/svx/inc/sdr/contact/viewcontactofunocontrol.hxx
index 9544170bc834..3e271d1bde79 100644
--- a/svx/inc/sdr/contact/viewcontactofunocontrol.hxx
+++ b/svx/inc/sdr/contact/viewcontactofunocontrol.hxx
@@ -73,8 +73,8 @@ namespace sdr { namespace contact {
         virtual ViewObjectContact& CreateObjectSpecificViewObjectContact( ObjectContact& _rObjectContact ) SAL_OVERRIDE;
 
     private:
-        ViewContactOfUnoControl( const ViewContactOfUnoControl& ) SAL_DELETED_FUNCTION;
-        ViewContactOfUnoControl& operator=( const ViewContactOfUnoControl& ) SAL_DELETED_FUNCTION;
+        ViewContactOfUnoControl( const ViewContactOfUnoControl& ) = delete;
+        ViewContactOfUnoControl& operator=( const ViewContactOfUnoControl& ) = delete;
 
     protected:
         // This method is responsible for creating the graphical visualisation data
diff --git a/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx b/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx
index 2d461f849b1d..25a7229c5200 100644
--- a/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx
+++ b/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx
@@ -100,8 +100,8 @@ namespace sdr { namespace contact {
         void impl_onControlChangedOrModified();
 
     private:
-        ViewObjectContactOfUnoControl( const ViewObjectContactOfUnoControl& ) SAL_DELETED_FUNCTION;
-        ViewObjectContactOfUnoControl& operator=( const ViewObjectContactOfUnoControl& ) SAL_DELETED_FUNCTION;
+        ViewObjectContactOfUnoControl( const ViewObjectContactOfUnoControl& ) = delete;
+        ViewObjectContactOfUnoControl& operator=( const ViewObjectContactOfUnoControl& ) = delete;
     };
 
     class SVX_DLLPRIVATE UnoControlPrintOrPreviewContact : public ViewObjectContactOfUnoControl
@@ -111,8 +111,8 @@ namespace sdr { namespace contact {
         virtual ~UnoControlPrintOrPreviewContact();
 
     private:
-        UnoControlPrintOrPreviewContact( const UnoControlPrintOrPreviewContact& ) SAL_DELETED_FUNCTION;
-        UnoControlPrintOrPreviewContact& operator=( const UnoControlPrintOrPreviewContact& ) SAL_DELETED_FUNCTION;
+        UnoControlPrintOrPreviewContact( const UnoControlPrintOrPreviewContact& ) = delete;
+        UnoControlPrintOrPreviewContact& operator=( const UnoControlPrintOrPreviewContact& ) = delete;
 
         virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo ) const SAL_OVERRIDE;
     };
diff --git a/svx/source/accessibility/ChildrenManagerImpl.hxx b/svx/source/accessibility/ChildrenManagerImpl.hxx
index ccacc2d582ad..dbe40fac7beb 100644
--- a/svx/source/accessibility/ChildrenManagerImpl.hxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.hxx
@@ -363,8 +363,8 @@ private:
     */
     sal_Int32 mnNewNameIndex;
 
-    ChildrenManagerImpl (const ChildrenManagerImpl&) SAL_DELETED_FUNCTION;
-    ChildrenManagerImpl& operator= (const ChildrenManagerImpl&) SAL_DELETED_FUNCTION;
+    ChildrenManagerImpl (const ChildrenManagerImpl&) = delete;
+    ChildrenManagerImpl& operator= (const ChildrenManagerImpl&) = delete;
 
     /** This member points to the currently focused shape.  It is NULL when
         there is no focused shape.
diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx
index ec2045604711..8efce1078997 100644
--- a/svx/source/engine3d/view3d.cxx
+++ b/svx/source/engine3d/view3d.cxx
@@ -93,8 +93,8 @@ class Impl3DMirrorConstructOverlay
     drawinglayer::primitive2d::Primitive2DSequence  maFullOverlay;
 
     // Copy assignment is forbidden and not implemented.
-    Impl3DMirrorConstructOverlay (const Impl3DMirrorConstructOverlay &) SAL_DELETED_FUNCTION;
-    Impl3DMirrorConstructOverlay & operator= (const Impl3DMirrorConstructOverlay &) SAL_DELETED_FUNCTION;
+    Impl3DMirrorConstructOverlay (const Impl3DMirrorConstructOverlay &) = delete;
+    Impl3DMirrorConstructOverlay & operator= (const Impl3DMirrorConstructOverlay &) = delete;
 
 public:
     explicit Impl3DMirrorConstructOverlay(const E3dView& rView);
diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx
index 49bf3cbd74bf..df846f608216 100644
--- a/svx/source/inc/datanavi.hxx
+++ b/svx/source/inc/datanavi.hxx
@@ -160,7 +160,7 @@ namespace svxform
         OUString m_sInstance_API;
         OUString m_sNone_API;
 
-        ReplaceString( const ReplaceString& ) SAL_DELETED_FUNCTION;
+        ReplaceString( const ReplaceString& ) = delete;
 
     public:
         ReplaceString() :
@@ -208,7 +208,7 @@ namespace svxform
         OUString m_sPut_API;
         OUString m_sGet_API;
 
-        MethodString( const MethodString& ) SAL_DELETED_FUNCTION;
+        MethodString( const MethodString& ) = delete;
 
     public:
 
diff --git a/svx/source/inc/delayedevent.hxx b/svx/source/inc/delayedevent.hxx
index 113948a8e404..d5a33dd6ecfc 100644
--- a/svx/source/inc/delayedevent.hxx
+++ b/svx/source/inc/delayedevent.hxx
@@ -69,8 +69,8 @@ namespace svxform
         DECL_LINK_TYPED( OnCall, void*, void );
 
     private:
-        DelayedEvent( const DelayedEvent& ) SAL_DELETED_FUNCTION;
-        DelayedEvent& operator=( const DelayedEvent& ) SAL_DELETED_FUNCTION;
+        DelayedEvent( const DelayedEvent& ) = delete;
+        DelayedEvent& operator=( const DelayedEvent& ) = delete;
     };
 
 
diff --git a/svx/source/inc/fmobj.hxx b/svx/source/inc/fmobj.hxx
index 38ff2b6906be..133d18f97383 100644
--- a/svx/source/inc/fmobj.hxx
+++ b/svx/source/inc/fmobj.hxx
@@ -29,7 +29,7 @@
 
 class SVX_DLLPUBLIC FmFormObj: public SdrUnoObj
 {
-    FmFormObj( const FmFormObj& ) SAL_DELETED_FUNCTION;
+    FmFormObj( const FmFormObj& ) = delete;
 
     ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >  aEvts;  // events des Objects
     ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor>   m_aEventsHistory;
diff --git a/svx/source/inc/fmpgeimp.hxx b/svx/source/inc/fmpgeimp.hxx
index 7ee1c1813c54..dccda1cd3f37 100644
--- a/svx/source/inc/fmpgeimp.hxx
+++ b/svx/source/inc/fmpgeimp.hxx
@@ -141,8 +141,8 @@ private:
         impl_createControlShapeMap_nothrow();
 
 private:
-    FmFormPageImpl( const FmFormPageImpl& ) SAL_DELETED_FUNCTION;
-    FmFormPageImpl& operator=( const FmFormPageImpl& ) SAL_DELETED_FUNCTION;
+    FmFormPageImpl( const FmFormPageImpl& ) = delete;
+    FmFormPageImpl& operator=( const FmFormPageImpl& ) = delete;
 };
 
 
diff --git a/svx/source/inc/formcontrolling.hxx b/svx/source/inc/formcontrolling.hxx
index f3b1f7d1730f..57bab7e5caa4 100644
--- a/svx/source/inc/formcontrolling.hxx
+++ b/svx/source/inc/formcontrolling.hxx
@@ -209,8 +209,8 @@ namespace svx
         }
 
     private:
-        FormControllerHelper( const FormControllerHelper& ) SAL_DELETED_FUNCTION;
-        FormControllerHelper& operator=( const FormControllerHelper& ) SAL_DELETED_FUNCTION;
+        FormControllerHelper( const FormControllerHelper& ) = delete;
+        FormControllerHelper& operator=( const FormControllerHelper& ) = delete;
     };
 
 
diff --git a/svx/source/svdraw/svdfmtf.hxx b/svx/source/svdraw/svdfmtf.hxx
index c290ceb978fc..7e253091dd60 100644
--- a/svx/source/svdraw/svdfmtf.hxx
+++ b/svx/source/svdraw/svdfmtf.hxx
@@ -154,8 +154,8 @@ protected:
 
 private:
     // Copy assignment is forbidden and not implemented.
-    ImpSdrGDIMetaFileImport (const ImpSdrGDIMetaFileImport &) SAL_DELETED_FUNCTION;
-    ImpSdrGDIMetaFileImport & operator= (const ImpSdrGDIMetaFileImport &) SAL_DELETED_FUNCTION;
+    ImpSdrGDIMetaFileImport (const ImpSdrGDIMetaFileImport &) = delete;
+    ImpSdrGDIMetaFileImport & operator= (const ImpSdrGDIMetaFileImport &) = delete;
 
 public:
     ImpSdrGDIMetaFileImport(
diff --git a/svx/source/table/accessiblecell.hxx b/svx/source/table/accessiblecell.hxx
index b7497fcf71c0..44518b83865b 100644
--- a/svx/source/table/accessiblecell.hxx
+++ b/svx/source/table/accessiblecell.hxx
@@ -131,8 +131,8 @@ protected:
     AccessibleTableShape *pAccTable;
 
 private:
-    AccessibleCell(const AccessibleCell&) SAL_DELETED_FUNCTION;
-    AccessibleCell& operator=(const AccessibleCell&) SAL_DELETED_FUNCTION;
+    AccessibleCell(const AccessibleCell&) = delete;
+    AccessibleCell& operator=(const AccessibleCell&) = delete;
 };
 
 } // end of namespace accessibility
diff --git a/svx/source/table/tablertfimporter.cxx b/svx/source/table/tablertfimporter.cxx
index d37f07cac3b2..1efb02a67baa 100644
--- a/svx/source/table/tablertfimporter.cxx
+++ b/svx/source/table/tablertfimporter.cxx
@@ -121,8 +121,8 @@ private:
     Reference< XTable > mxTable;
 
     // Copy assignment is forbidden and not implemented.
-    SdrTableRTFParser (const SdrTableRTFParser &) SAL_DELETED_FUNCTION;
-    SdrTableRTFParser & operator= (const SdrTableRTFParser &) SAL_DELETED_FUNCTION;
+    SdrTableRTFParser (const SdrTableRTFParser &) = delete;
+    SdrTableRTFParser & operator= (const SdrTableRTFParser &) = delete;
 };
 
 SdrTableRTFParser::SdrTableRTFParser( SdrTableObj& rTableObj )
diff --git a/svx/source/unogallery/unogalitem.hxx b/svx/source/unogallery/unogalitem.hxx
index e1bb9a22044f..349e0a5404d7 100644
--- a/svx/source/unogallery/unogalitem.hxx
+++ b/svx/source/unogallery/unogalitem.hxx
@@ -95,8 +95,8 @@ private:
     const ::GalleryObject*      implGetObject() const { return mpGalleryObject;}
     void                        implSetInvalid();
 
-                                GalleryItem( const GalleryItem& ) SAL_DELETED_FUNCTION;
-                                GalleryItem& operator=( const GalleryItem& ) SAL_DELETED_FUNCTION;
+                                GalleryItem( const GalleryItem& ) = delete;
+                                GalleryItem& operator=( const GalleryItem& ) = delete;
 };
 
 
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);
diff --git a/sw/source/core/access/parachangetrackinginfo.hxx b/sw/source/core/access/parachangetrackinginfo.hxx
index a8592529f1f0..d25a50ca0726 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& ) SAL_DELETED_FUNCTION;
-        SwParaChangeTrackingInfo& operator=( const SwParaChangeTrackingInfo& ) SAL_DELETED_FUNCTION;
+        SwParaChangeTrackingInfo( const SwParaChangeTrackingInfo& ) = delete;
+        SwParaChangeTrackingInfo& operator=( const SwParaChangeTrackingInfo& ) = delete;
 
         const SwTextFrm& mrTextFrm;
 
diff --git a/sw/source/core/access/textmarkuphelper.hxx b/sw/source/core/access/textmarkuphelper.hxx
index 37dd9f073a47..c0ae39448bc2 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& ) SAL_DELETED_FUNCTION;
-        SwTextMarkupHelper& operator=( const SwTextMarkupHelper& ) SAL_DELETED_FUNCTION;
+        SwTextMarkupHelper( const SwTextMarkupHelper& ) = delete;
+        SwTextMarkupHelper& operator=( const SwTextMarkupHelper& ) = delete;
 
         const SwAccessiblePortionData& mrPortionData;
 
diff --git a/sw/source/core/docnode/cancellablejob.hxx b/sw/source/core/docnode/cancellablejob.hxx
index 4d11272217e6..9058c60c263b 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& ) SAL_DELETED_FUNCTION;
-    void operator =( CancellableJob& ) SAL_DELETED_FUNCTION;
+    CancellableJob( CancellableJob& ) = delete;
+    void operator =( CancellableJob& ) = delete;
 
     ::rtl::Reference< ObservableThread > mrThread;
 };
diff --git a/sw/source/core/inc/unoflatpara.hxx b/sw/source/core/inc/unoflatpara.hxx
index 71182ecb4685..a9cd27892fe6 100644
--- a/sw/source/core/inc/unoflatpara.hxx
+++ b/sw/source/core/inc/unoflatpara.hxx
@@ -133,8 +133,8 @@ public:
         throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
 private:
-    SwXFlatParagraph( const SwXFlatParagraph & ) SAL_DELETED_FUNCTION;
-    SwXFlatParagraph & operator = ( const SwXFlatParagraph & ) SAL_DELETED_FUNCTION;
+    SwXFlatParagraph( const SwXFlatParagraph & ) = delete;
+    SwXFlatParagraph & operator = ( const SwXFlatParagraph & ) = delete;
 
     OUString maExpandText;
 };
@@ -162,8 +162,8 @@ protected:
     virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVERRIDE;
 
 private:
-    SwXFlatParagraphIterator( const SwXFlatParagraphIterator & ) SAL_DELETED_FUNCTION;
-    SwXFlatParagraphIterator & operator =(const SwXFlatParagraphIterator & ) SAL_DELETED_FUNCTION;
+    SwXFlatParagraphIterator( const SwXFlatParagraphIterator & ) = delete;
+    SwXFlatParagraphIterator & operator =(const SwXFlatParagraphIterator & ) = delete;
 
     // 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 652e1f535123..f24fc9731a9b 100644
--- a/sw/source/core/inc/unotextmarkup.hxx
+++ b/sw/source/core/inc/unotextmarkup.hxx
@@ -67,8 +67,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 & ) SAL_DELETED_FUNCTION;
-    SwXTextMarkup & operator =( const SwXTextMarkup & ) SAL_DELETED_FUNCTION;
+    SwXTextMarkup( const SwXTextMarkup & ) = delete;
+    SwXTextMarkup & operator =( const SwXTextMarkup & ) = delete;
 
     struct Impl;
     ::sw::UnoImplPtr<Impl> m_pImpl;
@@ -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 &) SAL_DELETED_FUNCTION;
-    void operator =(SwXStringKeyMap &) SAL_DELETED_FUNCTION;
+    SwXStringKeyMap(SwXStringKeyMap &) = delete;
+    void operator =(SwXStringKeyMap &) = delete;
 
     virtual ~SwXStringKeyMap() {}
 
diff --git a/sw/source/core/inc/wrong.hxx b/sw/source/core/inc/wrong.hxx
index 840ca664b291..bd33e0f9850c 100644
--- a/sw/source/core/inc/wrong.hxx
+++ b/sw/source/core/inc/wrong.hxx
@@ -192,8 +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 );
 
-    SwWrongList& operator= (const SwWrongList &) SAL_DELETED_FUNCTION;
-    SwWrongList( const SwWrongList& rCpy ) SAL_DELETED_FUNCTION;
+    SwWrongList& operator= (const SwWrongList &) = delete;
+    SwWrongList( const SwWrongList& rCpy ) = delete;
 
 public:
     SwWrongList( WrongListType eType );
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index d10cc0de8a33..0d5a592aa414 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -371,7 +371,7 @@ class SwTextPaintInfo : public SwTextSizeInfo
                    const bool bSmartTag = false,
                    const bool bGrammarCheck = false );
 
-    SwTextPaintInfo &operator=(const SwTextPaintInfo&) SAL_DELETED_FUNCTION;
+    SwTextPaintInfo &operator=(const SwTextPaintInfo&) = delete;
     void _NotifyURL( const SwLinePortion &rPor ) const;
 
 protected:
diff --git a/sw/source/filter/inc/msfilter.hxx b/sw/source/filter/inc/msfilter.hxx
index 78d835381c9a..5855235764cf 100644
--- a/sw/source/filter/inc/msfilter.hxx
+++ b/sw/source/filter/inc/msfilter.hxx
@@ -362,7 +362,7 @@ namespace sw
             explicit SetInDocAndDelete(SwDoc &rDoc) : mrDoc(rDoc) {}
             void operator()(SwFltStackEntry *pEntry);
         private:
-            SetInDocAndDelete& operator=(const SetInDocAndDelete&) SAL_DELETED_FUNCTION;
+            SetInDocAndDelete& operator=(const SetInDocAndDelete&) = delete;
         };
 
         /**
@@ -381,7 +381,7 @@ namespace sw
                     pEntry->SetEndPos(mrPos);
             }
         private:
-            SetEndIfOpen& operator=(const SetEndIfOpen&) SAL_DELETED_FUNCTION;
+            SetEndIfOpen& operator=(const SetEndIfOpen&) = delete;
         };
 
         /**
diff --git a/sw/source/filter/inc/wrtswtbl.hxx b/sw/source/filter/inc/wrtswtbl.hxx
index 8c7569197f24..144b19b81dda 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 &) SAL_DELETED_FUNCTION;
+    SwWriteTableRow & operator= (const SwWriteTableRow &) = delete;
 
 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 b88ba27c2d50..24953b710743 100644
--- a/sw/source/filter/ww8/docxexport.hxx
+++ b/sw/source/filter/ww8/docxexport.hxx
@@ -277,9 +277,9 @@ public:
     void SetFS(::sax_fastparser::FSHelperPtr mpFS);
 
 private:
-    DocxExport( const DocxExport& ) SAL_DELETED_FUNCTION;
+    DocxExport( const DocxExport& ) = delete;
 
-    DocxExport& operator=( const DocxExport& ) SAL_DELETED_FUNCTION;
+    DocxExport& operator=( const DocxExport& ) = delete;
 };
 
 #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 8acf8a68726d..e723b81e7f54 100644
--- a/sw/source/filter/ww8/escher.hxx
+++ b/sw/source/filter/ww8/escher.hxx
@@ -131,8 +131,8 @@ public:
     void PreWriteHyperlinkWithinFly(const SwFrameFormat& rFormat,EscherPropertyContainer& rPropOpt);
 
 private:
-    SwBasicEscherEx(const SwBasicEscherEx&) SAL_DELETED_FUNCTION;
-    SwBasicEscherEx& operator=(const SwBasicEscherEx&) SAL_DELETED_FUNCTION;
+    SwBasicEscherEx(const SwBasicEscherEx&) = delete;
+    SwBasicEscherEx& operator=(const SwBasicEscherEx&) = delete;
 };
 
 class SwEscherEx : public SwBasicEscherEx
@@ -172,8 +172,8 @@ public:
     EscherExHostAppData* StartShape(const com::sun::star::uno::Reference<
         com::sun::star::drawing::XShape > &, const Rectangle*) SAL_OVERRIDE {return &aHostData;}
 private:
-    SwEscherEx(const SwEscherEx&) SAL_DELETED_FUNCTION;
-    SwEscherEx &operator=(const SwEscherEx&) SAL_DELETED_FUNCTION;
+    SwEscherEx(const SwEscherEx&) = delete;
+    SwEscherEx &operator=(const SwEscherEx&) = delete;
 };
 
 #endif
diff --git a/sw/source/filter/ww8/rtfexport.hxx b/sw/source/filter/ww8/rtfexport.hxx
index b602d63a9e61..e3af02f88c87 100644
--- a/sw/source/filter/ww8/rtfexport.hxx
+++ b/sw/source/filter/ww8/rtfexport.hxx
@@ -192,9 +192,9 @@ public:
     OString* GetStyle(sal_uInt16 nId);
 
 private:
-    RtfExport(const RtfExport&) SAL_DELETED_FUNCTION;
+    RtfExport(const RtfExport&) = delete;
 
-    RtfExport& operator=(const RtfExport&) SAL_DELETED_FUNCTION;
+    RtfExport& operator=(const RtfExport&) = delete;
 
     void WriteFonts();
     void WriteStyles();
diff --git a/sw/source/filter/ww8/sortedarray.hxx b/sw/source/filter/ww8/sortedarray.hxx
index 15d48c3e9075..31943868e6e4 100644
--- a/sw/source/filter/ww8/sortedarray.hxx
+++ b/sw/source/filter/ww8/sortedarray.hxx
@@ -41,8 +41,8 @@ namespace ww
         C *mpWwSprmTab;
         size_t mnNoElems;
 
-        SortedArray(const SortedArray&) SAL_DELETED_FUNCTION;
-        SortedArray& operator=(const SortedArray&) SAL_DELETED_FUNCTION;
+        SortedArray(const SortedArray&) = delete;
+        SortedArray& operator=(const SortedArray&) = delete;
     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.hxx b/sw/source/filter/ww8/writerhelper.hxx
index d10f8e3c0c75..29f231ab1b5b 100644
--- a/sw/source/filter/ww8/writerhelper.hxx
+++ b/sw/source/filter/ww8/writerhelper.hxx
@@ -879,8 +879,8 @@ namespace sw
             */
             bool TransferToDoc(OUString &rName);
         private:
-            DrawingOLEAdaptor& operator=(const DrawingOLEAdaptor&) SAL_DELETED_FUNCTION;
-            DrawingOLEAdaptor(const DrawingOLEAdaptor &rDoc) SAL_DELETED_FUNCTION;
+            DrawingOLEAdaptor& operator=(const DrawingOLEAdaptor&) = delete;
+            DrawingOLEAdaptor(const DrawingOLEAdaptor &rDoc) = delete;
         };
     }
 }
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 7684aa3a8f9b..005138bf00b1 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -242,8 +242,8 @@ class WW8_WrPlcSepx : public MSWordSections
     bool m_bHeaderFooterWritten;
     WW8_WrPlc0* pTextPos;        // Position of the headers/footers
 
-    WW8_WrPlcSepx( const WW8_WrPlcSepx& ) SAL_DELETED_FUNCTION;
-    WW8_WrPlcSepx& operator=( const WW8_WrPlcSepx& ) SAL_DELETED_FUNCTION;
+    WW8_WrPlcSepx( const WW8_WrPlcSepx& ) = delete;
+    WW8_WrPlcSepx& operator=( const WW8_WrPlcSepx& ) = delete;
 
 public:
     explicit WW8_WrPlcSepx( MSWordExportBase& rExport );
@@ -376,8 +376,8 @@ public:
     DrawObjVector &GetObjArr() { return maDrawObjs; }
     virtual ~PlcDrawObj();
 private:
-    PlcDrawObj(const PlcDrawObj&) SAL_DELETED_FUNCTION;
-    PlcDrawObj& operator=(const PlcDrawObj&) SAL_DELETED_FUNCTION;
+    PlcDrawObj(const PlcDrawObj&) = delete;
+    PlcDrawObj& operator=(const PlcDrawObj&) = delete;
 };
 
 class MainTextPlcDrawObj : public PlcDrawObj
@@ -389,8 +389,8 @@ private:
         sal_uInt32 nLen) const SAL_OVERRIDE;
     virtual WW8_CP GetCpOffset(const WW8Fib &) const SAL_OVERRIDE;
 private:
-    MainTextPlcDrawObj(const MainTextPlcDrawObj&) SAL_DELETED_FUNCTION;
-    MainTextPlcDrawObj& operator=(const MainTextPlcDrawObj&) SAL_DELETED_FUNCTION;
+    MainTextPlcDrawObj(const MainTextPlcDrawObj&) = delete;
+    MainTextPlcDrawObj& operator=(const MainTextPlcDrawObj&) = delete;
 };
 
 class HdFtPlcDrawObj : public PlcDrawObj
@@ -402,8 +402,8 @@ private:
         sal_uInt32 nLen) const SAL_OVERRIDE;
     virtual WW8_CP GetCpOffset(const WW8Fib &rFib) const SAL_OVERRIDE;
 private:
-    HdFtPlcDrawObj(const HdFtPlcDrawObj&) SAL_DELETED_FUNCTION;
-    HdFtPlcDrawObj& operator=(const HdFtPlcDrawObj&) SAL_DELETED_FUNCTION;
+    HdFtPlcDrawObj(const HdFtPlcDrawObj&) = delete;
+    HdFtPlcDrawObj& operator=(const HdFtPlcDrawObj&) = delete;
 };
 
 typedef ::std::pair<OUString, sal_uLong> aBookmarkPair;
@@ -878,8 +878,8 @@ public:
     static void CorrectTabStopInSet( SfxItemSet& rSet, sal_uInt16 nAbsLeft );
 
 private:
-    MSWordExportBase( const MSWordExportBase& ) SAL_DELETED_FUNCTION;
-    MSWordExportBase& operator=( const MSWordExportBase& ) SAL_DELETED_FUNCTION;
+    MSWordExportBase( const MSWordExportBase& ) = delete;
+    MSWordExportBase& operator=( const MSWordExportBase& ) = delete;
 };
 
 /// The writer class that gets called for the WW8 filter.
@@ -935,8 +935,8 @@ public:
     SfxMedium* GetMedia() { return mpMedium; }
 
 private:
-    SwWW8Writer(const SwWW8Writer&) SAL_DELETED_FUNCTION;
-    SwWW8Writer& operator=(const SwWW8Writer&) SAL_DELETED_FUNCTION;
+    SwWW8Writer(const SwWW8Writer&) = delete;
+    SwWW8Writer& operator=(const SwWW8Writer&) = delete;
 };
 
 /// Exporter of the binary Word file formats.
@@ -1153,15 +1153,15 @@ protected:
     virtual void AppendSection( const SwPageDesc *pPageDesc, const SwSectionFormat* pFormat, sal_uLong nLnNum ) SAL_OVERRIDE;
 
 private:
-    WW8Export(const WW8Export&) SAL_DELETED_FUNCTION;
-    WW8Export& operator=(const WW8Export&) SAL_DELETED_FUNCTION;
+    WW8Export(const WW8Export&) = delete;
+    WW8Export& operator=(const WW8Export&) = delete;
 };
 
 class WW8_WrPlcSubDoc   // double Plc for Footnotes/Endnotes and Postits
 {
 private:
-    WW8_WrPlcSubDoc(const WW8_WrPlcSubDoc&) SAL_DELETED_FUNCTION;
-    WW8_WrPlcSubDoc& operator=(const WW8_WrPlcSubDoc&) SAL_DELETED_FUNCTION;
+    WW8_WrPlcSubDoc(const WW8_WrPlcSubDoc&) = delete;
+    WW8_WrPlcSubDoc& operator=(const WW8_WrPlcSubDoc&) = delete;
 protected:
     std::vector<WW8_CP> aCps;
     std::vector<const void*> aContent;                // PTRARR of SwFormatFootnote/PostIts/..
@@ -1184,8 +1184,8 @@ class WW8_WrPlcFootnoteEdn : public WW8_WrPlcSubDoc
 private:
     sal_uInt8 nTyp;
 
-    WW8_WrPlcFootnoteEdn(const WW8_WrPlcFootnoteEdn&) SAL_DELETED_FUNCTION;
-    WW8_WrPlcFootnoteEdn& operator=(WW8_WrPlcFootnoteEdn &) SAL_DELETED_FUNCTION;
+    WW8_WrPlcFootnoteEdn(const WW8_WrPlcFootnoteEdn&) = delete;
+    WW8_WrPlcFootnoteEdn& operator=(WW8_WrPlcFootnoteEdn &) = delete;
 public:
     explicit WW8_WrPlcFootnoteEdn( sal_uInt8 nTTyp ) : nTyp( nTTyp ) {}
 
@@ -1210,8 +1210,8 @@ struct WW8_Annotation
 class WW8_WrPlcAnnotations : public WW8_WrPlcSubDoc  // double Plc for Postits
 {
 private:
-    WW8_WrPlcAnnotations(const WW8_WrPlcAnnotations&) SAL_DELETED_FUNCTION;
-    WW8_WrPlcAnnotations& operator=(WW8_WrPlcAnnotations&) SAL_DELETED_FUNCTION;
+    WW8_WrPlcAnnotations(const WW8_WrPlcAnnotations&) = delete;
+    WW8_WrPlcAnnotations& operator=(WW8_WrPlcAnnotations&) = delete;
     std::set<const SwRedlineData*> maProcessedRedlines;
 
     std::map<const OUString, WW8_CP> m_aRangeStartPositions;
@@ -1234,8 +1234,8 @@ private:
     std::vector<sal_uInt32> aShapeIds;        // VARARR of ShapeIds for the SwFrameFormats
     virtual const std::vector<sal_uInt32>* GetShapeIdArr() const SAL_OVERRIDE;
 
-    WW8_WrPlcTextBoxes(const WW8_WrPlcTextBoxes&) SAL_DELETED_FUNCTION;
-    WW8_WrPlcTextBoxes& operator=(WW8_WrPlcTextBoxes&) SAL_DELETED_FUNCTION;
+    WW8_WrPlcTextBoxes(const WW8_WrPlcTextBoxes&) = delete;
+    WW8_WrPlcTextBoxes& operator=(WW8_WrPlcTextBoxes&) = delete;
 public:
     explicit WW8_WrPlcTextBoxes( sal_uInt8 nTTyp ) : nTyp( nTTyp ) {}
 
@@ -1263,8 +1263,8 @@ private:
     sal_uInt16 nFkpStartPage;
     ePLCFT ePlc;
 
-    WW8_WrPlcPn(const WW8_WrPlcPn&) SAL_DELETED_FUNCTION;
-    WW8_WrPlcPn& operator=(const WW8_WrPlcPn&) SAL_DELETED_FUNCTION;
+    WW8_WrPlcPn(const WW8_WrPlcPn&) = delete;
+    WW8_WrPlcPn& operator=(const WW8_WrPlcPn&) = delete;
 public:
     WW8_WrPlcPn( WW8Export& rWrt, ePLCFT ePl, WW8_FC nStartFc );
     ~WW8_WrPlcPn();
@@ -1283,8 +1283,8 @@ private:
     sal_uLong nDataLen;
     sal_uInt16 nStructSiz;
 
-    WW8_WrPlc1(const WW8_WrPlc1&) SAL_DELETED_FUNCTION;
-    WW8_WrPlc1& operator=(const WW8_WrPlc1&) SAL_DELETED_FUNCTION;
+    WW8_WrPlc1(const WW8_WrPlc1&) = delete;
+    WW8_WrPlc1& operator=(const WW8_WrPlc1&) = delete;
 protected:
     sal_uInt16 Count() const { return aPos.size(); }
     void Write( SvStream& rStrm );
@@ -1303,8 +1303,8 @@ private:
     sal_uInt8 nTextTyp;
     sal_uInt16 nResults;
 
-    WW8_WrPlcField(const WW8_WrPlcField&) SAL_DELETED_FUNCTION;
-    WW8_WrPlcField& operator=(const WW8_WrPlcField&) SAL_DELETED_FUNCTION;
+    WW8_WrPlcField(const WW8_WrPlcField&) = delete;
+    WW8_WrPlcField& operator=(const WW8_WrPlcField&) = delete;
 public:
     WW8_WrPlcField( sal_uInt16 nStructSz, sal_uInt8 nTTyp )
         : WW8_WrPlc1( nStructSz ), nTextTyp( nTTyp ), nResults(0)
@@ -1317,8 +1317,8 @@ public:
 class WW8_WrMagicTable : public WW8_WrPlc1
 {
 private:
-    WW8_WrMagicTable(const WW8_WrMagicTable&) SAL_DELETED_FUNCTION;
-    WW8_WrMagicTable& operator=(const WW8_WrMagicTable&) SAL_DELETED_FUNCTION;
+    WW8_WrMagicTable(const WW8_WrMagicTable&) = delete;
+    WW8_WrMagicTable& operator=(const WW8_WrMagicTable&) = delete;
 public:
     WW8_WrMagicTable() : WW8_WrPlc1( 4 ) {Append(0,0);}
     void Append( WW8_CP nCp, sal_uLong nData );
@@ -1368,8 +1368,8 @@ private:
     static 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);
 
-    SwWW8WrGrf(const SwWW8WrGrf&) SAL_DELETED_FUNCTION;
-    SwWW8WrGrf& operator=(const SwWW8WrGrf&) SAL_DELETED_FUNCTION;
+    SwWW8WrGrf(const SwWW8WrGrf&) = delete;
+    SwWW8WrGrf& operator=(const SwWW8WrGrf&) = delete;
 public:
     explicit SwWW8WrGrf( WW8Export& rW ) : rWrt( rW ), mnIdx( 0 ) {}
     void Insert(const sw::Frame &rFly);
@@ -1385,8 +1385,8 @@ class MSWordAttrIter
 {
 private:
     MSWordAttrIter* pOld;
-    MSWordAttrIter(const MSWordAttrIter&) SAL_DELETED_FUNCTION;
-    MSWordAttrIter& operator=(const MSWordAttrIter&) SAL_DELETED_FUNCTION;
+    MSWordAttrIter(const MSWordAttrIter&) = delete;
+    MSWordAttrIter& operator=(const MSWordAttrIter&) = delete;
 protected:
     MSWordExportBase& m_rExport;
 public:
@@ -1418,8 +1418,8 @@ private:
 
     void SetItemsThatDifferFromStandard(bool bCharAttr, SfxItemSet& rSet);
 
-    MSWord_SdrAttrIter(const MSWord_SdrAttrIter&) SAL_DELETED_FUNCTION;
-    MSWord_SdrAttrIter& operator=(const MSWord_SdrAttrIter&) SAL_DELETED_FUNCTION;
+    MSWord_SdrAttrIter(const MSWord_SdrAttrIter&) = delete;
+    MSWord_SdrAttrIter& operator=(const MSWord_SdrAttrIter&) = delete;
 public:
     MSWord_SdrAttrIter( MSWordExportBase& rWr, const EditTextObject& rEditObj,
         sal_uInt8 nType );
@@ -1475,8 +1475,8 @@ private:
 
     void IterToCurrent();
 
-    SwWW8AttrIter(const SwWW8AttrIter&) SAL_DELETED_FUNCTION;
-    SwWW8AttrIter& operator=(const SwWW8AttrIter&) SAL_DELETED_FUNCTION;
+    SwWW8AttrIter(const SwWW8AttrIter&) = delete;
+    SwWW8AttrIter& operator=(const SwWW8AttrIter&) = delete;
 public:
     SwWW8AttrIter( MSWordExportBase& rWr, const SwTextNode& rNd );
 
@@ -1544,8 +1544,8 @@ class MSWordStyles
     void OutputStyle( SwFormat* pFormat, sal_uInt16 nPos );
     void OutputStyle( const SwNumRule* pNumRule, sal_uInt16 nPos );
 
-    MSWordStyles( const MSWordStyles& ) SAL_DELETED_FUNCTION;
-    MSWordStyles& operator=( const MSWordStyles& ) SAL_DELETED_FUNCTION;
+    MSWordStyles( const MSWordStyles& ) = delete;
+    MSWordStyles& operator=( const MSWordStyles& ) = delete;
 
 public:
     MSWordStyles( MSWordExportBase& rExport, bool bListStyles = false );
diff --git a/sw/source/filter/ww8/ww8glsy.hxx b/sw/source/filter/ww8/ww8glsy.hxx
index b14f1268afd8..a375f1dd06c0 100644
--- a/sw/source/filter/ww8/ww8glsy.hxx
+++ b/sw/source/filter/ww8/ww8glsy.hxx
@@ -75,8 +75,8 @@ private:
         const ::std::vector<ww::bytes>& rExtra);
     static bool HasBareGraphicEnd(SwDoc *pD,SwNodeIndex &rIdx);
 
-    WW8Glossary(const WW8Glossary&) SAL_DELETED_FUNCTION;
-    WW8Glossary& operator=(const WW8Glossary&) SAL_DELETED_FUNCTION;
+    WW8Glossary(const WW8Glossary&) = delete;
+    WW8Glossary& operator=(const WW8Glossary&) = delete;
 };
 #endif
 
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 197d161af9c5..d520c1204eab 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -182,8 +182,8 @@ private:
         WW8aCFormat& aCharFormat, bool& bNewCharFormatCreated,
         const OUString& aPrefix = OUString());
 
-    WW8ListManager(const WW8ListManager&) SAL_DELETED_FUNCTION;
-    WW8ListManager& operator=(const WW8ListManager&) SAL_DELETED_FUNCTION;
+    WW8ListManager(const WW8ListManager&) = delete;
+    WW8ListManager& operator=(const WW8ListManager&) = delete;
     sal_uInt16 nLastLFOPosition;
 };
 
@@ -365,8 +365,8 @@ private:
     SwWW8ImplReader& rReader;
     sal_uInt16 nToggleAttrFlags;
     sal_uInt16 nToggleBiDiAttrFlags;
-    SwWW8FltControlStack(const SwWW8FltControlStack&) SAL_DELETED_FUNCTION;
-    SwWW8FltControlStack& operator=(const SwWW8FltControlStack&) SAL_DELETED_FUNCTION;
+    SwWW8FltControlStack(const SwWW8FltControlStack&) = delete;
+    SwWW8FltControlStack& operator=(const SwWW8FltControlStack&) = delete;
     const SwNumFormat* GetNumFormatFromStack(const SwPosition &rPos,
         const SwTextNode &rTextNode);
 protected:
@@ -426,8 +426,8 @@ public:
     void AddAnchor(const SwPosition& rPos,SwFrameFormat *pFormat);
     void Flush();
 private:
-    SwWW8FltAnchorStack(const SwWW8FltAnchorStack&) SAL_DELETED_FUNCTION;
-    SwWW8FltAnchorStack& operator=(const SwWW8FltAnchorStack&) SAL_DELETED_FUNCTION;
+    SwWW8FltAnchorStack(const SwWW8FltAnchorStack&) = delete;
+    SwWW8FltAnchorStack& operator=(const SwWW8FltAnchorStack&) = delete;
 };
 
 //For fields whose handling cannot be fully resolved until we hit the end of
@@ -442,7 +442,7 @@ public:
     explicit Position(const SwPaM &rPaM);
     Position(const Position &rEntry);
 private:
-    Position& operator=(const Position&) SAL_DELETED_FUNCTION;
+    Position& operator=(const Position&) = delete;
 };
 
 namespace SwWW8
@@ -498,8 +498,8 @@ protected:
     virtual void SetAttrInDoc(const SwPosition& rTmpPos,
         SwFltStackEntry& rEntry) SAL_OVERRIDE;
 private:
-    SwWW8FltRefStack(const SwWW8FltRefStack&) SAL_DELETED_FUNCTION;
-    SwWW8FltRefStack& operator=(const SwWW8FltRefStack&) SAL_DELETED_FUNCTION;
+    SwWW8FltRefStack(const SwWW8FltRefStack&) = delete;
+    SwWW8FltRefStack& operator=(const SwWW8FltRefStack&) = delete;
 };
 
 template< typename Type >
@@ -697,8 +697,8 @@ public:
 class WW8FormulaCheckBox : public WW8FormulaControl
 {
 private:
-    WW8FormulaCheckBox(const WW8FormulaCheckBox&) SAL_DELETED_FUNCTION;
-    WW8FormulaCheckBox& operator=(const WW8FormulaCheckBox&) SAL_DELETED_FUNCTION;
+    WW8FormulaCheckBox(const WW8FormulaCheckBox&) = delete;
+    WW8FormulaCheckBox& operator=(const WW8FormulaCheckBox&) = delete;
 
 public:
     explicit WW8FormulaCheckBox(SwWW8ImplReader &rR);
@@ -713,8 +713,8 @@ public:
 class WW8FormulaListBox : public WW8FormulaControl
 {
 private:
-    WW8FormulaListBox(const WW8FormulaListBox&) SAL_DELETED_FUNCTION;
-    WW8FormulaListBox& operator=(const WW8FormulaListBox&) SAL_DELETED_FUNCTION;
+    WW8FormulaListBox(const WW8FormulaListBox&) = delete;
+    WW8FormulaListBox& operator=(const WW8FormulaListBox&) = delete;
 
 public:
     explicit WW8FormulaListBox(SwWW8ImplReader &rR);
@@ -729,8 +729,8 @@ public:
 class WW8FormulaEditBox : public WW8FormulaControl
 {
 private:
-    WW8FormulaEditBox(const WW8FormulaEditBox&) SAL_DELETED_FUNCTION;
-    WW8FormulaEditBox& operator=(const WW8FormulaEditBox&) SAL_DELETED_FUNCTION;
+    WW8FormulaEditBox(const WW8FormulaEditBox&) = delete;
+    WW8FormulaEditBox& operator=(const WW8FormulaEditBox&) = delete;
 public:
     explicit WW8FormulaEditBox(SwWW8ImplReader &rR);
     //no real implementation, return false
@@ -781,8 +781,8 @@ private:
                                   const int _nCalledByGroup,
                                   sal_Int64 nAspect ) const SAL_OVERRIDE;
 
-    SwMSDffManager(const SwMSDffManager&) SAL_DELETED_FUNCTION;
-    SwMSDffManager& operator=(const SwMSDffManager&) SAL_DELETED_FUNCTION;
+    SwMSDffManager(const SwMSDffManager&) = delete;
+    SwMSDffManager& operator=(const SwMSDffManager&) = delete;
 public:
     static sal_uInt32 GetFilterFlags();
     static sal_Int32 GetEscherLineMatch(MSO_LineStyle eStyle, MSO_SPT eShapeType,
@@ -890,8 +890,8 @@ private:
     SwFormatPageDesc SetSwFormatPageDesc(mySegIter &rIter, mySegIter &rStart,
         bool bIgnoreCols);
 
-    wwSectionManager(const wwSectionManager&) SAL_DELETED_FUNCTION;
-    wwSectionManager& operator=(const wwSectionManager&) SAL_DELETED_FUNCTION;
+    wwSectionManager(const wwSectionManager&) = delete;
+    wwSectionManager& operator=(const wwSectionManager&) = delete;
 public:
     explicit wwSectionManager(SwWW8ImplReader &rReader) : mrReader(rReader), mnDesc(0)
         {}
@@ -958,8 +958,8 @@ private:
     const SwDoc &mrDoc;
     OUString msFileLinkSeed;
     int mnFileSectionNo;
-    wwSectionNamer(const wwSectionNamer&) SAL_DELETED_FUNCTION;
-    wwSectionNamer& operator=(const wwSectionNamer&) SAL_DELETED_FUNCTION;
+    wwSectionNamer(const wwSectionNamer&) = delete;
+    wwSectionNamer& operator=(const wwSectionNamer&) = delete;
 public:
     OUString UniqueName();
     wwSectionNamer(const SwDoc &rDoc, const OUString &rSeed)
@@ -1690,8 +1690,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 );
-    SwWW8ImplReader(const SwWW8ImplReader &) SAL_DELETED_FUNCTION;
-    SwWW8ImplReader& operator=(const SwWW8ImplReader&) SAL_DELETED_FUNCTION;
+    SwWW8ImplReader(const SwWW8ImplReader &) = delete;
+    SwWW8ImplReader& operator=(const SwWW8ImplReader&) = delete;
 public:     // really private, but can only be done 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 c5c3c9050b43..4b508e5f995e 100644
--- a/sw/source/filter/ww8/ww8par2.hxx
+++ b/sw/source/filter/ww8/ww8par2.hxx
@@ -37,8 +37,8 @@ public:
     WW8DupProperties(SwDoc &rDoc, SwWW8FltControlStack *pStk);
     void Insert(const SwPosition &rPos);
 private:
-    WW8DupProperties(const WW8DupProperties&) SAL_DELETED_FUNCTION;
-    WW8DupProperties& operator=(const WW8DupProperties&) SAL_DELETED_FUNCTION;
+    WW8DupProperties(const WW8DupProperties&) = delete;
+    WW8DupProperties& operator=(const WW8DupProperties&) = delete;
     SwWW8FltControlStack* pCtrlStck;
     SfxItemSet aChrSet,aParSet;
 };
@@ -125,8 +125,8 @@ friend class SwWW8ImplReader;
     bool PrepareStyle(SwWW8StyInf &rSI, ww::sti eSti, sal_uInt16 nThisStyle, sal_uInt16 nNextStyle);
     void PostStyle(SwWW8StyInf &rSI, bool bOldNoImp);
 
-    WW8RStyle(const WW8RStyle&) SAL_DELETED_FUNCTION;
-    WW8RStyle& operator=(const WW8RStyle&) SAL_DELETED_FUNCTION;
+    WW8RStyle(const WW8RStyle&) = delete;
+    WW8RStyle& operator=(const WW8RStyle&) = delete;
 public:
     WW8RStyle( WW8Fib& rFib, SwWW8ImplReader* pI );
     void Import();
@@ -137,7 +137,7 @@ public:
 class WW8FlySet: public SfxItemSet
 {
 private:
-    const WW8FlySet& operator=(const WW8FlySet&) SAL_DELETED_FUNCTION;
+    const WW8FlySet& operator=(const WW8FlySet&) = delete;
     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 6426b0ba0797..4712bca7228e 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -267,8 +267,8 @@ public:
     sal_uInt16 GetAktId() const { return nAktId; }
 
 private:
-    WW8SprmIter(const WW8SprmIter&) SAL_DELETED_FUNCTION;
-    WW8SprmIter& operator=(const WW8SprmIter&) SAL_DELETED_FUNCTION;
+    WW8SprmIter(const WW8SprmIter&) = delete;
+    WW8SprmIter& operator=(const WW8SprmIter&) = delete;
 };
 
 /* among others for FKPs to normal attr., i.e. one less attr than positions */
@@ -341,8 +341,8 @@ private:
     WW8PLCFpcd& rPLCF;
     long nIdx;
 
-    WW8PLCFpcd_Iter(const WW8PLCFpcd_Iter&) SAL_DELETED_FUNCTION;
-    WW8PLCFpcd_Iter& operator=(const WW8PLCFpcd_Iter&) SAL_DELETED_FUNCTION;
+    WW8PLCFpcd_Iter(const WW8PLCFpcd_Iter&) = delete;
+    WW8PLCFpcd_Iter& operator=(const WW8PLCFpcd_Iter&) = delete;
 
 public:
     WW8PLCFpcd_Iter( WW8PLCFpcd& rPLCFpcd, long nStartPos = -1 );
@@ -376,8 +376,8 @@ private:
     WW8_FC nStartFc;
     bool bDirty;
 
-    WW8PLCFx(const WW8PLCFx&) SAL_DELETED_FUNCTION;
-    WW8PLCFx& operator=(const WW8PLCFx&) SAL_DELETED_FUNCTION;
+    WW8PLCFx(const WW8PLCFx&) = delete;
+    WW8PLCFx& operator=(const WW8PLCFx&) = delete;
 
 public:
     WW8PLCFx(ww::WordVersion eVersion, bool bSprm)
@@ -418,8 +418,8 @@ private:
                                 // 1 byte param
     sal_uInt16 nGrpprls;            // attribute count of this
 
-    WW8PLCFx_PCDAttrs(const WW8PLCFx_PCDAttrs&) SAL_DELETED_FUNCTION;
-    WW8PLCFx_PCDAttrs& operator=(const WW8PLCFx_PCDAttrs&) SAL_DELETED_FUNCTION;
+    WW8PLCFx_PCDAttrs(const WW8PLCFx_PCDAttrs&) = delete;
+    WW8PLCFx_PCDAttrs& operator=(const WW8PLCFx_PCDAttrs&) = delete;
 
 public:
     WW8PLCFx_PCDAttrs(ww::WordVersion eVersion, WW8PLCFx_PCD* pPLCFx_PCD,
@@ -441,8 +441,8 @@ private:
     bool bVer67;
     WW8_CP nClipStart;
 
-    WW8PLCFx_PCD(const WW8PLCFx_PCD&) SAL_DELETED_FUNCTION;
-    WW8PLCFx_PCD& operator=(const WW8PLCFx_PCD&) SAL_DELETED_FUNCTION;
+    WW8PLCFx_PCD(const WW8PLCFx_PCD&) = delete;
+    WW8PLCFx_PCD& operator=(const WW8PLCFx_PCD&) = delete;
 
 public:
     WW8PLCFx_PCD(ww::WordVersion eVersion, WW8PLCFpcd* pPLCFpcd,
@@ -574,8 +574,8 @@ private:
 
     bool NewFkp();
 
-    WW8PLCFx_Fc_FKP(const WW8PLCFx_Fc_FKP&) SAL_DELETED_FUNCTION;
-    WW8PLCFx_Fc_FKP& operator=(const WW8PLCFx_Fc_FKP&) SAL_DELETED_FUNCTION;
+    WW8PLCFx_Fc_FKP(const WW8PLCFx_Fc_FKP&) = delete;
+    WW8PLCFx_Fc_FKP& operator=(const WW8PLCFx_Fc_FKP&) = delete;
 
 protected:
     ePLCFT ePLCF;
@@ -609,8 +609,8 @@ private:
     bool bLineEnd : 1;
     bool bComplex : 1;
 
-    WW8PLCFx_Cp_FKP(const WW8PLCFx_Cp_FKP&) SAL_DELETED_FUNCTION;
-    WW8PLCFx_Cp_FKP& operator=(const WW8PLCFx_Cp_FKP&) SAL_DELETED_FUNCTION;
+    WW8PLCFx_Cp_FKP(const WW8PLCFx_Cp_FKP&) = delete;
+    WW8PLCFx_Cp_FKP& operator=(const WW8PLCFx_Cp_FKP&) = delete;
 
 public:
     WW8PLCFx_Cp_FKP( SvStream* pSt, SvStream* pTableSt, SvStream* pDataSt,
@@ -641,8 +641,8 @@ private:
     sal_uInt16 nArrMax;
     sal_uInt16 nSprmSiz;
 
-    WW8PLCFx_SEPX(const WW8PLCFx_SEPX&) SAL_DELETED_FUNCTION;
-    WW8PLCFx_SEPX& operator=(const WW8PLCFx_SEPX&) SAL_DELETED_FUNCTION;
+    WW8PLCFx_SEPX(const WW8PLCFx_SEPX&) = delete;
+    WW8PLCFx_SEPX& operator=(const WW8PLCFx_SEPX&) = delete;
 
 public:
     WW8PLCFx_SEPX( SvStream* pSt, SvStream* pTablexySt, const WW8Fib& rFib,
@@ -669,8 +669,8 @@ private:
     WW8PLCF* pRef;
     WW8PLCF* pText;
 
-    WW8PLCFx_SubDoc(const WW8PLCFx_SubDoc&) SAL_DELETED_FUNCTION;
-    WW8PLCFx_SubDoc& operator=(const WW8PLCFx_SubDoc&) SAL_DELETED_FUNCTION;
+    WW8PLCFx_SubDoc(const WW8PLCFx_SubDoc&) = delete;
+    WW8PLCFx_SubDoc& operator=(const WW8PLCFx_SubDoc&) = delete;
 
 public:
     WW8PLCFx_SubDoc(SvStream* pSt, ww::WordVersion eVersion, WW8_CP nStartCp,
@@ -698,8 +698,8 @@ class WW8PLCFx_FLD : public WW8PLCFx
 private:
     WW8PLCFspecial* pPLCF;
     const WW8Fib& rFib;
-    WW8PLCFx_FLD(const WW8PLCFx_FLD&) SAL_DELETED_FUNCTION;
-    WW8PLCFx_FLD& operator=(const WW8PLCFx_FLD &) SAL_DELETED_FUNCTION;
+    WW8PLCFx_FLD(const WW8PLCFx_FLD&) = delete;
+    WW8PLCFx_FLD& operator=(const WW8PLCFx_FLD &) = delete;
 
 public:
     WW8PLCFx_FLD(SvStream* pSt, const WW8Fib& rMyFib, short nType);
@@ -728,8 +728,8 @@ private:
     sal_uInt16 nIsEnd;
     sal_Int32 nBookmarkId; // counter incremented by GetUniqueBookmarkName.
 
-    WW8PLCFx_Book(const WW8PLCFx_Book&) SAL_DELETED_FUNCTION;
-    WW8PLCFx_Book& operator=(const WW8PLCFx_Book&) SAL_DELETED_FUNCTION;
+    WW8PLCFx_Book(const WW8PLCFx_Book&) = delete;
+    WW8PLCFx_Book& operator=(const WW8PLCFx_Book&) = delete;
 
 public:
     WW8PLCFx_Book(SvStream* pTableSt,const WW8Fib& rFib);
@@ -766,8 +766,8 @@ private:
     sal_Int32 nIMax;
     bool m_bIsEnd;
 
-    WW8PLCFx_AtnBook(const WW8PLCFx_AtnBook&) SAL_DELETED_FUNCTION;
-    WW8PLCFx_AtnBook& operator=(const WW8PLCFx_AtnBook&) SAL_DELETED_FUNCTION;
+    WW8PLCFx_AtnBook(const WW8PLCFx_AtnBook&) = delete;
+    WW8PLCFx_AtnBook& operator=(const WW8PLCFx_AtnBook&) = delete;
 
 public:
     WW8PLCFx_AtnBook(SvStream* pTableSt,const WW8Fib& rFib);
diff --git a/sw/source/filter/ww8/ww8toolbar.hxx b/sw/source/filter/ww8/ww8toolbar.hxx
index e52b92739ec1..7c4b7d7d96c0 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&) SAL_DELETED_FUNCTION;
-    SwCTB& operator = ( const SwCTB&) SAL_DELETED_FUNCTION;
+    SwCTB(const SwCTB&) = delete;
+    SwCTB& operator = ( const SwCTB&) = delete;
 
 public:
     SwCTB();
@@ -100,8 +100,8 @@ class Tcg255SubStruct : public TBBase
     friend class Tcg255;
 
     bool mbReadId;
-    Tcg255SubStruct(const Tcg255SubStruct&) SAL_DELETED_FUNCTION;
-    Tcg255SubStruct& operator = ( const Tcg255SubStruct&) SAL_DELETED_FUNCTION;
+    Tcg255SubStruct(const Tcg255SubStruct&) = delete;
+    Tcg255SubStruct& operator = ( const Tcg255SubStruct&) = delete;
 
 protected:
     sal_uInt8 ch;
@@ -158,8 +158,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&) SAL_DELETED_FUNCTION;
-    SwCTBWrapper& operator = ( const SwCTBWrapper&) SAL_DELETED_FUNCTION;
+    SwCTBWrapper(const SwCTBWrapper&) = delete;
+    SwCTBWrapper& operator = ( const SwCTBWrapper&) = delete;
 
 public:
     explicit SwCTBWrapper( bool bReadId = true );
@@ -202,8 +202,8 @@ class PlfMcd : public Tcg255SubStruct
 {
     sal_Int32 iMac;
     std::vector<MCD> rgmcd; // array of MCD's
-    PlfMcd(const PlfMcd&) SAL_DELETED_FUNCTION;
-    PlfMcd& operator = ( const PlfMcd&) SAL_DELETED_FUNCTION;
+    PlfMcd(const PlfMcd&) = delete;
+    PlfMcd& operator = ( const PlfMcd&) = delete;
 
 public:
     explicit PlfMcd( bool bReadId = true );
@@ -217,8 +217,8 @@ class Acd : public TBBase
 {
     sal_Int16 ibst;
     sal_uInt16 fciBasedOnABC; //  fciBasedOn(13 bits) A(1bit)B(1bit)C(1Bit)
-    Acd(const Acd&) SAL_DELETED_FUNCTION;
-    Acd& operator = ( const Acd&) SAL_DELETED_FUNCTION;
+    Acd(const Acd&) = delete;
+    Acd& operator = ( const Acd&) = delete;
 
 public:
     Acd();
@@ -233,8 +233,8 @@ class PlfAcd: public Tcg255SubStruct
 {
     sal_Int32 iMac;
     Acd* rgacd;
-    PlfAcd(const PlfAcd&) SAL_DELETED_FUNCTION;
-    PlfAcd& operator = ( const PlfAcd&) SAL_DELETED_FUNCTION;
+    PlfAcd(const PlfAcd&) = delete;
+    PlfAcd& operator = ( const PlfAcd&) = delete;
 
 public:
     explicit PlfAcd( bool bReadId = true );
@@ -254,8 +254,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&) SAL_DELETED_FUNCTION;
-    Kme& operator = ( const Kme&) SAL_DELETED_FUNCTION;
+    Kme(const Kme&) = delete;
+    Kme& operator = ( const Kme&) = delete;
 
 public:
     Kme();
@@ -270,8 +270,8 @@ class PlfKme : public Tcg255SubStruct
 {
     sal_Int32 iMac;
     Kme* rgkme;
-    PlfKme(const PlfKme&) SAL_DELETED_FUNCTION;
-    PlfKme& operator = ( const PlfKme&) SAL_DELETED_FUNCTION;
+    PlfKme(const PlfKme&) = delete;
+    PlfKme& operator = ( const PlfKme&) = delete;
 
 public:
     explicit PlfKme( bool bReadId = true );
@@ -296,8 +296,8 @@ class TcgSttbfCore : public TBBase
     sal_uInt16 cData;
     sal_uInt16 cbExtra;
     SBBItem* dataItems;
-    TcgSttbfCore(const TcgSttbfCore&) SAL_DELETED_FUNCTION;
-    TcgSttbfCore& operator = ( const TcgSttbfCore&) SAL_DELETED_FUNCTION;
+    TcgSttbfCore(const TcgSttbfCore&) = delete;
+    TcgSttbfCore& operator = ( const TcgSttbfCore&) = delete;
 
 public:
     TcgSttbfCore();
@@ -311,8 +311,8 @@ public:
 class TcgSttbf : public Tcg255SubStruct
 {
     TcgSttbfCore sttbf;
-    TcgSttbf(const TcgSttbf&) SAL_DELETED_FUNCTION;
-    TcgSttbf& operator = ( const TcgSttbf&) SAL_DELETED_FUNCTION;
+    TcgSttbf(const TcgSttbf&) = delete;
+    TcgSttbf& operator = ( const TcgSttbf&) = delete;
 
 public:
     explicit TcgSttbf( bool bReadId = true );
@@ -328,8 +328,8 @@ class Xstz : public TBBase
     Xst xst; //An Xst specifying the string with its pre-pended length.
     sal_uInt16 chTerm;
 
-    Xstz(const Xstz&) SAL_DELETED_FUNCTION;
-    Xstz& operator = ( const Xstz&) SAL_DELETED_FUNCTION;
+    Xstz(const Xstz&) = delete;
+    Xstz& operator = ( const Xstz&) = delete;
 
 public:
     Xstz();
@@ -344,8 +344,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&) SAL_DELETED_FUNCTION;
-    MacroName& operator = ( const MacroName&) SAL_DELETED_FUNCTION;
+    MacroName(const MacroName&) = delete;
+    MacroName& operator = ( const MacroName&) = delete;
 
 public:
     MacroName();
@@ -361,8 +361,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&) SAL_DELETED_FUNCTION;
-    MacroNames& operator = ( const MacroNames&) SAL_DELETED_FUNCTION;
+    MacroNames(const MacroNames&) = delete;
+    MacroNames& operator = ( const MacroNames&) = delete;
 
 public:
     explicit MacroNames( bool bReadId = true );
@@ -376,8 +376,8 @@ public:
 class Tcg255 : public TBBase
 {
     std::vector< Tcg255SubStruct* > rgtcgData; // array of sub structures
-    Tcg255(const Tcg255&) SAL_DELETED_FUNCTION;
-    Tcg255& operator = ( const Tcg255&) SAL_DELETED_FUNCTION;
+    Tcg255(const Tcg255&) = delete;
+    Tcg255& operator = ( const Tcg255&) = delete;
     bool processSubStruct( sal_uInt8 nId, SvStream& );
 
 public:
@@ -394,8 +394,8 @@ class Tcg: public TBBase
 {
     sal_Int8 nTcgVer;
     std::unique_ptr< Tcg255 > tcg;
-    Tcg(const Tcg&) SAL_DELETED_FUNCTION;
-    Tcg& operator = ( const Tcg&) SAL_DELETED_FUNCTION;
+    Tcg(const Tcg&) = delete;
+    Tcg& operator = ( const Tcg&) = delete;
 
 public:
     Tcg();
diff --git a/sw/source/uibase/inc/swdtflvr.hxx b/sw/source/uibase/inc/swdtflvr.hxx
index ffaa2a936ea8..a778987903b5 100644
--- a/sw/source/uibase/inc/swdtflvr.hxx
+++ b/sw/source/uibase/inc/swdtflvr.hxx
@@ -131,8 +131,8 @@ class SW_DLLPUBLIC SwTransferable : public TransferableHelper
 
     void SetDataForDragAndDrop( const Point& rSttPos );
 
-                                    SwTransferable( const SwTransferable& ) SAL_DELETED_FUNCTION;
-    SwTransferable&                 operator=( const SwTransferable& ) SAL_DELETED_FUNCTION;
+                                    SwTransferable( const SwTransferable& ) = delete;
+    SwTransferable&                 operator=( const SwTransferable& ) = delete;
 
 protected:
     virtual void        AddSupportedFormats() SAL_OVERRIDE;
diff --git a/sw/source/uibase/inc/toxmgr.hxx b/sw/source/uibase/inc/toxmgr.hxx
index f81b1a8f737e..48bb27406b88 100644
--- a/sw/source/uibase/inc/toxmgr.hxx
+++ b/sw/source/uibase/inc/toxmgr.hxx
@@ -61,8 +61,8 @@ class SW_DLLPUBLIC SwTOXDescription
     //TODO: TemplateNames
     //const String* pTemplateName = 0, ???
 
-    SwTOXDescription(SwTOXDescription&) SAL_DELETED_FUNCTION;
-    SwTOXDescription & operator= (SwTOXDescription&) SAL_DELETED_FUNCTION;
+    SwTOXDescription(SwTOXDescription&) = delete;
+    SwTOXDescription & operator= (SwTOXDescription&) = delete;
 
 public:
     // single argument ctors shall be explicit.
@@ -185,8 +185,8 @@ class SwTOXMarkDescription
     OUString*   pPhoneticReadingOfPrimKey;
     OUString*   pPhoneticReadingOfSecKey;
 
-    SwTOXMarkDescription(SwTOXMarkDescription&) SAL_DELETED_FUNCTION;
-    SwTOXMarkDescription & operator= (SwTOXMarkDescription&) SAL_DELETED_FUNCTION;
+    SwTOXMarkDescription(SwTOXMarkDescription&) = delete;
+    SwTOXMarkDescription & operator= (SwTOXMarkDescription&) = delete;
 
 public:
     // single argument ctors shall be explicit.
diff --git a/sw/source/uibase/inc/uinums.hxx b/sw/source/uibase/inc/uinums.hxx
index e03e03398257..6276d8094159 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;
         std::vector<std::unique_ptr<SfxPoolItem>> m_Items;
 
-        _SwNumFormatGlobal& operator=( const _SwNumFormatGlobal& ) SAL_DELETED_FUNCTION;
+        _SwNumFormatGlobal& operator=( const _SwNumFormatGlobal& ) = delete;
 
     public:
         _SwNumFormatGlobal( const SwNumFormat& rFormat );
diff --git a/sw/source/uibase/inc/unomailmerge.hxx b/sw/source/uibase/inc/unomailmerge.hxx
index 14c1ad5f2f79..99f21d17a7ef 100644
--- a/sw/source/uibase/inc/unomailmerge.hxx
+++ b/sw/source/uibase/inc/unomailmerge.hxx
@@ -126,8 +126,8 @@ class SwXMailMerge :
 
     void    launchEvent( const com::sun::star::beans::PropertyChangeEvent &rEvt ) const;
 
-    SwXMailMerge( const SwXMailMerge & ) SAL_DELETED_FUNCTION;
-    SwXMailMerge & operator = ( const SwXMailMerge & ) SAL_DELETED_FUNCTION;
+    SwXMailMerge( const SwXMailMerge & ) = delete;
+    SwXMailMerge & operator = ( const SwXMailMerge & ) = delete;
 protected:
     virtual ~SwXMailMerge();
 public:
diff --git a/testtools/source/bridgetest/currentcontextchecker.hxx b/testtools/source/bridgetest/currentcontextchecker.hxx
index f16cd5bea93b..6b5dd1116981 100644
--- a/testtools/source/bridgetest/currentcontextchecker.hxx
+++ b/testtools/source/bridgetest/currentcontextchecker.hxx
@@ -48,8 +48,8 @@ public:
         throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
 private:
-    CurrentContextChecker(CurrentContextChecker &) SAL_DELETED_FUNCTION;
-    void operator =(CurrentContextChecker &) SAL_DELETED_FUNCTION;
+    CurrentContextChecker(CurrentContextChecker &) = delete;
+    void operator =(CurrentContextChecker &) = delete;
 
     bool performCheck(
         ::com::sun::star::uno::Reference<
diff --git a/ucb/source/ucp/file/filrec.hxx b/ucb/source/ucp/file/filrec.hxx
index 9760c4a6c998..e3963d9e1807 100644
--- a/ucb/source/ucp/file/filrec.hxx
+++ b/ucb/source/ucp/file/filrec.hxx
@@ -33,9 +33,9 @@ class ReconnectingFile
 
     bool        m_bDisconnect;
 
-    ReconnectingFile( ReconnectingFile& ) SAL_DELETED_FUNCTION;
+    ReconnectingFile( ReconnectingFile& ) = delete;
 
-    ReconnectingFile& operator=( ReconnectingFile& ) SAL_DELETED_FUNCTION;
+    ReconnectingFile& operator=( ReconnectingFile& ) = delete;
 
 public:
 
diff --git a/ucb/source/ucp/ftp/ftploaderthread.hxx b/ucb/source/ucp/ftp/ftploaderthread.hxx
index f955ca9c866c..0919c9b23b06 100644
--- a/ucb/source/ucp/ftp/ftploaderthread.hxx
+++ b/ucb/source/ucp/ftp/ftploaderthread.hxx
@@ -47,8 +47,8 @@ namespace ftp {
 
 
     private:
-        FTPLoaderThread(const FTPLoaderThread&) SAL_DELETED_FUNCTION;
-        FTPLoaderThread& operator=(const FTPLoaderThread&) SAL_DELETED_FUNCTION;
+        FTPLoaderThread(const FTPLoaderThread&) = delete;
+        FTPLoaderThread& operator=(const FTPLoaderThread&) = delete;
 
         oslThreadKey m_threadKey;
 
diff --git a/ucb/source/ucp/webdav-neon/ContentProperties.hxx b/ucb/source/ucp/webdav-neon/ContentProperties.hxx
index 1e730c836a0d..3943f8dd620a 100644
--- a/ucb/source/ucp/webdav-neon/ContentProperties.hxx
+++ b/ucb/source/ucp/webdav-neon/ContentProperties.hxx
@@ -161,7 +161,7 @@ private:
 
     static com::sun::star::uno::Any m_aEmptyAny;
 
-    ContentProperties & operator=( const ContentProperties & ) SAL_DELETED_FUNCTION;
+    ContentProperties & operator=( const ContentProperties & ) = delete;
 
     const PropertyValue * get( const OUString & rName ) const;
 };
@@ -171,8 +171,8 @@ class CachableContentProperties
 private:
     ContentProperties m_aProps;
 
-    CachableContentProperties & operator=( const CachableContentProperties & ) SAL_DELETED_FUNCTION;
-    CachableContentProperties( const CachableContentProperties & ) SAL_DELETED_FUNCTION;
+    CachableContentProperties & operator=( const CachableContentProperties & ) = delete;
+    CachableContentProperties( const CachableContentProperties & ) = delete;
 
 public:
     explicit CachableContentProperties( const ContentProperties & rProps );
diff --git a/unotools/source/config/configmgr.cxx b/unotools/source/config/configmgr.cxx
index 91a77ef8e8a9..870cc8d31beb 100644
--- a/unotools/source/config/configmgr.cxx
+++ b/unotools/source/config/configmgr.cxx
@@ -59,8 +59,8 @@ private:
     utl::ConfigManager & manager_;
     utl::ConfigItem * item_;
 
-    RegisterConfigItemHelper(const RegisterConfigItemHelper&) SAL_DELETED_FUNCTION;
-    RegisterConfigItemHelper& operator=(const RegisterConfigItemHelper&) SAL_DELETED_FUNCTION;
+    RegisterConfigItemHelper(const RegisterConfigItemHelper&) = delete;
+    RegisterConfigItemHelper& operator=(const RegisterConfigItemHelper&) = delete;
 };
 
 css::uno::Reference< css::lang::XMultiServiceFactory >
diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx
index 5bda4e65b148..d2fceaed0a80 100644
--- a/unotools/source/config/lingucfg.cxx
+++ b/unotools/source/config/lingucfg.cxx
@@ -151,8 +151,8 @@ class SvtLinguConfigItem : public utl::ConfigItem
     bool                LoadOptions( const uno::Sequence< OUString > &rProperyNames );
     bool                SaveOptions( const uno::Sequence< OUString > &rProperyNames );
 
-    SvtLinguConfigItem(const SvtLinguConfigItem&) SAL_DELETED_FUNCTION;
-    SvtLinguConfigItem& operator=(const SvtLinguConfigItem&) SAL_DELETED_FUNCTION;
+    SvtLinguConfigItem(const SvtLinguConfigItem&) = delete;
+    SvtLinguConfigItem& operator=(const SvtLinguConfigItem&) = delete;
     virtual void    ImplCommit() SAL_OVERRIDE;
 
 public:
diff --git a/unotools/source/config/searchopt.cxx b/unotools/source/config/searchopt.cxx
index ed3b6e956ed5..8afa66b0bc5f 100644
--- a/unotools/source/config/searchopt.cxx
+++ b/unotools/source/config/searchopt.cxx
@@ -40,8 +40,8 @@ class SvtSearchOptions_Impl : public ConfigItem
     sal_Int32   nFlags;
     bool    bModified;
 
-    SvtSearchOptions_Impl(const SvtSearchOptions_Impl&) SAL_DELETED_FUNCTION;
-    SvtSearchOptions_Impl& operator=(const SvtSearchOptions_Impl&) SAL_DELETED_FUNCTION;
+    SvtSearchOptions_Impl(const SvtSearchOptions_Impl&) = delete;
+    SvtSearchOptions_Impl& operator=(const SvtSearchOptions_Impl&) = delete;
 
     // ConfigItem
     virtual void    ImplCommit() SAL_OVERRIDE;
diff --git a/unotools/source/misc/componentresmodule.cxx b/unotools/source/misc/componentresmodule.cxx
index 74af55a443e2..bf45f21ea40f 100644
--- a/unotools/source/misc/componentresmodule.cxx
+++ b/unotools/source/misc/componentresmodule.cxx
@@ -38,8 +38,8 @@ namespace utl
         bool            m_bInitialized;
         OString  m_sResFilePrefix;
 
-        OComponentResModuleImpl(const OComponentResModuleImpl&) SAL_DELETED_FUNCTION;
-        OComponentResModuleImpl& operator=(const OComponentResModuleImpl&) SAL_DELETED_FUNCTION;
+        OComponentResModuleImpl(const OComponentResModuleImpl&) = delete;
+        OComponentResModuleImpl& operator=(const OComponentResModuleImpl&) = delete;
 
     public:
         explicit OComponentResModuleImpl( const OString& _rResFilePrefix )
diff --git a/unotools/source/misc/sharedunocomponent.cxx b/unotools/source/misc/sharedunocomponent.cxx
index 9390df81362d..a2f29e328756 100644
--- a/unotools/source/misc/sharedunocomponent.cxx
+++ b/unotools/source/misc/sharedunocomponent.cxx
@@ -71,8 +71,8 @@ namespace utl
     private:
         Reference< XCloseable > m_xCloseable;
 
-        CloseableComponentImpl(const CloseableComponentImpl&) SAL_DELETED_FUNCTION;
-        CloseableComponentImpl& operator=(const CloseableComponentImpl&) SAL_DELETED_FUNCTION;
+        CloseableComponentImpl(const CloseableComponentImpl&) = delete;
+        CloseableComponentImpl& operator=(const CloseableComponentImpl&) = delete;
 
     public:
         explicit CloseableComponentImpl( const Reference< XInterface >& _rxComponent );
diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx
index d8782cf0eb9b..ffd4060d165e 100644
--- a/uui/source/iahndl.hxx
+++ b/uui/source/iahndl.hxx
@@ -85,8 +85,8 @@ private:
             ::com::sun::star::uno::Reference< com::sun::star::awt::XWindow >                m_xWindowParam;
             const OUString                                                                  m_aContextParam;
             StringHashMap                                                                   m_aTypedCustomHandlers;
-    UUIInteractionHelper(UUIInteractionHelper &) SAL_DELETED_FUNCTION;
-    void operator =(const UUIInteractionHelper&) SAL_DELETED_FUNCTION;
+    UUIInteractionHelper(UUIInteractionHelper &) = delete;
+    void operator =(const UUIInteractionHelper&) = delete;
 
 public:
     UUIInteractionHelper(
diff --git a/uui/source/requeststringresolver.hxx b/uui/source/requeststringresolver.hxx
index d355c4bbaee1..3d859091f509 100644
--- a/uui/source/requeststringresolver.hxx
+++ b/uui/source/requeststringresolver.hxx
@@ -49,8 +49,8 @@ public:
 private:
     UUIInteractionHelper * m_pImpl;
 
-    UUIInteractionRequestStringResolver(UUIInteractionRequestStringResolver &) SAL_DELETED_FUNCTION;
-    void operator =(UUIInteractionRequestStringResolver&) SAL_DELETED_FUNCTION;
+    UUIInteractionRequestStringResolver(UUIInteractionRequestStringResolver &) = delete;
+    void operator =(UUIInteractionRequestStringResolver&) = delete;
 
     explicit UUIInteractionRequestStringResolver(
         com::sun::star::uno::Reference<
diff --git a/vcl/inc/brdwin.hxx b/vcl/inc/brdwin.hxx
index 5811c052b419..7832b216167d 100644
--- a/vcl/inc/brdwin.hxx
+++ b/vcl/inc/brdwin.hxx
@@ -112,8 +112,8 @@ private:
                                       WinBits nStyle, sal_uInt16 nTypeStyle,
                                       const ::com::sun::star::uno::Any& );
 
-                            ImplBorderWindow (const ImplBorderWindow &) SAL_DELETED_FUNCTION;
-                            ImplBorderWindow& operator= (const ImplBorderWindow &) SAL_DELETED_FUNCTION;
+                            ImplBorderWindow (const ImplBorderWindow &) = delete;
+                            ImplBorderWindow& operator= (const ImplBorderWindow &) = delete;
 
 public:
                             ImplBorderWindow( vcl::Window* pParent,
diff --git a/vcl/inc/cvtsvm.hxx b/vcl/inc/cvtsvm.hxx
index 437839dcfb88..fdb83338fe3e 100644
--- a/vcl/inc/cvtsvm.hxx
+++ b/vcl/inc/cvtsvm.hxx
@@ -89,8 +89,8 @@ public:
                         ~SVMConverter() {}
 
 private:
-                        SVMConverter( const SVMConverter& ) SAL_DELETED_FUNCTION;
-    SVMConverter&       operator=( const SVMConverter& ) SAL_DELETED_FUNCTION;
+                        SVMConverter( const SVMConverter& ) = delete;
+    SVMConverter&       operator=( const SVMConverter& ) = delete;
 };
 
 #endif // INCLUDED_VCL_INC_CVTSVM_HXX
diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx
index 37568c735804..198da6ee76e0 100644
--- a/vcl/inc/generic/glyphcache.hxx
+++ b/vcl/inc/generic/glyphcache.hxx
@@ -306,8 +306,8 @@ private:
     ServerFont&             mrServerFont;
     com::sun::star::uno::Reference<com::sun::star::i18n::XBreakIterator> mxBreak;
 
-                            ServerFontLayout( const ServerFontLayout& ) SAL_DELETED_FUNCTION;
-                            ServerFontLayout& operator=( const ServerFontLayout& ) SAL_DELETED_FUNCTION;
+                            ServerFontLayout( const ServerFontLayout& ) = delete;
+                            ServerFontLayout& operator=( const ServerFontLayout& ) = delete;
 
 };
 
diff --git a/vcl/inc/graphite_features.hxx b/vcl/inc/graphite_features.hxx
index dc37dfc89d89..97bd1861eaef 100644
--- a/vcl/inc/graphite_features.hxx
+++ b/vcl/inc/graphite_features.hxx
@@ -50,7 +50,7 @@ namespace grutils
         ~GrFeatureParser();
         gr_feature_val * values() const { return mpSettings; };
     private:
-        GrFeatureParser(const GrFeatureParser & copy) SAL_DELETED_FUNCTION;
+        GrFeatureParser(const GrFeatureParser & copy) = delete;
         void setLang(const gr_face * face, const OString & lang);
         static bool isCharId(const OString & id, size_t offset, size_t length);
         static gr_uint32 getCharId(const OString & id, size_t offset, size_t length);
diff --git a/vcl/inc/image.h b/vcl/inc/image.h
index 00861670abba..1315db1ba9b7 100644
--- a/vcl/inc/image.h
+++ b/vcl/inc/image.h
@@ -51,8 +51,8 @@ private:
     void        ImplUpdateDisabledBmpEx();
 
 private:
-    ImplImageBmp( const ImplImageBmp& ) SAL_DELETED_FUNCTION;
-    void operator=( const ImplImageBmp& ) SAL_DELETED_FUNCTION;
+    ImplImageBmp( const ImplImageBmp& ) = delete;
+    void operator=( const ImplImageBmp& ) = delete;
 };
 
 // - ImageTypes -
@@ -137,8 +137,8 @@ struct ImplImage
                     ~ImplImage();
 
 private:
-            ImplImage( const ImplImage&) SAL_DELETED_FUNCTION;
-    void    operator=( const ImplImage&) SAL_DELETED_FUNCTION;
+            ImplImage( const ImplImage&) = delete;
+    void    operator=( const ImplImage&) = delete;
 };
 
 #endif // INCLUDED_VCL_INC_IMAGE_H
diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx
index 5ad974e56841..25aa15afb75e 100644
--- a/vcl/inc/impfont.hxx
+++ b/vcl/inc/impfont.hxx
@@ -173,8 +173,8 @@ private:
     friend void intrusive_ptr_add_ref(ImplFontCharMap* pImplFontCharMap);
     friend void intrusive_ptr_release(ImplFontCharMap* pImplFontCharMap);
 
-                        ImplFontCharMap( const ImplFontCharMap& ) SAL_DELETED_FUNCTION;
-    void                operator=( const ImplFontCharMap& ) SAL_DELETED_FUNCTION;
+                        ImplFontCharMap( const ImplFontCharMap& ) = delete;
+    void                operator=( const ImplFontCharMap& ) = delete;
 
     static ImplFontCharMapPtr getDefaultMap( bool bSymbols=false);
     bool                isDefaultMap() const;
diff --git a/vcl/inc/impimagetree.hxx b/vcl/inc/impimagetree.hxx
index 5323eadb44d0..2ee52c8dd917 100644
--- a/vcl/inc/impimagetree.hxx
+++ b/vcl/inc/impimagetree.hxx
@@ -57,8 +57,8 @@ public:
     css::uno::Reference< css::container::XNameAccess > getNameAccess();
 
 private:
-    ImplImageTree(const ImplImageTree&) SAL_DELETED_FUNCTION;
-    ImplImageTree& operator=(const ImplImageTree&) SAL_DELETED_FUNCTION;
+    ImplImageTree(const ImplImageTree&) = delete;
+    ImplImageTree& operator=(const ImplImageTree&) = delete;
 
     typedef std::unordered_map<OUString, std::pair<bool, BitmapEx>, OUStringHash> IconCache;
     typedef std::unordered_map<OUString, OUString, OUStringHash> IconLinkHash;
diff --git a/vcl/inc/opengl/program.hxx b/vcl/inc/opengl/program.hxx
index 3a4751286332..5de3c1bdbe5f 100644
--- a/vcl/inc/opengl/program.hxx
+++ b/vcl/inc/opengl/program.hxx
@@ -45,7 +45,7 @@ private:
     float mfLastPixelOffset;
 
 
-    OpenGLProgram(const OpenGLProgram &) SAL_DELETED_FUNCTION;
+    OpenGLProgram(const OpenGLProgram &) = delete;
 public:
     OpenGLProgram();
     ~OpenGLProgram();
diff --git a/vcl/inc/osx/salframe.h b/vcl/inc/osx/salframe.h
index 52a8ac378b0c..1e8a61eb3a57 100644
--- a/vcl/inc/osx/salframe.h
+++ b/vcl/inc/osx/salframe.h
@@ -202,8 +202,8 @@ public:
  private: // data
     static AquaSalFrame*                   s_pCaptureFrame;
 
-    AquaSalFrame( const AquaSalFrame& ) SAL_DELETED_FUNCTION;
-    AquaSalFrame& operator=(const AquaSalFrame&) SAL_DELETED_FUNCTION;
+    AquaSalFrame( const AquaSalFrame& ) = delete;
+    AquaSalFrame& operator=(const AquaSalFrame&) = delete;
 };
 
 #endif // INCLUDED_VCL_INC_OSX_SALFRAME_H
diff --git a/vcl/inc/osx/salprn.h b/vcl/inc/osx/salprn.h
index 51964643d37e..20ac58189fbb 100644
--- a/vcl/inc/osx/salprn.h
+++ b/vcl/inc/osx/salprn.h
@@ -109,8 +109,8 @@ class AquaSalInfoPrinter : public SalInfoPrinter
     void setPaperSize( long i_nWidth, long i_nHeight, Orientation i_eSetOrientation );
 
     private:
-    AquaSalInfoPrinter( const AquaSalInfoPrinter& ) SAL_DELETED_FUNCTION;
-    AquaSalInfoPrinter& operator=(const AquaSalInfoPrinter&) SAL_DELETED_FUNCTION;
+    AquaSalInfoPrinter( const AquaSalInfoPrinter& ) = delete;
+    AquaSalInfoPrinter& operator=(const AquaSalInfoPrinter&) = delete;
 };
 
 // - AquaSalPrinter -
@@ -142,8 +142,8 @@ class AquaSalPrinter : public SalPrinter
     virtual sal_uLong               GetErrorCode() SAL_OVERRIDE;
 
     private:
-    AquaSalPrinter( const AquaSalPrinter& ) SAL_DELETED_FUNCTION;
-    AquaSalPrinter& operator=(const AquaSalPrinter&) SAL_DELETED_FUNCTION;
+    AquaSalPrinter( const AquaSalPrinter& ) = delete;
+    AquaSalPrinter& operator=(const AquaSalPrinter&) = delete;
 };
 
 const double fPtTo100thMM = 35.27777778;
diff --git a/vcl/inc/outfont.hxx b/vcl/inc/outfont.hxx
index 2b56acd4fdea..c4c30fbc81bd 100644
--- a/vcl/inc/outfont.hxx
+++ b/vcl/inc/outfont.hxx
@@ -295,8 +295,8 @@ public:
     sal_Int32           Count() const { return mnLines; }
 
 private:
-                            ImplMultiTextLineInfo( const ImplMultiTextLineInfo& ) SAL_DELETED_FUNCTION;
-    ImplMultiTextLineInfo&  operator=( const ImplMultiTextLineInfo& ) SAL_DELETED_FUNCTION;
+                            ImplMultiTextLineInfo( const ImplMultiTextLineInfo& ) = delete;
+    ImplMultiTextLineInfo&  operator=( const ImplMultiTextLineInfo& ) = delete;
 };
 
 #endif // INCLUDED_VCL_INC_OUTFONT_HXX
diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx
index 46a3a9e521ad..775a34d8da2a 100644
--- a/vcl/inc/sallayout.hxx
+++ b/vcl/inc/sallayout.hxx
@@ -216,8 +216,8 @@ protected:
     static int      CalcAsianKerning( sal_UCS4, bool bLeft, bool bVertical );
 
 private:
-                    SalLayout( const SalLayout& ) SAL_DELETED_FUNCTION;
-                    SalLayout& operator=( const SalLayout& ) SAL_DELETED_FUNCTION;
+                    SalLayout( const SalLayout& ) = delete;
+                    SalLayout& operator=( const SalLayout& ) = delete;
 
 protected:
     int             mnMinCharPos;
@@ -264,8 +264,8 @@ private:
     virtual void    DropGlyph( int ) SAL_OVERRIDE {}
     virtual void    Simplify( bool ) SAL_OVERRIDE {}
 
-                    MultiSalLayout( const MultiSalLayout& ) SAL_DELETED_FUNCTION;
-                    MultiSalLayout& operator=( const MultiSalLayout& ) SAL_DELETED_FUNCTION;
+                    MultiSalLayout( const MultiSalLayout& ) = delete;
+                    MultiSalLayout& operator=( const MultiSalLayout& ) = delete;
 
 private:
     SalLayout*      mpLayouts[ MAX_FALLBACK ];
@@ -368,8 +368,8 @@ protected:
 private:
     mutable Point   maBasePoint;
 
-                    GenericSalLayout( const GenericSalLayout& ) SAL_DELETED_FUNCTION;
-                    GenericSalLayout& operator=( const GenericSalLayout& ) SAL_DELETED_FUNCTION;
+                    GenericSalLayout( const GenericSalLayout& ) = delete;
+                    GenericSalLayout& operator=( const GenericSalLayout& ) = delete;
 };
 
 #undef SalGraphics
diff --git a/vcl/inc/textlayout.hxx b/vcl/inc/textlayout.hxx
index 6b86aafc422a..f7fbeb91ff78 100644
--- a/vcl/inc/textlayout.hxx
+++ b/vcl/inc/textlayout.hxx
@@ -97,8 +97,8 @@ namespace vcl
                               MetricVector* _pVector = NULL, OUString* _pDisplayText = NULL );
 
     private:
-        ControlTextRenderer( const ControlTextRenderer& ) SAL_DELETED_FUNCTION;
-        ControlTextRenderer& operator=( const ControlTextRenderer& ) SAL_DELETED_FUNCTION;
+        ControlTextRenderer( const ControlTextRenderer& ) = delete;
+        ControlTextRenderer& operator=( const ControlTextRenderer& ) = delete;
 
     private:
         ::std::unique_ptr< ReferenceDeviceTextLayout >   m_pImpl;
diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index 4eebb7639cad..eb79d392edc8 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -203,8 +203,8 @@ enum AlwaysInputMode { AlwaysInputNone = 0, AlwaysInputEnabled = 1, AlwaysInputD
 class WindowImpl
 {
 private:
-    WindowImpl(const WindowImpl&) SAL_DELETED_FUNCTION;
-    WindowImpl& operator=(const WindowImpl&) SAL_DELETED_FUNCTION;
+    WindowImpl(const WindowImpl&) = delete;
+    WindowImpl& operator=(const WindowImpl&) = delete;
 public:
     WindowImpl( WindowType );
     ~WindowImpl();
diff --git a/vcl/source/edit/textdoc.hxx b/vcl/source/edit/textdoc.hxx
index 8f19ee5021f0..4a3e7c2f7a09 100644
--- a/vcl/source/edit/textdoc.hxx
+++ b/vcl/source/edit/textdoc.hxx
@@ -28,8 +28,8 @@
 class TextCharAttribList
 {
 private:
-    TextCharAttribList(const TextCharAttribList&) SAL_DELETED_FUNCTION;
-    TextCharAttribList& operator=(const TextCharAttribList&) SAL_DELETED_FUNCTION;
+    TextCharAttribList(const TextCharAttribList&) = delete;
+    TextCharAttribList& operator=(const TextCharAttribList&) = delete;
 
     typedef boost::ptr_vector<TextCharAttrib> TextCharAttribs;
     TextCharAttribs maAttribs;
diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index 5b8aec715c99..84e4057152f7 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -269,8 +269,8 @@ namespace
 class PPDDecompressStream
 {
 private:
-    PPDDecompressStream(const PPDDecompressStream&) SAL_DELETED_FUNCTION;
-    PPDDecompressStream& operator=(const PPDDecompressStream&) SAL_DELETED_FUNCTION;
+    PPDDecompressStream(const PPDDecompressStream&) = delete;
+    PPDDecompressStream& operator=(const PPDDecompressStream&) = delete;
 
     SvFileStream*       mpFileStream;
     SvMemoryStream*     mpMemStream;
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx
index e55d2d29dd1d..4ad96fd3c63f 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx
@@ -166,8 +166,8 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base
         // FilePicker Event functions
 
     private:
-        SalGtkFilePicker( const SalGtkFilePicker& ) SAL_DELETED_FUNCTION;
-        SalGtkFilePicker& operator=( const SalGtkFilePicker& ) SAL_DELETED_FUNCTION;
+        SalGtkFilePicker( const SalGtkFilePicker& ) = delete;
+        SalGtkFilePicker& operator=( const SalGtkFilePicker& ) = delete;
 
         bool FilterNameExists( const OUString& rTitle );
         bool FilterNameExists( const UnoFilterList& _rGroupedFilters );
diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx
index e438d331f728..b95ac72e60a7 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx
@@ -65,8 +65,8 @@ class SalGtkFolderPicker :
             throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     private:
-        SalGtkFolderPicker( const SalGtkFolderPicker& ) SAL_DELETED_FUNCTION;
-        SalGtkFolderPicker& operator=( const SalGtkFolderPicker& ) SAL_DELETED_FUNCTION;
+        SalGtkFolderPicker( const SalGtkFolderPicker& ) = delete;
+        SalGtkFolderPicker& operator=( const SalGtkFolderPicker& ) = delete;
 };
 
 #endif // INCLUDED_VCL_UNX_GTK_FPICKER_SALGTKFOLDERPICKER_HXX
diff --git a/vcl/unx/gtk/inc/gtkprintwrapper.hxx b/vcl/unx/gtk/inc/gtkprintwrapper.hxx
index 009903254606..955cd43e68c4 100644
--- a/vcl/unx/gtk/inc/gtkprintwrapper.hxx
+++ b/vcl/unx/gtk/inc/gtkprintwrapper.hxx
@@ -34,8 +34,8 @@ namespace unx
 class GtkPrintWrapper
 {
 private:
-    GtkPrintWrapper(const GtkPrintWrapper&) SAL_DELETED_FUNCTION;
-    GtkPrintWrapper& operator=(const GtkPrintWrapper&) SAL_DELETED_FUNCTION;
+    GtkPrintWrapper(const GtkPrintWrapper&) = delete;
+    GtkPrintWrapper& operator=(const GtkPrintWrapper&) = delete;
 #if defined ENABLE_GTK_PRINT || GTK_CHECK_VERSION(3,0,0)
 public:
     GtkPrintWrapper();
diff --git a/vcl/unx/kde/UnxFilePicker.hxx b/vcl/unx/kde/UnxFilePicker.hxx
index 7ec5b0db12b0..6f30577c360b 100644
--- a/vcl/unx/kde/UnxFilePicker.hxx
+++ b/vcl/unx/kde/UnxFilePicker.hxx
@@ -145,8 +145,8 @@ public:
     virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
 private:
-    UnxFilePicker( const UnxFilePicker& ) SAL_DELETED_FUNCTION;
-    UnxFilePicker& operator=( const UnxFilePicker& ) SAL_DELETED_FUNCTION;
+    UnxFilePicker( const UnxFilePicker& ) = delete;
+    UnxFilePicker& operator=( const UnxFilePicker& ) = delete;
 
 protected:
     void                        initFilePicker();
diff --git a/vcl/unx/kde4/KDE4FilePicker.hxx b/vcl/unx/kde4/KDE4FilePicker.hxx
index 186e57a29cbf..19a04b6c02ea 100644
--- a/vcl/unx/kde4/KDE4FilePicker.hxx
+++ b/vcl/unx/kde4/KDE4FilePicker.hxx
@@ -215,8 +215,8 @@ Q_SIGNALS:
     void checkProtocolSignal();
 
 private:
-    KDE4FilePicker( const KDE4FilePicker& ) SAL_DELETED_FUNCTION;
-    KDE4FilePicker& operator=( const KDE4FilePicker& ) SAL_DELETED_FUNCTION;
+    KDE4FilePicker( const KDE4FilePicker& ) = delete;
+    KDE4FilePicker& operator=( const KDE4FilePicker& ) = delete;
 
     //add a custom control widget to the file dialog
     void addCustomControl(sal_Int16 controlId);
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
index 6886e4a700b7..aaf5bf713f1a 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
@@ -232,7 +232,7 @@ protected:
     bool inPositionV;
 
 private:
-    void operator =(OOXMLFastContextHandler &) SAL_DELETED_FUNCTION;
+    void operator =(OOXMLFastContextHandler &) = delete;
     /// Handles AlternateContent. Returns true, if children of the current element should be ignored.
     bool prepareMceContext(Token_t nElement, const css::uno::Reference<css::xml::sax::XFastAttributeList>& Attribs);
 
diff --git a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
index 8a49e5d7fa93..6d7874c432f5 100644
--- a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
@@ -86,8 +86,8 @@ public:
     void setIsSubstream( bool bSubstream );
 
 private:
-    OOXMLFastDocumentHandler(OOXMLFastDocumentHandler &) SAL_DELETED_FUNCTION;
-    void operator =(OOXMLFastDocumentHandler &) SAL_DELETED_FUNCTION;
+    OOXMLFastDocumentHandler(OOXMLFastDocumentHandler &) = delete;
+    void operator =(OOXMLFastDocumentHandler &) = delete;
 
     css::uno::Reference< css::uno::XComponentContext > m_xContext;
 
diff --git a/writerfilter/source/rtftok/rtfvalue.hxx b/writerfilter/source/rtftok/rtfvalue.hxx
index 3a1c77749fa9..8012734471b6 100644
--- a/writerfilter/source/rtftok/rtfvalue.hxx
+++ b/writerfilter/source/rtftok/rtfvalue.hxx
@@ -57,7 +57,7 @@ public:
     RTFShape& getShape() const;
     bool equals(RTFValue& rOther);
 private:
-    RTFValue& operator=(RTFValue const& rOther) SAL_DELETED_FUNCTION;
+    RTFValue& operator=(RTFValue const& rOther) = delete;
     int m_nValue;
     OUString m_sValue;
     std::shared_ptr<RTFSprms> m_pAttributes;
diff --git a/writerperfect/inc/WPFTEncodingDialog.hxx b/writerperfect/inc/WPFTEncodingDialog.hxx
index 4820836c0513..bbc53ad093c8 100644
--- a/writerperfect/inc/WPFTEncodingDialog.hxx
+++ b/writerperfect/inc/WPFTEncodingDialog.hxx
@@ -47,8 +47,8 @@ private:
 
     void dispose() SAL_OVERRIDE;
 
-    WPFTEncodingDialog(WPFTEncodingDialog const &) SAL_DELETED_FUNCTION;
-    WPFTEncodingDialog &operator=(WPFTEncodingDialog const &) SAL_DELETED_FUNCTION;
+    WPFTEncodingDialog(WPFTEncodingDialog const &) = delete;
+    WPFTEncodingDialog &operator=(WPFTEncodingDialog const &) = delete;
 };
 
 }
diff --git a/xmlhelp/source/cxxhelp/provider/db.hxx b/xmlhelp/source/cxxhelp/provider/db.hxx
index 72eaf9456432..868f70ace854 100644
--- a/xmlhelp/source/cxxhelp/provider/db.hxx
+++ b/xmlhelp/source/cxxhelp/provider/db.hxx
@@ -96,8 +96,8 @@ namespace helpdatafileproxy {
         bool startIteration();
         bool getNextKeyAndValue( HDFData& rKey, HDFData& rValue );
         void stopIteration();
-        Hdf(const Hdf&) SAL_DELETED_FUNCTION;
-        void operator=(const Hdf&) SAL_DELETED_FUNCTION;
+        Hdf(const Hdf&) = delete;
+        void operator=(const Hdf&) = delete;
     };
 
 }
diff --git a/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx b/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx
index 150eaef4ddaa..74b6a2f50dee 100644
--- a/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx
+++ b/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx
@@ -112,7 +112,7 @@ private:
     DECL_LINK_TYPED( SignatureVerifyResultListener, XMLSignatureVerifyResult&, void );
     DECL_LINK_TYPED( StartVerifySignatureElement, LinkParamNone*, void );
 
-    XMLSignatureHelper(const XMLSignatureHelper&) SAL_DELETED_FUNCTION;
+    XMLSignatureHelper(const XMLSignatureHelper&) = delete;
 
 public:
     XMLSignatureHelper(const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& mrCtx );