vcl: VclPtr conversion in svx.

Change-Id: I3a1000baa049b11728c46efbc2f0af0d8f34cf2b

Conflicts:
include/svx/charmap.hxx
include/svx/float3d.hxx
include/svx/fontwork.hxx
include/svx/galctrl.hxx
svx/inc/svdibrow.hxx
svx/source/dialog/dlgctl3d.cxx
svx/source/dialog/fontwork.cxx
svx/source/engine3d/float3d.cxx
svx/source/fmcomp/gridctrl.cxx
svx/source/gallery2/galbrws1.cxx
svx/source/inc/docrecovery.hxx

45 files changed, 177 insertions, 165 deletions

diff --git a/include/avmedia/mediaplayer.hxx b/include/avmedia/mediaplayer.hxx
index 101c6c623dfc..bb24bd08ff0a 100644
--- a/include/avmedia/mediaplayer.hxx
+++ b/include/avmedia/mediaplayer.hxx
@@ -45,6 +45,7 @@ public:
 
                             MediaFloater( SfxBindings* pBindings, SfxChildWindow* pCW, vcl::Window* pParent );
                             virtual ~MediaFloater();
+    virtual void            dispose() SAL_OVERRIDE;
 
     void                    setURL( const OUString& rURL, const OUString& rReferer, bool bPlayImmediately );
 
diff --git a/include/svx/bmpmask.hxx b/include/svx/bmpmask.hxx
index 8ee7e7c71b18..52e4f1574c4f 100644
--- a/include/svx/bmpmask.hxx
+++ b/include/svx/bmpmask.hxx
@@ -139,6 +139,7 @@ public:
 
     SvxBmpMask(SfxBindings *pBindinx, SfxChildWindow *pCW, vcl::Window* pParent);
     virtual ~SvxBmpMask();
+    virtual void dispose() SAL_OVERRIDE;
 
     void                SetColor( const Color& rColor );
     void                PipetteClicked();
diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx
index d27afb6c9042..c877be2d0ea4 100644
--- a/include/svx/charmap.hxx
+++ b/include/svx/charmap.hxx
@@ -22,6 +22,8 @@
 #include <vcl/ctrl.hxx>
 #include <vcl/metric.hxx>
 #include <vcl/scrbar.hxx>
+#include <vcl/vclptr.hxx>
+#include <boost/shared_ptr.hpp>
 #include <map>
 #include <memory>
 #include <svx/svxdllapi.h>
@@ -44,6 +46,7 @@ class SVX_DLLPUBLIC SvxShowCharSet : public Control
 public:
                     SvxShowCharSet( vcl::Window* pParent );
                     virtual ~SvxShowCharSet();
+    virtual void    dispose() SAL_OVERRIDE;
 
     void            SetFont( const vcl::Font& rFont );
 
@@ -71,7 +74,7 @@ public:
     sal_uInt16                  GetRowPos(sal_uInt16 _nPos) const;
     sal_uInt16                  GetColumnPos(sal_uInt16 _nPos) const;
 
-    ScrollBar&                  getScrollBar() { return aVscrollSB;}
+    ScrollBar&                  getScrollBar() { return *aVscrollSB.get();}
     void                        ReleaseAccessible();
     sal_Int32                   getMaxCharCount() const;
 
@@ -112,7 +115,7 @@ private:
     sal_Int32       nSelectedIndex;
 
     FontCharMapPtr  mpFontCharMap;
-    ScrollBar       aVscrollSB;
+    VclPtr<ScrollBar>  aVscrollSB;
 
 private:
     void            DrawChars_Impl( int n1, int n2);
diff --git a/include/svx/checklbx.hxx b/include/svx/checklbx.hxx
index eb587db0924f..ff3319d4b5cc 100644
--- a/include/svx/checklbx.hxx
+++ b/include/svx/checklbx.hxx
@@ -46,6 +46,7 @@ public:
     SvxCheckListBox( vcl::Window* pParent, WinBits nWinStyle = 0 );
     void SetNormalStaticImage(const Image& rNormalStaticImage);
     virtual ~SvxCheckListBox();
+    virtual void dispose() SAL_OVERRIDE;
 
     void            InsertEntry         ( const OUString& rStr,
                                           sal_uLong  nPos = TREELIST_APPEND,
diff --git a/include/svx/colrctrl.hxx b/include/svx/colrctrl.hxx
index 7de406d33b4c..8b0de9800e53 100644
--- a/include/svx/colrctrl.hxx
+++ b/include/svx/colrctrl.hxx
@@ -26,6 +26,7 @@
 #include <svl/lstner.hxx>
 #include <svx/svxdllapi.h>
 #include <svx/xtable.hxx>
+#include <vcl/vclptr.hxx>
 
 class SvData;
 
@@ -75,7 +76,7 @@ class SvxColorDockingWindow : public SfxDockingWindow, public SfxListener
 
 private:
     XColorListRef       pColorList;
-    SvxColorValueSet_docking aColorSet;
+    VclPtr<SvxColorValueSet_docking> aColorSet;
     sal_uInt16          nLeftSlot;
     sal_uInt16          nRightSlot;
     sal_uInt16          nCols;
@@ -103,6 +104,7 @@ public:
                           SfxChildWindow *pCW,
                           vcl::Window* pParent);
     virtual ~SvxColorDockingWindow();
+    virtual void    dispose() SAL_OVERRIDE;
 
     virtual void    Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE;
 
diff --git a/include/svx/compressgraphicdialog.hxx b/include/svx/compressgraphicdialog.hxx
index b8dcf80da12a..83e1f6607a37 100644
--- a/include/svx/compressgraphicdialog.hxx
+++ b/include/svx/compressgraphicdialog.hxx
@@ -84,8 +84,6 @@ public:
     CompressGraphicsDialog( vcl::Window* pParent, SdrGrafObj* pGraphicObj, SfxBindings& rBindings );
     CompressGraphicsDialog( vcl::Window* pParent, Graphic& rGraphic, Size rViewSize100mm, Rectangle& rCropRectangle, SfxBindings& rBindings );
 
-    virtual ~CompressGraphicsDialog();
-
     SdrGrafObj* GetCompressedSdrGrafObj();
     Graphic GetCompressedGraphic();
 
diff --git a/include/svx/connctrl.hxx b/include/svx/connctrl.hxx
index 6caac030eb93..f052915143b0 100644
--- a/include/svx/connctrl.hxx
+++ b/include/svx/connctrl.hxx
@@ -46,6 +46,7 @@ private:
 public:
     SvxXConnectionPreview( vcl::Window* pParent, WinBits nStyle);
     virtual ~SvxXConnectionPreview();
+    virtual void dispose() SAL_OVERRIDE;
 
     virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
     virtual void Resize() SAL_OVERRIDE;
