loplugin:deletedspecial

Change-Id: I9ea64443350ed2e1341b99270fa8b29189f07eb2

33 files changed, 97 insertions, 136 deletions

diff --git a/include/vcl/btndlg.hxx b/include/vcl/btndlg.hxx
index d537592de190..fc51c15b95d1 100644
--- a/include/vcl/btndlg.hxx
+++ b/include/vcl/btndlg.hxx
@@ -72,9 +72,8 @@ protected:
     SAL_DLLPRIVATE long ImplGetButtonSize();
 
 private:
-    // Copy assignment is forbidden and not implemented.
-    SAL_DLLPRIVATE      ButtonDialog( const ButtonDialog & );
-    SAL_DLLPRIVATE      ButtonDialog& operator=( const ButtonDialog& );
+                        ButtonDialog( const ButtonDialog & ) SAL_DELETED_FUNCTION;
+                        ButtonDialog& operator=( const ButtonDialog& ) SAL_DELETED_FUNCTION;
 
 private:
     boost::ptr_vector<ImplBtnDlgItem> maItemList;
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx
index 3ea832d9525d..3ab556ddfe50 100644
--- a/include/vcl/button.hxx
+++ b/include/vcl/button.hxx
@@ -43,9 +43,8 @@ private:
     /// Command URL (like .uno:Save) in case the button should handle it.
     OUString maCommand;
 
-    // Copy assignment is forbidden and not implemented.
-    SAL_DLLPRIVATE                  Button (const Button &);
-    SAL_DLLPRIVATE                  Button & operator= (const Button &);
+                                    Button (const Button &) SAL_DELETED_FUNCTION;
+                                    Button & operator= (const Button &) SAL_DELETED_FUNCTION;
 public:
     SAL_DLLPRIVATE sal_uInt16       ImplGetButtonState() const;
     SAL_DLLPRIVATE sal_uInt16&      ImplGetButtonState();
@@ -219,9 +218,8 @@ protected:
 private:
     SAL_DLLPRIVATE void            ImplInit( vcl::Window* pParent, WinBits nStyle );
 
-    // Copy assignment is forbidden and not implemented.
-    SAL_DLLPRIVATE                 OKButton (const OKButton &);
-    SAL_DLLPRIVATE                 OKButton & operator= (const OKButton &);
+                                   OKButton (const OKButton &) SAL_DELETED_FUNCTION;
+                                   OKButton & operator= (const OKButton &) SAL_DELETED_FUNCTION;
 
 public:
     explicit        OKButton( vcl::Window* pParent, WinBits nStyle = WB_DEFBUTTON );
@@ -237,9 +235,8 @@ protected:
 private:
     SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle );
 
-    // Copy assignment is forbidden and not implemented.
-    SAL_DLLPRIVATE      CancelButton (const CancelButton &);
-    SAL_DLLPRIVATE      CancelButton & operator= (const CancelButton &);
+                        CancelButton (const CancelButton &) SAL_DELETED_FUNCTION;
+                        CancelButton & operator= (const CancelButton &) SAL_DELETED_FUNCTION;
 
 public:
     explicit        CancelButton( vcl::Window* pParent, WinBits nStyle = 0 );
@@ -265,9 +262,8 @@ protected:
 private:
     SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle );
 
-    // Copy assignment is forbidden and not implemented.
-    SAL_DLLPRIVATE      HelpButton( const HelpButton & );
-    SAL_DLLPRIVATE      HelpButton & operator= ( const HelpButton & );
+                        HelpButton( const HelpButton & ) SAL_DELETED_FUNCTION;
+                        HelpButton & operator= ( const HelpButton & ) SAL_DELETED_FUNCTION;
 
 public:
     explicit        HelpButton( vcl::Window* pParent, WinBits nStyle = 0 );
@@ -310,9 +306,8 @@ private:
     SAL_DLLPRIVATE Size     ImplGetRadioImageSize() const;
     SAL_DLLPRIVATE long     ImplGetImageToTextDistance() const;
 
-    // Copy assignment is forbidden and not implemented.
-    SAL_DLLPRIVATE          RadioButton(const RadioButton &);
-    SAL_DLLPRIVATE          RadioButton& operator= (const RadioButton &);
+                            RadioButton(const RadioButton &) SAL_DELETED_FUNCTION;
+                            RadioButton& operator= (const RadioButton &) SAL_DELETED_FUNCTION;
 
 protected:
     using Control::ImplInitSettings;
@@ -437,9 +432,8 @@ private:
     SAL_DLLPRIVATE long         ImplGetImageToTextDistance() const;
     SAL_DLLPRIVATE Size         ImplGetCheckImageSize() const;
 
