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

Change-Id: I328ac7a95ccc87732efae48b567a0556865928f3

8 files changed, 21 insertions, 21 deletions

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 );