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/tools/config.hxx   |  4 ++--
 include/tools/inetstrm.hxx |  4 ++--
 include/tools/resary.hxx   |  4 ++--
 include/tools/resmgr.hxx   |  4 ++--
 include/tools/stream.hxx   | 12 ++++++------
 5 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'include/tools')

diff --git a/include/tools/config.hxx b/include/tools/config.hxx
index 772c1c7da8f9..f6014f24fd81 100644
--- a/include/tools/config.hxx
+++ b/include/tools/config.hxx
@@ -61,8 +61,8 @@ public:
     void                Flush();
 
 private:
-                        Config( const Config& rConfig ) SAL_DELETED_FUNCTION;
-    Config&             operator = ( const Config& rConfig ) SAL_DELETED_FUNCTION;
+                        Config( const Config& rConfig ) = delete;
+    Config&             operator = ( const Config& rConfig ) = delete;
 };
 
 #endif
diff --git a/include/tools/inetstrm.hxx b/include/tools/inetstrm.hxx
index 7e43b0d912e8..834df8573194 100644
--- a/include/tools/inetstrm.hxx
+++ b/include/tools/inetstrm.hxx
@@ -47,8 +47,8 @@ class TOOLS_DLLPUBLIC INetMIMEMessageStream
     sal_uIntPtr                  nChildIndex;
     INetMIMEMessageStream *pChildStrm;
 
-    INetMIMEMessageStream (const INetMIMEMessageStream& rStrm) SAL_DELETED_FUNCTION;
-    INetMIMEMessageStream& operator= (const INetMIMEMessageStream& rStrm) SAL_DELETED_FUNCTION;
+    INetMIMEMessageStream (const INetMIMEMessageStream& rStrm) = delete;
+    INetMIMEMessageStream& operator= (const INetMIMEMessageStream& rStrm) = delete;
 
     int GetHeaderLine(sal_Char *pData, sal_uIntPtr nSize);
     int GetBodyLine(sal_Char *pData, sal_uIntPtr nSize);
diff --git a/include/tools/resary.hxx b/include/tools/resary.hxx
index e03ec168f78b..4e15feb5ee08 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& ) SAL_DELETED_FUNCTION;
-    ResStringArray& operator=( const ResStringArray& ) SAL_DELETED_FUNCTION;
+    ResStringArray( const ResStringArray& ) = delete;
+    ResStringArray& operator=( const ResStringArray& ) = delete;
 
 public:
     ResStringArray( const ResId& rResId );
diff --git a/include/tools/resmgr.hxx b/include/tools/resmgr.hxx
index 4c72c17855da..ade174674240 100644
--- a/include/tools/resmgr.hxx
+++ b/include/tools/resmgr.hxx
@@ -127,8 +127,8 @@ private:
     // like ReadString but doesn't call the string hook
     TOOLS_DLLPRIVATE OUString ReadStringWithoutHook();
 
-    ResMgr(const ResMgr&) SAL_DELETED_FUNCTION;
-    ResMgr& operator=(const ResMgr&) SAL_DELETED_FUNCTION;
+    ResMgr(const ResMgr&) = delete;
+    ResMgr& operator=(const ResMgr&) = delete;
 
 public:
     static void         DestroyAllResMgr();  ///< Called upon app shutdown
diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx
index 702734d014b6..19f062ee2e3a 100644
--- a/include/tools/stream.hxx
+++ b/include/tools/stream.hxx
@@ -226,8 +226,8 @@ private:
     // helper methods
     TOOLS_DLLPRIVATE void ImpInit();
 
-                    SvStream ( const SvStream& rStream ) SAL_DELETED_FUNCTION;
-    SvStream&       operator=( const SvStream& rStream ) SAL_DELETED_FUNCTION;
+                    SvStream ( const SvStream& rStream ) = delete;
+    SvStream&       operator=( const SvStream& rStream ) = delete;
 
 protected:
     sal_uInt64      m_nBufFilePos; ///< File position of pBuf[0]
@@ -622,8 +622,8 @@ private:
     sal_uInt16      nLockCounter;
     bool            bIsOpen;
 
-    SvFileStream (const SvFileStream&) SAL_DELETED_FUNCTION;
-    SvFileStream & operator= (const SvFileStream&) SAL_DELETED_FUNCTION;
+    SvFileStream (const SvFileStream&) = delete;
+    SvFileStream & operator= (const SvFileStream&) = delete;
 
     bool LockRange( sal_Size nByteOffset, sal_Size nBytes );
     bool UnlockRange( sal_Size nByteOffset, sal_Size nBytes );
@@ -656,8 +656,8 @@ public:
 
 class TOOLS_DLLPUBLIC SvMemoryStream : public SvStream
 {
-    SvMemoryStream (const SvMemoryStream&) SAL_DELETED_FUNCTION;
-    SvMemoryStream & operator= (const SvMemoryStream&) SAL_DELETED_FUNCTION;
+    SvMemoryStream (const SvMemoryStream&) = delete;
+    SvMemoryStream & operator= (const SvMemoryStream&) = delete;
 
 protected:
     sal_Size        nSize;
-- 
cgit