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

Change-Id: I328ac7a95ccc87732efae48b567a0556865928f3

5 files changed, 9 insertions, 9 deletions

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