vcl: VclPtr conversion in forms
Change-Id: Ib6a84b5d52a695aca69e1fcfde6390d1059a3745
diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx
index 722bdef..69f3f03 100644
--- a/forms/source/richtext/richtextvclcontrol.cxx
+++ b/forms/source/richtext/richtextvclcontrol.cxx
@@ -59,7 +59,13 @@ 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 4e3123d..b5532ca 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 3ccbf2e..b7da152 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;
diff --git a/forms/source/solar/inc/navtoolbar.hxx b/forms/source/solar/inc/navtoolbar.hxx
index 5be47c8..91d8cb1 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
*/
