From 344f939e7d249e7188bc2d668de73c48bb38d4e5 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Fri, 16 Jan 2015 15:29:55 +0200
Subject: [PATCH] vcl: VclPtr conversion in forms

Change-Id: Ib6a84b5d52a695aca69e1fcfde6390d1059a3745
---
 forms/source/richtext/richtextvclcontrol.cxx |  6 ++++++
 forms/source/richtext/richtextvclcontrol.hxx |  1 +
 forms/source/solar/control/navtoolbar.cxx    | 11 ++++++-----
 forms/source/solar/inc/navtoolbar.hxx        |  2 +-
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx
index 722bdefa52d7..69f3f032e566 100644
--- a/forms/source/richtext/richtextvclcontrol.cxx
+++ b/forms/source/richtext/richtextvclcontrol.cxx
@@ -58,8 +58,14 @@ namespace frm
 
 
     RichTextControl::~RichTextControl( )
+    {
+        dispose();
+    }
+
+    void RichTextControl::dispose()
     {
         delete m_pImpl;
+        Control::dispose();
     }
 
 
diff --git a/forms/source/richtext/richtextvclcontrol.hxx b/forms/source/richtext/richtextvclcontrol.hxx
index 4e3123d0b75a..b5532ca4bc0f 100644
--- a/forms/source/richtext/richtextvclcontrol.hxx
+++ b/forms/source/richtext/richtextvclcontrol.hxx
@@ -52,6 +52,7 @@ namespace frm
         );
 
         virtual ~RichTextControl( );
+        virtual void dispose() SAL_OVERRIDE;
 
         /* enables the change notifications for a particular attribute
 
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
@@ -146,6 +146,11 @@ namespace frm
 
 
     NavigationToolBar::~NavigationToolBar( )
+    {
+        dispose();
+    }
+
+    void NavigationToolBar::dispose()
     {
         for (   ::std::vector< vcl::Window* >::iterator loopChildWins = m_aChildWins.begin();
                 loopChildWins != m_aChildWins.end();
@@ -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;
diff --git a/forms/source/solar/inc/navtoolbar.hxx b/forms/source/solar/inc/navtoolbar.hxx
index 5be47c86c5f1..91d8cb1987a1 100644
--- a/forms/source/solar/inc/navtoolbar.hxx
+++ b/forms/source/solar/inc/navtoolbar.hxx
@@ -71,6 +71,7 @@ namespace frm
             const ::boost::shared_ptr< const ICommandDescriptionProvider >& _pDescriptionProvider
         );
         virtual ~NavigationToolBar( );
+        virtual void dispose() SAL_OVERRIDE;
 
         /** sets the dispatcher which is to be used for the features
 
@@ -158,7 +159,6 @@ namespace frm
 
     public:
         RecordPositionInput( vcl::Window* _pParent );
-        virtual ~RecordPositionInput();
 
         /** sets the dispatcher which is to be used for the features
         */