loplugin:deletedspecial

Change-Id: I0faa47383f8952a74742a640ab2af602b4fcba8f

11 files changed, 23 insertions, 28 deletions

diff --git a/connectivity/source/cpool/ZPoolCollection.hxx b/connectivity/source/cpool/ZPoolCollection.hxx
index c4f222680cc8..a8c55c0b17d6 100644
--- a/connectivity/source/cpool/ZPoolCollection.hxx
+++ b/connectivity/source/cpool/ZPoolCollection.hxx
@@ -77,9 +77,8 @@ namespace connectivity
         ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDesktop2>               m_xDesktop;
 
     private:
-        OPoolCollection();                          // never implemented
-        OPoolCollection(const OPoolCollection&);    // never implemented
-        int operator= (const OPoolCollection&);         // never implemented
+        OPoolCollection(const OPoolCollection&) SAL_DELETED_FUNCTION;
+        int operator= (const OPoolCollection&) SAL_DELETED_FUNCTION;
 
         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 a6ffc852ae62..18c9887fb466 100644
--- a/connectivity/source/drivers/mork/MorkParser.hxx
+++ b/connectivity/source/drivers/mork/MorkParser.hxx
@@ -164,8 +164,8 @@ protected: // Data
     enum { NPColumns, NPValues, NPRows } nowParsing_;
 
 private:
-    MorkParser(const MorkParser &);
-    MorkParser &operator=(const MorkParser &);
+    MorkParser(const MorkParser &) SAL_DELETED_FUNCTION;
+    MorkParser &operator=(const MorkParser &) SAL_DELETED_FUNCTION;
 
 };
 
diff --git a/connectivity/source/drivers/postgresql/pq_statics.hxx b/connectivity/source/drivers/postgresql/pq_statics.hxx
index 537017c0fb63..ce70eb696d56 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 & );
-    Statics & operator = ( const Statics & );
+    Statics( const Statics & ) SAL_DELETED_FUNCTION;
+    Statics & operator = ( const Statics & ) SAL_DELETED_FUNCTION;
 };
 
 Statics & getStatics();
diff --git a/connectivity/source/inc/ParameterSubstitution.hxx b/connectivity/source/inc/ParameterSubstitution.hxx
index a84853c917b8..ab6214edd6be 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& );
-        ParameterSubstitution& operator=( const ParameterSubstitution& );
+        ParameterSubstitution( const ParameterSubstitution& ) SAL_DELETED_FUNCTION;
+        ParameterSubstitution& operator=( const ParameterSubstitution& ) SAL_DELETED_FUNCTION;
     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 bdc0cba15e03..64d07e516c89 100644
--- a/connectivity/source/inc/RowFunctionParser.hxx
+++ b/connectivity/source/inc/RowFunctionParser.hxx
@@ -131,9 +131,8 @@ private:
     // supposed to be a singleton
     FunctionParser();
 
-    // default: disabled copy/assignment
-    FunctionParser(const FunctionParser&);
-    FunctionParser& operator=( const FunctionParser& );
+    FunctionParser(const FunctionParser&) SAL_DELETED_FUNCTION;
+    FunctionParser& operator=( const FunctionParser& ) SAL_DELETED_FUNCTION;
 };
 
 
diff --git a/connectivity/source/inc/java/ContextClassLoader.hxx b/connectivity/source/inc/java/ContextClassLoader.hxx
index 6384507264bd..58e3789c9b60 100644
--- a/connectivity/source/inc/java/ContextClassLoader.hxx
+++ b/connectivity/source/inc/java/ContextClassLoader.hxx
@@ -73,8 +73,8 @@ namespace connectivity { namespace jdbc
         }
 
     private:
-        ContextClassLoaderScope(ContextClassLoaderScope &); // not defined
-        void operator =(ContextClassLoaderScope &); // not defined
+        ContextClassLoaderScope(ContextClassLoaderScope &) SAL_DELETED_FUNCTION;
+        void operator =(ContextClassLoaderScope &) SAL_DELETED_FUNCTION;
 
         void pop( bool clearExceptions );
 
