loplugin:deletedspecial

Change-Id: I1ffc6af694367f0ff70b7598c093203f1f68882c

29 files changed, 70 insertions, 142 deletions

diff --git a/include/svx/AccessibleControlShape.hxx b/include/svx/AccessibleControlShape.hxx
index 55cd22d7d5f0..e19cf1499101 100644
--- a/include/svx/AccessibleControlShape.hxx
+++ b/include/svx/AccessibleControlShape.hxx
@@ -193,16 +193,9 @@ private:
     bool        m_bWaitingForControl    : 1;    // if we are created before our control exists, we need to wait for it to appear ...
 
 private:
-    /** Don't use the default constructor.  Use the public constructor that
-        takes the original shape and the parent as arguments instead.
-    */
-    AccessibleControlShape( );
-
-    /// Don't use the constructor. not implemented.
-    AccessibleControlShape(const AccessibleControlShape&);
+    AccessibleControlShape(const AccessibleControlShape&) SAL_DELETED_FUNCTION;
 
-    /// Don't use the assignment operator. not implemented.
-    AccessibleControlShape& operator= (const AccessibleControlShape&);
+    AccessibleControlShape& operator= (const AccessibleControlShape&) SAL_DELETED_FUNCTION;
 };
 
 } // end of namespace accessibility
diff --git a/include/svx/AccessibleGraphicShape.hxx b/include/svx/AccessibleGraphicShape.hxx
index 56f48b6404c4..3e8d46fee679 100644
--- a/include/svx/AccessibleGraphicShape.hxx
+++ b/include/svx/AccessibleGraphicShape.hxx
@@ -99,16 +99,9 @@ protected:
         throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
 
 private:
-    /** Don't use the default constructor.  Use the public constructor that
-        takes the original shape and the parent as arguments instead.
-    */
-    SVX_DLLPRIVATE AccessibleGraphicShape (void);
-
-    /// Don't use the constructor.  Not yet implemented.
-    SVX_DLLPRIVATE AccessibleGraphicShape (const AccessibleGraphicShape&);
+    AccessibleGraphicShape (const AccessibleGraphicShape&) SAL_DELETED_FUNCTION;
 
-    /// Don't use the assignment operator.  Not yet implemented.
-    SVX_DLLPRIVATE AccessibleGraphicShape& operator= (const AccessibleGraphicShape&);
+    AccessibleGraphicShape& operator= (const AccessibleGraphicShape&) SAL_DELETED_FUNCTION;
 };
 
 } // end of namespace accessibility
diff --git a/include/svx/AccessibleOLEShape.hxx b/include/svx/AccessibleOLEShape.hxx
index 945144af6620..943639851b8f 100644
--- a/include/svx/AccessibleOLEShape.hxx
+++ b/include/svx/AccessibleOLEShape.hxx
@@ -105,16 +105,9 @@ protected:
         throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
 
 private:
-    /** Don't use the default constructor.  Use the public constructor that
-        takes the original shape and the parent as arguments instead.
-    */
-    SVX_DLLPRIVATE AccessibleOLEShape (void);
+    AccessibleOLEShape (const AccessibleOLEShape&) SAL_DELETED_FUNCTION;
 
-    /// Don't use the constructor.  Not yet implemented.
-    SVX_DLLPRIVATE AccessibleOLEShape (const AccessibleOLEShape&);
-
-    /// Don't use the assignment operator.  Not yet implemented.
-    SVX_DLLPRIVATE AccessibleOLEShape& operator= (const AccessibleOLEShape&);
+    AccessibleOLEShape& operator= (const AccessibleOLEShape&) SAL_DELETED_FUNCTION;
 };
 
 } // end of namespace accessibility
diff --git a/include/svx/AccessibleShape.hxx b/include/svx/AccessibleShape.hxx
index 93188dad31a0..e7a6442b6537 100644
--- a/include/svx/AccessibleShape.hxx
+++ b/include/svx/AccessibleShape.hxx
@@ -459,14 +459,8 @@ protected:
     void UpdateStates (void);
 
 private:
-    /** Don't use the default constructor.  Use the public constructor that
-        takes the original shape and the parent as arguments instead.
-    */
-    SVX_DLLPRIVATE explicit AccessibleShape (void);
-    /// Don't use the copy constructor.  Is there any use for it?
-    SVX_DLLPRIVATE explicit AccessibleShape (const AccessibleShape&);
-    /// Don't use the assignment operator.  Do we need this?
-    SVX_DLLPRIVATE AccessibleShape& operator= (const AccessibleShape&);
+    AccessibleShape (const AccessibleShape&) SAL_DELETED_FUNCTION;
+    AccessibleShape& operator= (const AccessibleShape&) SAL_DELETED_FUNCTION;
     //Old accessible name
     OUString aAccName;
 
diff --git a/include/svx/AccessibleShapeInfo.hxx b/include/svx/AccessibleShapeInfo.hxx
index 6abb2b5b1726..d8591fcb1470 100644
--- a/include/svx/AccessibleShapeInfo.hxx
+++ b/include/svx/AccessibleShapeInfo.hxx
@@ -91,9 +91,7 @@ public:
 
     AccessibleShapeInfo (const AccessibleShapeInfo&);
 private:
-    // Don't use these three methods.
-    SVX_DLLPRIVATE explicit AccessibleShapeInfo (void);
-    SVX_DLLPRIVATE AccessibleShapeInfo& operator= (const AccessibleShapeInfo&);
+    AccessibleShapeInfo& operator= (const AccessibleShapeInfo&) SAL_DELETED_FUNCTION;
 };
 
 } // end of namespace accessibility
diff --git a/include/svx/ChildrenManager.hxx b/include/svx/ChildrenManager.hxx
index 74a9caa3c9b0..17bc1a36ab61 100644
--- a/include/svx/ChildrenManager.hxx
+++ b/include/svx/ChildrenManager.hxx
@@ -197,10 +197,8 @@ protected:
     ChildrenManagerImpl* mpImpl;
 
 private:
-    // Don't use the copy constructor or the assignment operator.  They are
-    // not implemented (and are not intended to be).
-    SVX_DLLPRIVATE ChildrenManager (const ChildrenManager&);
-    SVX_DLLPRIVATE ChildrenManager& operator= (const ChildrenManager&);
+    ChildrenManager (const ChildrenManager&) SAL_DELETED_FUNCTION;
+    ChildrenManager& operator= (const ChildrenManager&) SAL_DELETED_FUNCTION;
 };
 
 } // end of namespace accessibility
diff --git a/include/svx/EnhancedCustomShapeFunctionParser.hxx b/include/svx/EnhancedCustomShapeFunctionParser.hxx
index 0f2c87a3bd32..164ca6fd13f5 100644
--- a/include/svx/EnhancedCustomShapeFunctionParser.hxx
+++ b/include/svx/EnhancedCustomShapeFunctionParser.hxx
@@ -195,9 +195,8 @@ private:
     // supposed to be a singleton
     FunctionParser();
 
-    // default: disabled copy/assignment
-    FunctionParser(const FunctionParser&);
-    FunctionParser& operator=( const FunctionParser& );
+    FunctionParser(const FunctionParser&) SAL_DELETED_FUNCTION;
+    FunctionParser& operator=( const FunctionParser& ) SAL_DELETED_FUNCTION;
 };
 
 }
diff --git a/include/svx/fmmodel.hxx b/include/svx/fmmodel.hxx
index 128579b4fc7e..03f65dfe399b 100644
--- a/include/svx/fmmodel.hxx
+++ b/include/svx/fmmodel.hxx
@@ -42,8 +42,8 @@ private:
     bool            m_bOpenInDesignMode : 1;
     bool            m_bAutoControlFocus : 1;
 
-    SVX_DLLPRIVATE FmFormModel( const FmFormModel& );   // never implemented
-    SVX_DLLPRIVATE void operator=(const FmFormModel& rSrcModel);   // never implemented
+    FmFormModel( const FmFormModel& ) SAL_DELETED_FUNCTION;
+    void operator=(const FmFormModel& rSrcModel) SAL_DELETED_FUNCTION;
 
 public:
     TYPEINFO_OVERRIDE();
diff --git a/include/svx/rulritem.hxx b/include/svx/rulritem.hxx
index af5907a293cd..2204de11acef 100644
--- a/include/svx/rulritem.hxx
+++ b/include/svx/rulritem.hxx
@@ -43,7 +43,7 @@ class SVX_DLLPUBLIC SvxLongLRSpaceItem : public SfxPoolItem
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
 
 private:
-    SVX_DLLPRIVATE const SvxLongLRSpaceItem& operator=(const SvxLongLRSpaceItem &); // n.i.
+    const SvxLongLRSpaceItem& operator=(const SvxLongLRSpaceItem &) SAL_DELETED_FUNCTION;
 
 public:
     TYPEINFO_OVERRIDE();
@@ -76,7 +76,7 @@ class SVX_DLLPUBLIC SvxLongULSpaceItem : public SfxPoolItem
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
 
 private:
-    SVX_DLLPRIVATE const SvxLongULSpaceItem& operator=(const SvxLongULSpaceItem &); // n.i.
+    const SvxLongULSpaceItem& operator=(const SvxLongULSpaceItem &) SAL_DELETED_FUNCTION;
 
 public:
     TYPEINFO_OVERRIDE();
@@ -108,7 +108,7 @@ protected:
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
 
 private:
-    SVX_DLLPRIVATE const SvxPagePosSizeItem& operator=(const SvxPagePosSizeItem &); // n.i.
+    const SvxPagePosSizeItem& operator=(const SvxPagePosSizeItem &) SAL_DELETED_FUNCTION;
 public:
     TYPEINFO_OVERRIDE();
     SvxPagePosSizeItem(const Point &rPos, long lWidth, long lHeight);
@@ -234,7 +234,7 @@ protected:
     virtual bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
 
 private:
-    SVX_DLLPRIVATE const SvxObjectItem &operator=(const SvxObjectItem &); // n.i.
+    const SvxObjectItem &operator=(const SvxObjectItem &) SAL_DELETED_FUNCTION;
 
 public:
     TYPEINFO_OVERRIDE();
diff --git a/include/svx/sdr/table/tablecontroller.hxx b/include/svx/sdr/table/tablecontroller.hxx
index 11824be41b17..ca5f024f3134 100644
--- a/include/svx/sdr/table/tablecontroller.hxx
+++ b/include/svx/sdr/table/tablecontroller.hxx
@@ -113,8 +113,8 @@ public:
     //declare event notification method
     void NotifySelection( const CellPos& firstPos, const CellPos& lastPos, const CellPos& newPos );
 private:
-    SvxTableController(SvxTableController &); // not defined
-    void operator =(SvxTableController &); // not defined
+    SvxTableController(SvxTableController &) SAL_DELETED_FUNCTION;
+    void operator =(SvxTableController &) SAL_DELETED_FUNCTION;
 
     // internals
     SVX_DLLPRIVATE void ApplyBorderAttr( const SfxItemSet& rAttr );
diff --git a/include/svx/sdrmasterpagedescriptor.hxx b/include/svx/sdrmasterpagedescriptor.hxx
index 7da54df7971d..92da6c41d8c5 100644
--- a/include/svx/sdrmasterpagedescriptor.hxx
+++ b/include/svx/sdrmasterpagedescriptor.hxx
@@ -51,8 +51,7 @@ namespace sdr
         // ViewContact part
         sdr::contact::ViewContact*                      mpViewContact;
 
-        // assignment operator defined, but not implemented
-        void operator=(const MasterPageDescriptor& rCandidate);
+        void operator=(const MasterPageDescriptor& rCandidate) SAL_DELETED_FUNCTION;
 
     protected:
         sdr::contact::ViewContact* CreateObjectSpecificViewContact();
diff --git a/include/svx/sdrpagewindow.hxx b/include/svx/sdrpagewindow.hxx
index e7156eb91a45..05e1aa6f0d04 100644
--- a/include/svx/sdrpagewindow.hxx
+++ b/include/svx/sdrpagewindow.hxx
@@ -51,8 +51,8 @@ class SVX_DLLPUBLIC SdrPageWindow
 
     Impl* mpImpl;
 
-    SdrPageWindow( const SdrPageWindow& ); // disabled
-    SdrPageWindow& operator= ( const SdrPageWindow& ); // disabled
+    SdrPageWindow( const SdrPageWindow& ) SAL_DELETED_FUNCTION;
+    SdrPageWindow& operator= ( const SdrPageWindow& ) SAL_DELETED_FUNCTION;
 
 public:
     SdrPageWindow(SdrPageView& rNewPageView, SdrPaintWindow& rPaintWindow);
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index d71434d4d3aa..b3fa3c4b43a0 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -259,10 +259,9 @@ protected:
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoModel();
 
 private:
