diff options
| author | Oliver Bolte <obo@openoffice.org> | 2009-08-04 13:26:02 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2009-08-04 13:26:02 +0000 |
| commit | 0e58d0e32a896533e8f60668bff86074c408ab85 (patch) | |
| tree | 9cf6b8d349e6332bc28e96718084f86755a2e2ee | |
| parent | 2693c1ea81289feb4b9892aef7fc7031ef5b0a60 (diff) | |
CWS-TOOLING: integrate CWS extmgr04
2009-08-03 15:43:55 +0200 dv r274583 : #i103933# added patch flag to deploymentgui library
2009-07-31 17:33:31 +0200 dv r274543 : #i103933# Fixed crash on shutdown of office for macintosh version
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_dialog2.cxx | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index 3877c4688e..988b879954 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -190,9 +190,7 @@ Entry_Impl::Entry_Impl( const uno::Reference< deployment::XPackage > &xPackage, //------------------------------------------------------------------------------ Entry_Impl::~Entry_Impl() -{ - delete m_pPublisher; -} +{} //------------------------------------------------------------------------------ StringCompare Entry_Impl::CompareTo( const CollatorWrapper *pCollator, const TEntry_Impl pEntry ) const @@ -461,6 +459,19 @@ ExtensionBox_Impl::ExtensionBox_Impl( ExtMgrDialog* pParent, TheExtensionManager //------------------------------------------------------------------------------ ExtensionBox_Impl::~ExtensionBox_Impl() { + typedef std::vector< TEntry_Impl >::iterator ITER; + + for ( ITER iIndex = m_vEntries.begin(); iIndex < m_vEntries.end(); ++iIndex ) + { + if ( (*iIndex)->m_pPublisher ) + { + delete (*iIndex)->m_pPublisher; + (*iIndex)->m_pPublisher = NULL; + } + } + + m_vEntries.clear(); + delete m_pOptionsBtn; delete m_pEnableBtn; delete m_pRemoveBtn; |