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

Change-Id: I328ac7a95ccc87732efae48b567a0556865928f3

15 files changed, 40 insertions, 40 deletions

diff --git a/include/svtools/acceleratorexecute.hxx b/include/svtools/acceleratorexecute.hxx
index 4b099e0169f5..975b44def6f9 100644
--- a/include/svtools/acceleratorexecute.hxx
+++ b/include/svtools/acceleratorexecute.hxx
@@ -218,8 +218,8 @@ class SVT_DLLPUBLIC AcceleratorExecute : private TMutexInit
          */
         SVT_DLLPRIVATE AcceleratorExecute();
 
-        AcceleratorExecute(const AcceleratorExecute& rCopy) SAL_DELETED_FUNCTION;
-        void operator=(const AcceleratorExecute&)  SAL_DELETED_FUNCTION;
+        AcceleratorExecute(const AcceleratorExecute& rCopy) = delete;
+        void operator=(const AcceleratorExecute&)  = delete;
 
         /** TODO document me */
         SVT_DLLPRIVATE OUString impl_ts_findCommand(const css::awt::KeyEvent& aKey);
diff --git a/include/svtools/contextmenuhelper.hxx b/include/svtools/contextmenuhelper.hxx
index 3333027d4391..2e7d8c0dda72 100644
--- a/include/svtools/contextmenuhelper.hxx
+++ b/include/svtools/contextmenuhelper.hxx
@@ -65,8 +65,8 @@ class SVT_DLLPUBLIC ContextMenuHelper
         // asynchronous link to prevent destruction while on stack
         DECL_STATIC_LINK_TYPED( ContextMenuHelper, ExecuteHdl_Impl, void*, void );
 
-        ContextMenuHelper( const ContextMenuHelper& ) SAL_DELETED_FUNCTION;
-        const ContextMenuHelper& operator=( const ContextMenuHelper& ) SAL_DELETED_FUNCTION;
+        ContextMenuHelper( const ContextMenuHelper& ) = delete;
+        const ContextMenuHelper& operator=( const ContextMenuHelper& ) = delete;
 
         // show context menu and dispatch command automatically
         void            executePopupMenu( const Point& aPos, PopupMenu* pMenu );
diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx
index eedb574af60e..bdecb651e967 100644
--- a/include/svtools/ctrlbox.hxx
+++ b/include/svtools/ctrlbox.hxx
@@ -194,8 +194,8 @@ public:
     }
 
 private:
-                    ColorListBox( const ColorListBox& ) SAL_DELETED_FUNCTION;
-    ColorListBox&   operator =( const ColorListBox& ) SAL_DELETED_FUNCTION;
+                    ColorListBox( const ColorListBox& ) = delete;
+    ColorListBox&   operator =( const ColorListBox& ) = delete;
 };
 
 inline void ColorListBox::SelectEntry( const Color& rColor, bool bSelect )
@@ -345,8 +345,8 @@ protected:
     Color   GetColorDist( sal_Int32  nPos = 0 );
 
 private:
-                    LineListBox( const LineListBox& ) SAL_DELETED_FUNCTION;
-    LineListBox&    operator =( const LineListBox& ) SAL_DELETED_FUNCTION;
+                    LineListBox( const LineListBox& ) = delete;
+    LineListBox&    operator =( const LineListBox& ) = delete;
 };
 
 inline void LineListBox::SetColor( const Color& rColor )
@@ -401,8 +401,8 @@ public:
 private:
     void            InitFontMRUEntriesFile();
 
-                    FontNameBox( const FontNameBox& ) SAL_DELETED_FUNCTION;
-    FontNameBox&    operator =( const FontNameBox& ) SAL_DELETED_FUNCTION;
+                    FontNameBox( const FontNameBox& ) = delete;
+    FontNameBox&    operator =( const FontNameBox& ) = delete;
 };
 
 class SVT_DLLPUBLIC FontStyleBox : public ComboBox