-    // not implemented:
-    SVX_DLLPRIVATE SdrModel(const SdrModel& rSrcModel);
-    SVX_DLLPRIVATE void operator=(const SdrModel& rSrcModel);
-    SVX_DLLPRIVATE bool operator==(const SdrModel& rCmpModel) const;
+    SdrModel(const SdrModel& rSrcModel) SAL_DELETED_FUNCTION;
+    void operator=(const SdrModel& rSrcModel) SAL_DELETED_FUNCTION;
+    bool operator==(const SdrModel& rCmpModel) const SAL_DELETED_FUNCTION;
     SVX_DLLPRIVATE void ImpPostUndoAction(SdrUndoAction* pUndo);
     SVX_DLLPRIVATE void ImpSetUIUnit();
     SVX_DLLPRIVATE void ImpSetOutlinerDefaults( SdrOutliner* pOutliner, bool bInit = false );
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index ab94f3150d03..1d83a024e055 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -194,9 +194,9 @@ protected:
     sal_uInt16                      nVersion;
 
 private:
-    SVX_DLLPRIVATE void operator=(const SdrObjUserData& rData);        // not implemented
-    SVX_DLLPRIVATE bool operator==(const SdrObjUserData& rData) const; // not implemented
-    SVX_DLLPRIVATE bool operator!=(const SdrObjUserData& rData) const; // not implemented
+    void operator=(const SdrObjUserData& rData) SAL_DELETED_FUNCTION;
+    bool operator==(const SdrObjUserData& rData) const SAL_DELETED_FUNCTION;
+    bool operator!=(const SdrObjUserData& rData) const SAL_DELETED_FUNCTION;
 
 public:
     TYPEINFO();
@@ -273,7 +273,7 @@ private:
     struct Impl;
     Impl* mpImpl;
 
-    SdrObject( const SdrObject& ); // disabled
+    SdrObject( const SdrObject& ) SAL_DELETED_FUNCTION;
 
 public:
     void AddObjectUser(sdr::ObjectUser& rNewUser);
