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

5 files changed, 1 insertions, 5 deletions

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