loplugin:deletedspecial

Change-Id: I2f0cbeebce5d3bb087128bae32816a89f1f1d222

4 files changed, 11 insertions, 20 deletions

diff --git a/ucb/source/ucp/file/filrec.hxx b/ucb/source/ucp/file/filrec.hxx
index 6591ca9351a0..6d7b8cc9c399 100644
--- a/ucb/source/ucp/file/filrec.hxx
+++ b/ucb/source/ucp/file/filrec.hxx
@@ -33,9 +33,9 @@ class ReconnectingFile
 
     bool        m_bDisconnect;
 
-    ReconnectingFile( ReconnectingFile& );
+    ReconnectingFile( ReconnectingFile& ) SAL_DELETED_FUNCTION;
 
-    ReconnectingFile& operator=( ReconnectingFile& );
+    ReconnectingFile& operator=( ReconnectingFile& ) SAL_DELETED_FUNCTION;
 
 public:
 
diff --git a/ucb/source/ucp/ftp/ftploaderthread.hxx b/ucb/source/ucp/ftp/ftploaderthread.hxx
index 701c973baa00..f955ca9c866c 100644
--- a/ucb/source/ucp/ftp/ftploaderthread.hxx
+++ b/ucb/source/ucp/ftp/ftploaderthread.hxx
@@ -47,13 +47,8 @@ namespace ftp {
 
 
     private:
-
-        /** Don't enable assignment and copy construction.
-         *  Not defined:
-         */
-
-        FTPLoaderThread(const FTPLoaderThread&);
-        FTPLoaderThread& operator=(const FTPLoaderThread&);
+        FTPLoaderThread(const FTPLoaderThread&) SAL_DELETED_FUNCTION;
+        FTPLoaderThread& operator=(const FTPLoaderThread&) SAL_DELETED_FUNCTION;
 
         oslThreadKey m_threadKey;
 
diff --git a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx
index 79e4e2b015b4..18084a7d8108 100644
--- a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx
@@ -45,10 +45,6 @@
 
 using namespace com::sun::star;
 using namespace tdoc_ucp;
-using ::comphelper::DocumentInfo;
-
-
-
 
 // OfficeDocumentsCloseListener Implementation.
 
@@ -227,7 +223,7 @@ void SAL_CALL OfficeDocumentsManager::documentEventOccured(
                 OSL_ENSURE( xStorage.is(), "Got no document storage!" );
 
                 rtl:: OUString aDocId = getDocumentId( Event.Source );
-                rtl:: OUString aTitle = DocumentInfo::getDocumentTitle(
+                rtl:: OUString aTitle = comphelper::DocumentInfo::getDocumentTitle(
                     uno::Reference< frame::XModel >( Event.Source, uno::UNO_QUERY ) );
 
                 m_aDocs[ aDocId ] = StorageInfo( aTitle, xStorage, xModel );
@@ -366,7 +362,7 @@ void SAL_CALL OfficeDocumentsManager::documentEventOccured(
                     (*it).second.xStorage = xStorage;
 
                     // Adjust title.
-                    (*it).second.aTitle = DocumentInfo::getDocumentTitle( xModel );
+                    (*it).second.aTitle = comphelper::DocumentInfo::getDocumentTitle( xModel );
                     break;
                 }
                 ++it;
@@ -392,7 +388,7 @@ void SAL_CALL OfficeDocumentsManager::documentEventOccured(
                 if ( (*it).second.xModel == xModel )
                 {
                     // Adjust title.
-                    rtl:: OUString aTitle = DocumentInfo::getDocumentTitle( xModel );
+                    rtl:: OUString aTitle = comphelper::DocumentInfo::getDocumentTitle( xModel );
                     (*it).second.aTitle = aTitle;
 
                     // Adjust storage.
@@ -484,7 +480,7 @@ void OfficeDocumentsManager::buildDocumentsList()
                     {
                         // new document
                         OUString aDocId = getDocumentId( xModel );
-                        OUString aTitle = DocumentInfo::getDocumentTitle( xModel );
+                        OUString aTitle = comphelper::DocumentInfo::getDocumentTitle( xModel );
 
                         uno::Reference< document::XStorageBasedDocument >
                                 xDoc( xModel, uno::UNO_QUERY );
diff --git a/ucb/source/ucp/webdav-neon/ContentProperties.hxx b/ucb/source/ucp/webdav-neon/ContentProperties.hxx
index a805c611ce5d..3f844b610869 100644
--- a/ucb/source/ucp/webdav-neon/ContentProperties.hxx
+++ b/ucb/source/ucp/webdav-neon/ContentProperties.hxx
@@ -161,7 +161,7 @@ private:
 
     static com::sun::star::uno::Any m_aEmptyAny;
 
-    ContentProperties & operator=( const ContentProperties & ); // n.i.
+    ContentProperties & operator=( const ContentProperties & ) SAL_DELETED_FUNCTION;
 
     const PropertyValue * get( const OUString & rName ) const;
 };
@@ -171,8 +171,8 @@ class CachableContentProperties
 private:
     ContentProperties m_aProps;
 
-    CachableContentProperties & operator=( const CachableContentProperties & ); // n.i.
-    CachableContentProperties( const CachableContentProperties & ); // n.i.
+    CachableContentProperties & operator=( const CachableContentProperties & ) SAL_DELETED_FUNCTION;
+    CachableContentProperties( const CachableContentProperties & ) SAL_DELETED_FUNCTION;
 
 public:
     CachableContentProperties( const ContentProperties & rProps );