diff --git a/include/svx/contdlg.hxx b/include/svx/contdlg.hxx
index f1192de2a0f8..064d0038d468 100644
--- a/include/svx/contdlg.hxx
+++ b/include/svx/contdlg.hxx
@@ -75,7 +75,6 @@ public:
 
                         SvxContourDlg(SfxBindings *pBindings, SfxChildWindow *pCW,
                                       vcl::Window* pParent);
-                        virtual ~SvxContourDlg();
 
     const Graphic&      GetGraphic() const;
     bool                IsGraphicChanged() const;
diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx
index 9d8d3c789fb0..f5519bdfe462 100644
--- a/include/svx/ctredlin.hxx
+++ b/include/svx/ctredlin.hxx
@@ -116,6 +116,7 @@ public:
 
     SvxRedlinTable(SvSimpleTableContainer& rParent, WinBits nBits = WB_BORDER);
     virtual ~SvxRedlinTable();
+    virtual void    dispose() SAL_OVERRIDE;
 
     // For FilterPage only {
     void            SetFilterDate(bool bFlag=true);
@@ -322,6 +323,7 @@ private:
 public:
     SvxTPView(vcl::Window * pParent, VclBuilderContainer *pTopLevel);
     virtual ~SvxTPView();
+    virtual void    dispose() SAL_OVERRIDE;
 
     void            InsertWriterHeader();
     void            InsertCalcHeader();
@@ -382,6 +384,7 @@ public:
                     SvxAcceptChgCtr(vcl::Window* pParent, VclBuilderContainer* pTopLevel);
 
                     virtual ~SvxAcceptChgCtr();
+    virtual void    dispose() SAL_OVERRIDE;
 
     void            ShowFilterPage();
     void            ShowViewPage();
diff --git a/include/svx/dialcontrol.hxx b/include/svx/dialcontrol.hxx
index 38b60e3f6f4e..a2bc07462921 100644
--- a/include/svx/dialcontrol.hxx
+++ b/include/svx/dialcontrol.hxx
@@ -80,8 +80,6 @@ class SVX_DLLPUBLIC DialControl : public Control
 public:
     explicit            DialControl( vcl::Window* pParent, WinBits nBits );
 
-    virtual             ~DialControl();
-
     virtual void        Paint( const Rectangle& rRect ) SAL_OVERRIDE;
 
     virtual void        StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE;
diff --git a/include/svx/dlgctl3d.hxx b/include/svx/dlgctl3d.hxx
index a17e9a81ab4a..41c1b9c9a695 100644
--- a/include/svx/dlgctl3d.hxx
+++ b/include/svx/dlgctl3d.hxx
@@ -51,6 +51,7 @@ protected:
 public:
     Svx3DPreviewControl(vcl::Window* pParent, WinBits nStyle = 0);
     virtual ~Svx3DPreviewControl();
+    virtual void dispose() SAL_OVERRIDE;
 
     virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
     virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
@@ -104,7 +105,6 @@ class SVX_DLLPUBLIC Svx3DLightControl : public Svx3DPreviewControl
 
 public:
     Svx3DLightControl(vcl::Window* pParent, WinBits nStyle = 0);
-    virtual ~Svx3DLightControl();
 
     virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE;
     virtual void MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE;
@@ -145,18 +145,19 @@ class SVX_DLLPUBLIC SvxLightCtl3D : public Control
 {
 private:
     // local controls
-    Svx3DLightControl       maLightControl;
-    ScrollBar               maHorScroller;
-    ScrollBar               maVerScroller;
-    PushButton              maSwitcher;
+    VclPtr<Svx3DLightControl>  maLightControl;
+    VclPtr<ScrollBar>          maHorScroller;
+    VclPtr<ScrollBar>          maVerScroller;
+    VclPtr<PushButton>         maSwitcher;
 
     // callback for interactive changes
-    Link                    maUserInteractiveChangeCallback;
-    Link                    maUserSelectionChangeCallback;
+    Link                       maUserInteractiveChangeCallback;
+    Link                       maUserSelectionChangeCallback;
 
 public:
     SvxLightCtl3D(vcl::Window* pParent);
     virtual ~SvxLightCtl3D();
+    virtual void dispose() SAL_OVERRIDE;
 
     // react to size changes
     virtual void Resize() SAL_OVERRIDE;
@@ -166,7 +167,7 @@ public:
     void CheckSelection();
 
     // bring further settings to the outside world
-    Svx3DLightControl& GetSvx3DLightControl() { return maLightControl; }
+    Svx3DLightControl& GetSvx3DLightControl() { return *maLightControl.get(); }
 
     // register user callback
     void SetUserInteractiveChangeCallback(Link aNew) { maUserInteractiveChangeCallback = aNew; }
diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx
index 456c4f8afb25..15794fa60c82 100644
--- a/include/svx/dlgctrl.hxx
+++ b/include/svx/dlgctrl.hxx
@@ -100,6 +100,7 @@ public:
     void SetControlSettings(RECT_POINT eRpt = RP_MM, sal_uInt16 nBorder = 200,
         sal_uInt16 nCircle = 80, CTL_STYLE eStyle = CS_RECT);
     virtual ~SvxRectCtl();
+    virtual void dispose() SAL_OVERRIDE;
 
     virtual void        Paint( const Rectangle& rRect ) SAL_OVERRIDE;
     virtual void        MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
@@ -179,6 +180,7 @@ public:
     SvxPixelCtl( vcl::Window* pParent, sal_uInt16 nNumber = 8 );
 
     virtual ~SvxPixelCtl();
+    virtual void dispose() SAL_OVERRIDE;
 
     virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
     virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
@@ -322,7 +324,6 @@ private:
 
 public:
     LineLB(vcl::Window* pParent, WinBits aWB);
-    virtual ~LineLB();
 
     void Fill(const XDashListRef &pList);
     bool getAddStandardFields() const { return mbAddStandardFields; }
@@ -341,7 +342,6 @@ class SVX_DLLPUBLIC LineEndLB : public ListBox
 
 public:
     LineEndLB( vcl::Window* pParent, WinBits aWB );
-    virtual ~LineEndLB (void);
 
     void Fill( const XLineEndListRef &pList, bool bStart = true );
 
@@ -373,6 +373,7 @@ protected:
 public:
     SvxPreviewBase(vcl::Window* pParent);
     virtual ~SvxPreviewBase();
+    virtual void dispose() SAL_OVERRIDE;
 
     // change support
     virtual void StateChanged(StateChangedType nStateChange) SAL_OVERRIDE;
@@ -403,6 +404,7 @@ private:
 public:
     SvxXLinePreview( vcl::Window* pParent );
     virtual ~SvxXLinePreview();
+    virtual void dispose() SAL_OVERRIDE;
 
     void SetLineAttributes(const SfxItemSet& rItemSet);
 
@@ -429,6 +431,7 @@ private:
 public:
     SvxXRectPreview(vcl::Window* pParent);
     virtual ~SvxXRectPreview();
+    virtual void dispose() SAL_OVERRIDE;
 
     void SetAttributes(const SfxItemSet& rItemSet);
 
@@ -454,6 +457,7 @@ public:
     SvxXShadowPreview(vcl::Window *pParent);
 
     virtual ~SvxXShadowPreview();
+    virtual void dispose() SAL_OVERRIDE;
 
     void SetRectangleAttributes(const SfxItemSet& rItemSet);
     void SetShadowAttributes(const SfxItemSet& rItemSet);
diff --git a/include/svx/fillctrl.hxx b/include/svx/fillctrl.hxx
index c8878d9f8355..1c164cd30575 100644
--- a/include/svx/fillctrl.hxx
+++ b/include/svx/fillctrl.hxx
@@ -101,6 +101,7 @@ private:
 public:
     FillControl(vcl::Window* pParent, WinBits nStyle = 0);
     virtual ~FillControl();
+    virtual void dispose() SAL_OVERRIDE;
 
     virtual void Resize() SAL_OVERRIDE;
 };