diff --git a/include/svx/svdovirt.hxx b/include/svx/svdovirt.hxx
index ce4c31828016..6140c386492c 100644
--- a/include/svx/svdovirt.hxx
+++ b/include/svx/svdovirt.hxx
@@ -35,7 +35,7 @@
 
 class SVX_DLLPUBLIC SdrVirtObj : public SdrObject
 {
-    SdrVirtObj( const SdrVirtObj& ); // disabled
+    SdrVirtObj( const SdrVirtObj& ) SAL_DELETED_FUNCTION;
 public:
     virtual sdr::properties::BaseProperties& GetProperties() const SAL_OVERRIDE;
 
diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx
index c05a5b80f4c0..03387e2b79ad 100644
--- a/include/svx/svdpage.hxx
+++ b/include/svx/svdpage.hxx
@@ -326,8 +326,8 @@ public:
 class SVX_DLLPUBLIC SdrPageGridFrameList {
     std::vector<SdrPageGridFrame*> aList;
 private:
-    SVX_DLLPRIVATE SdrPageGridFrameList(const SdrPageGridFrameList& rSrcList);      // never implemented
-    SVX_DLLPRIVATE void           operator=(const SdrPageGridFrameList& rSrcList);  // never implemented
+    SdrPageGridFrameList(const SdrPageGridFrameList& rSrcList) SAL_DELETED_FUNCTION;
+    void           operator=(const SdrPageGridFrameList& rSrcList) SAL_DELETED_FUNCTION;
 protected:
     SdrPageGridFrame* GetObject(sal_uInt16 i) const { return aList[i]; }
 public:
@@ -374,8 +374,7 @@ private:
     void ImpRemoveStyleSheet();
     void ImpAddStyleSheet(SfxStyleSheet& rNewStyleSheet);
 
-    // not implemented
-    SdrPageProperties& operator=(const SdrPageProperties& rCandidate);
+    SdrPageProperties& operator=(const SdrPageProperties& rCandidate) SAL_DELETED_FUNCTION;
 
 public:
     // construct/destruct
diff --git a/svx/inc/sdr/contact/viewcontactofunocontrol.hxx b/svx/inc/sdr/contact/viewcontactofunocontrol.hxx
index 254b9033ed09..9544170bc834 100644
--- a/svx/inc/sdr/contact/viewcontactofunocontrol.hxx
+++ b/svx/inc/sdr/contact/viewcontactofunocontrol.hxx
@@ -73,9 +73,8 @@ namespace sdr { namespace contact {
         virtual ViewObjectContact& CreateObjectSpecificViewObjectContact( ObjectContact& _rObjectContact ) SAL_OVERRIDE;
 
     private:
-        ViewContactOfUnoControl();                                            // never implemented
-        ViewContactOfUnoControl( const ViewContactOfUnoControl& );              // never implemented
-        ViewContactOfUnoControl& operator=( const ViewContactOfUnoControl& );   // never implemented
+        ViewContactOfUnoControl( const ViewContactOfUnoControl& ) SAL_DELETED_FUNCTION;
+        ViewContactOfUnoControl& operator=( const ViewContactOfUnoControl& ) SAL_DELETED_FUNCTION;
 
     protected:
         // This method is responsible for creating the graphical visualisation data
diff --git a/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx b/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx
index 50140badca56..2d461f849b1d 100644
--- a/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx
+++ b/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx
@@ -100,9 +100,8 @@ namespace sdr { namespace contact {
         void impl_onControlChangedOrModified();
 
     private:
-        ViewObjectContactOfUnoControl();                                                    // never implemented
-        ViewObjectContactOfUnoControl( const ViewObjectContactOfUnoControl& );              // never implemented
-        ViewObjectContactOfUnoControl& operator=( const ViewObjectContactOfUnoControl& );   // never implemented
+        ViewObjectContactOfUnoControl( const ViewObjectContactOfUnoControl& ) SAL_DELETED_FUNCTION;
+        ViewObjectContactOfUnoControl& operator=( const ViewObjectContactOfUnoControl& ) SAL_DELETED_FUNCTION;
     };
 
     class SVX_DLLPRIVATE UnoControlPrintOrPreviewContact : public ViewObjectContactOfUnoControl
@@ -112,9 +111,8 @@ namespace sdr { namespace contact {
         virtual ~UnoControlPrintOrPreviewContact();
 
     private:
-        UnoControlPrintOrPreviewContact();                                                 // never implemented
-        UnoControlPrintOrPreviewContact( const UnoControlPrintOrPreviewContact& );            // never implemented
-        UnoControlPrintOrPreviewContact& operator=( const UnoControlPrintOrPreviewContact& ); // never implemented
+        UnoControlPrintOrPreviewContact( const UnoControlPrintOrPreviewContact& ) SAL_DELETED_FUNCTION;
+        UnoControlPrintOrPreviewContact& operator=( const UnoControlPrintOrPreviewContact& ) SAL_DELETED_FUNCTION;
 
         virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo ) const SAL_OVERRIDE;
     };
diff --git a/svx/source/accessibility/ChildrenManagerImpl.hxx b/svx/source/accessibility/ChildrenManagerImpl.hxx
index 4ef4d8b30fc2..93769e05f2e9 100644
--- a/svx/source/accessibility/ChildrenManagerImpl.hxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.hxx
@@ -363,10 +363,8 @@ private:
     */
     sal_Int32 mnNewNameIndex;
 
-    // Don't use the copy constructor or the assignment operator.  They are
-    // not implemented (and are not intended to be).
-    ChildrenManagerImpl (const ChildrenManagerImpl&);
-    ChildrenManagerImpl& operator= (const ChildrenManagerImpl&);
+    ChildrenManagerImpl (const ChildrenManagerImpl&) SAL_DELETED_FUNCTION;
+    ChildrenManagerImpl& operator= (const ChildrenManagerImpl&) SAL_DELETED_FUNCTION;
 
     /** This member points to the currently focused shape.  It is NULL when
         there is no focused shape.
diff --git a/svx/source/form/fmcontrollayout.cxx b/svx/source/form/fmcontrollayout.cxx
index dc76c80e8d57..9bcafa7ffba3 100644
--- a/svx/source/form/fmcontrollayout.cxx
+++ b/svx/source/form/fmcontrollayout.cxx
@@ -73,6 +73,14 @@ namespace svxform
 
     namespace
     {
+        ::utl::OConfigurationNode getLayoutSettings( DocumentType _eDocType )
+        {
+            OUString sConfigName = "/org.openoffice.Office.Common/Forms/ControlLayout/";
+            sConfigName += DocumentClassification::getModuleIdentifierForDocumentType( _eDocType );
+            return OConfigurationTreeRoot::createWithComponentContext(
+                ::comphelper::getProcessComponentContext(),    // TODO
+                sConfigName );
+        }
 
         template< class INTERFACE_TYPE >
         Reference< INTERFACE_TYPE > getTypedModelNode( const Reference< XInterface >& _rxModelNode )
@@ -279,17 +287,6 @@ namespace svxform
         }
     }
 
-
-    ::utl::OConfigurationNode ControlLayouter::getLayoutSettings( DocumentType _eDocType )
-    {
-        OUString sConfigName = "/org.openoffice.Office.Common/Forms/ControlLayout/";
-        sConfigName += DocumentClassification::getModuleIdentifierForDocumentType( _eDocType );
-        return OConfigurationTreeRoot::createWithComponentContext(
-            ::comphelper::getProcessComponentContext(),    // TODO
-            sConfigName );
-    }
-
-
     bool ControlLayouter::useDynamicBorderColor( DocumentType _eDocType )
     {
         OConfigurationNode aConfig = getLayoutSettings( _eDocType );
diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx
index a3459b8329d2..7a351b9e1fa9 100644
--- a/svx/source/inc/datanavi.hxx
+++ b/svx/source/inc/datanavi.hxx
@@ -156,7 +156,7 @@ namespace svxform
         OUString m_sInstance_API;
         OUString m_sNone_API;
 
-        ReplaceString( const ReplaceString& );
+        ReplaceString( const ReplaceString& ) SAL_DELETED_FUNCTION;
 
     public:
         ReplaceString() :
@@ -204,7 +204,7 @@ namespace svxform
         OUString m_sPut_API;
         OUString m_sGet_API;
 
-        MethodString( const MethodString& );
+        MethodString( const MethodString& ) SAL_DELETED_FUNCTION;
 
     public:
 
diff --git a/svx/source/inc/delayedevent.hxx b/svx/source/inc/delayedevent.hxx
index 9f4a12a1b533..5f078aa9d3c7 100644
--- a/svx/source/inc/delayedevent.hxx
+++ b/svx/source/inc/delayedevent.hxx
@@ -69,9 +69,8 @@ namespace svxform
         DECL_LINK( OnCall, void* );
 
     private:
-        DelayedEvent();                                  // never implemented
-        DelayedEvent( const DelayedEvent& );              // never implemented
-        DelayedEvent& operator=( const DelayedEvent& );   // never implemented
+        DelayedEvent( const DelayedEvent& ) SAL_DELETED_FUNCTION;
+        DelayedEvent& operator=( const DelayedEvent& ) SAL_DELETED_FUNCTION;
     };
 
 
diff --git a/svx/source/inc/fmcontrollayout.hxx b/svx/source/inc/fmcontrollayout.hxx
index 422763c957fd..b717c8f6cb37 100644
--- a/svx/source/inc/fmcontrollayout.hxx
+++ b/svx/source/inc/fmcontrollayout.hxx
@@ -29,24 +29,23 @@
 namespace svxform
 {
 
-    class ControlLayouter
+    namespace ControlLayouter
     {
-    public:
         /** initializes the layout of a newly created form control (model)
         */
-        static void initializeControlLayout(
+        void initializeControlLayout(
                         const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControlModel,
                         DocumentType _eDocType
                     );
 
         /** determines whether for the given document type, dynamic control border coloring is enabled
         */
-        static bool useDynamicBorderColor( DocumentType _eDocType );
+        bool useDynamicBorderColor( DocumentType _eDocType );
 
         /** determines whether for the given document type, form controls should use the document's reference device
             for text rendering
         */
-        static bool useDocumentReferenceDevice( DocumentType _eDocType );
+        bool useDocumentReferenceDevice( DocumentType _eDocType );
 
         /** gets the "default" style in a document which can be used if some default text format is needed
 
@@ -56,18 +55,9 @@ namespace svxform
             @param _rxModel
                 a form component.
         */
-        static ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
+        ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
                     getDefaultDocumentTextStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxModel );
-
-    private:
-        ControlLayouter();    // never implemented
-
-    private:
-        static ::utl::OConfigurationNode
-            getLayoutSettings(
-                DocumentType _eDocType
-            );
-    };
+    }
 
 
 } // namespace svxform
diff --git a/svx/source/inc/fmobj.hxx b/svx/source/inc/fmobj.hxx
index 8663bc9e1b5d..01ff874296c6 100644
--- a/svx/source/inc/fmobj.hxx
+++ b/svx/source/inc/fmobj.hxx
@@ -29,7 +29,7 @@
 
 class SVX_DLLPUBLIC FmFormObj: public SdrUnoObj
 {
-    FmFormObj( const FmFormObj& ); // disabled
+    FmFormObj( const FmFormObj& ) SAL_DELETED_FUNCTION;
 
     ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >  aEvts;  // events des Objects
     ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor>   m_aEventsHistory;
diff --git a/svx/source/inc/fmpgeimp.hxx b/svx/source/inc/fmpgeimp.hxx
index fee4a834dfb0..17b5644ee484 100644
--- a/svx/source/inc/fmpgeimp.hxx
+++ b/svx/source/inc/fmpgeimp.hxx
@@ -146,9 +146,8 @@ private:
         impl_createControlShapeMap_nothrow();
 
 private:
-    FmFormPageImpl();                                   // never implemented
-    FmFormPageImpl( const FmFormPageImpl& );            // never implemented
-    FmFormPageImpl& operator=( const FmFormPageImpl& ); // never implemented
+    FmFormPageImpl( const FmFormPageImpl& ) SAL_DELETED_FUNCTION;
+    FmFormPageImpl& operator=( const FmFormPageImpl& ) SAL_DELETED_FUNCTION;
 };
 
 
diff --git a/svx/source/inc/formcontrolling.hxx b/svx/source/inc/formcontrolling.hxx
index 5822a6ec1934..5927e4a505dc 100644
--- a/svx/source/inc/formcontrolling.hxx
+++ b/svx/source/inc/formcontrolling.hxx
@@ -215,9 +215,8 @@ namespace svx
         }
 
     private:
-        FormControllerHelper();                                         // never implemented
-        FormControllerHelper( const FormControllerHelper& );            // never implemented
-        FormControllerHelper& operator=( const FormControllerHelper& ); // never implemented
+        FormControllerHelper( const FormControllerHelper& ) SAL_DELETED_FUNCTION;
+        FormControllerHelper& operator=( const FormControllerHelper& ) SAL_DELETED_FUNCTION;
     };
 
 
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 60aec9453890..64a5304cd04d 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -306,19 +306,6 @@ SdrModel::~SdrModel()
     delete mpImpl;
 }
 
