loplugin:deletedspecial

Change-Id: Ia503ee8012ca9a2a6128c657961176968073f37f

20 files changed, 52 insertions, 88 deletions

diff --git a/include/svtools/acceleratorexecute.hxx b/include/svtools/acceleratorexecute.hxx
index 7880958f7e0e..cb47ade1e7ec 100644
--- a/include/svtools/acceleratorexecute.hxx
+++ b/include/svtools/acceleratorexecute.hxx
@@ -222,8 +222,8 @@ class SVT_DLLPUBLIC AcceleratorExecute : private TMutexInit
          */
         SVT_DLLPRIVATE AcceleratorExecute();
 
-        AcceleratorExecute(const AcceleratorExecute& rCopy);
-        void operator=(const AcceleratorExecute&) {};
+        AcceleratorExecute(const AcceleratorExecute& rCopy) SAL_DELETED_FUNCTION;
+        void operator=(const AcceleratorExecute&)  SAL_DELETED_FUNCTION;
 
         /** TODO document me */
         SVT_DLLPRIVATE OUString impl_ts_findCommand(const css::awt::KeyEvent& aKey);
diff --git a/include/svtools/bindablecontrolhelper.hxx b/include/svtools/bindablecontrolhelper.hxx
index 9811b00891d7..6ddaf5dc81d2 100644
--- a/include/svtools/bindablecontrolhelper.hxx
+++ b/include/svtools/bindablecontrolhelper.hxx
@@ -34,14 +34,10 @@ namespace svt
     /** helper class for obtaining streams (which also can be used with the ImageProducer)
         from a resource
     */
-    class BindableControlHelper
+    namespace BindableControlHelper
     {
-    private:
-        BindableControlHelper();    // never implemented
-
-    public:
-        SVT_DLLPUBLIC static  void ApplyListSourceAndBindableData( const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& xModel, const com::sun::star::uno::Reference< com::sun::star::uno::XInterface >& rObj, const OUString& rsCtrlSource, const OUString& rsRowSource, sal_uInt16 nRefTab = 0 );
-    };
+        SVT_DLLPUBLIC void ApplyListSourceAndBindableData( const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& xModel, const com::sun::star::uno::Reference< com::sun::star::uno::XInterface >& rObj, const OUString& rsCtrlSource, const OUString& rsRowSource, sal_uInt16 nRefTab = 0 );
+    }
 
 
 } // namespace svt
diff --git a/include/svtools/contextmenuhelper.hxx b/include/svtools/contextmenuhelper.hxx
index 6b5d58ce6485..c0fd6bcf6124 100644
--- a/include/svtools/contextmenuhelper.hxx
+++ b/include/svtools/contextmenuhelper.hxx
@@ -65,9 +65,8 @@ class SVT_DLLPUBLIC ContextMenuHelper
         // asynchronous link to prevent destruction while on stack
         DECL_STATIC_LINK( ContextMenuHelper, ExecuteHdl_Impl, ExecuteInfo* );
 
-        // no copy-ctor and operator=
-        ContextMenuHelper( const ContextMenuHelper& );
-        const ContextMenuHelper& operator=( const ContextMenuHelper& );
+        ContextMenuHelper( const ContextMenuHelper& ) SAL_DELETED_FUNCTION;
+        const ContextMenuHelper& operator=( const ContextMenuHelper& ) SAL_DELETED_FUNCTION;
 
         // show context menu and dispatch command automatically
         void            executePopupMenu( const Point& aPos, PopupMenu* pMenu );
@@ -99,7 +98,6 @@ class SVT_DLLPUBLIC ContextMenuHelper
         }
 
         ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XFrame >         m_xWeakFrame;
-        OUString                                                                 m_aModuleIdentifier;
         OUString                                                                 m_aSelf;
         ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer >     m_xURLTransformer;
         ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >       m_aDefaultArgs;
diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx
index 2968848cc277..886650bb59f8 100644
--- a/include/svtools/ctrlbox.hxx
+++ b/include/svtools/ctrlbox.hxx
@@ -198,9 +198,8 @@ public:
     }
 
 private:
-    // declared as private because some compilers would generate the default functions
-                    ColorListBox( const ColorListBox& );
-    ColorListBox&   operator =( const ColorListBox& );
+                    ColorListBox( const ColorListBox& ) SAL_DELETED_FUNCTION;
+    ColorListBox&   operator =( const ColorListBox& ) SAL_DELETED_FUNCTION;
 
     void            SetEntryData( sal_Int32  nPos, void* pNewData );
     void*           GetEntryData( sal_Int32  nPos ) const;
