mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vcl: VclPtr conversion in forms

Browse Source 
Change-Id: Ib6a84b5d52a695aca69e1fcfde6390d1059a3745
This commit is contained in:
Noel Grandin
2015-01-16 15:29:55 +02:00
committed by Michael Meeks
parent 36070535cb
commit 344f939e7d
4 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forms/source/richtext/richtextvclcontrol.cxx
View File

@@ -58,8 +58,14 @@ namespace frm
RichTextControl::~RichTextControl( ) RichTextControl::~RichTextControl( )
{
dispose();
}
void RichTextControl::dispose()
{ {
delete m_pImpl; delete m_pImpl;
Control::dispose();
} }

1
forms/source/richtext/richtextvclcontrol.hxx
View File

@@ -52,6 +52,7 @@ namespace frm
); );
virtual ~RichTextControl( ); virtual ~RichTextControl( );
virtual void dispose() SAL_OVERRIDE;
/* enables the change notifications for a particular attribute /* enables the change notifications for a particular attribute

11
forms/source/solar/control/navtoolbar.cxx
View File

@@ -146,6 +146,11 @@ namespace frm
NavigationToolBar::~NavigationToolBar( ) NavigationToolBar::~NavigationToolBar( )
{
dispose();
}
void NavigationToolBar::dispose()
{ {
for ( ::std::vector< vcl::Window* >::iterator loopChildWins = m_aChildWins.begin(); for ( ::std::vector< vcl::Window* >::iterator loopChildWins = m_aChildWins.begin();
loopChildWins != m_aChildWins.end(); loopChildWins != m_aChildWins.end();
@@ -155,6 +160,7 @@ namespace frm
delete *loopChildWins; delete *loopChildWins;
} }
delete m_pToolbar; delete m_pToolbar;
vcl::Window::dispose();
} }
@@ -658,11 +664,6 @@ namespace frm
} }
RecordPositionInput::~RecordPositionInput()
{
}
void RecordPositionInput::setDispatcher( const IFeatureDispatcher* _pDispatcher ) void RecordPositionInput::setDispatcher( const IFeatureDispatcher* _pDispatcher )
{ {
m_pDispatcher = _pDispatcher; m_pDispatcher = _pDispatcher;

2
forms/source/solar/inc/navtoolbar.hxx
View File

@@ -71,6 +71,7 @@ namespace frm
const ::boost::shared_ptr< const ICommandDescriptionProvider >& _pDescriptionProvider const ::boost::shared_ptr< const ICommandDescriptionProvider >& _pDescriptionProvider
); );
virtual ~NavigationToolBar( ); virtual ~NavigationToolBar( );
virtual void dispose() SAL_OVERRIDE;
/** sets the dispatcher which is to be used for the features /** sets the dispatcher which is to be used for the features
@@ -158,7 +159,6 @@ namespace frm
public: public:
RecordPositionInput( vcl::Window* _pParent ); RecordPositionInput( vcl::Window* _pParent );
virtual ~RecordPositionInput();
/** sets the dispatcher which is to be used for the features /** sets the dispatcher which is to be used for the features
*/ */