5 files changed, 9 insertions, 11 deletions
diff --git a/include/svx/sidebar/PanelLayout.hxx b/include/svx/sidebar/PanelLayout.hxx
index 6eac3d3eef90..82790a402e62 100644
--- a/include/svx/sidebar/PanelLayout.hxx
+++ b/include/svx/sidebar/PanelLayout.hxx
@@ -16,6 +16,7 @@
 #include <vcl/ctrl.hxx>
 #include <vcl/timer.hxx>
 #include <vcl/idle.hxx>
+#include <vcl/vclptr.hxx>
 
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
@@ -34,6 +35,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/Popup.hxx b/include/svx/sidebar/Popup.hxx
index 7f0d804f78c2..4fd74d14db8a 100644
--- a/include/svx/sidebar/Popup.hxx
+++ b/include/svx/sidebar/Popup.hxx
@@ -22,6 +22,9 @@
 #include <svx/svxdllapi.h>
 #include <rtl/ustring.hxx>
 #include <tools/link.hxx>
+#include <vcl/vclptr.hxx>
+#include <svx/sidebar/PopupContainer.hxx>
+#include <svx/sidebar/PopupControl.hxx>
 
 #include <boost/function.hpp>
 
@@ -30,9 +33,6 @@ class ToolBox;
 
 namespace svx { namespace sidebar {
 
-class PopupContainer;
-class PopupControl;
-
 /** A wrapper around a PopupContainer and a PopupControl object.
     Usually used as drop down for a toolbox.  Use Show() to start
     drop down mode and Hide() to end it.
@@ -76,7 +76,7 @@ public :
     void SetPopupModeEndHandler (const ::boost::function<void()>& rCallback);
 
 protected:
-    std::unique_ptr<PopupControl> mxControl;
+    VclPtr<PopupControl> mxControl;
 
     /** Make sure that both PopupContainer and PopupControl objects
         exist.  Calls the maControlCreator functor if necessary.
@@ -89,11 +89,11 @@ protected:
     void CreateContainerAndControl();
 
 private:
-    vcl::Window* mpParent;
-    ::boost::function<PopupControl*(PopupContainer*)> maControlCreator;
+    VclPtr<vcl::Window> mpParent;
+    ::boost::function<VclPtr<PopupControl>(PopupContainer*)> maControlCreator;
     ::boost::function<void()> maPopupModeEndCallback;
     const ::rtl::OUString msAccessibleName;
-    std::unique_ptr<PopupContainer> mxContainer;
+    VclPtr<PopupContainer> mxContainer;
 
     DECL_LINK(PopupModeEndHandler, void*);
 };
diff --git a/include/svx/sidebar/PopupControl.hxx b/include/svx/sidebar/PopupControl.hxx
index 32658b3ae4d7..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();
 
     virtual void Paint (const Rectangle& rect) SAL_OVERRIDE;
 };
diff --git a/include/svx/sidebar/SidebarDialControl.hxx b/include/svx/sidebar/SidebarDialControl.hxx
index 1d829d27fe76..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();
 
     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 e6724b278c9c..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();
-
     // add item for control type IMAGE_TEXT
     // if control type does not match IMAGE_TEXT no item is added.
     // @param pSelectedItemImage