@@ -359,9 +358,8 @@ protected:
     Color   GetColorDist( sal_Int32  nPos = 0 );
 
 private:
-    // declared as private because some compilers would generate the default methods
-                    LineListBox( const LineListBox& );
-    LineListBox&    operator =( const LineListBox& );
+                    LineListBox( const LineListBox& ) SAL_DELETED_FUNCTION;
+    LineListBox&    operator =( const LineListBox& ) SAL_DELETED_FUNCTION;
     void            SetEntryData( sal_Int32  nPos, void* pNewData );
     void*           GetEntryData( sal_Int32  nPos ) const;
 };
@@ -418,9 +416,8 @@ public:
 private:
     void            InitFontMRUEntriesFile();
 
-    // declared as private because some compilers would generate the default functions
-                    FontNameBox( const FontNameBox& );
-    FontNameBox&    operator =( const FontNameBox& );
+                    FontNameBox( const FontNameBox& ) SAL_DELETED_FUNCTION;
+    FontNameBox&    operator =( const FontNameBox& ) SAL_DELETED_FUNCTION;
 };
 
 class SVT_DLLPUBLIC FontStyleBox : public ComboBox
@@ -444,9 +441,8 @@ public:
     void            Fill( const OUString& rName, const FontList* pList );
 
 private:
-    // declared as private because some compilers would generate the default functions
-                    FontStyleBox( const FontStyleBox& );
-    FontStyleBox&   operator =( const FontStyleBox& );
+                    FontStyleBox( const FontStyleBox& ) SAL_DELETED_FUNCTION;
+    FontStyleBox&   operator =( const FontStyleBox& ) SAL_DELETED_FUNCTION;
 };
 
 inline void FontStyleBox::SetText( const OUString& rText )
@@ -502,9 +498,8 @@ public:
     virtual sal_Int64   GetValue() const SAL_OVERRIDE;
 
 private:
-    // declared as private because some compilers would generate the default functions
-                    FontSizeBox( const FontSizeBox& );
-    FontSizeBox&    operator =( const FontSizeBox& );
+                    FontSizeBox( const FontSizeBox& ) SAL_DELETED_FUNCTION;
+    FontSizeBox&    operator =( const FontSizeBox& ) SAL_DELETED_FUNCTION;
 };
 
 #endif // INCLUDED_SVTOOLS_CTRLBOX_HXX
diff --git a/include/svtools/ctrltool.hxx b/include/svtools/ctrltool.hxx
index a28ff1d398a4..93fa66b2e976 100644
--- a/include/svtools/ctrltool.hxx
+++ b/include/svtools/ctrltool.hxx
@@ -137,7 +137,6 @@ private:
     OUString                maMapBoth;
     OUString                maMapPrinterOnly;
     OUString                maMapScreenOnly;
-    OUString                maMapSizeNotAvailable;
     OUString                maMapStyleNotAvailable;
     mutable OUString        maMapNotAvailable;
     OUString                maLight;
@@ -197,8 +196,8 @@ public:
     static const sal_IntPtr* GetStdSizeAry();
 
 private:
-                            FontList( const FontList& );
-    FontList&               operator =( const FontList& );
+                            FontList( const FontList& ) SAL_DELETED_FUNCTION;
+    FontList&               operator =( const FontList& ) SAL_DELETED_FUNCTION;
 };
 
 class SVT_DLLPUBLIC FontSizeNames
diff --git a/include/svtools/dialogcontrolling.hxx b/include/svtools/dialogcontrolling.hxx
index 150e934ca464..2e4014babd14 100644
--- a/include/svtools/dialogcontrolling.hxx
+++ b/include/svtools/dialogcontrolling.hxx
@@ -120,8 +120,8 @@ namespace svt
         DECL_LINK( OnWindowEvent, const VclWindowEvent* );
 
     private:
-        DialogController( const DialogController& );            // never implemented
-        DialogController& operator=( const DialogController& ); // never implemented
+        DialogController( const DialogController& ) SAL_DELETED_FUNCTION;
+        DialogController& operator=( const DialogController& ) SAL_DELETED_FUNCTION;
     };
     typedef ::boost::shared_ptr< DialogController > PDialogController;
 