diff --git a/connectivity/source/inc/java/LocalRef.hxx b/connectivity/source/inc/java/LocalRef.hxx
index 92a699bee24d..048f43afc8f6 100644
--- a/connectivity/source/inc/java/LocalRef.hxx
+++ b/connectivity/source/inc/java/LocalRef.hxx
@@ -80,8 +80,8 @@ namespace connectivity { namespace jdbc
         bool    is()  const { return m_object != NULL; }
 
     private:
-        LocalRef(LocalRef &); // not defined
-        void operator =(LocalRef &); // not defined
+        LocalRef(LocalRef &) SAL_DELETED_FUNCTION;
+        void operator =(LocalRef &) SAL_DELETED_FUNCTION;
 
     protected:
         JNIEnv& m_environment;
diff --git a/connectivity/source/inc/java/lang/Object.hxx b/connectivity/source/inc/java/lang/Object.hxx
index e1c136ae5348..adaa7a87a7ad 100644
--- a/connectivity/source/inc/java/lang/Object.hxx
+++ b/connectivity/source/inc/java/lang/Object.hxx
@@ -46,8 +46,8 @@ namespace connectivity
     class SDBThreadAttach
     {
         jvmaccess::VirtualMachine::AttachGuard m_aGuard;
-        SDBThreadAttach(SDBThreadAttach&);
-        SDBThreadAttach& operator= (SDBThreadAttach&);
+        SDBThreadAttach(SDBThreadAttach&) SAL_DELETED_FUNCTION;
+        SDBThreadAttach& operator= (SDBThreadAttach&) SAL_DELETED_FUNCTION;
     public:
         SDBThreadAttach();
         ~SDBThreadAttach();
@@ -68,9 +68,8 @@ namespace connectivity
 
     class  java_lang_Object
     {
-        // operator= and the copy ctor are forbidden
-        java_lang_Object& operator= (java_lang_Object&);
-        java_lang_Object(java_lang_Object&);
+        java_lang_Object& operator= (java_lang_Object&) SAL_DELETED_FUNCTION;
+        java_lang_Object(java_lang_Object&) SAL_DELETED_FUNCTION;
 
     protected:
         // The Java handle to this class
diff --git a/include/connectivity/ParameterCont.hxx b/include/connectivity/ParameterCont.hxx
index b87e1c36dfbb..931398c893e6 100644
--- a/include/connectivity/ParameterCont.hxx
+++ b/include/connectivity/ParameterCont.hxx
@@ -43,8 +43,8 @@ namespace dbtools
     protected:
         virtual ~OParameterContinuation() { }
     private:
-        OParameterContinuation(const OParameterContinuation&);
-        void operator =(const OParameterContinuation&);
+        OParameterContinuation(const OParameterContinuation&) SAL_DELETED_FUNCTION;
+        void operator =(const OParameterContinuation&) SAL_DELETED_FUNCTION;
     };
 } // dbtools
 #endif // INCLUDED_CONNECTIVITY_PARAMETERCONT_HXX
diff --git a/include/connectivity/parameters.hxx b/include/connectivity/parameters.hxx
index 1904fbf8e079..9af2b77b14bd 100644
--- a/include/connectivity/parameters.hxx
+++ b/include/connectivity/parameters.hxx
@@ -402,9 +402,8 @@ namespace dbtools
         void    cacheConnectionInfo();
 
     private:
-        ParameterManager();                                      // never implemented
-        ParameterManager( const ParameterManager& );              // never implemented
-        ParameterManager& operator=( const ParameterManager& );   // never implemented
+        ParameterManager( const ParameterManager& ) SAL_DELETED_FUNCTION;
+        ParameterManager& operator=( const ParameterManager& ) SAL_DELETED_FUNCTION;
     };
 
 
diff --git a/include/connectivity/sqliterator.hxx b/include/connectivity/sqliterator.hxx
index 785c821337fc..0ea58d989c20 100644
--- a/include/connectivity/sqliterator.hxx
+++ b/include/connectivity/sqliterator.hxx
@@ -129,8 +129,7 @@ namespace connectivity
 
 
       private:
-        OSQLParseTreeIterator();                                        // never implemented
-        OSQLParseTreeIterator(const OSQLParseTreeIterator & rIter);     // never implemented
+        OSQLParseTreeIterator(const OSQLParseTreeIterator & rIter) SAL_DELETED_FUNCTION;
 
       public:
         OSQLParseTreeIterator(