-
-// not yet implemented
-void SdrModel::operator=(const SdrModel&)
-{
-    OSL_FAIL("SdrModel::operator=() is not yet implemented.");
-}
-
-bool SdrModel::operator==(const SdrModel&) const
-{
-    OSL_FAIL("SdrModel::operator==() is not yet implemented");
-    return false;
-}
-
 void SdrModel::SetSwapGraphics( bool bSwap )
 {
     bSwapGraphics = bSwap;
diff --git a/svx/source/table/accessiblecell.hxx b/svx/source/table/accessiblecell.hxx
index fd07cf5925f0..86d31e9d38d1 100644
--- a/svx/source/table/accessiblecell.hxx
+++ b/svx/source/table/accessiblecell.hxx
@@ -131,9 +131,8 @@ protected:
     AccessibleTableShape *pAccTable;
 
 private:
-    explicit AccessibleCell(void);  // not implemented
-    explicit AccessibleCell(const AccessibleCell&); // not implemented
-    AccessibleCell& operator=(const AccessibleCell&); // not implemented
+    AccessibleCell(const AccessibleCell&) SAL_DELETED_FUNCTION;
+    AccessibleCell& operator=(const AccessibleCell&) SAL_DELETED_FUNCTION;
 };
 
 } // end of namespace accessibility
diff --git a/svx/source/unogallery/unogalitem.hxx b/svx/source/unogallery/unogalitem.hxx
index 7f60ad842acd..a0e0b1e3a95c 100644
--- a/svx/source/unogallery/unogalitem.hxx
+++ b/svx/source/unogallery/unogalitem.hxx
@@ -95,10 +95,8 @@ private:
     const ::GalleryObject*      implGetObject() const { return mpGalleryObject;}
     void                        implSetInvalid();
 
-                                // not available
-                                GalleryItem();
-                                GalleryItem( const GalleryItem& );
-                                GalleryItem& operator=( const GalleryItem& );
+                                GalleryItem( const GalleryItem& ) SAL_DELETED_FUNCTION;
+                                GalleryItem& operator=( const GalleryItem& ) SAL_DELETED_FUNCTION;
 };