@@ -181,8 +181,8 @@ namespace svt
         void    addController( const PDialogController& _pController );
 
     private:
-        ControlDependencyManager( const ControlDependencyManager& );            // never implemented
-        ControlDependencyManager& operator=( const ControlDependencyManager& ); // never implemented
+        ControlDependencyManager( const ControlDependencyManager& ) SAL_DELETED_FUNCTION;
+        ControlDependencyManager& operator=( const ControlDependencyManager& ) SAL_DELETED_FUNCTION;
     };
 
 
diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx
index 9a9722d36212..9d39b57e0d22 100644
--- a/include/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
@@ -445,9 +445,8 @@ namespace svt
         };
 
     private:
-        // forbid these ones
-        EditBrowseBox(EditBrowseBox&);
-        EditBrowseBox& operator=(EditBrowseBox&);
+        EditBrowseBox(EditBrowseBox&) SAL_DELETED_FUNCTION;
+        EditBrowseBox& operator=(EditBrowseBox&) SAL_DELETED_FUNCTION;
 
         class BrowserMouseEventPtr
         {
diff --git a/include/svtools/embedhlp.hxx b/include/svtools/embedhlp.hxx
index f157ce6c7761..ff899cd0fd23 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& );
+    EmbeddedObjectRef& operator = ( const EmbeddedObjectRef& ) SAL_DELETED_FUNCTION;
 
 public:
     static void DrawPaintReplacement( const Rectangle &rRect, const OUString &rText, OutputDevice *pOut );
diff --git a/include/svtools/imageresourceaccess.hxx b/include/svtools/imageresourceaccess.hxx
index 93287db5a671..fbfbeb0bdc42 100644
--- a/include/svtools/imageresourceaccess.hxx
+++ b/include/svtools/imageresourceaccess.hxx
@@ -37,16 +37,12 @@ namespace svt
     /** helper class for obtaining streams (which also can be used with the ImageProducer)
         from a resource
     */
-    class GraphicAccess
+    namespace GraphicAccess
     {
-    private:
-        GraphicAccess();    // never implemented
-
-    public:
         /** determines whether the given URL denotes an image within a resource
          ( or an image specified by a vnd.sun.star.GraphicObject scheme URL )
         */
-        SVT_DLLPUBLIC static  bool        isSupportedURL( const OUString& _rURL );
+        SVT_DLLPUBLIC bool        isSupportedURL( const OUString& _rURL );
 
         /** for a given URL of an image within a resource ( or an image specified by a vnd.sun.star.GraphicObject scheme URL ), this method retrieves
             an SvStream for this image.
@@ -57,7 +53,7 @@ namespace svt
             the image must be copied), so you are strongly encouraged to only use it
             when you know that the image is small enough.
         */
-        SVT_DLLPUBLIC static  SvStream*   getImageStream(
+        SVT_DLLPUBLIC SvStream*   getImageStream(
                     const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext,
                     const OUString& _rImageResourceURL
                 );
@@ -65,12 +61,12 @@ namespace svt
         /** for a given URL of an image within a resource ( or an image specified by a vnd.sun.star.GraphicObject scheme URL ), this method retrieves
             an com::sun::star::io::XInputStream for this image.
         */
-        SVT_DLLPUBLIC static  ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
+        SVT_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
                 getImageXStream(
                     const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext,
                     const OUString& _rImageResourceURL
                 );
-    };
+    }
 
 
 } // namespace svt
diff --git a/include/svtools/javacontext.hxx b/include/svtools/javacontext.hxx
index 08e4f75f4304..20e65873cb54 100644
--- a/include/svtools/javacontext.hxx
+++ b/include/svtools/javacontext.hxx
@@ -63,9 +63,8 @@ namespace svt
             throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     private:
-        SVT_DLLPRIVATE JavaContext(); //not implemented
-        SVT_DLLPRIVATE JavaContext(JavaContext&); //not implemented
-        SVT_DLLPRIVATE JavaContext& operator = (JavaContext&); //not implemented
+        JavaContext(JavaContext&) SAL_DELETED_FUNCTION;
+        JavaContext& operator = (JavaContext&) SAL_DELETED_FUNCTION;
 
         oslInterlockedCount m_aRefCount;
 
diff --git a/include/svtools/javainteractionhandler.hxx b/include/svtools/javainteractionhandler.hxx
index 2425cee6df96..7b0d00defe40 100644
--- a/include/svtools/javainteractionhandler.hxx
+++ b/include/svtools/javainteractionhandler.hxx
@@ -57,8 +57,8 @@ public:
 
 private:
     oslInterlockedCount m_aRefCount;
-    SVT_DLLPRIVATE JavaInteractionHandler(JavaInteractionHandler const&); //not implemented
-    SVT_DLLPRIVATE JavaInteractionHandler& operator = (JavaInteractionHandler const &); //not implemented
+    JavaInteractionHandler(JavaInteractionHandler const&) SAL_DELETED_FUNCTION;
+    JavaInteractionHandler& operator = (JavaInteractionHandler const &) SAL_DELETED_FUNCTION;
     SVT_DLLPRIVATE virtual ~JavaInteractionHandler();
     bool m_bShowErrorsOnce;
     bool m_bJavaDisabled_Handled;
diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx
index 86b7773568ee..6c430dcc54e9 100644
--- a/include/svtools/ruler.hxx
+++ b/include/svtools/ruler.hxx
@@ -719,9 +719,8 @@ private:
 
     DECL_DLLPRIVATE_LINK( ImplUpdateHdl, void* );
 
-    // Forbidden and not implemented.
-    Ruler (const Ruler &);
-    Ruler& operator= (const Ruler &);
+    Ruler (const Ruler &) SAL_DELETED_FUNCTION;
+    Ruler& operator= (const Ruler &) SAL_DELETED_FUNCTION;
 
 protected:
     long            GetRulerVirHeight() const { return mnVirHeight;}
diff --git a/include/svtools/scriptedtext.hxx b/include/svtools/scriptedtext.hxx
index 45f602b9239c..47e1e4a19743 100644
--- a/include/svtools/scriptedtext.hxx
+++ b/include/svtools/scriptedtext.hxx
@@ -41,8 +41,7 @@ class SVT_DLLPUBLIC SvtScriptedTextHelper
 private:
     SvtScriptedTextHelper_Impl* mpImpl;             /// Implementation of class functionality.
 
