4 files changed, 5 insertions, 2 deletions
diff --git a/svtools/inc/roadmap.hxx b/svtools/inc/roadmap.hxx
index c12e7449a725..b4b75782e17c 100644
--- a/svtools/inc/roadmap.hxx
+++ b/svtools/inc/roadmap.hxx
@@ -58,6 +58,7 @@ namespace svt
     public:
         ORoadmap( vcl::Window* _pParent, WinBits _nWinStyle = 0 );
         virtual ~ORoadmap( );
+        virtual void dispose() SAL_OVERRIDE;
 
         void            SetRoadmapBitmap( const BitmapEx& maBitmap, bool _bInvalidate = true );
 
diff --git a/svtools/inc/table/tablecontrol.hxx b/svtools/inc/table/tablecontrol.hxx
index e4b7cbf26cea..22242efc5304 100644
--- a/svtools/inc/table/tablecontrol.hxx
+++ b/svtools/inc/table/tablecontrol.hxx
@@ -64,6 +64,7 @@ namespace svt { namespace table
     public:
         TableControl( vcl::Window* _pParent, WinBits _nStyle );
         virtual ~TableControl();
+        virtual void dispose() SAL_OVERRIDE;
 
         /// sets a new table model
         void        SetModel( PTableModel _pModel );
diff --git a/svtools/inc/vclxaccessibleheaderbar.hxx b/svtools/inc/vclxaccessibleheaderbar.hxx
index ff750f9b6aee..4fcfd9e99536 100644
--- a/svtools/inc/vclxaccessibleheaderbar.hxx
+++ b/svtools/inc/vclxaccessibleheaderbar.hxx
@@ -36,7 +36,7 @@ class VCLXAccessibleHeaderBar : public VCLXAccessibleComponent
 {
 
 public:
-    HeaderBar*  m_pHeadBar;
+    VclPtr<HeaderBar>  m_pHeadBar;
     virtual ~VCLXAccessibleHeaderBar();
 
     virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) SAL_OVERRIDE;
diff --git a/svtools/inc/vclxaccessibleheaderbaritem.hxx b/svtools/inc/vclxaccessibleheaderbaritem.hxx
index 301036cb04b5..727c2e7a8177 100644
--- a/svtools/inc/vclxaccessibleheaderbaritem.hxx
+++ b/svtools/inc/vclxaccessibleheaderbaritem.hxx
@@ -25,6 +25,7 @@
 #include <cppuhelper/implbase2.hxx>
 
 #include <tools/link.hxx>
+#include <vcl/vclptr.hxx>
 
 #include <vector>
 
@@ -53,7 +54,7 @@ class VCLXAccessibleHeaderBarItem :    public AccessibleExtendedComponentHelper_
 {
 private:
     VCLExternalSolarLock*    m_pExternalLock;
-    HeaderBar*                m_pHeadBar;
+    VclPtr<HeaderBar>        m_pHeadBar;
     sal_Int32                m_nIndexInParent;
 
 protected: