loplugin:deletedspecial

Change-Id: I4e264af4bb8d5fcd53666922fc4ef24a863ac8f3

5 files changed, 24 insertions, 33 deletions

diff --git a/include/tools/config.hxx b/include/tools/config.hxx
index ddffd49cb009..d4b503064a1b 100644
--- a/include/tools/config.hxx
+++ b/include/tools/config.hxx
@@ -68,8 +68,8 @@ public:
     bool                IsPersistenceEnabled() const { return mbPersistence; }
 
 private:
-    TOOLS_DLLPRIVATE    Config( const Config& rConfig );
-    TOOLS_DLLPRIVATE Config&            operator = ( const Config& rConfig );
+                        Config( const Config& rConfig ) SAL_DELETED_FUNCTION;
+    Config&             operator = ( const Config& rConfig ) SAL_DELETED_FUNCTION;
 };
 
 #endif
diff --git a/include/tools/inetstrm.hxx b/include/tools/inetstrm.hxx
index e2dfc729de72..6801293b4b16 100644
--- a/include/tools/inetstrm.hxx
+++ b/include/tools/inetstrm.hxx
@@ -38,9 +38,8 @@ enum INetStreamStatus
 
 class TOOLS_DLLPUBLIC INetIStream
 {
-    // Not implemented.
-    INetIStream (const INetIStream& rStrm);
-    INetIStream& operator= (const INetIStream& rStrm);
+    INetIStream (const INetIStream& rStrm) SAL_DELETED_FUNCTION;
+    INetIStream& operator= (const INetIStream& rStrm) SAL_DELETED_FUNCTION;
 
 protected:
     virtual int GetData (sal_Char *pData, sal_uIntPtr nSize) = 0;
@@ -54,9 +53,8 @@ public:
 
 class INetOStream
 {
-    // Not implemented.
-    INetOStream (const INetOStream& rStrm);
-    INetOStream& operator= (const INetOStream& rStrm);
+    INetOStream (const INetOStream& rStrm) SAL_DELETED_FUNCTION;
+    INetOStream& operator= (const INetOStream& rStrm) SAL_DELETED_FUNCTION;
 
 protected:
     virtual int PutData (
@@ -98,9 +96,8 @@ class INetMessageIStream : public INetIStream
 
     virtual int GetData (sal_Char *pData, sal_uIntPtr nSize) SAL_OVERRIDE;
 
-    // Not implemented.
-    INetMessageIStream (const INetMessageIStream& rStrm);
-    INetMessageIStream& operator= (const INetMessageIStream& rStrm);
+    INetMessageIStream (const INetMessageIStream& rStrm) SAL_DELETED_FUNCTION;
+    INetMessageIStream& operator= (const INetMessageIStream& rStrm) SAL_DELETED_FUNCTION;
 
 protected:
     virtual int GetMsgLine (sal_Char *pData, sal_uIntPtr nSize);
@@ -128,9 +125,8 @@ class INetMessageOStream : public INetOStream
 
     virtual int PutData (const sal_Char *pData, sal_uIntPtr nSize) SAL_OVERRIDE;
 
-    // Not implemented.
-    INetMessageOStream (const INetMessageOStream& rStrm);
-    INetMessageOStream& operator= (const INetMessageOStream& rStrm);
+    INetMessageOStream (const INetMessageOStream& rStrm) SAL_DELETED_FUNCTION;
+    INetMessageOStream& operator= (const INetMessageOStream& rStrm) SAL_DELETED_FUNCTION;
 
 protected:
     virtual int PutMsgLine (const sal_Char *pData, sal_uIntPtr nSize);
@@ -150,9 +146,8 @@ class INetMessageIOStream
     : public INetMessageIStream,
       public INetMessageOStream
 {
-    // Not implemented.
-    INetMessageIOStream (const INetMessageIOStream& rStrm);
-    INetMessageIOStream& operator= (const INetMessageIOStream& rStrm);
+    INetMessageIOStream (const INetMessageIOStream& rStrm) SAL_DELETED_FUNCTION;
+    INetMessageIOStream& operator= (const INetMessageIOStream& rStrm) SAL_DELETED_FUNCTION;
 
 public:
     INetMessageIOStream (sal_uIntPtr nBufferSize = 2048);
@@ -184,9 +179,8 @@ class TOOLS_DLLPUBLIC INetMIMEMessageStream : public INetMessageIOStream
     static INetMessageEncoding GetMsgEncoding (
         const OUString& rContentType);
 
-    // Not implemented.
-    INetMIMEMessageStream (const INetMIMEMessageStream& rStrm);
-    INetMIMEMessageStream& operator= (const INetMIMEMessageStream& rStrm);
+    INetMIMEMessageStream (const INetMIMEMessageStream& rStrm) SAL_DELETED_FUNCTION;
+    INetMIMEMessageStream& operator= (const INetMIMEMessageStream& rStrm) SAL_DELETED_FUNCTION;
 
 protected:
     virtual int GetMsgLine (sal_Char *pData, sal_uIntPtr nSize) SAL_OVERRIDE;
diff --git a/include/tools/resary.hxx b/include/tools/resary.hxx
index 90b6ba9b0d05..e03ec168f78b 100644
--- a/include/tools/resary.hxx
+++ b/include/tools/resary.hxx
@@ -31,8 +31,8 @@ class TOOLS_DLLPUBLIC ResStringArray
     struct Impl;
     Impl* mpImpl;
 
-    ResStringArray( const ResStringArray& ); // disabled
-    ResStringArray& operator=( const ResStringArray& ); // disabled
+    ResStringArray( const ResStringArray& ) SAL_DELETED_FUNCTION;
+    ResStringArray& operator=( const ResStringArray& ) SAL_DELETED_FUNCTION;
 
 public:
     ResStringArray( const ResId& rResId );
diff --git a/include/tools/resmgr.hxx b/include/tools/resmgr.hxx
index cb5d3a3655f0..70393f0d0a5e 100644
--- a/include/tools/resmgr.hxx
+++ b/include/tools/resmgr.hxx
@@ -122,9 +122,8 @@ private:
 
     static ResMgr* ImplCreateResMgr( InternalResMgr* pImpl ) { return new ResMgr( pImpl ); }
 
-    // no copying
-    ResMgr(const ResMgr&);
-    ResMgr& operator=(const ResMgr&);
+    ResMgr(const ResMgr&) SAL_DELETED_FUNCTION;
+    ResMgr& operator=(const ResMgr&) SAL_DELETED_FUNCTION;
 
 public:
     static void         DestroyAllResMgr();  ///< Called upon app shutdown
diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx
index 72679f282463..4e022cade7c8 100644
--- a/include/tools/stream.hxx
+++ b/include/tools/stream.hxx
@@ -240,8 +240,8 @@ private:
     // helper methods
     TOOLS_DLLPRIVATE void ImpInit();
 
-                    SvStream ( const SvStream& rStream ); // not implemented
-    SvStream&       operator=( const SvStream& rStream ); // not implemented
+                    SvStream ( const SvStream& rStream ) SAL_DELETED_FUNCTION;
+    SvStream&       operator=( const SvStream& rStream ) SAL_DELETED_FUNCTION;
 
 protected:
     sal_uInt64      m_nBufFilePos; ///< File position of pBuf[0]
@@ -638,9 +638,8 @@ private:
     sal_uInt16      nLockCounter;
     bool            bIsOpen;
 
-    // Forbidden and not implemented.
-    SvFileStream (const SvFileStream&);
-    SvFileStream & operator= (const SvFileStream&);
+    SvFileStream (const SvFileStream&) SAL_DELETED_FUNCTION;
+    SvFileStream & operator= (const SvFileStream&) SAL_DELETED_FUNCTION;
 
     bool LockRange( sal_Size nByteOffset, sal_Size nBytes );
     bool UnlockRange( sal_Size nByteOffset, sal_Size nBytes );
@@ -674,9 +673,8 @@ public:
 
 class TOOLS_DLLPUBLIC SvMemoryStream : public SvStream
 {
-    // Forbidden and not implemented.
-    SvMemoryStream (const SvMemoryStream&);
-    SvMemoryStream & operator= (const SvMemoryStream&);
+    SvMemoryStream (const SvMemoryStream&) SAL_DELETED_FUNCTION;
+    SvMemoryStream & operator= (const SvMemoryStream&) SAL_DELETED_FUNCTION;
 
     sal_Size        GetBufSize() const { return nSize; }