3 files changed, 3 insertions, 5 deletions
diff --git a/include/svtools/toolpanel/drawerlayouter.hxx b/include/svtools/toolpanel/drawerlayouter.hxx
index cba7f020e735..e35d0dd211c9 100644
--- a/include/svtools/toolpanel/drawerlayouter.hxx
+++ b/include/svtools/toolpanel/drawerlayouter.hxx
@@ -29,12 +29,8 @@
 
 namespace svt
 {
-
-
     class ToolPanelViewShell;
     class ToolPanelDrawer;
-    typedef std::shared_ptr< ToolPanelDrawer >  PToolPanelDrawer;
-
 
     //= ToolPanelDrawer
 
@@ -79,7 +75,7 @@ namespace svt
 private:
         vcl::Window&                             m_rParentWindow;
         IToolPanelDeck&                     m_rPanelDeck;
-        ::std::vector< PToolPanelDrawer >   m_aDrawers;
+        ::std::vector< VclPtr<ToolPanelDrawer> >   m_aDrawers;
         ::boost::optional< size_t >         m_aLastKnownActivePanel;
     };
 
diff --git a/include/svtools/toolpanel/paneltabbar.hxx b/include/svtools/toolpanel/paneltabbar.hxx
index 18e4d1ea1197..3e20b2dede70 100644
--- a/include/svtools/toolpanel/paneltabbar.hxx
+++ b/include/svtools/toolpanel/paneltabbar.hxx
@@ -52,6 +52,7 @@ namespace svt
     public:
         PanelTabBar( vcl::Window& i_rParentWindow, IToolPanelDeck& i_rPanelDeck, const TabAlignment i_eAlignment, const TabItemContent i_eItemContent );
         virtual ~PanelTabBar();
+        virtual void dispose() SAL_OVERRIDE;
 
         // attribute access
         TabItemContent  GetTabItemContent() const;
diff --git a/include/svtools/toolpanel/toolpaneldeck.hxx b/include/svtools/toolpanel/toolpaneldeck.hxx
index d9c06ced6771..211c099deb93 100644
--- a/include/svtools/toolpanel/toolpaneldeck.hxx
+++ b/include/svtools/toolpanel/toolpaneldeck.hxx
@@ -138,6 +138,7 @@ namespace svt
     public:
         ToolPanelDeck( vcl::Window& i_rParent, const WinBits i_nStyle = WB_DIALOGCONTROL );
         virtual ~ToolPanelDeck();
+        virtual void dispose() SAL_OVERRIDE;
 
         // attributes
         PDeckLayouter       GetLayouter() const;