diff --git a/include/svx/float3d.hxx b/include/svx/float3d.hxx
index fcc6dce4f987..44d62800d5d2 100644
--- a/include/svx/float3d.hxx
+++ b/include/svx/float3d.hxx
@@ -60,108 +60,108 @@ class SVX_DLLPUBLIC Svx3DWin : public SfxDockingWindow
     using Window::Update;
 
 private:
-    PushButton*         m_pBtnGeo;
-    PushButton*         m_pBtnRepresentation;
-    PushButton*         m_pBtnLight;
-    PushButton*         m_pBtnTexture;
-    PushButton*         m_pBtnMaterial;
-    PushButton*         m_pBtnUpdate;
-    PushButton*         m_pBtnAssign;
+    VclPtr<PushButton>         m_pBtnGeo;
+    VclPtr<PushButton>         m_pBtnRepresentation;
+    VclPtr<PushButton>         m_pBtnLight;
+    VclPtr<PushButton>         m_pBtnTexture;
+    VclPtr<PushButton>         m_pBtnMaterial;
+    VclPtr<PushButton>         m_pBtnUpdate;
+    VclPtr<PushButton>         m_pBtnAssign;
 
 // geometry
-    VclContainer*       m_pFLGeometrie;
-    FixedText*          m_pFtPercentDiagonal;
-    MetricField*        m_pMtrPercentDiagonal;
-    FixedText*          m_pFtBackscale;
-    MetricField*        m_pMtrBackscale;
-    FixedText*          m_pFtEndAngle;
-    MetricField*        m_pMtrEndAngle;
-    FixedText*          m_pFtDepth;
-    MetricField*        m_pMtrDepth;
-
-    VclContainer*       m_pFLSegments;
-    NumericField*       m_pNumHorizontal;
-    NumericField*       m_pNumVertical;
-
-    VclContainer*       m_pFLNormals;
-    PushButton*         m_pBtnNormalsObj;
-    PushButton*         m_pBtnNormalsFlat;
-    PushButton*         m_pBtnNormalsSphere;
-    PushButton*         m_pBtnNormalsInvert;
-    PushButton*         m_pBtnTwoSidedLighting;
-    PushButton*         m_pBtnDoubleSided;
+    VclPtr<VclContainer>       m_pFLGeometrie;
+    VclPtr<FixedText>          m_pFtPercentDiagonal;
+    VclPtr<MetricField>        m_pMtrPercentDiagonal;
+    VclPtr<FixedText>          m_pFtBackscale;
+    VclPtr<MetricField>        m_pMtrBackscale;
+    VclPtr<FixedText>          m_pFtEndAngle;
+    VclPtr<MetricField>        m_pMtrEndAngle;
+    VclPtr<FixedText>          m_pFtDepth;
+    VclPtr<MetricField>        m_pMtrDepth;
+
+    VclPtr<VclContainer>       m_pFLSegments;
+    VclPtr<NumericField>       m_pNumHorizontal;
+    VclPtr<NumericField>       m_pNumVertical;
+
+    VclPtr<VclContainer>       m_pFLNormals;
+    VclPtr<PushButton>         m_pBtnNormalsObj;
+    VclPtr<PushButton>         m_pBtnNormalsFlat;
+    VclPtr<PushButton>         m_pBtnNormalsSphere;
+    VclPtr<PushButton>         m_pBtnNormalsInvert;
+    VclPtr<PushButton>         m_pBtnTwoSidedLighting;
+    VclPtr<PushButton>         m_pBtnDoubleSided;
 
 // presentation
-    VclContainer*       m_pFLRepresentation;
-    ListBox*            m_pLbShademode;
+    VclPtr<VclContainer>       m_pFLRepresentation;
+    VclPtr<ListBox>            m_pLbShademode;
 
-    VclContainer*       m_pFLShadow;
-    PushButton*         m_pBtnShadow3d;
-    FixedText*          m_pFtSlant;
-    MetricField*        m_pMtrSlant;
+    VclPtr<VclContainer>       m_pFLShadow;
+    VclPtr<PushButton>         m_pBtnShadow3d;
+    VclPtr<FixedText>          m_pFtSlant;
+    VclPtr<MetricField>        m_pMtrSlant;
 
-    VclContainer*       m_pFLCamera;
-    MetricField*        m_pMtrDistance;
-    MetricField*        m_pMtrFocalLength;
+    VclPtr<VclContainer>       m_pFLCamera;
+    VclPtr<MetricField>        m_pMtrDistance;
+    VclPtr<MetricField>        m_pMtrFocalLength;
 
 // lighting
