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
---
 svl/source/fsstor/fsstorage.cxx | 4 ++--
 svl/source/items/style.cxx      | 4 ++--
 svl/source/numbers/zforfind.hxx | 4 ++--
 svl/source/numbers/zforscan.hxx | 4 ++--
 svl/source/undo/undo.cxx        | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'svl')

diff --git a/svl/source/fsstor/fsstorage.cxx b/svl/source/fsstor/fsstorage.cxx
index 704f2f67111c..cbe3664b9c15 100644
--- a/svl/source/fsstor/fsstorage.cxx
+++ b/svl/source/fsstor/fsstorage.cxx
@@ -88,8 +88,8 @@ struct FSStorage_Impl
     ~FSStorage_Impl();
 
     // Copy assignment is forbidden and not implemented.
-    FSStorage_Impl (const FSStorage_Impl &) SAL_DELETED_FUNCTION;
-    FSStorage_Impl & operator= (const FSStorage_Impl &) SAL_DELETED_FUNCTION;
+    FSStorage_Impl (const FSStorage_Impl &) = delete;
+    FSStorage_Impl & operator= (const FSStorage_Impl &) = delete;
 };
 
 FSStorage_Impl::~FSStorage_Impl()
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index 930bf92ca77c..6d85ca198f81 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -86,8 +86,8 @@ SfxStyleSheetHint::SfxStyleSheetHint
 class SfxStyleSheetBasePool_Impl
 {
 private:
-    SfxStyleSheetBasePool_Impl(const SfxStyleSheetBasePool_Impl&) SAL_DELETED_FUNCTION;
-    SfxStyleSheetBasePool_Impl& operator=(const SfxStyleSheetBasePool_Impl&) SAL_DELETED_FUNCTION;
+    SfxStyleSheetBasePool_Impl(const SfxStyleSheetBasePool_Impl&) = delete;
+    SfxStyleSheetBasePool_Impl& operator=(const SfxStyleSheetBasePool_Impl&) = delete;
 public:
     SfxStyleSheetIteratorPtr pIter;
 
diff --git a/svl/source/numbers/zforfind.hxx b/svl/source/numbers/zforfind.hxx
index 4dab5cb27d2a..cbadd292b1e9 100644
--- a/svl/source/numbers/zforfind.hxx
+++ b/svl/source/numbers/zforfind.hxx
@@ -185,8 +185,8 @@ private:
     sal_uInt16  nDatePatternNumbers;
 
     // Copy assignment is forbidden and not implemented.
-    ImpSvNumberInputScan (const ImpSvNumberInputScan &) SAL_DELETED_FUNCTION;
-    ImpSvNumberInputScan & operator= (const ImpSvNumberInputScan &) SAL_DELETED_FUNCTION;
+    ImpSvNumberInputScan (const ImpSvNumberInputScan &) = delete;
+    ImpSvNumberInputScan & operator= (const ImpSvNumberInputScan &) = delete;
 
     void Reset();                               // Reset all variables before start of analysis
 
diff --git a/svl/source/numbers/zforscan.hxx b/svl/source/numbers/zforscan.hxx
index 8a9b75ca91c6..82535fd1e84a 100644
--- a/svl/source/numbers/zforscan.hxx
+++ b/svl/source/numbers/zforscan.hxx
@@ -194,8 +194,8 @@ private: // Private section
     sal_uInt8 nNatNumModifier;                  // Thai T speciality
 
     // Copy assignment is forbidden and not implemented.
-    ImpSvNumberformatScan (const ImpSvNumberformatScan &) SAL_DELETED_FUNCTION;
-    ImpSvNumberformatScan & operator= (const ImpSvNumberformatScan &) SAL_DELETED_FUNCTION;
+    ImpSvNumberformatScan (const ImpSvNumberformatScan &) = delete;
+    ImpSvNumberformatScan & operator= (const ImpSvNumberformatScan &) = delete;
 
     void InitKeywords() const;
     void InitSpecialKeyword( NfKeywordIndex eIdx ) const;
diff --git a/svl/source/undo/undo.cxx b/svl/source/undo/undo.cxx
index cdc14a00483b..b843d5cc8445 100644
--- a/svl/source/undo/undo.cxx
+++ b/svl/source/undo/undo.cxx
@@ -259,8 +259,8 @@ struct SVL_DLLPRIVATE SfxUndoManager_Data
     }
 
     // Copy assignment is forbidden and not implemented.
-    SfxUndoManager_Data (const SfxUndoManager_Data &) SAL_DELETED_FUNCTION;
-    SfxUndoManager_Data & operator= (const SfxUndoManager_Data &) SAL_DELETED_FUNCTION;
+    SfxUndoManager_Data (const SfxUndoManager_Data &) = delete;
+    SfxUndoManager_Data & operator= (const SfxUndoManager_Data &) = delete;
 };
 
 namespace svl { namespace undo { namespace impl
-- 
cgit