diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-11-21 10:14:59 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-11-21 11:16:37 +0000 |
| commit | e53da8804d00182cf83f67880e2799b15b70a46f (patch) | |
| tree | a529648c9295ff3d8b220097f871710a3906e455 /desktop/source/deployment | |
| parent | e9be9ba808359d87675e20cc1c5c7e2c78e59c7d (diff) | |
xslt dialog is supposed to be a modeless dialog
and fix the lifecycle to die at the right time
Change-Id: Ibe8f683ed162500a93e02a56d8607bd2ee431ded
Diffstat (limited to 'desktop/source/deployment')
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_theextmgr.cxx | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx index cfe9794f59a1..d8a80fdc612c 100644 --- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx +++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx @@ -22,7 +22,7 @@ #include "osl/mutex.hxx" -#include "toolkit/helper/vclunohelper.hxx" +#include <toolkit/helper/vclunohelper.hxx> #include "com/sun/star/beans/XPropertySet.hpp" #include "com/sun/star/configuration/theDefaultProvider.hpp" @@ -103,12 +103,9 @@ TheExtensionManager::TheExtensionManager( Window *pParent, //------------------------------------------------------------------------------ TheExtensionManager::~TheExtensionManager() { - if ( m_pUpdReqDialog ) - delete m_pUpdReqDialog; - if ( m_pExtMgrDialog ) - delete m_pExtMgrDialog; - if ( m_pExecuteCmdQueue ) - delete m_pExecuteCmdQueue; + delete m_pUpdReqDialog; + delete m_pExtMgrDialog; + delete m_pExecuteCmdQueue; } //------------------------------------------------------------------------------ @@ -454,7 +451,7 @@ void TheExtensionManager::queryTermination( ::lang::EventObject const & ) { ToTop( TOTOP_RESTOREWHENMIN ); throw frame::TerminationVetoException( - OUSTR("The office cannot be closed while the Extension Manager is running"), + OUString("The office cannot be closed while the Extension Manager is running"), uno::Reference<XInterface>(static_cast<frame::XTerminateListener*>(this), uno::UNO_QUERY)); } else @@ -496,8 +493,8 @@ void TheExtensionManager::modified( ::lang::EventObject const & /*rEvt*/ ) return s_ExtMgr; } - Window * pParent = DIALOG_NO_PARENT; - if ( xParent.is() ) + Window* pParent = DIALOG_NO_PARENT; + if (xParent.is()) pParent = VCLUnoHelper::GetWindow(xParent); ::rtl::Reference<TheExtensionManager> that( new TheExtensionManager( pParent, xContext ) ); |