From bff4c13475957863bfa7da5bc3bcf82a64a7503a Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Mon, 12 Oct 2015 15:25:41 +0200
Subject: Replace "SAL_DELETED_FUNCTION" with "= delete" in LIBO_INTERNAL_ONLY
 code

Change-Id: I328ac7a95ccc87732efae48b567a0556865928f3
---
 include/connectivity/ParameterCont.hxx        | 4 ++--
 include/connectivity/formattedcolumnvalue.hxx | 4 ++--
 include/connectivity/parameters.hxx           | 4 ++--
 include/connectivity/sqliterator.hxx          | 2 +-
 include/connectivity/statementcomposer.hxx    | 6 +++---
 5 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'include/connectivity')

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;
     };
 
 
-- 
cgit