Replace "SAL_DELETED_FUNCTION" with "= delete" in LIBO_INTERNAL_ONLY code

Change-Id: I328ac7a95ccc87732efae48b567a0556865928f3

26 files changed, 79 insertions, 79 deletions

diff --git a/include/vcl/btndlg.hxx b/include/vcl/btndlg.hxx
index cf5206e35d27..692c611c5869 100644
--- a/include/vcl/btndlg.hxx
+++ b/include/vcl/btndlg.hxx
@@ -80,8 +80,8 @@ protected:
     SAL_DLLPRIVATE long ImplGetButtonSize();
 
 private:
-                        ButtonDialog( const ButtonDialog & ) SAL_DELETED_FUNCTION;
-                        ButtonDialog& operator=( const ButtonDialog& ) SAL_DELETED_FUNCTION;
+                        ButtonDialog( const ButtonDialog & ) = delete;
+                        ButtonDialog& operator=( const ButtonDialog& ) = delete;
 
 private:
     std::vector<std::unique_ptr<ImplBtnDlgItem>> m_ItemList;
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index 26b5d8c3b7c0..580cc74ab201 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -120,8 +120,8 @@ public:
     css::uno::Reference<css::frame::XFrame> getFrame() { return m_xFrame; }
 
 private:
-    VclBuilder(const VclBuilder&) SAL_DELETED_FUNCTION;
-    VclBuilder& operator=(const VclBuilder&) SAL_DELETED_FUNCTION;
+    VclBuilder(const VclBuilder&) = delete;
+    VclBuilder& operator=(const VclBuilder&) = delete;
 
     typedef std::map<OUString, std::unique_ptr<osl::Module>> ModuleMap;
 
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx
index 408eda900569..ea1af74d6157 100644
--- a/include/vcl/button.hxx
+++ b/include/vcl/button.hxx
@@ -44,8 +44,8 @@ private:
     /// Command URL (like .uno:Save) in case the button should handle it.
     OUString maCommand;
 
-                                    Button (const Button &) SAL_DELETED_FUNCTION;
-                                    Button & operator= (const Button &) SAL_DELETED_FUNCTION;
+                                    Button (const Button &) = delete;
+                                    Button & operator= (const Button &) = delete;
 public:
     SAL_DLLPRIVATE DrawButtonFlags  ImplGetButtonState() const;
     SAL_DLLPRIVATE DrawButtonFlags& ImplGetButtonState();
@@ -218,8 +218,8 @@ protected:
 private:
     SAL_DLLPRIVATE void            ImplInit( vcl::Window* pParent, WinBits nStyle );
 
-                                   OKButton (const OKButton &) SAL_DELETED_FUNCTION;
-                                   OKButton & operator= (const OKButton &) SAL_DELETED_FUNCTION;
+                                   OKButton (const OKButton &) = delete;
+                                   OKButton & operator= (const OKButton &) = delete;
 
 public:
     explicit        OKButton( vcl::Window* pParent, WinBits nStyle = WB_DEFBUTTON );
@@ -234,8 +234,8 @@ protected:
 private:
     SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle );
 
-                        CancelButton (const CancelButton &) SAL_DELETED_FUNCTION;
-                        CancelButton & operator= (const CancelButton &) SAL_DELETED_FUNCTION;
+                        CancelButton (const CancelButton &) = delete;
+                        CancelButton & operator= (const CancelButton &) = delete;
 
 public:
     explicit        CancelButton( vcl::Window* pParent, WinBits nStyle = 0 );
@@ -261,8 +261,8 @@ protected:
 private:
     SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle );
 
-                        HelpButton( const HelpButton & ) SAL_DELETED_FUNCTION;
-                        HelpButton & operator= ( const HelpButton & ) SAL_DELETED_FUNCTION;
+                        HelpButton( const HelpButton & ) = delete;
+                        HelpButton & operator= ( const HelpButton & ) = delete;
 
 public:
     explicit        HelpButton( vcl::Window* pParent, WinBits nStyle = 0 );
@@ -302,8 +302,8 @@ private:
     SAL_DLLPRIVATE Size     ImplGetRadioImageSize() const;
     SAL_DLLPRIVATE long     ImplGetImageToTextDistance() const;
 