-    VclContainer*       m_pFLLight;
-    PushButton*         m_pBtnLight1;
-    PushButton*         m_pBtnLight2;
-    PushButton*         m_pBtnLight3;
-    PushButton*         m_pBtnLight4;
-    PushButton*         m_pBtnLight5;
-    PushButton*         m_pBtnLight6;
-    PushButton*         m_pBtnLight7;
-    PushButton*         m_pBtnLight8;
-    ColorLB*            m_pLbLight1;
-    ColorLB*            m_pLbLight2;
-    ColorLB*            m_pLbLight3;
-    ColorLB*            m_pLbLight4;
-    ColorLB*            m_pLbLight5;
-    ColorLB*            m_pLbLight6;
-    ColorLB*            m_pLbLight7;
-    ColorLB*            m_pLbLight8;
-    PushButton*         m_pBtnLightColor;
-    ColorLB*            m_pLbAmbientlight;    // ListBox
-    PushButton*         m_pBtnAmbientColor;   // color button
+    VclPtr<VclContainer>       m_pFLLight;
+    VclPtr<PushButton>         m_pBtnLight1;
+    VclPtr<PushButton>         m_pBtnLight2;
+    VclPtr<PushButton>         m_pBtnLight3;
+    VclPtr<PushButton>         m_pBtnLight4;
+    VclPtr<PushButton>         m_pBtnLight5;
+    VclPtr<PushButton>         m_pBtnLight6;
+    VclPtr<PushButton>         m_pBtnLight7;
+    VclPtr<PushButton>         m_pBtnLight8;
+    VclPtr<ColorLB>            m_pLbLight1;
+    VclPtr<ColorLB>            m_pLbLight2;
+    VclPtr<ColorLB>            m_pLbLight3;
+    VclPtr<ColorLB>            m_pLbLight4;
+    VclPtr<ColorLB>            m_pLbLight5;
+    VclPtr<ColorLB>            m_pLbLight6;
+    VclPtr<ColorLB>            m_pLbLight7;
+    VclPtr<ColorLB>            m_pLbLight8;
+    VclPtr<PushButton>         m_pBtnLightColor;
+    VclPtr<ColorLB>            m_pLbAmbientlight;    // ListBox
+    VclPtr<PushButton>         m_pBtnAmbientColor;   // color button
 
 // Textures
     VclContainer*       m_pFLTexture;
-    PushButton*         m_pBtnTexLuminance;
-    PushButton*         m_pBtnTexColor;
-    PushButton*         m_pBtnTexReplace;
-    PushButton*         m_pBtnTexModulate;
-    PushButton*         m_pBtnTexBlend;
-    PushButton*         m_pBtnTexObjectX;
-    PushButton*         m_pBtnTexParallelX;
-    PushButton*         m_pBtnTexCircleX;
-    PushButton*         m_pBtnTexObjectY;
-    PushButton*         m_pBtnTexParallelY;
-    PushButton*         m_pBtnTexCircleY;
-    PushButton*         m_pBtnTexFilter;
+    VclPtr<PushButton>         m_pBtnTexLuminance;
+    VclPtr<PushButton>         m_pBtnTexColor;
+    VclPtr<PushButton>         m_pBtnTexReplace;
+    VclPtr<PushButton>         m_pBtnTexModulate;
+    VclPtr<PushButton>         m_pBtnTexBlend;
+    VclPtr<PushButton>         m_pBtnTexObjectX;
+    VclPtr<PushButton>         m_pBtnTexParallelX;
+    VclPtr<PushButton>         m_pBtnTexCircleX;
+    VclPtr<PushButton>         m_pBtnTexObjectY;
+    VclPtr<PushButton>         m_pBtnTexParallelY;
+    VclPtr<PushButton>         m_pBtnTexCircleY;
+    VclPtr<PushButton>         m_pBtnTexFilter;
 
 // material
 // material editor
-    VclContainer*       m_pFLMaterial;
-    ListBox*            m_pLbMatFavorites;
-    ColorLB*            m_pLbMatColor;
-    PushButton*         m_pBtnMatColor;
-    ColorLB*            m_pLbMatEmission;
-    PushButton*         m_pBtnEmissionColor;
+    VclPtr<VclContainer>       m_pFLMaterial;
+    VclPtr<ListBox>            m_pLbMatFavorites;
+    VclPtr<ColorLB>            m_pLbMatColor;
+    VclPtr<PushButton>         m_pBtnMatColor;
+    VclPtr<ColorLB>            m_pLbMatEmission;
+    VclPtr<PushButton>         m_pBtnEmissionColor;
 
-    VclContainer*       m_pFLMatSpecular;
-    ColorLB*            m_pLbMatSpecular;
-    PushButton*         m_pBtnSpecularColor;
-    MetricField*        m_pMtrMatSpecularIntensity;
+    VclPtr<VclContainer>       m_pFLMatSpecular;
+    VclPtr<ColorLB>            m_pLbMatSpecular;
+    VclPtr<PushButton>         m_pBtnSpecularColor;
+    VclPtr<MetricField>        m_pMtrMatSpecularIntensity;
 
-    Svx3DPreviewControl* m_pCtlPreview;
-    SvxLightCtl3D*      m_pCtlLightPreview;
+    VclPtr<Svx3DPreviewControl> m_pCtlPreview;
+    VclPtr<SvxLightCtl3D>      m_pCtlLightPreview;
 
 // bottom part
-    PushButton*         m_pBtnConvertTo3D;
-    PushButton*         m_pBtnLatheObject;
-    PushButton*         m_pBtnPerspective;
+    VclPtr<PushButton>         m_pBtnConvertTo3D;
+    VclPtr<PushButton>         m_pBtnLatheObject;
+    VclPtr<PushButton>         m_pBtnPerspective;
 
 // the rest ...
     Image               aImgLightOn;
@@ -189,8 +189,6 @@ private:
 
     bool                bOnly3DChanged;
 
-
-
     DECL_LINK( ClickViewTypeHdl, void * );
     DECL_LINK( ClickUpdateHdl, void * );
     DECL_LINK( ClickAssignHdl, void * );
@@ -220,6 +218,7 @@ public:
             Svx3DWin( SfxBindings* pBindings, SfxChildWindow *pCW,
                         vcl::Window* pParent );
             virtual ~Svx3DWin();
+    virtual void dispose() SAL_OVERRIDE;
 
     void    InitColorLB( const SdrModel* pDoc );
     bool    IsUpdateMode() const { return bUpdate; }
diff --git a/include/svx/fmgridcl.hxx b/include/svx/fmgridcl.hxx
index f373f5e59787..5517a27d3ec2 100644
--- a/include/svx/fmgridcl.hxx
+++ b/include/svx/fmgridcl.hxx
@@ -43,6 +43,7 @@ protected:
 public:
     FmGridHeader( BrowseBox* pParent, WinBits nWinBits = WB_STDHEADERBAR | WB_DRAG );
     virtual ~FmGridHeader();
+    virtual void dispose() SAL_OVERRIDE;
 
 public:
     struct AccessControl { friend class FmGridControl; private: AccessControl() { } };
diff --git a/include/svx/fntctrl.hxx b/include/svx/fntctrl.hxx
index 0c9461f73891..1a2c1db40016 100644
--- a/include/svx/fntctrl.hxx
+++ b/include/svx/fntctrl.hxx
@@ -49,6 +49,7 @@ public:
                         SvxFontPrevWindow( vcl::Window* pParent, const ResId& rId );
                         SvxFontPrevWindow(vcl::Window* pParent, WinBits nStyle);
     virtual             ~SvxFontPrevWindow();
+    virtual void        dispose() SAL_OVERRIDE;
 
     virtual void        StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE;
     virtual void        DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
diff --git a/include/svx/fontwork.hxx b/include/svx/fontwork.hxx
index 283b631f205b..76521bfcb536 100644
--- a/include/svx/fontwork.hxx
+++ b/include/svx/fontwork.hxx
@@ -92,20 +92,22 @@ class SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow
 
     SvxFontWorkControllerItem* pCtrlItems[CONTROLLER_COUNT];
 
-    ToolBox*        m_pTbxStyle;
-    ToolBox*        m_pTbxAdjust;
+    VclPtr<ToolBox>         m_pTbxStyle;
+    VclPtr<ToolBox>         m_pTbxAdjust;
 
-    MetricField*    m_pMtrFldDistance;
-    MetricField*    m_pMtrFldTextStart;
+    VclPtr<FixedImage>      m_pFbDistance;
+    VclPtr<MetricField>     m_pMtrFldDistance;
+    VclPtr<FixedImage>      m_pFbTextStart;
+    VclPtr<MetricField>     m_pMtrFldTextStart;
 
-    ToolBox*        m_pTbxShadow;
+    VclPtr<ToolBox>         m_pTbxShadow;
 
-    FixedImage*     m_pFbShadowX;
-    MetricField*    m_pMtrFldShadowX;
-    FixedImage*     m_pFbShadowY;
-    MetricField*    m_pMtrFldShadowY;
+    VclPtr<FixedImage>      m_pFbShadowX;
+    VclPtr<MetricField>     m_pMtrFldShadowX;
+    VclPtr<FixedImage>      m_pFbShadowY;
+    VclPtr<MetricField>     m_pMtrFldShadowY;
 
-    ColorLB*        m_pShadowColorLB;
+    VclPtr<ColorLB>         m_pShadowColorLB;
 
     SfxBindings&    rBindings;
     Idle            aInputIdle;
@@ -172,6 +174,7 @@ class SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow
     SvxFontWorkDialog(SfxBindings *pBinding, SfxChildWindow *pCW,
                       vcl::Window* pParent);
     virtual ~SvxFontWorkDialog();
+    virtual void dispose() SAL_OVERRIDE;
 
     void SetColorList(const XColorListRef &pTable);
 };
diff --git a/include/svx/fontworkgallery.hxx b/include/svx/fontworkgallery.hxx
index 7bd4534a83ae..c2521a7a81f4 100644
--- a/include/svx/fontworkgallery.hxx
+++ b/include/svx/fontworkgallery.hxx
@@ -98,7 +98,6 @@ class SVX_DLLPUBLIC FontWorkGalleryDialog : public ModalDialog
 
 public:
     FontWorkGalleryDialog( SdrView* pView, vcl::Window* pParent, sal_uInt16 nSID );
-    virtual ~FontWorkGalleryDialog();
 
     // SJ: if the SdrObject** is set, the SdrObject is not inserted into the page when executing the dialog
     void SetSdrObjectRef( SdrObject**, SdrModel* pModel );
diff --git a/include/svx/frmdirlbox.hxx b/include/svx/frmdirlbox.hxx
index 80bd1b12f0ad..c7145e8348c9 100644
--- a/include/svx/frmdirlbox.hxx
+++ b/include/svx/frmdirlbox.hxx
@@ -40,7 +40,6 @@ class SVX_DLLPUBLIC FrameDirectionListBox : public ListBox
 {
 public:
     explicit            FrameDirectionListBox( vcl::Window* pParent, WinBits nBits );
-    virtual             ~FrameDirectionListBox();
 
     /** Inserts a string with corresponding direction enum into the listbox. */
     void                InsertEntryValue(
diff --git a/include/svx/frmsel.hxx b/include/svx/frmsel.hxx
index e92271b44d06..61b361503e99 100644
--- a/include/svx/frmsel.hxx
+++ b/include/svx/frmsel.hxx
@@ -84,7 +84,6 @@ class SVX_DLLPUBLIC FrameSelector : public Control
 {
 public:
     FrameSelector(vcl::Window* pParent);
-    virtual             ~FrameSelector();
 
     /** Initializes the control, enables/disables frame borders according to flags. */
     void                Initialize( FrameSelFlags nFlags );
diff --git a/include/svx/galctrl.hxx b/include/svx/galctrl.hxx
index d1b6a3939cfc..2765e9ca2560 100644
--- a/include/svx/galctrl.hxx
+++ b/include/svx/galctrl.hxx
@@ -109,7 +109,6 @@ private:
 public:
 
                         GalleryIconView( GalleryBrowser2* pParent, GalleryTheme* pTheme );
-                        virtual ~GalleryIconView();
 };
 
 class GalleryListView : public BrowseBox
@@ -144,7 +143,6 @@ private:
 public:
 
                         GalleryListView( GalleryBrowser2* pParent, GalleryTheme* pTheme );
-                        virtual ~GalleryListView();
 
     void                SetSelectHdl( const Link& rSelectHdl ) { maSelectHdl = rSelectHdl; }
 
diff --git a/include/svx/graphctl.hxx b/include/svx/graphctl.hxx
index 8cd389cc35e5..b3278ded904b 100644
--- a/include/svx/graphctl.hxx
+++ b/include/svx/graphctl.hxx
@@ -80,8 +80,9 @@ protected:
 
 public:
 
-   GraphCtrl( vcl::Window* pParent, WinBits nStyle );
-   virtual ~GraphCtrl();
+    GraphCtrl( vcl::Window* pParent, WinBits nStyle );
+    virtual ~GraphCtrl();
+    virtual void dispose() SAL_OVERRIDE;
 
     void                SetWinStyle( WinBits nWinBits );
     WinBits             GetWinStyle() const { return nWinStyle; }
diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx
index e50c6e5fe878..11f384eb6665 100644
--- a/include/svx/gridctrl.hxx
+++ b/include/svx/gridctrl.hxx
@@ -151,20 +151,20 @@ public:
         friend class NavigationBar::AbsolutePos;
 
         //  zusaetzliche Controls
-        FixedText       m_aRecordText;
-        AbsolutePos     m_aAbsolute;            // absolute positioning
-        FixedText       m_aRecordOf;
-        FixedText       m_aRecordCount;
+        VclPtr<FixedText>    m_aRecordText;
+        VclPtr<AbsolutePos>  m_aAbsolute;            // absolute positioning
+        VclPtr<FixedText>    m_aRecordOf;
+        VclPtr<FixedText>    m_aRecordCount;
 
-        ImageButton     m_aFirstBtn;            // ImageButton for 'go to the first record'
-        ImageButton     m_aPrevBtn;         // ImageButton for 'go to the previous record'
-        ImageButton     m_aNextBtn;         // ImageButton for 'go to the next record'
-        ImageButton     m_aLastBtn;         // ImageButton for 'go to the last record'
-        ImageButton     m_aNewBtn;          // ImageButton for 'go to a new record'
-        sal_uInt16      m_nDefaultWidth;
-        sal_Int32       m_nCurrentPos;
+        VclPtr<ImageButton>  m_aFirstBtn;            // ImageButton for 'go to the first record'
+        VclPtr<ImageButton>  m_aPrevBtn;         // ImageButton for 'go to the previous record'
+        VclPtr<ImageButton>  m_aNextBtn;         // ImageButton for 'go to the next record'
+        VclPtr<ImageButton>  m_aLastBtn;         // ImageButton for 'go to the last record'
+        VclPtr<ImageButton>  m_aNewBtn;          // ImageButton for 'go to a new record'
+        sal_uInt16           m_nDefaultWidth;
+        sal_Int32            m_nCurrentPos;
 
-        bool            m_bPositioning;     // protect PositionDataSource against recursion
+        bool                 m_bPositioning;     // protect PositionDataSource against recursion
 
     public:
         //  StatusIds for Controls of the Bar
@@ -183,6 +183,8 @@ public:
         };
 
         NavigationBar(vcl::Window* pParent, WinBits nStyle = 0);
+        virtual ~NavigationBar();
+        virtual void dispose() SAL_OVERRIDE;
 
         // Status methods for Controls
         void InvalidateAll(sal_Int32 nCurrentPos = -1, bool bAll = false);
@@ -225,7 +227,7 @@ private:
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >    m_xContext;
 
     DbGridColumns   m_aColumns;         // Column description
-    NavigationBar   m_aBar;
+    VclPtr<NavigationBar>   m_aBar;
     DbGridRowRef    m_xDataRow;         // Row which can be modified
                                         // comes from the data cursor
     DbGridRowRef    m_xSeekRow,         // Row to which the iterator can set
@@ -370,6 +372,7 @@ public:
         WinBits nBits = WB_BORDER);
 
     virtual ~DbGridControl();
