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

Change-Id: I328ac7a95ccc87732efae48b567a0556865928f3

9 files changed, 19 insertions, 19 deletions

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