-                            RadioButton(const RadioButton &) SAL_DELETED_FUNCTION;
-                            RadioButton& operator= (const RadioButton &) SAL_DELETED_FUNCTION;
+                            RadioButton(const RadioButton &) = delete;
+                            RadioButton& operator= (const RadioButton &) = delete;
 
 protected:
     using Control::ImplInitSettings;
@@ -426,8 +426,8 @@ private:
     SAL_DLLPRIVATE long         ImplGetImageToTextDistance() const;
     SAL_DLLPRIVATE Size         ImplGetCheckImageSize() const;
 
-                                CheckBox(const CheckBox &) SAL_DELETED_FUNCTION;
-                                CheckBox& operator= (const CheckBox &) SAL_DELETED_FUNCTION;
+                                CheckBox(const CheckBox &) = delete;
+                                CheckBox& operator= (const CheckBox &) = delete;
 
 protected:
     using Control::ImplInitSettings;
@@ -510,8 +510,8 @@ protected:
 private:
     SAL_DLLPRIVATE void     ImplInitStyle();
 
-                            ImageButton( const ImageButton & ) SAL_DELETED_FUNCTION;
-                            ImageButton & operator= ( const ImageButton & ) SAL_DELETED_FUNCTION;
+                            ImageButton( const ImageButton & ) = delete;
+                            ImageButton & operator= ( const ImageButton & ) = delete;
 
 public:
                  ImageButton( vcl::Window* pParent, WinBits nStyle = 0 );