+    virtual void dispose() SAL_OVERRIDE;
 
     virtual void Init() SAL_OVERRIDE;
     virtual void InitColumnsByFields(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& xFields) = 0;
@@ -431,7 +434,7 @@ public:
     bool HasNavigationBar() const {return m_bNavigationBar;}
 
     sal_uInt16 GetOptions() const {return m_nOptions;}
-    NavigationBar& GetNavigationBar() {return m_aBar;}
+    NavigationBar& GetNavigationBar() {return *m_aBar.get();}
     sal_uInt16 SetOptions(sal_uInt16 nOpt);
         // The new options are interpreted with respect to the current data source. If it is unable
         // to update, to insert or to restore, the according options are ignored. If the grid isn't
diff --git a/include/svx/hdft.hxx b/include/svx/hdft.hxx
index ad0a5cc8cccd..719c5aa73033 100644
--- a/include/svx/hdft.hxx
+++ b/include/svx/hdft.hxx
@@ -52,6 +52,7 @@ public:
     virtual void    Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
 
     virtual         ~SvxHFPage();
+    virtual void    dispose() SAL_OVERRIDE;
 
     void DisableDeleteQueryBox() { mbDisableQueryBox = true; }
     void EnableBackgroundSelector(bool bNew) { mbEnableBackgroundSelector = bNew; }
diff --git a/include/svx/imapdlg.hxx b/include/svx/imapdlg.hxx
index 7c288fed577a..d21dc4230a90 100644
--- a/include/svx/imapdlg.hxx
+++ b/include/svx/imapdlg.hxx
@@ -136,6 +136,7 @@ public:
                         SvxIMapDlg( SfxBindings *pBindings, SfxChildWindow *pCW,
                                     vcl::Window* pParent );
                         virtual ~SvxIMapDlg();
+    virtual void        dispose() SAL_OVERRIDE;
 
     void                SetExecState( bool bEnable );
 
diff --git a/include/svx/itemwin.hxx b/include/svx/itemwin.hxx
index 0df5118feda8..785228561c5b 100644
--- a/include/svx/itemwin.hxx
+++ b/include/svx/itemwin.hxx
@@ -49,7 +49,6 @@ public:
     SvxLineBox( vcl::Window* pParent,
                 const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
                 WinBits nBits = WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL );
-    virtual ~SvxLineBox();
 
     void FillControl();
 
@@ -87,7 +86,6 @@ public:
     SvxMetricField( vcl::Window* pParent,
                     const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
                     WinBits nBits = WB_BORDER | WB_SPIN | WB_REPEAT );
-    virtual ~SvxMetricField();
 
     void            Update( const XLineWidthItem* pItem );
     void            SetCoreUnit( SfxMapUnit eUnit );
@@ -100,7 +98,6 @@ class SvxFillTypeBox : public FillTypeLB
 {
 public:
     SvxFillTypeBox( vcl::Window* pParent, WinBits nBits = WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL );
-    virtual ~SvxFillTypeBox();
 
     void            Selected() { bSelect = true; }
     bool            IsRelease() { return bRelease;}
@@ -123,7 +120,6 @@ class SvxFillAttrBox : public FillAttrLB
 {
 public:
     SvxFillAttrBox( vcl::Window* pParent, WinBits nBits = WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL );
-    virtual ~SvxFillAttrBox();
 
     bool            IsRelease() { return bRelease;}
 
diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx
index f804f32b0d33..7cc8a3e9afe5 100644
--- a/include/svx/langbox.hxx
+++ b/include/svx/langbox.hxx
@@ -116,7 +116,6 @@ class SVX_DLLPUBLIC SvxLanguageBox : public ListBox, public SvxLanguageBoxBase
 {
 public:
     SvxLanguageBox( vcl::Window* pParent, WinBits nBits, bool bCheck = false );
-    virtual ~SvxLanguageBox();
 
 private:
     SVX_DLLPRIVATE virtual sal_Int32    ImplInsertImgEntry( const OUString& rEntry, sal_Int32  nPos, bool bChecked ) SAL_OVERRIDE;
@@ -143,7 +142,6 @@ class SVX_DLLPUBLIC SvxLanguageComboBox : public ComboBox, public SvxLanguageBox
 {
 public:
     SvxLanguageComboBox( vcl::Window* pParent, WinBits nBits, bool bCheck = false );
-    virtual ~SvxLanguageComboBox();
 
     enum EditedAndValid
     {
diff --git a/include/svx/linectrl.hxx b/include/svx/linectrl.hxx
index c7c80a48b15a..a853dd802125 100644
--- a/include/svx/linectrl.hxx
+++ b/include/svx/linectrl.hxx
@@ -82,7 +82,7 @@ class SvxLineEndWindow : public SfxPopupWindow
 
 private:
     XLineEndListRef pLineEndList;
-    ValueSet        aLineEndSet;
+    VclPtr<ValueSet> aLineEndSet;
     sal_uInt16      nCols;
     sal_uInt16      nLines;
     sal_uIntPtr     nLineEndWidth;
@@ -118,6 +118,7 @@ public:
                       vcl::Window* pParentWindow,
                       const OUString& rWndTitle );
     virtual ~SvxLineEndWindow();
+    virtual void    dispose() SAL_OVERRIDE;
 
     void            StartSelection();
 
diff --git a/include/svx/linkwarn.hxx b/include/svx/linkwarn.hxx
index 8fc66afffb18..395b1b6f6367 100644
--- a/include/svx/linkwarn.hxx
+++ b/include/svx/linkwarn.hxx
@@ -32,6 +32,7 @@ private:
 public:
     SvxLinkWarningDialog(vcl::Window* pParent, const OUString& _rFileName);
     virtual ~SvxLinkWarningDialog();
+    virtual void dispose() SAL_OVERRIDE;
 };
 
 #endif // INCLUDED_SVX_LINKWARN_HXX
diff --git a/include/svx/measctrl.hxx b/include/svx/measctrl.hxx
index 83161ca627ed..4753ab17a671 100644
--- a/include/svx/measctrl.hxx
+++ b/include/svx/measctrl.hxx
@@ -43,6 +43,7 @@ private:
 public:
     SvxXMeasurePreview(vcl::Window* pParent, WinBits nStyle);
     virtual ~SvxXMeasurePreview();
+    virtual void dispose() SAL_OVERRIDE;
 
     virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE;
     virtual void Resize() SAL_OVERRIDE;
diff --git a/include/svx/numvset.hxx b/include/svx/numvset.hxx
index f5e3781e6642..374219902745 100644
--- a/include/svx/numvset.hxx
+++ b/include/svx/numvset.hxx
@@ -66,27 +66,26 @@ class SVX_DLLPUBLIC SvxNumValueSet : public ValueSet
         com::sun::star::uno::Reference<
             com::sun::star::container::XIndexAccess> > aOutlineSettings;
 
-    public:
+public:
     SvxNumValueSet(vcl::Window* pParent, WinBits nWinBits = WB_TABSTOP);
     void init(sal_uInt16 nType);
     virtual ~SvxNumValueSet();
+    virtual void dispose() SAL_OVERRIDE;
 
     virtual void    UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE;
 
     void            SetHTMLMode(bool bSet) {bHTMLMode = bSet;}
     void            SetNumberingSettings(
-        const com::sun::star::uno::Sequence<
-            com::sun::star::uno::Sequence<
-                com::sun::star::beans::PropertyValue> >& aNum,
-        com::sun::star::uno::Reference<com::sun::star::text::XNumberingFormatter>& xFormatter,
-        const com::sun::star::lang::Locale& rLocale );
+        const css::uno::Sequence<
+                  css::uno::Sequence<css::beans::PropertyValue> >& aNum,
+        css::uno::Reference<css::text::XNumberingFormatter>& xFormatter,
+        const css::lang::Locale& rLocale );
 
     void            SetOutlineNumberingSettings(
-            com::sun::star::uno::Sequence<
-                com::sun::star::uno::Reference<
-                    com::sun::star::container::XIndexAccess> >& rOutline,
-            com::sun::star::uno::Reference<com::sun::star::text::XNumberingFormatter>& xFormatter,
-            const com::sun::star::lang::Locale& rLocale);
+            css::uno::Sequence<
+                css::uno::Reference<css::container::XIndexAccess> >& rOutline,
+            css::uno::Reference<css::text::XNumberingFormatter>& xFormatter,
+            const css::lang::Locale& rLocale);
 };
 
 class SVX_DLLPUBLIC SvxBmpNumValueSet : public SvxNumValueSet
@@ -96,7 +95,7 @@ class SVX_DLLPUBLIC SvxBmpNumValueSet : public SvxNumValueSet
 
     void init();
 
-    protected:
+protected:
         DECL_LINK(FormatHdl_Impl, void *);
 
     void            SetGrfNotFound(bool bSet) {bGrfNotFound = bSet;}
@@ -104,9 +103,10 @@ class SVX_DLLPUBLIC SvxBmpNumValueSet : public SvxNumValueSet
 
     Idle&          GetFormatIdle() {return aFormatIdle;}
 
-    public:
+public:
     SvxBmpNumValueSet(vcl::Window* pParent, WinBits nWinBits = WB_TABSTOP);
     virtual ~SvxBmpNumValueSet();
+    virtual void dispose() SAL_OVERRIDE;
 
     virtual void    UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE;
 
diff --git a/include/svx/pagectrl.hxx b/include/svx/pagectrl.hxx
index 8b6da4dd29f0..007d4caf5634 100644
--- a/include/svx/pagectrl.hxx
+++ b/include/svx/pagectrl.hxx
@@ -89,6 +89,7 @@ protected:
 public:
     SvxPageWindow( vcl::Window* pParent );
     virtual ~SvxPageWindow();
+    virtual void dispose() SAL_OVERRIDE;
 
     //UUUU
     void setHeaderFillAttributes(const drawinglayer::attribute::SdrAllFillAttributesHelperPtr& rFillAttributes) { maHeaderFillAttributes = rFillAttributes; }
diff --git a/include/svx/passwd.hxx b/include/svx/passwd.hxx
index 920fa19c7c68..901488c0fc26 100644
--- a/include/svx/passwd.hxx
+++ b/include/svx/passwd.hxx
@@ -52,7 +52,6 @@ private:
 
 public:
                     SvxPasswordDialog( vcl::Window* pParent, bool bAllowEmptyPasswords = false, bool bDisableOldPassword = false );
-                    virtual ~SvxPasswordDialog();
 
     OUString        GetOldPassword() const { return m_pOldPasswdED->GetText(); }
     OUString        GetNewPassword() const { return m_pNewPasswdED->GetText(); }
diff --git a/include/svx/prtqry.hxx b/include/svx/prtqry.hxx
index afe6b9b6d85a..a2f4e9298262 100644
--- a/include/svx/prtqry.hxx
+++ b/include/svx/prtqry.hxx
@@ -26,7 +26,6 @@ class SVX_DLLPUBLIC SvxPrtQryBox : public MessBox
 {
 public:
     SvxPrtQryBox(vcl::Window* pParent);
-    virtual ~SvxPrtQryBox();
 };
 
 #endif
diff --git a/include/svx/rubydialog.hxx b/include/svx/rubydialog.hxx
index bd605a17778e..793fa887c96d 100644
--- a/include/svx/rubydialog.hxx
+++ b/include/svx/rubydialog.hxx
@@ -143,7 +143,7 @@ class SvxRubyDialog : public SfxModelessDialog
     void                AssertOneEntry();
 
     void                Update();