-                                /** Assignment operator not implemented to prevent usage. */
-    SvtScriptedTextHelper&      operator=( const SvtScriptedTextHelper& );
+    SvtScriptedTextHelper&      operator=( const SvtScriptedTextHelper& ) SAL_DELETED_FUNCTION;
 
 public:
                                 /** Constructor sets an output device and no fonts.
diff --git a/include/svtools/transfer.hxx b/include/svtools/transfer.hxx
index 3013a62a28eb..9cf81c8de868 100644
--- a/include/svtools/transfer.hxx
+++ b/include/svtools/transfer.hxx
@@ -406,10 +406,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;
 
-                        // not available
-                        DragSourceHelper();
-    DragSourceHelper&   operator=( const DragSourceHelper& rDragSourceHelper );
-    bool                operator==( const DragSourceHelper& rDragSourceHelper ) const;
+    DragSourceHelper&   operator=( const DragSourceHelper& rDragSourceHelper ) SAL_DELETED_FUNCTION;
+    bool                operator==( const DragSourceHelper& rDragSourceHelper ) const SAL_DELETED_FUNCTION;
 
 public:
 
@@ -458,10 +456,9 @@ private:
     ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >    mxDropTargetListener;
     DataFlavorExVector*                                                                             mpFormats;
 
-                        // not available
-                        DropTargetHelper();
-    DropTargetHelper&   operator=( const DropTargetHelper& rDropTargetHelper );
-    bool                operator==( const DropTargetHelper& rDropTargetHelper ) const;
+                        DropTargetHelper() SAL_DELETED_FUNCTION;
+    DropTargetHelper&   operator=( const DropTargetHelper& rDropTargetHelper ) SAL_DELETED_FUNCTION;
+    bool                operator==( const DropTargetHelper& rDropTargetHelper ) const SAL_DELETED_FUNCTION;
 
     void                ImplConstruct();
 
diff --git a/include/svtools/treelist.hxx b/include/svtools/treelist.hxx
index e702833ead21..ba631403d548 100644
--- a/include/svtools/treelist.hxx
+++ b/include/svtools/treelist.hxx
@@ -128,8 +128,8 @@ class SVT_DLLPUBLIC SvTreeList
     SVT_DLLPRIVATE void ResortChildren( SvTreeListEntry* pParent );
     SVT_DLLPRIVATE void ReverseChildren( SvTreeListEntry* pParent );
 
-    SvTreeList(const SvTreeList&); // disabled
-    SvTreeList& operator= (const SvTreeList&); // disabled
+    SvTreeList(const SvTreeList&) SAL_DELETED_FUNCTION;
+    SvTreeList& operator= (const SvTreeList&) SAL_DELETED_FUNCTION;
 
 protected:
     SvTreeListEntry*        pRootItem;
diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx
index fe6f8e5597f7..acb7a4e92ad7 100644
--- a/include/svtools/valueset.hxx
+++ b/include/svtools/valueset.hxx
@@ -270,9 +270,8 @@ private:
     DECL_DLLPRIVATE_LINK( ImplScrollHdl, ScrollBar* );
     DECL_DLLPRIVATE_LINK( ImplTimerHdl, void* );
 
-    // Forbidden and not implemented.
-    ValueSet (const ValueSet &);
-    ValueSet & operator= (const ValueSet &);
+    ValueSet (const ValueSet &) SAL_DELETED_FUNCTION;
+    ValueSet & operator= (const ValueSet &) SAL_DELETED_FUNCTION;
 
 protected:
 
diff --git a/include/svtools/xwindowitem.hxx b/include/svtools/xwindowitem.hxx
index 470b09ed4b09..a6117baf6c5a 100644
--- a/include/svtools/xwindowitem.hxx
+++ b/include/svtools/xwindowitem.hxx
@@ -35,8 +35,7 @@ class SVT_DLLPUBLIC XWindowItem : public SfxPoolItem
 {
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >      m_xWin;
 
-    // disallow use assignment operator
-    XWindowItem & operator = ( const XWindowItem & );
+    XWindowItem & operator = ( const XWindowItem & ) SAL_DELETED_FUNCTION;
 
 public:
     TYPEINFO_OVERRIDE();
diff --git a/svtools/inc/table/tablecontrol.hxx b/svtools/inc/table/tablecontrol.hxx
index cde9465ed222..87285f52946d 100644
--- a/svtools/inc/table/tablecontrol.hxx
+++ b/svtools/inc/table/tablecontrol.hxx
@@ -204,9 +204,8 @@ namespace svt { namespace table
         DECL_DLLPRIVATE_LINK( ImplSelectHdl, void* );
 
     private:
-        TableControl();                                 // never implemented
-        TableControl( const TableControl& );            // never implemented
-        TableControl& operator=( const TableControl& ); // never implemented
+        TableControl( const TableControl& ) SAL_DELETED_FUNCTION;
+        TableControl& operator=( const TableControl& ) SAL_DELETED_FUNCTION;
     };
 
 
diff --git a/svtools/source/graphic/descriptor.hxx b/svtools/source/graphic/descriptor.hxx
index 53dfacacbd12..94142a4d24cf 100644
--- a/svtools/source/graphic/descriptor.hxx
+++ b/svtools/source/graphic/descriptor.hxx
@@ -112,9 +112,9 @@ private:
     bool                    mbAlpha;
     bool                    mbAnimated;
 
-    GraphicDescriptor( const GraphicDescriptor& rDescriptor );
+    GraphicDescriptor( const GraphicDescriptor& rDescriptor ) SAL_DELETED_FUNCTION;
 
-    GraphicDescriptor& operator=( const GraphicDescriptor& );
+    GraphicDescriptor& operator=( const GraphicDescriptor& ) SAL_DELETED_FUNCTION;
 
     void implCreate( SvStream& rIStm, const OUString* pPath );
 };
diff --git a/svtools/source/misc/acceleratorexecute.cxx b/svtools/source/misc/acceleratorexecute.cxx
index 67660c27a2c7..4cfbfb7b524a 100644
--- a/svtools/source/misc/acceleratorexecute.cxx
+++ b/svtools/source/misc/acceleratorexecute.cxx
@@ -82,16 +82,6 @@ AcceleratorExecute::AcceleratorExecute()
 {
 }
 
-
-AcceleratorExecute::AcceleratorExecute(const AcceleratorExecute&)
-    : TMutexInit      (                                                     )
-    , m_aAsyncCallback(LINK(this, AcceleratorExecute, impl_ts_asyncCallback))
-{
-    // copy construction sint supported in real ...
-    // but we need this ctor to init our async callback ...
-}
-
-
 AcceleratorExecute::~AcceleratorExecute()
 {
     // does nothing real