@@ -520,8 +520,8 @@ public:
 
 class VCL_DLLPUBLIC ImageRadioButton : public RadioButton
 {
-                    ImageRadioButton( const ImageRadioButton & ) SAL_DELETED_FUNCTION;
-                    ImageRadioButton & operator= ( const ImageRadioButton & ) SAL_DELETED_FUNCTION;
+                    ImageRadioButton( const ImageRadioButton & ) = delete;
+                    ImageRadioButton & operator= ( const ImageRadioButton & ) = delete;
 
 public:
     explicit        ImageRadioButton( vcl::Window* pParent, WinBits nStyle = 0 );
@@ -529,8 +529,8 @@ public:
 
 class VCL_DLLPUBLIC TriStateBox : public CheckBox
 {
-                    TriStateBox( const TriStateBox & ) SAL_DELETED_FUNCTION;
-                    TriStateBox & operator= ( const TriStateBox & ) SAL_DELETED_FUNCTION;
+                    TriStateBox( const TriStateBox & ) = delete;
+                    TriStateBox & operator= ( const TriStateBox & ) = delete;
 
 public:
     explicit        TriStateBox( vcl::Window* pParent, WinBits nStyle = 0 );
diff --git a/include/vcl/ctrl.hxx b/include/vcl/ctrl.hxx
index 28bf572b54ac..7fe2411d6b21 100644
--- a/include/vcl/ctrl.hxx
+++ b/include/vcl/ctrl.hxx
@@ -47,8 +47,8 @@ private:
 
     SAL_DLLPRIVATE void     ImplInitControlData();
 
-                            Control (const Control &) SAL_DELETED_FUNCTION;
-                            Control & operator= (const Control &) SAL_DELETED_FUNCTION;
+                            Control (const Control &) = delete;
+                            Control & operator= (const Control &) = delete;
 
 protected:
                     Control( WindowType nType );
diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx
index 5fc0708fed02..1ab08d2fb10f 100644
--- a/include/vcl/dialog.hxx
+++ b/include/vcl/dialog.hxx
@@ -55,8 +55,8 @@ private:
 
     virtual void ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE;
 
-    SAL_DLLPRIVATE         Dialog (const Dialog &) SAL_DELETED_FUNCTION;
-    SAL_DLLPRIVATE         Dialog & operator= (const Dialog &) SAL_DELETED_FUNCTION;
+    SAL_DLLPRIVATE         Dialog (const Dialog &) = delete;
+    SAL_DLLPRIVATE         Dialog & operator= (const Dialog &) = delete;
 
     DECL_DLLPRIVATE_LINK_TYPED( ImplAsyncCloseHdl, void*, void );
 
@@ -129,8 +129,8 @@ public:
 // - ModelessDialog -
 class VCL_DLLPUBLIC ModelessDialog : public Dialog
 {
-                    ModelessDialog (const ModelessDialog &) SAL_DELETED_FUNCTION;
-                    ModelessDialog & operator= (const ModelessDialog &) SAL_DELETED_FUNCTION;
+                    ModelessDialog (const ModelessDialog &) = delete;
+                    ModelessDialog & operator= (const ModelessDialog &) = delete;
 
 public:
     explicit        ModelessDialog( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription, Dialog::InitFlag eFlag = Dialog::InitFlag::Default );
@@ -149,8 +149,8 @@ protected:
 
 private:
 
-    SAL_DLLPRIVATE         ModalDialog (const ModalDialog &) SAL_DELETED_FUNCTION;
-    SAL_DLLPRIVATE         ModalDialog & operator= (const ModalDialog &) SAL_DELETED_FUNCTION;
+    SAL_DLLPRIVATE         ModalDialog (const ModalDialog &) = delete;
+    SAL_DLLPRIVATE         ModalDialog & operator= (const ModalDialog &) = delete;
 };
 
 #endif // INCLUDED_VCL_DIALOG_HXX
diff --git a/include/vcl/dockingarea.hxx b/include/vcl/dockingarea.hxx
index a0ce2d674daa..f7cf79fda498 100644
--- a/include/vcl/dockingarea.hxx
+++ b/include/vcl/dockingarea.hxx
@@ -31,8 +31,8 @@ class VCL_DLLPUBLIC DockingAreaWindow : public vcl::Window
 private:
     ImplData*       mpImplData;
 
-                    DockingAreaWindow (const DockingAreaWindow &) SAL_DELETED_FUNCTION;
-                    DockingAreaWindow & operator= (const DockingAreaWindow &) SAL_DELETED_FUNCTION;
+                    DockingAreaWindow (const DockingAreaWindow &) = delete;
+                    DockingAreaWindow & operator= (const DockingAreaWindow &) = delete;
 
 public:
     explicit        DockingAreaWindow( vcl::Window* pParent );
diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx
index 49021e4fd605..b9b51e977082 100644
--- a/include/vcl/dockwin.hxx
+++ b/include/vcl/dockwin.hxx
@@ -262,8 +262,8 @@ private:
     SAL_DLLPRIVATE void setPosSizeOnContainee(Size aSize, Window &rBox);
     DECL_DLLPRIVATE_LINK_TYPED( ImplHandleLayoutTimerHdl, Idle*, void );
 
-                           DockingWindow (const DockingWindow &) SAL_DELETED_FUNCTION;
-                           DockingWindow & operator= (const DockingWindow &) SAL_DELETED_FUNCTION;
+                           DockingWindow (const DockingWindow &) = delete;
+                           DockingWindow & operator= (const DockingWindow &) = delete;
 
 protected:
     using Window::ImplInit;
diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx
index 68c43dde59c9..2ce1a6b2ec67 100644
--- a/include/vcl/floatwin.hxx
+++ b/include/vcl/floatwin.hxx
@@ -115,8 +115,8 @@ private:
     DECL_DLLPRIVATE_LINK_TYPED(  ImplEndPopupModeHdl, void*, void );
     virtual void setPosSizeOnContainee(Size aSize, Window &rBox) SAL_OVERRIDE;
 
-                           FloatingWindow (const FloatingWindow &) SAL_DELETED_FUNCTION;
-                           FloatingWindow & operator= (const FloatingWindow &) SAL_DELETED_FUNCTION;
+                           FloatingWindow (const FloatingWindow &) = delete;
+                           FloatingWindow & operator= (const FloatingWindow &) = delete;
 
 protected:
     using Window::ImplInit;
diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx
index 191a6e73208a..05dfed3608e7 100644
--- a/include/vcl/graphicfilter.hxx
+++ b/include/vcl/graphicfilter.hxx
@@ -172,8 +172,8 @@ class VCL_DLLPUBLIC GraphicDescriptor
     bool            ImpDetectSGV( SvStream& rStm, bool bExtendedInfo );
     bool            ImpDetectEMF( SvStream& rStm, bool bExtendedInfo );
     bool            ImpDetectSVG( SvStream& rStm, bool bExtendedInfo );
-    GraphicDescriptor( const GraphicDescriptor& ) SAL_DELETED_FUNCTION;
-    GraphicDescriptor& operator=( const GraphicDescriptor& ) SAL_DELETED_FUNCTION;
+    GraphicDescriptor( const GraphicDescriptor& ) = delete;
+    GraphicDescriptor& operator=( const GraphicDescriptor& ) = delete;
 
 public:
 
diff --git a/include/vcl/menubtn.hxx b/include/vcl/menubtn.hxx
index 62933f1e45a9..d2672eb9bc47 100644
--- a/include/vcl/menubtn.hxx
+++ b/include/vcl/menubtn.hxx
@@ -47,8 +47,8 @@ private:
     SAL_DLLPRIVATE void    ImplInitMenuButtonData();
     DECL_DLLPRIVATE_LINK_TYPED( ImplMenuTimeoutHdl, Timer*, void );
 
-                           MenuButton( const MenuButton & ) SAL_DELETED_FUNCTION;
-                           MenuButton& operator=( const MenuButton & ) SAL_DELETED_FUNCTION;
+                           MenuButton( const MenuButton & ) = delete;
+                           MenuButton& operator=( const MenuButton & ) = delete;
 
 protected:
     using Window::ImplInit;
diff --git a/include/vcl/metric.hxx b/include/vcl/metric.hxx
index 7a7c7d30c860..ba2393d4123e 100644
--- a/include/vcl/metric.hxx
+++ b/include/vcl/metric.hxx
@@ -212,8 +212,8 @@ private:
     sal_uInt32          mnRefCount;
 
     // prevent assignment and copy construction
-                        FontCharMap( const FontCharMap& ) SAL_DELETED_FUNCTION;
-    void                operator=( const FontCharMap& ) SAL_DELETED_FUNCTION;
+                        FontCharMap( const FontCharMap& ) = delete;
+    void                operator=( const FontCharMap& ) = delete;
 };
 
 inline void intrusive_ptr_add_ref(FontCharMap* pFontCharMap)
diff --git a/include/vcl/morebtn.hxx b/include/vcl/morebtn.hxx
index 01a6e95da5cf..e03f9d4956de 100644
--- a/include/vcl/morebtn.hxx
+++ b/include/vcl/morebtn.hxx
@@ -39,8 +39,8 @@ private:
     MapUnit             meUnit;
     bool                mbState;
 
-                        MoreButton( const MoreButton & ) SAL_DELETED_FUNCTION;
-                        MoreButton& operator=( const MoreButton & ) SAL_DELETED_FUNCTION;
+                        MoreButton( const MoreButton & ) = delete;
+                        MoreButton& operator=( const MoreButton & ) = delete;
     SAL_DLLPRIVATE void ShowState();
 
 protected:
diff --git a/include/vcl/opengl/OpenGLHelper.hxx b/include/vcl/opengl/OpenGLHelper.hxx
index 50783f278eb9..437b4350101a 100644
--- a/include/vcl/opengl/OpenGLHelper.hxx
+++ b/include/vcl/opengl/OpenGLHelper.hxx
@@ -37,7 +37,7 @@
 // All member functions static and VCL_DLLPUBLIC. Basically a glorified namespace.
 struct VCL_DLLPUBLIC OpenGLHelper
 {
-    OpenGLHelper() SAL_DELETED_FUNCTION; // Should not be instantiated
+    OpenGLHelper() = delete; // Should not be instantiated
 
 public:
 
diff --git a/include/vcl/opengl/OpenGLWrapper.hxx b/include/vcl/opengl/OpenGLWrapper.hxx
index 4d3a9e9ab57b..e73aa08466be 100644
--- a/include/vcl/opengl/OpenGLWrapper.hxx
+++ b/include/vcl/opengl/OpenGLWrapper.hxx
@@ -17,7 +17,7 @@
 // All member functions static and VCL_DLLPUBLIC. Basically a glorified namespace.
 struct VCL_DLLPUBLIC OpenGLWrapper
 {
-    OpenGLWrapper() SAL_DELETED_FUNCTION; // Should not be instantiated
+    OpenGLWrapper() = delete; // Should not be instantiated
 
     /**
      * Returns true if VCL has OpenGL rendering enabled
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 20bd81ae197f..f4cbc5f06704 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -351,8 +351,8 @@ private:
     }
 
 private:
-    OutputDevice(const OutputDevice&) SAL_DELETED_FUNCTION;
-    OutputDevice& operator=(const OutputDevice&) SAL_DELETED_FUNCTION;
+    OutputDevice(const OutputDevice&) = delete;
+    OutputDevice& operator=(const OutputDevice&) = delete;
 
     mutable SalGraphics*            mpGraphics;         ///< Graphics context to draw on
     mutable VclPtr<OutputDevice>    mpPrevGraphics;     ///< Previous output device in list
@@ -633,7 +633,7 @@ protected:
 private:
 
     // not implemented; to detect misuses of DrawOutDev(...OutputDevice&);
-    SAL_DLLPRIVATE void         DrawOutDev( const Point&, const Size&, const Point&,  const Size&, const Printer&) SAL_DELETED_FUNCTION;
+    SAL_DLLPRIVATE void         DrawOutDev( const Point&, const Size&, const Point&,  const Size&, const Printer&) = delete;
     ///@}
 
 
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index d382f12cafe7..9d5fafb5efb9 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -236,8 +236,8 @@ private:
 
 private:
     SAL_DLLPRIVATE bool         EndJob();
-                                Printer( const Printer& rPrinter ) SAL_DELETED_FUNCTION;
-                   Printer&     operator =( const Printer& rPrinter ) SAL_DELETED_FUNCTION;
+                                Printer( const Printer& rPrinter ) = delete;
+                   Printer&     operator =( const Printer& rPrinter ) = delete;
 
 public:
     SAL_DLLPRIVATE void         ImplStartPage();
diff --git a/include/vcl/quickselectionengine.hxx b/include/vcl/quickselectionengine.hxx
index d68b4fa8bbe4..2eba2495481f 100644
--- a/include/vcl/quickselectionengine.hxx
+++ b/include/vcl/quickselectionengine.hxx
@@ -80,8 +80,8 @@ namespace vcl
         bool bEnabled;
 
     private:
-        QuickSelectionEngine( const QuickSelectionEngine& ) SAL_DELETED_FUNCTION;
-        QuickSelectionEngine& operator=( const QuickSelectionEngine& ) SAL_DELETED_FUNCTION;
+        QuickSelectionEngine( const QuickSelectionEngine& ) = delete;
+        QuickSelectionEngine& operator=( const QuickSelectionEngine& ) = delete;
     };
 
 
diff --git a/include/vcl/split.hxx b/include/vcl/split.hxx
index 069712aca2cf..7ef3eba0273d 100644
--- a/include/vcl/split.hxx
+++ b/include/vcl/split.hxx
@@ -53,8 +53,8 @@ private:
     SAL_DLLPRIVATE void      ImplRestoreSplitter();
     SAL_DLLPRIVATE void      ImplInitHorVer(bool bNew);
 
-                             Splitter (const Splitter &) SAL_DELETED_FUNCTION;
-                             Splitter& operator= (const Splitter &) SAL_DELETED_FUNCTION;
+                             Splitter (const Splitter &) = delete;
+                             Splitter& operator= (const Splitter &) = delete;
 
 protected:
     using Window::ImplInit;
diff --git a/include/vcl/splitwin.hxx b/include/vcl/splitwin.hxx
index 4cec7d07645b..2e9066be7b89 100644
--- a/include/vcl/splitwin.hxx
+++ b/include/vcl/splitwin.hxx
@@ -120,8 +120,8 @@ private:
                                                 long& rMouseOff, ImplSplitSet** ppFoundSet, sal_uInt16& rFoundPos );
     SAL_DLLPRIVATE void ImplDrawSplitTracking(const Point& rPos);
 
-                        SplitWindow (const SplitWindow &) SAL_DELETED_FUNCTION;
-                        SplitWindow & operator= (const SplitWindow &) SAL_DELETED_FUNCTION;
+                        SplitWindow (const SplitWindow &) = delete;
+                        SplitWindow & operator= (const SplitWindow &) = delete;
 public:
                         SplitWindow( vcl::Window* pParent, WinBits nStyle = 0 );
     virtual             ~SplitWindow();
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index a5fb8fe0e4df..e1d8320404bc 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -1501,8 +1501,8 @@ private:
 class VCL_DLLPUBLIC SolarMutexGuard
 {
 private:
-    SolarMutexGuard( const SolarMutexGuard& ) SAL_DELETED_FUNCTION;
-    const SolarMutexGuard& operator = ( const SolarMutexGuard& ) SAL_DELETED_FUNCTION;
+    SolarMutexGuard( const SolarMutexGuard& ) = delete;
+    const SolarMutexGuard& operator = ( const SolarMutexGuard& ) = delete;
     comphelper::SolarMutex& m_solarMutex;
 
 public:
@@ -1523,8 +1523,8 @@ public:
 
 class VCL_DLLPUBLIC SolarMutexClearableGuard SAL_FINAL
 {
-    SolarMutexClearableGuard( const SolarMutexClearableGuard& ) SAL_DELETED_FUNCTION;
-    const SolarMutexClearableGuard& operator = ( const SolarMutexClearableGuard& ) SAL_DELETED_FUNCTION;
+    SolarMutexClearableGuard( const SolarMutexClearableGuard& ) = delete;
+    const SolarMutexClearableGuard& operator = ( const SolarMutexClearableGuard& ) = delete;
     bool m_bCleared;
 public:
     /** Acquires mutex
@@ -1561,8 +1561,8 @@ protected:
 
 class VCL_DLLPUBLIC SolarMutexResettableGuard SAL_FINAL
 {
-    SolarMutexResettableGuard( const SolarMutexResettableGuard& ) SAL_DELETED_FUNCTION;
-    const SolarMutexResettableGuard& operator = ( const SolarMutexResettableGuard& ) SAL_DELETED_FUNCTION;
+    SolarMutexResettableGuard( const SolarMutexResettableGuard& ) = delete;
+    const SolarMutexResettableGuard& operator = ( const SolarMutexResettableGuard& ) = delete;
     bool m_bCleared;
 public:
     /** Acquires mutex
@@ -1621,8 +1621,8 @@ private:
 #endif
     comphelper::SolarMutex& m_rSolarMutex;
 
-    SolarMutexTryAndBuyGuard(const SolarMutexTryAndBuyGuard&) SAL_DELETED_FUNCTION;
-    SolarMutexTryAndBuyGuard& operator=(const SolarMutexTryAndBuyGuard&) SAL_DELETED_FUNCTION;
+    SolarMutexTryAndBuyGuard(const SolarMutexTryAndBuyGuard&) = delete;
+    SolarMutexTryAndBuyGuard& operator=(const SolarMutexTryAndBuyGuard&) = delete;
 
 public:
 
diff --git a/include/vcl/svgdata.hxx b/include/vcl/svgdata.hxx
index b234c1083de0..84a625e935d1 100644
--- a/include/vcl/svgdata.hxx
+++ b/include/vcl/svgdata.hxx
@@ -57,8 +57,8 @@ private:
     void ensureReplacement();
     void ensureSequenceAndRange();
 
-    SvgData(const SvgData&) SAL_DELETED_FUNCTION;
-    SvgData& operator=(const SvgData&) SAL_DELETED_FUNCTION;
+    SvgData(const SvgData&) = delete;
+    SvgData& operator=(const SvgData&) = delete;
 
 public:
     SvgData(const SvgDataArray& rSvgDataArray, const OUString& rPath);
diff --git a/include/vcl/syschild.hxx b/include/vcl/syschild.hxx
index 928c1861b52a..ec72bf5ecb7c 100644
--- a/include/vcl/syschild.hxx
+++ b/include/vcl/syschild.hxx
@@ -34,8 +34,8 @@ private:
     SAL_DLLPRIVATE void     ImplTestJavaException( void* pEnv );
 
     // Copy assignment is forbidden and not implemented.
-                            SystemChildWindow (const SystemChildWindow &) SAL_DELETED_FUNCTION;
-                            SystemChildWindow & operator= (const SystemChildWindow &) SAL_DELETED_FUNCTION;
+                            SystemChildWindow (const SystemChildWindow &) = delete;
+                            SystemChildWindow & operator= (const SystemChildWindow &) = delete;
 
 public:
     explicit                SystemChildWindow( vcl::Window* pParent, WinBits nStyle = 0 );
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index 732e6f5eb645..5b08217e0a5d 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -229,8 +229,8 @@ private:
     DECL_DLLPRIVATE_LINK_TYPED(    ImplCustomMenuListener, VclMenuEvent&, void );
     DECL_DLLPRIVATE_LINK_TYPED(    ImplDropdownLongClickHdl, Timer*, void );
 
-                                   ToolBox (const ToolBox &) SAL_DELETED_FUNCTION;
-                          ToolBox& operator= (const ToolBox &) SAL_DELETED_FUNCTION;
+                                   ToolBox (const ToolBox &) = delete;
+                          ToolBox& operator= (const ToolBox &) = delete;
 
 public:
     SAL_DLLPRIVATE void            ImplFloatControl( bool bStart, FloatingWindow* pWindow = NULL );
diff --git a/include/vcl/vclptr.hxx b/include/vcl/vclptr.hxx
index 2614886e9723..ce2cd3518e1a 100644
--- a/include/vcl/vclptr.hxx
+++ b/include/vcl/vclptr.hxx
@@ -352,12 +352,12 @@ public:
 
 private:
     // Most likely we don't want this default copy-construtor.
-    ScopedVclPtr (const ScopedVclPtr<reference_type> &) SAL_DELETED_FUNCTION;
+    ScopedVclPtr (const ScopedVclPtr<reference_type> &) = delete;
     // And certainly we don't want a default assignment operator.
-    ScopedVclPtr<reference_type>& operator= (const ScopedVclPtr<reference_type> &) SAL_DELETED_FUNCTION;
+    ScopedVclPtr<reference_type>& operator= (const ScopedVclPtr<reference_type> &) = delete;
     // And disallow reset as that doesn't call disposeAndClear on the original reference
-    void reset() SAL_DELETED_FUNCTION;
-    void reset(reference_type *pBody) SAL_DELETED_FUNCTION;
+    void reset() = delete;
+    void reset(reference_type *pBody) = delete;
 
 protected:
     inline ScopedVclPtr (reference_type * pBody, __sal_NoAcquire)
diff --git a/include/vcl/virdev.hxx b/include/vcl/virdev.hxx
index 669a224741ad..e2e555933f49 100644
--- a/include/vcl/virdev.hxx
+++ b/include/vcl/virdev.hxx
@@ -51,8 +51,8 @@ private:
                                                 const basebmp::RawMemorySharedArray &pAlphaBuffer,
                                                 const bool bTopDown );
 
-    VirtualDevice (const VirtualDevice &) SAL_DELETED_FUNCTION;
-    VirtualDevice & operator= (const VirtualDevice &) SAL_DELETED_FUNCTION;
+    VirtualDevice (const VirtualDevice &) = delete;
+    VirtualDevice & operator= (const VirtualDevice &) = delete;
 
     /** Used for alpha VDev, to set areas to opaque
 
diff --git a/include/vcl/wrkwin.hxx b/include/vcl/wrkwin.hxx
index 467e54ad4e9b..0a8b3cd1249a 100644
--- a/include/vcl/wrkwin.hxx
+++ b/include/vcl/wrkwin.hxx
@@ -62,8 +62,8 @@ private:
     SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle, const ::com::sun::star::uno::Any& aSystemWorkWindowToken );
 
 private:
-    WorkWindow( const WorkWindow& rWin ) SAL_DELETED_FUNCTION;
-    WorkWindow&  operator =( const WorkWindow& rWin ) SAL_DELETED_FUNCTION;
+    WorkWindow( const WorkWindow& rWin ) = delete;
+    WorkWindow&  operator =( const WorkWindow& rWin ) = delete;
 
 protected:
     explicit        WorkWindow( WindowType nType );