-    virtual bool    Close() SAL_OVERRIDE;
+    virtual bool        Close() SAL_OVERRIDE;
 
     long                GetLastPos() const {return nLastPos;}
     void                SetLastPos(long nSet) {nLastPos = nSet;}
@@ -163,6 +163,7 @@ public:
                         SvxRubyDialog(SfxBindings *pBindings, SfxChildWindow *pCW,
                                     vcl::Window* pParent);
     virtual             ~SvxRubyDialog();
+    virtual void        dispose() SAL_OVERRIDE;
 
     virtual void        Activate() SAL_OVERRIDE;
     virtual void        Deactivate() SAL_OVERRIDE;
diff --git a/include/svx/ruler.hxx b/include/svx/ruler.hxx
index ff44a6c45d64..9a1195d95875 100644
--- a/include/svx/ruler.hxx
+++ b/include/svx/ruler.hxx
@@ -254,6 +254,7 @@ public:
     SvxRuler(vcl::Window* pParent, vcl::Window *pEditWin, sal_uInt16 nRulerFlags,
              SfxBindings &rBindings, WinBits nWinStyle = WB_STDRULER);
     virtual ~SvxRuler();
+    virtual void dispose() SAL_OVERRIDE;
 
     void SetMinFrameSize(long lSize);
     long GetMinFrameSize() const ;
diff --git a/include/svx/sidebar/PanelLayout.hxx b/include/svx/sidebar/PanelLayout.hxx
index 6eac3d3eef90..e4db4f09b732 100644
--- a/include/svx/sidebar/PanelLayout.hxx
+++ b/include/svx/sidebar/PanelLayout.hxx
@@ -34,6 +34,7 @@ public:
     PanelLayout(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription,
             const com::sun::star::uno::Reference<com::sun::star::frame::XFrame> &rFrame);
     virtual ~PanelLayout();
+    virtual void dispose() SAL_OVERRIDE;
 
     virtual Size GetOptimalSize() const SAL_OVERRIDE;
     virtual void setPosSizePixel(long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags = WINDOW_POSSIZE_ALL) SAL_OVERRIDE;
diff --git a/include/svx/sidebar/PopupContainer.hxx b/include/svx/sidebar/PopupContainer.hxx
index f8f6f524573f..ff3c40881977 100644
--- a/include/svx/sidebar/PopupContainer.hxx
+++ b/include/svx/sidebar/PopupContainer.hxx
@@ -34,7 +34,6 @@ class SVX_DLLPUBLIC PopupContainer
 {
 public:
     PopupContainer (vcl::Window* pParent);
-    virtual ~PopupContainer (void);
 
     virtual bool Notify (NotifyEvent& rNEvt) SAL_OVERRIDE;
 };
diff --git a/include/svx/sidebar/PopupControl.hxx b/include/svx/sidebar/PopupControl.hxx
index 84bed5af5870..626e7074501d 100644
--- a/include/svx/sidebar/PopupControl.hxx
+++ b/include/svx/sidebar/PopupControl.hxx
@@ -38,7 +38,6 @@ public :
     PopupControl (
         vcl::Window* pParent,
         const ResId& rResId);
-    virtual ~PopupControl (void);
 
     virtual void Paint (const Rectangle& rect) SAL_OVERRIDE;
 };
diff --git a/include/svx/sidebar/SidebarDialControl.hxx b/include/svx/sidebar/SidebarDialControl.hxx
index a77d0f412419..52d798e2ab89 100644
--- a/include/svx/sidebar/SidebarDialControl.hxx
+++ b/include/svx/sidebar/SidebarDialControl.hxx
@@ -29,7 +29,6 @@ class SVX_DLLPUBLIC SidebarDialControl : public svx::DialControl
 {
 public:
     SidebarDialControl (vcl::Window* pParent, WinBits nBits = 0);
-    virtual ~SidebarDialControl (void);
 
     virtual Size GetOptimalSize() const SAL_OVERRIDE;
     virtual void MouseButtonDown (const MouseEvent& rMEvt) SAL_OVERRIDE;
diff --git a/include/svx/sidebar/ValueSetWithTextControl.hxx b/include/svx/sidebar/ValueSetWithTextControl.hxx
index 33054ead6feb..e0c941d19645 100644
--- a/include/svx/sidebar/ValueSetWithTextControl.hxx
+++ b/include/svx/sidebar/ValueSetWithTextControl.hxx
@@ -52,8 +52,6 @@ public:
         vcl::Window* pParent,
         const ResId& rResId);
 
-    virtual ~ValueSetWithTextControl(void);
-
     // add item for control type IMAGE_TEXT
     // if control type does not match IMAGE_TEXT no item is added.
     // @param pSelectedItemImage
diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx
index 15d221bcd773..35e259b5988a 100644
--- a/include/svx/srchdlg.hxx
+++ b/include/svx/srchdlg.hxx
@@ -120,6 +120,7 @@ friend class SvxJSearchOptionsDialog;
 public:
     SvxSearchDialog( vcl::Window* pParent, SfxChildWindow* pChildWin, SfxBindings& rBind );
     virtual ~SvxSearchDialog();
+    virtual void dispose() SAL_OVERRIDE;
 
     virtual bool    Close() SAL_OVERRIDE;
 
diff --git a/include/svx/stddlg.hxx b/include/svx/stddlg.hxx
index 85cdf46c5b52..a3e3df05f628 100644
--- a/include/svx/stddlg.hxx
+++ b/include/svx/stddlg.hxx
@@ -28,7 +28,6 @@ class SVX_DLLPUBLIC SvxStandardDialog: public SfxModalDialog
 {
 public:
     SvxStandardDialog( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription );
-    virtual ~SvxStandardDialog();
 
     short           Execute() SAL_OVERRIDE;
 
diff --git a/include/svx/swframeexample.hxx b/include/svx/swframeexample.hxx
index b6f698c0773f..3ed7c447ec5b 100644
--- a/include/svx/swframeexample.hxx
+++ b/include/svx/swframeexample.hxx
@@ -74,7 +74,6 @@ protected:
 public:
 
     SvxSwFrameExample(vcl::Window* pParent, WinBits nStyle);
-    virtual ~SvxSwFrameExample();
 
     inline void SetWrap(sal_uInt16 nW)          { nWrap     = nW; }
 
diff --git a/include/svx/txencbox.hxx b/include/svx/txencbox.hxx
index e0df5adeef38..43f028bcaae7 100644
--- a/include/svx/txencbox.hxx
+++ b/include/svx/txencbox.hxx
@@ -35,6 +35,7 @@ private:
 public:
     SvxTextEncodingBox( vcl::Window* pParent, WinBits nBits );
     virtual ~SvxTextEncodingBox();
+    virtual void dispose() SAL_OVERRIDE;
 
     /** Fill with all known encodings but exclude those matching one or more
         given flags as defined in rtl/tencinfo.h