-    // Copy assignment is forbidden and not implemented.
-    SAL_DLLPRIVATE              CheckBox(const CheckBox &);
-    SAL_DLLPRIVATE              CheckBox& operator= (const CheckBox &);
+                                CheckBox(const CheckBox &) SAL_DELETED_FUNCTION;
+                                CheckBox& operator= (const CheckBox &) SAL_DELETED_FUNCTION;
 
 protected:
     using Control::ImplInitSettings;
@@ -523,9 +517,8 @@ protected:
 private:
     SAL_DLLPRIVATE void     ImplInitStyle();
 
-    // Copy assignment is forbidden and not implemented.
-    SAL_DLLPRIVATE          ImageButton( const ImageButton & );
-    SAL_DLLPRIVATE          ImageButton & operator= ( const ImageButton & );
+                            ImageButton( const ImageButton & ) SAL_DELETED_FUNCTION;
+                            ImageButton & operator= ( const ImageButton & ) SAL_DELETED_FUNCTION;
 
 public:
                     ImageButton( vcl::Window* pParent, WinBits nStyle = 0 );
@@ -535,9 +528,8 @@ public:
 
 class VCL_DLLPUBLIC ImageRadioButton : public RadioButton
 {
-    // Copy assignment is forbidden and not implemented.
-    SAL_DLLPRIVATE  ImageRadioButton( const ImageRadioButton & );
-    SAL_DLLPRIVATE  ImageRadioButton & operator= ( const ImageRadioButton & );
+                    ImageRadioButton( const ImageRadioButton & ) SAL_DELETED_FUNCTION;
+                    ImageRadioButton & operator= ( const ImageRadioButton & ) SAL_DELETED_FUNCTION;
 
 public:
     explicit        ImageRadioButton( vcl::Window* pParent, WinBits nStyle = 0 );
@@ -546,9 +538,8 @@ public:
 
 class VCL_DLLPUBLIC TriStateBox : public CheckBox
 {
-    // Copy assignment is forbidden and not implemented.
-    SAL_DLLPRIVATE  TriStateBox( const TriStateBox & );
-    SAL_DLLPRIVATE  TriStateBox & operator= ( const TriStateBox & );
+                    TriStateBox( const TriStateBox & ) SAL_DELETED_FUNCTION;
+                    TriStateBox & operator= ( const TriStateBox & ) SAL_DELETED_FUNCTION;
 
 public:
     explicit        TriStateBox( vcl::Window* pParent, WinBits nStyle = 0 );
diff --git a/include/vcl/ctrl.hxx b/include/vcl/ctrl.hxx
index 11582347936d..d85c85885b2c 100644
--- a/include/vcl/ctrl.hxx
+++ b/include/vcl/ctrl.hxx
@@ -46,9 +46,8 @@ private:
 
     SAL_DLLPRIVATE void     ImplInitControlData();
 
-    // Copy assignment is forbidden and not implemented.
-    SAL_DLLPRIVATE          Control (const Control &);
-    SAL_DLLPRIVATE          Control & operator= (const Control &);
+                            Control (const Control &) SAL_DELETED_FUNCTION;
+                            Control & operator= (const Control &) SAL_DELETED_FUNCTION;
 
 protected:
                     Control( WindowType nType );
diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx
index 11b862541bfa..0b00ebeccdda 100644
--- a/include/vcl/dialog.hxx
+++ b/include/vcl/dialog.hxx
@@ -53,9 +53,8 @@ private:
     SAL_DLLPRIVATE void    ImplInitDialogData();
     SAL_DLLPRIVATE void    ImplInitSettings();
 
-    // Copy assignment is forbidden and not implemented.
-    SAL_DLLPRIVATE         Dialog (const Dialog &);
-    SAL_DLLPRIVATE         Dialog & operator= (const Dialog &);
+    SAL_DLLPRIVATE         Dialog (const Dialog &) SAL_DELETED_FUNCTION;
+    SAL_DLLPRIVATE         Dialog & operator= (const Dialog &) SAL_DELETED_FUNCTION;
 
     DECL_DLLPRIVATE_LINK( ImplAsyncCloseHdl, void* );
 
@@ -126,9 +125,8 @@ public:
 // - ModelessDialog -
 class VCL_DLLPUBLIC ModelessDialog : public Dialog
 {
-    // Copy assignment is forbidden and not implemented.
-    SAL_DLLPRIVATE         ModelessDialog (const ModelessDialog &);
-    SAL_DLLPRIVATE         ModelessDialog & operator= (const ModelessDialog &);
+                    ModelessDialog (const ModelessDialog &) SAL_DELETED_FUNCTION;
+                    ModelessDialog & operator= (const ModelessDialog &) SAL_DELETED_FUNCTION;
 
 public:
     explicit        ModelessDialog( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription );
@@ -149,9 +147,8 @@ protected:
 
 private:
 
-    // Copy assignment is forbidden and not implemented.
-    SAL_DLLPRIVATE         ModalDialog (const ModalDialog &);
-    SAL_DLLPRIVATE         ModalDialog & operator= (const ModalDialog &);
+    SAL_DLLPRIVATE         ModalDialog (const ModalDialog &) SAL_DELETED_FUNCTION;
+    SAL_DLLPRIVATE         ModalDialog & operator= (const ModalDialog &) SAL_DELETED_FUNCTION;
 };
 
 #endif // INCLUDED_VCL_DIALOG_HXX
diff --git a/include/vcl/dockingarea.hxx b/include/vcl/dockingarea.hxx
index c0b75181159e..7fa2ad55fec0 100644
--- a/include/vcl/dockingarea.hxx
+++ b/include/vcl/dockingarea.hxx
@@ -31,9 +31,8 @@ class VCL_DLLPUBLIC DockingAreaWindow : public vcl::Window
 private:
     ImplData*       mpImplData;
 
-    // Copy assignment is forbidden and not implemented.
-    SAL_DLLPRIVATE  DockingAreaWindow (const DockingAreaWindow &);
-    SAL_DLLPRIVATE  DockingAreaWindow & operator= (const DockingAreaWindow &);
+                    DockingAreaWindow (const DockingAreaWindow &) SAL_DELETED_FUNCTION;
+                    DockingAreaWindow & operator= (const DockingAreaWindow &) SAL_DELETED_FUNCTION;
 
 public:
     explicit        DockingAreaWindow( vcl::Window* pParent );
diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx
index 1ae7479a19db..9cc9ec927dbc 100644
--- a/include/vcl/dockwin.hxx
+++ b/include/vcl/dockwin.hxx
@@ -271,9 +271,8 @@ private:
     SAL_DLLPRIVATE void setPosSizeOnContainee(Size aSize, Window &rBox);
     DECL_DLLPRIVATE_LINK( ImplHandleLayoutTimerHdl, void* );
 
-    // Copy assignment is forbidden and not implemented.
-    SAL_DLLPRIVATE         DockingWindow (const DockingWindow &);
-    SAL_DLLPRIVATE         DockingWindow & operator= (const DockingWindow &);
+                           DockingWindow (const DockingWindow &) SAL_DELETED_FUNCTION;
+                           DockingWindow & operator= (const DockingWindow &) SAL_DELETED_FUNCTION;
 
 protected:
     using Window::ImplInit;
diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx
index 5ad30a7282e5..d017b218901e 100644
--- a/include/vcl/floatwin.hxx
+++ b/include/vcl/floatwin.hxx
@@ -95,9 +95,8 @@ private:
     SAL_DLLPRIVATE void    ImplCallPopupModeEnd();
     DECL_DLLPRIVATE_LINK(  ImplEndPopupModeHdl, void* );
 
-    // Copy assignment is forbidden and not implemented.
-    SAL_DLLPRIVATE         FloatingWindow (const FloatingWindow &);
-    SAL_DLLPRIVATE         FloatingWindow & operator= (const FloatingWindow &);
+                           FloatingWindow (const FloatingWindow &) SAL_DELETED_FUNCTION;
+                           FloatingWindow & operator= (const FloatingWindow &) SAL_DELETED_FUNCTION;
 
 protected:
     using Window::ImplInit;
diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx
index 8ae868fe7fdc..9ae0af810ea2 100644
--- a/include/vcl/graphicfilter.hxx
+++ b/include/vcl/graphicfilter.hxx
@@ -162,8 +162,8 @@ class VCL_DLLPUBLIC GraphicDescriptor
     bool            ImpDetectEMF( SvStream& rStm, bool bExtendedInfo );
     bool            ImpDetectSVG( SvStream& rStm, bool bExtendedInfo );
     bool            ImpDetectMOV( SvStream& rStm, bool bExtendedInfo );
-    GraphicDescriptor( const GraphicDescriptor& );
-    GraphicDescriptor& operator=( const GraphicDescriptor& );
+    GraphicDescriptor( const GraphicDescriptor& ) SAL_DELETED_FUNCTION;
+    GraphicDescriptor& operator=( const GraphicDescriptor& ) SAL_DELETED_FUNCTION;
 
 public:
 
diff --git a/include/vcl/menubtn.hxx b/include/vcl/menubtn.hxx
index 83087ab98318..41e03c6462f9 100644
--- a/include/vcl/menubtn.hxx
+++ b/include/vcl/menubtn.hxx
@@ -47,9 +47,8 @@ private:
     SAL_DLLPRIVATE void    ImplInitMenuButtonData();
     DECL_DLLPRIVATE_LINK(  ImplMenuTimeoutHdl, void* );
 
-    // Copy assignment is forbidden and not implemented.
-    SAL_DLLPRIVATE         MenuButton( const MenuButton & );
-    SAL_DLLPRIVATE         MenuButton& operator=( const MenuButton & );
+                           MenuButton( const MenuButton & ) SAL_DELETED_FUNCTION;
+                           MenuButton& operator=( const MenuButton & ) SAL_DELETED_FUNCTION;
 
 protected:
     using Window::ImplInit;
diff --git a/include/vcl/metric.hxx b/include/vcl/metric.hxx
index e9872a97d7af..e2049696e500 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& );
-    void                operator=( const FontCharMap& );
+                        FontCharMap( const FontCharMap& ) SAL_DELETED_FUNCTION;
+    void                operator=( const FontCharMap& ) SAL_DELETED_FUNCTION;
 };
 
 inline void intrusive_ptr_add_ref(FontCharMap* pFontCharMap)
