diff options
author | Noel Grandin <noel@peralex.com> | 2015-01-16 15:29:55 +0200 |
---|---|---|
committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-09 21:35:00 +0100 |
commit | 344f939e7d249e7188bc2d668de73c48bb38d4e5 (patch) | |
tree | 78e1e946e636a3000049d46069b07bb45dfd6d93 /forms/source/solar | |
parent | 36070535cb6c1a257d2ea2cb3f10e83bf3aaa96f (diff) |
vcl: VclPtr conversion in forms
Change-Id: Ib6a84b5d52a695aca69e1fcfde6390d1059a3745
Diffstat (limited to 'forms/source/solar')
-rw-r--r-- | forms/source/solar/control/navtoolbar.cxx | 11 | ||||
-rw-r--r-- | forms/source/solar/inc/navtoolbar.hxx | 2 |
2 files changed, 7 insertions, 6 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; 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 */ |