1 files changed, 7 insertions, 7 deletions
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*);
 };