diff --git a/include/vcl/morebtn.hxx b/include/vcl/morebtn.hxx
index f77339136ba3..4dbd6da57736 100644
--- a/include/vcl/morebtn.hxx
+++ b/include/vcl/morebtn.hxx
@@ -39,9 +39,8 @@ private:
     MapUnit             meUnit;
     bool                mbState;
 
-    // Copy assignment is forbidden and not implemented.
-    SAL_DLLPRIVATE      MoreButton( const MoreButton & );
-    SAL_DLLPRIVATE      MoreButton& operator=( const MoreButton & );
+                        MoreButton( const MoreButton & ) SAL_DELETED_FUNCTION;
+                        MoreButton& operator=( const MoreButton & ) SAL_DELETED_FUNCTION;
     SAL_DLLPRIVATE void ShowState();
 
 protected:
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index 45226f0c8f0f..b0dd3f07afd3 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -244,8 +244,8 @@ private:
 
 private:
     SAL_DLLPRIVATE bool         EndJob();
-    SAL_DLLPRIVATE              Printer( const Printer& rPrinter );
-    SAL_DLLPRIVATE Printer&     operator =( const Printer& rPrinter );
+                                Printer( const Printer& rPrinter ) SAL_DELETED_FUNCTION;
+                   Printer&     operator =( const Printer& rPrinter ) SAL_DELETED_FUNCTION;
 
 public:
     SAL_DLLPRIVATE void         ImplStartPage();