@@ -425,8 +425,8 @@ public:
     void            Fill( const OUString& rName, const FontList* pList );
 
 private:
-                    FontStyleBox( const FontStyleBox& ) SAL_DELETED_FUNCTION;
-    FontStyleBox&   operator =( const FontStyleBox& ) SAL_DELETED_FUNCTION;
+                    FontStyleBox( const FontStyleBox& ) = delete;
+    FontStyleBox&   operator =( const FontStyleBox& ) = delete;
 };
 
 inline void FontStyleBox::SetText( const OUString& rText )
@@ -481,8 +481,8 @@ public:
     virtual sal_Int64   GetValue() const SAL_OVERRIDE;
 
 private:
-                    FontSizeBox( const FontSizeBox& ) SAL_DELETED_FUNCTION;
-    FontSizeBox&    operator =( const FontSizeBox& ) SAL_DELETED_FUNCTION;
+                    FontSizeBox( const FontSizeBox& ) = delete;
+    FontSizeBox&    operator =( const FontSizeBox& ) = delete;
 };
 
 #endif // INCLUDED_SVTOOLS_CTRLBOX_HXX
diff --git a/include/svtools/ctrltool.hxx b/include/svtools/ctrltool.hxx
index 9d5c50119cce..6bec2bd8e25e 100644
--- a/include/svtools/ctrltool.hxx
+++ b/include/svtools/ctrltool.hxx
@@ -195,8 +195,8 @@ public:
     static const sal_IntPtr* GetStdSizeAry() { return aStdSizeAry; }
 
 private:
-                            FontList( const FontList& ) SAL_DELETED_FUNCTION;
-    FontList&               operator =( const FontList& ) SAL_DELETED_FUNCTION;
+                            FontList( const FontList& ) = delete;
+    FontList&               operator =( const FontList& ) = delete;
 };
 
 class SVT_DLLPUBLIC FontSizeNames
diff --git a/include/svtools/dialogcontrolling.hxx b/include/svtools/dialogcontrolling.hxx
index 47ef7497e475..fc3fa11f79a4 100644
--- a/include/svtools/dialogcontrolling.hxx
+++ b/include/svtools/dialogcontrolling.hxx
@@ -118,8 +118,8 @@ namespace svt
         DECL_LINK_TYPED( OnWindowEvent, VclWindowEvent&, void );
 
     private:
-        DialogController( const DialogController& ) SAL_DELETED_FUNCTION;
-        DialogController& operator=( const DialogController& ) SAL_DELETED_FUNCTION;
+        DialogController( const DialogController& ) = delete;
+        DialogController& operator=( const DialogController& ) = delete;
     };
     typedef std::shared_ptr< DialogController > PDialogController;
 
@@ -179,8 +179,8 @@ namespace svt
         void    addController( const PDialogController& _pController );
 
     private:
-        ControlDependencyManager( const ControlDependencyManager& ) SAL_DELETED_FUNCTION;
-        ControlDependencyManager& operator=( const ControlDependencyManager& ) SAL_DELETED_FUNCTION;
+        ControlDependencyManager( const ControlDependencyManager& ) = delete;
+        ControlDependencyManager& operator=( const ControlDependencyManager& ) = delete;
     };
 
 
diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx
index afe8adccbaae..819e7fdd6650 100644
--- a/include/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
@@ -451,8 +451,8 @@ namespace svt
         };
 
     private:
-        EditBrowseBox(EditBrowseBox&) SAL_DELETED_FUNCTION;
-        EditBrowseBox& operator=(EditBrowseBox&) SAL_DELETED_FUNCTION;
+        EditBrowseBox(EditBrowseBox&) = delete;
+        EditBrowseBox& operator=(EditBrowseBox&) = delete;
 
         class BrowserMouseEventPtr
         {
diff --git a/include/svtools/embedhlp.hxx b/include/svtools/embedhlp.hxx
index ff899cd0fd23..b1b33282f05d 100644
--- a/include/svtools/embedhlp.hxx
+++ b/include/svtools/embedhlp.hxx
@@ -50,7 +50,7 @@ class SVT_DLLPUBLIC EmbeddedObjectRef
     SVT_DLLPRIVATE SvStream* GetGraphicStream( bool bUpdate ) const;
     SVT_DLLPRIVATE void GetReplacement( bool bUpdate );
 
-    EmbeddedObjectRef& operator = ( const EmbeddedObjectRef& ) SAL_DELETED_FUNCTION;
+    EmbeddedObjectRef& operator = ( const EmbeddedObjectRef& ) = delete;
 
 public:
     static void DrawPaintReplacement( const Rectangle &rRect, const OUString &rText, OutputDevice *pOut );
diff --git a/include/svtools/javacontext.hxx b/include/svtools/javacontext.hxx
index 20e65873cb54..d636d9e2f4e4 100644
--- a/include/svtools/javacontext.hxx
+++ b/include/svtools/javacontext.hxx
@@ -63,8 +63,8 @@ namespace svt
             throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     private:
-        JavaContext(JavaContext&) SAL_DELETED_FUNCTION;
-        JavaContext& operator = (JavaContext&) SAL_DELETED_FUNCTION;
+        JavaContext(JavaContext&) = delete;
+        JavaContext& operator = (JavaContext&) = delete;
 
         oslInterlockedCount m_aRefCount;
 
diff --git a/include/svtools/javainteractionhandler.hxx b/include/svtools/javainteractionhandler.hxx
index 7b0d00defe40..4346d8fdf222 100644
--- a/include/svtools/javainteractionhandler.hxx
+++ b/include/svtools/javainteractionhandler.hxx
@@ -57,8 +57,8 @@ public:
 
 private:
     oslInterlockedCount m_aRefCount;
-    JavaInteractionHandler(JavaInteractionHandler const&) SAL_DELETED_FUNCTION;
-    JavaInteractionHandler& operator = (JavaInteractionHandler const &) SAL_DELETED_FUNCTION;
+    JavaInteractionHandler(JavaInteractionHandler const&) = delete;
+    JavaInteractionHandler& operator = (JavaInteractionHandler const &) = delete;
     SVT_DLLPRIVATE virtual ~JavaInteractionHandler();
     bool m_bShowErrorsOnce;
     bool m_bJavaDisabled_Handled;
diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx
index 116f0c80d7ba..aaa88c4189e0 100644
--- a/include/svtools/ruler.hxx
+++ b/include/svtools/ruler.hxx
@@ -698,8 +698,8 @@ private:
     SVT_DLLPRIVATE void     ImplDrag( const Point& rPos );
     SVT_DLLPRIVATE void     ImplEndDrag();
 
-    Ruler (const Ruler &) SAL_DELETED_FUNCTION;
-    Ruler& operator= (const Ruler &) SAL_DELETED_FUNCTION;
+    Ruler (const Ruler &) = delete;
+    Ruler& operator= (const Ruler &) = delete;
 
 protected:
     long            GetRulerVirHeight() const { return mnVirHeight;}
diff --git a/include/svtools/scriptedtext.hxx b/include/svtools/scriptedtext.hxx
index 47e1e4a19743..af3b82634e12 100644
--- a/include/svtools/scriptedtext.hxx
+++ b/include/svtools/scriptedtext.hxx
@@ -41,7 +41,7 @@ class SVT_DLLPUBLIC SvtScriptedTextHelper
 private:
     SvtScriptedTextHelper_Impl* mpImpl;             /// Implementation of class functionality.
 
-    SvtScriptedTextHelper&      operator=( const SvtScriptedTextHelper& ) SAL_DELETED_FUNCTION;
+    SvtScriptedTextHelper&      operator=( const SvtScriptedTextHelper& ) = delete;
 
 public:
                                 /** Constructor sets an output device and no fonts.
diff --git a/include/svtools/transfer.hxx b/include/svtools/transfer.hxx
index b58031d8c430..cc8286ef14d7 100644
--- a/include/svtools/transfer.hxx
+++ b/include/svtools/transfer.hxx
@@ -405,8 +405,8 @@ private:
     ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragGestureRecognizer > mxDragGestureRecognizer;
     ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragGestureListener >   mxDragGestureListener;
 
-    DragSourceHelper&   operator=( const DragSourceHelper& rDragSourceHelper ) SAL_DELETED_FUNCTION;
-    bool                operator==( const DragSourceHelper& rDragSourceHelper ) const SAL_DELETED_FUNCTION;
+    DragSourceHelper&   operator=( const DragSourceHelper& rDragSourceHelper ) = delete;
+    bool                operator==( const DragSourceHelper& rDragSourceHelper ) const = delete;
 
 public:
 
@@ -455,9 +455,9 @@ private:
     ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >    mxDropTargetListener;
     DataFlavorExVector*                                                                             mpFormats;
 
-                        DropTargetHelper() SAL_DELETED_FUNCTION;
-    DropTargetHelper&   operator=( const DropTargetHelper& rDropTargetHelper ) SAL_DELETED_FUNCTION;
-    bool                operator==( const DropTargetHelper& rDropTargetHelper ) const SAL_DELETED_FUNCTION;
+                        DropTargetHelper() = delete;
+    DropTargetHelper&   operator=( const DropTargetHelper& rDropTargetHelper ) = delete;
+    bool                operator==( const DropTargetHelper& rDropTargetHelper ) const = delete;
 
     void                ImplConstruct();
 
diff --git a/include/svtools/treelist.hxx b/include/svtools/treelist.hxx
index 26e3f90d63b4..873b9bb822bb 100644
--- a/include/svtools/treelist.hxx
+++ b/include/svtools/treelist.hxx
@@ -127,8 +127,8 @@ class SVT_DLLPUBLIC SvTreeList
     SVT_DLLPRIVATE void ResortChildren( SvTreeListEntry* pParent );
     SVT_DLLPRIVATE void ReverseChildren( SvTreeListEntry* pParent );
 
-    SvTreeList(const SvTreeList&) SAL_DELETED_FUNCTION;
-    SvTreeList& operator= (const SvTreeList&) SAL_DELETED_FUNCTION;
+    SvTreeList(const SvTreeList&) = delete;
+    SvTreeList& operator= (const SvTreeList&) = delete;
 
 protected:
     SvTreeListEntry*        pRootItem;
diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx
index 7215a2c4a0ff..8d41a49bd4ce 100644
--- a/include/svtools/valueset.hxx
+++ b/include/svtools/valueset.hxx
@@ -274,8 +274,8 @@ private:
     DECL_DLLPRIVATE_LINK_TYPED( ImplScrollHdl, ScrollBar*, void );
     DECL_DLLPRIVATE_LINK_TYPED( ImplTimerHdl, Timer*, void );
 
-    ValueSet (const ValueSet &) SAL_DELETED_FUNCTION;
-    ValueSet & operator= (const ValueSet &) SAL_DELETED_FUNCTION;
+    ValueSet (const ValueSet &) = delete;
+    ValueSet & operator= (const ValueSet &) = delete;
 
 protected:
     bool StartDrag( const CommandEvent& rCEvt, vcl::Region& rRegion );
diff --git a/include/svtools/xwindowitem.hxx b/include/svtools/xwindowitem.hxx
index 921ab112ba2b..07fc6f005b37 100644
--- a/include/svtools/xwindowitem.hxx
+++ b/include/svtools/xwindowitem.hxx
@@ -35,7 +35,7 @@ class SVT_DLLPUBLIC XWindowItem : public SfxPoolItem
 {
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >      m_xWin;
 
-    XWindowItem & operator = ( const XWindowItem & ) SAL_DELETED_FUNCTION;
+    XWindowItem & operator = ( const XWindowItem & ) = delete;
 
 public:
     TYPEINFO_OVERRIDE();