1 files changed, 6 insertions, 5 deletions
diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx
index 3ccbf2eb8457..b7da15239386 100644
--- a/forms/source/solar/control/navtoolbar.cxx
+++ b/forms/source/solar/control/navtoolbar.cxx
@@ -147,6 +147,11 @@ namespace frm
 
     NavigationToolBar::~NavigationToolBar( )
     {
+        dispose();
+    }
+
+    void NavigationToolBar::dispose()
+    {
         for (   ::std::vector< vcl::Window* >::iterator loopChildWins = m_aChildWins.begin();
                 loopChildWins != m_aChildWins.end();
                 ++loopChildWins
@@ -155,6 +160,7 @@ namespace frm
             delete *loopChildWins;
         }
         delete m_pToolbar;
+        vcl::Window::dispose();
     }
 
 
@@ -658,11 +664,6 @@ namespace frm
     }
 
 
-    RecordPositionInput::~RecordPositionInput()
-    {
-    }
-
-
     void RecordPositionInput::setDispatcher( const IFeatureDispatcher* _pDispatcher )
     {
         m_pDispatcher = _pDispatcher;