diff --git a/include/vcl/quickselectionengine.hxx b/include/vcl/quickselectionengine.hxx
index 138a7883f891..3c33172a1667 100644
--- a/include/vcl/quickselectionengine.hxx
+++ b/include/vcl/quickselectionengine.hxx
@@ -80,9 +80,8 @@ namespace vcl
         bool bEnabled;
 
     private:
-        QuickSelectionEngine();                                         // never implemented
-        QuickSelectionEngine( const QuickSelectionEngine& );            // never implemented
-        QuickSelectionEngine& operator=( const QuickSelectionEngine& ); // never implemented
+        QuickSelectionEngine( const QuickSelectionEngine& ) SAL_DELETED_FUNCTION;
+        QuickSelectionEngine& operator=( const QuickSelectionEngine& ) SAL_DELETED_FUNCTION;
     };
 
 
diff --git a/include/vcl/split.hxx b/include/vcl/split.hxx
index c24556e5d72f..fbc833272ce7 100644
--- a/include/vcl/split.hxx
+++ b/include/vcl/split.hxx
@@ -53,9 +53,8 @@ private:
     SAL_DLLPRIVATE void      ImplRestoreSplitter();
     SAL_DLLPRIVATE void      ImplInitHorVer(bool bNew);
 
-    // Copy assignment is forbidden and not implemented.
-    SAL_DLLPRIVATE           Splitter (const Splitter &);
-    SAL_DLLPRIVATE           Splitter& operator= (const Splitter &);
+                             Splitter (const Splitter &) SAL_DELETED_FUNCTION;
+                             Splitter& operator= (const Splitter &) SAL_DELETED_FUNCTION;
 
 protected:
     using Window::ImplInit;
diff --git a/include/vcl/splitwin.hxx b/include/vcl/splitwin.hxx
index 83f640696814..715b08324a06 100644
--- a/include/vcl/splitwin.hxx
+++ b/include/vcl/splitwin.hxx
@@ -66,8 +66,6 @@ private:
                         mbCalc:1,
                         mbRecalc:1,
                         mbInvalidate:1,
-                        mbSizeable:1,
-                        mbBorder:1,
                         mbAutoHide:1,
                         mbFadeIn:1,
                         mbFadeOut:1,
@@ -121,9 +119,8 @@ private:
                                                 long& rMouseOff, ImplSplitSet** ppFoundSet, sal_uInt16& rFoundPos );
     static SAL_DLLPRIVATE void ImplDrawSplitTracking( SplitWindow* pThis, const Point& rPos );
 
-    // Copy assignment is forbidden and not implemented.
-    SAL_DLLPRIVATE      SplitWindow (const SplitWindow &);
-    SAL_DLLPRIVATE      SplitWindow & operator= (const SplitWindow &);
+                        SplitWindow (const SplitWindow &) SAL_DELETED_FUNCTION;
+                        SplitWindow & operator= (const SplitWindow &) SAL_DELETED_FUNCTION;
 public:
                         SplitWindow( vcl::Window* pParent, WinBits nStyle = 0 );
                         virtual ~SplitWindow();
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index cedca2ade592..9fc2d917f079 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -1513,8 +1513,8 @@ private:
 class VCL_DLLPUBLIC SolarMutexGuard
 {
     private:
-        SolarMutexGuard( const SolarMutexGuard& );
-        const SolarMutexGuard& operator = ( const SolarMutexGuard& );
+        SolarMutexGuard( const SolarMutexGuard& ) SAL_DELETED_FUNCTION;
+        const SolarMutexGuard& operator = ( const SolarMutexGuard& ) SAL_DELETED_FUNCTION;
         comphelper::SolarMutex& m_solarMutex;
 
     public:
@@ -1536,8 +1536,8 @@ class VCL_DLLPUBLIC SolarMutexGuard
 
 class VCL_DLLPUBLIC SolarMutexClearableGuard SAL_FINAL
 {
-    SolarMutexClearableGuard( const SolarMutexClearableGuard& );
-    const SolarMutexClearableGuard& operator = ( const SolarMutexClearableGuard& );
+    SolarMutexClearableGuard( const SolarMutexClearableGuard& ) SAL_DELETED_FUNCTION;
+    const SolarMutexClearableGuard& operator = ( const SolarMutexClearableGuard& ) SAL_DELETED_FUNCTION;
     bool m_bCleared;
 public:
     /** Acquires mutex
@@ -1573,8 +1573,8 @@ protected:
 
 class VCL_DLLPUBLIC SolarMutexResettableGuard SAL_FINAL
 {
-    SolarMutexResettableGuard( const SolarMutexResettableGuard& );
-    const SolarMutexResettableGuard& operator = ( const SolarMutexResettableGuard& );
+    SolarMutexResettableGuard( const SolarMutexResettableGuard& ) SAL_DELETED_FUNCTION;
+    const SolarMutexResettableGuard& operator = ( const SolarMutexResettableGuard& ) SAL_DELETED_FUNCTION;
     bool m_bCleared;
 public:
     /** Acquires mutex
diff --git a/include/vcl/syschild.hxx b/include/vcl/syschild.hxx
index 9a8c57d6ec5b..87e16fcc183a 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.
-    SAL_DLLPRIVATE          SystemChildWindow (const SystemChildWindow &);
-    SAL_DLLPRIVATE          SystemChildWindow & operator= (const SystemChildWindow &);
+                            SystemChildWindow (const SystemChildWindow &) SAL_DELETED_FUNCTION;
+                            SystemChildWindow & operator= (const SystemChildWindow &) SAL_DELETED_FUNCTION;
 
 public:
     explicit                SystemChildWindow( vcl::Window* pParent, WinBits nStyle = 0 );
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index d4baf3e16800..672b22958484 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -240,9 +240,8 @@ private:
     DECL_DLLPRIVATE_LINK(          ImplCustomMenuListener, VclMenuEvent* );
     DECL_DLLPRIVATE_LINK(          ImplDropdownLongClickHdl, void* );
 
-    // Copy assignment is forbidden and not implemented.
-    SAL_DLLPRIVATE                 ToolBox (const ToolBox &);
-    SAL_DLLPRIVATE        ToolBox& operator= (const ToolBox &);
+                                   ToolBox (const ToolBox &) SAL_DELETED_FUNCTION;
+                          ToolBox& operator= (const ToolBox &) SAL_DELETED_FUNCTION;
 
 public:
     SAL_DLLPRIVATE void            ImplFloatControl( bool bStart, FloatingWindow* pWindow = NULL );
diff --git a/include/vcl/virdev.hxx b/include/vcl/virdev.hxx
index 5776f5f5cb80..06dbae6ddffa 100644
--- a/include/vcl/virdev.hxx
+++ b/include/vcl/virdev.hxx
@@ -50,9 +50,8 @@ private:
                                                 const basebmp::RawMemorySharedArray &pBuffer,
                                                 const bool bTopDown );
 
-    // Copy assignment is forbidden and not implemented.
-    VirtualDevice (const VirtualDevice &);
-    VirtualDevice & operator= (const VirtualDevice &);
+    VirtualDevice (const VirtualDevice &) SAL_DELETED_FUNCTION;
+    VirtualDevice & operator= (const VirtualDevice &) SAL_DELETED_FUNCTION;
 
     /** Used for alpha VDev, to set areas to opaque
 
diff --git a/include/vcl/wrkwin.hxx b/include/vcl/wrkwin.hxx
index 5b3a266790f2..637bfc8779a6 100644
--- a/include/vcl/wrkwin.hxx
+++ b/include/vcl/wrkwin.hxx
@@ -53,8 +53,8 @@ private:
     SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle, const ::com::sun::star::uno::Any& aSystemWorkWindowToken );
 
 private:
-    SAL_DLLPRIVATE              WorkWindow( const WorkWindow& rWin );
-    SAL_DLLPRIVATE WorkWindow&  operator =( const WorkWindow& rWin );
+    WorkWindow( const WorkWindow& rWin ) SAL_DELETED_FUNCTION;
+    WorkWindow&  operator =( const WorkWindow& rWin ) SAL_DELETED_FUNCTION;
 
 protected:
     explicit        WorkWindow( WindowType nType );
diff --git a/vcl/inc/brdwin.hxx b/vcl/inc/brdwin.hxx
index 119f24c9e48a..e859e35065b6 100644
--- a/vcl/inc/brdwin.hxx
+++ b/vcl/inc/brdwin.hxx
@@ -111,9 +111,8 @@ private:
                                       WinBits nStyle, sal_uInt16 nTypeStyle,
                                       const ::com::sun::star::uno::Any& );
 
-                            // Copy assignment is forbidden and not implemented.
-                            ImplBorderWindow (const ImplBorderWindow &);
-                            ImplBorderWindow& operator= (const ImplBorderWindow &);
+                            ImplBorderWindow (const ImplBorderWindow &) SAL_DELETED_FUNCTION;
+                            ImplBorderWindow& operator= (const ImplBorderWindow &) SAL_DELETED_FUNCTION;
 
 public:
                             ImplBorderWindow( vcl::Window* pParent,
diff --git a/vcl/inc/cvtsvm.hxx b/vcl/inc/cvtsvm.hxx
index 5f2b69933c68..437839dcfb88 100644
--- a/vcl/inc/cvtsvm.hxx
+++ b/vcl/inc/cvtsvm.hxx
@@ -89,9 +89,8 @@ public:
                         ~SVMConverter() {}
 
 private:
-                        // Not implemented
-                        SVMConverter( const SVMConverter& );
-    SVMConverter&       operator=( const SVMConverter& );
+                        SVMConverter( const SVMConverter& ) SAL_DELETED_FUNCTION;
+    SVMConverter&       operator=( const SVMConverter& ) SAL_DELETED_FUNCTION;
 };
 
 #endif // INCLUDED_VCL_INC_CVTSVM_HXX
diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx
index 382e70c5206a..c8d3552ba7c9 100644
--- a/vcl/inc/generic/glyphcache.hxx
+++ b/vcl/inc/generic/glyphcache.hxx
@@ -303,9 +303,8 @@ private:
     ServerFont&             mrServerFont;
     com::sun::star::uno::Reference<com::sun::star::i18n::XBreakIterator> mxBreak;
 
-    // enforce proper copy semantic
-    SAL_DLLPRIVATE          ServerFontLayout( const ServerFontLayout& );
-    SAL_DLLPRIVATE          ServerFontLayout& operator=( const ServerFontLayout& );
+                            ServerFontLayout( const ServerFontLayout& ) SAL_DELETED_FUNCTION;
+                            ServerFontLayout& operator=( const ServerFontLayout& ) SAL_DELETED_FUNCTION;
 
 };
 
diff --git a/vcl/inc/graphite_features.hxx b/vcl/inc/graphite_features.hxx
index 2b8b81b1a72c..e957b508e1cb 100644
--- a/vcl/inc/graphite_features.hxx
+++ b/vcl/inc/graphite_features.hxx
@@ -57,7 +57,7 @@ namespace grutils
         size_t numFeatures() const { return mnNumSettings; }
         gr_feature_val * values() const { return mpSettings; };
     private:
-        GrFeatureParser(const GrFeatureParser & copy);
+        GrFeatureParser(const GrFeatureParser & copy) SAL_DELETED_FUNCTION;
         void setLang(const gr_face * face, const OString & lang);
         bool isCharId(const OString & id, size_t offset, size_t length);
         gr_uint32 getCharId(const OString & id, size_t offset, size_t length);
diff --git a/vcl/inc/image.h b/vcl/inc/image.h
index b9767ce0362c..ced9debcc6a6 100644
--- a/vcl/inc/image.h
+++ b/vcl/inc/image.h
@@ -49,9 +49,9 @@ private:
     void        ImplUpdateDisplayBmp( OutputDevice* pOutDev );
     void        ImplUpdateDisabledBmpEx( int nPos );
 
-private:    // prevent assignment and copy construction
-    ImplImageBmp( const ImplImageBmp& );
-    void operator=( const ImplImageBmp& );
+private:
+    ImplImageBmp( const ImplImageBmp& ) SAL_DELETED_FUNCTION;
+    void operator=( const ImplImageBmp& ) SAL_DELETED_FUNCTION;
 };
 
 // - ImageTypes -
@@ -137,9 +137,9 @@ struct ImplImage
                     ImplImage();
                     ~ImplImage();
 
-private:    // prevent assignment and copy construction
-            ImplImage( const ImplImage&);
-    void    operator=( const ImplImage&);
+private:
+            ImplImage( const ImplImage&) SAL_DELETED_FUNCTION;
+    void    operator=( const ImplImage&) SAL_DELETED_FUNCTION;
 };
 
 #endif // INCLUDED_VCL_INC_IMAGE_H
diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx
index 8efb30b9363f..3a02b1d9483a 100644
--- a/vcl/inc/impfont.hxx
+++ b/vcl/inc/impfont.hxx
@@ -168,9 +168,8 @@ private:
     friend void intrusive_ptr_add_ref(ImplFontCharMap* pImplFontCharMap);
     friend void intrusive_ptr_release(ImplFontCharMap* pImplFontCharMap);
 
-    // prevent assignment and copy construction
-    explicit            ImplFontCharMap( const ImplFontCharMap& );
-    void                operator=( const ImplFontCharMap& );
+                        ImplFontCharMap( const ImplFontCharMap& ) SAL_DELETED_FUNCTION;
+    void                operator=( const ImplFontCharMap& ) SAL_DELETED_FUNCTION;
 
     static ImplFontCharMapPtr getDefaultMap( bool bSymbols=false);
     bool                isDefaultMap() const;
diff --git a/vcl/inc/outfont.hxx b/vcl/inc/outfont.hxx
index 69de06ac1cf9..4533be7b06b3 100644
--- a/vcl/inc/outfont.hxx
+++ b/vcl/inc/outfont.hxx
@@ -297,8 +297,8 @@ public:
     sal_Int32           Count() const { return mnLines; }
 
 private:
-                            ImplMultiTextLineInfo( const ImplMultiTextLineInfo& );
-    ImplMultiTextLineInfo&  operator=( const ImplMultiTextLineInfo& );
+                            ImplMultiTextLineInfo( const ImplMultiTextLineInfo& ) SAL_DELETED_FUNCTION;
+    ImplMultiTextLineInfo&  operator=( const ImplMultiTextLineInfo& ) SAL_DELETED_FUNCTION;
 };
 
 #endif // INCLUDED_VCL_INC_OUTFONT_HXX
diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx
index 545181ac85c3..698263a55d31 100644
--- a/vcl/inc/sallayout.hxx
+++ b/vcl/inc/sallayout.hxx
@@ -208,9 +208,8 @@ protected:
     static int      CalcAsianKerning( sal_UCS4, bool bLeft, bool bVertical );
 
 private:
-    // enforce proper copy semantic
-    SAL_DLLPRIVATE  SalLayout( const SalLayout& );
-    SAL_DLLPRIVATE  SalLayout& operator=( const SalLayout& );
+                    SalLayout( const SalLayout& ) SAL_DELETED_FUNCTION;
+                    SalLayout& operator=( const SalLayout& ) SAL_DELETED_FUNCTION;
 
 protected:
     int             mnMinCharPos;
@@ -257,9 +256,8 @@ private:
     virtual void    DropGlyph( int ) SAL_OVERRIDE {}
     virtual void    Simplify( bool ) SAL_OVERRIDE {}
 
-    // enforce proper copy semantic
-    SAL_DLLPRIVATE  MultiSalLayout( const MultiSalLayout& );
-    SAL_DLLPRIVATE  MultiSalLayout& operator=( const MultiSalLayout& );
+                    MultiSalLayout( const MultiSalLayout& ) SAL_DELETED_FUNCTION;
+                    MultiSalLayout& operator=( const MultiSalLayout& ) SAL_DELETED_FUNCTION;
 
 private:
     SalLayout*      mpLayouts[ MAX_FALLBACK ];
@@ -363,9 +361,8 @@ protected:
 private:
     mutable Point   maBasePoint;
 
-    // enforce proper copy semantic
-    SAL_DLLPRIVATE  GenericSalLayout( const GenericSalLayout& );
-    SAL_DLLPRIVATE  GenericSalLayout& operator=( const GenericSalLayout& );
+                    GenericSalLayout( const GenericSalLayout& ) SAL_DELETED_FUNCTION;
+                    GenericSalLayout& operator=( const GenericSalLayout& ) SAL_DELETED_FUNCTION;
 };
 
 #undef SalGraphics
diff --git a/vcl/inc/textlayout.hxx b/vcl/inc/textlayout.hxx
index 3ba4d6012f9e..3510df221a66 100644
--- a/vcl/inc/textlayout.hxx
+++ b/vcl/inc/textlayout.hxx
@@ -97,9 +97,8 @@ namespace vcl
                               MetricVector* _pVector = NULL, OUString* _pDisplayText = NULL );
 
     private:
-        ControlTextRenderer();                                                  // never implemented
-        ControlTextRenderer( const ControlTextRenderer& );              // never implemented
-        ControlTextRenderer& operator=( const ControlTextRenderer& );   // never implemented
+        ControlTextRenderer( const ControlTextRenderer& ) SAL_DELETED_FUNCTION;
+        ControlTextRenderer& operator=( const ControlTextRenderer& ) SAL_DELETED_FUNCTION;
 
     private:
         ::std::unique_ptr< ReferenceDeviceTextLayout >   m_pImpl;
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx
index 1b1214386766..bac2d01a2240 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx
@@ -167,9 +167,8 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base
         // FilePicker Event functions
 
     private:
-        // prevent copy and assignment
-        SalGtkFilePicker( const SalGtkFilePicker& );
-        SalGtkFilePicker& operator=( const SalGtkFilePicker& );
+        SalGtkFilePicker( const SalGtkFilePicker& ) SAL_DELETED_FUNCTION;
+        SalGtkFilePicker& operator=( const SalGtkFilePicker& ) SAL_DELETED_FUNCTION;
 
         bool FilterNameExists( const OUString& rTitle );
         bool FilterNameExists( const UnoFilterList& _rGroupedFilters );
@@ -205,7 +204,6 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base
         GtkWidget  *m_pToggles[ TOGGLE_LAST ];
 
         bool mbToggleVisibility[TOGGLE_LAST];
-        bool mbToggleChecked[TOGGLE_LAST];
 
         enum {
             PLAY,
diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx
index f309dddd4e3b..0744bcd82bb2 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx
@@ -65,9 +65,8 @@ class SalGtkFolderPicker :
             throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     private:
-        // prevent copy and assignment
-        SalGtkFolderPicker( const SalGtkFolderPicker& );
-        SalGtkFolderPicker& operator=( const SalGtkFolderPicker& );
+        SalGtkFolderPicker( const SalGtkFolderPicker& ) SAL_DELETED_FUNCTION;
+        SalGtkFolderPicker& operator=( const SalGtkFolderPicker& ) SAL_DELETED_FUNCTION;
 };
 
 #endif // INCLUDED_VCL_UNX_GTK_FPICKER_SALGTKFOLDERPICKER_HXX
diff --git a/vcl/unx/kde/UnxFilePicker.hxx b/vcl/unx/kde/UnxFilePicker.hxx
index e1b54c312d69..d32db2d70d30 100644
--- a/vcl/unx/kde/UnxFilePicker.hxx
+++ b/vcl/unx/kde/UnxFilePicker.hxx
@@ -147,9 +147,8 @@ public:
     virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
 private:
-    // prevent copy and assignment
-    UnxFilePicker( const UnxFilePicker& );
-    UnxFilePicker& operator=( const UnxFilePicker& );
+    UnxFilePicker( const UnxFilePicker& ) SAL_DELETED_FUNCTION;
+    UnxFilePicker& operator=( const UnxFilePicker& ) SAL_DELETED_FUNCTION;
 
 protected:
     void                        initFilePicker();
diff --git a/vcl/unx/kde4/KDE4FilePicker.hxx b/vcl/unx/kde4/KDE4FilePicker.hxx
index 7ac1d2e223ad..5292a3eb55e4 100644
--- a/vcl/unx/kde4/KDE4FilePicker.hxx
+++ b/vcl/unx/kde4/KDE4FilePicker.hxx
@@ -219,9 +219,8 @@ Q_SIGNALS:
     void checkProtocolSignal();
 
 private:
-    // prevent copy and assignment
-    KDE4FilePicker( const KDE4FilePicker& );
-    KDE4FilePicker& operator=( const KDE4FilePicker& );
+    KDE4FilePicker( const KDE4FilePicker& ) SAL_DELETED_FUNCTION;
+    KDE4FilePicker& operator=( const KDE4FilePicker& ) SAL_DELETED_FUNCTION;
 
     //add a custom control widget to the file dialog
     void addCustomControl(sal_Int16 controlId);