diff options
| author | Noel Grandin <noel@peralex.com> | 2015-05-06 14:07:17 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-05-06 12:12:26 +0000 |
| commit | 39078c247d31674544901f8449f5141185f79f7f (patch) | |
| tree | cedf9386e7ddd05996a7755853e6eb2e6adac5fd /desktop | |
| parent | 7847a338f13071dcd591617f0e8d8fd69b2b0818 (diff) | |
cleanup DIALOG_NO_PARENT, follow on to tdf#91090
remove the DIALOG_NO_PARENT abomination and replace it with a flags
parameter
Change-Id: I71b7dc46c619f2db56af6d4dc2c17daf0a2c8534
Reviewed-on: https://gerrit.libreoffice.org/15645
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_dialog2.cxx | 4 | ||||
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_dialog2.hxx | 2 | ||||
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_theextmgr.cxx | 8 |
3 files changed, 6 insertions, 8 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index 7978b440688a..4b3fb8fcee37 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -668,8 +668,8 @@ void DialogHelper::PostUserEvent( const Link<>& rLink, void* pCaller ) } // ExtMgrDialog -ExtMgrDialog::ExtMgrDialog(vcl::Window *pParent, TheExtensionManager *pManager) - : ModelessDialog(pParent, "ExtensionManagerDialog", "desktop/ui/extensionmanager.ui") +ExtMgrDialog::ExtMgrDialog(vcl::Window *pParent, TheExtensionManager *pManager, Dialog::InitFlag eFlag) + : ModelessDialog(pParent, "ExtensionManagerDialog", "desktop/ui/extensionmanager.ui", eFlag) , DialogHelper(pManager->getContext(), (Dialog*) this) , m_sAddPackages(getResourceString(RID_STR_ADD_PACKAGES)) , m_bHasProgress(false) diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx index 75e52f0c1f9c..46a0c9e3f448 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx @@ -139,7 +139,7 @@ class ExtMgrDialog : public ModelessDialog, DECL_DLLPRIVATE_LINK( startProgress, void * ); public: - ExtMgrDialog( vcl::Window * pParent, TheExtensionManager *pManager ); + ExtMgrDialog( vcl::Window * pParent, TheExtensionManager *pManager, Dialog::InitFlag eFlag = Dialog::InitFlag::Default ); virtual ~ExtMgrDialog(); virtual void dispose() SAL_OVERRIDE; diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx index fa42dc29ff94..ccf0b54ff150 100644 --- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx +++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx @@ -120,12 +120,10 @@ void TheExtensionManager::createDialog( const bool bCreateUpdDlg ) } else if ( !m_pExtMgrDialog ) { - // FIXME: horrible ... - vcl::Window* pParent = DIALOG_NO_PARENT; if (m_xParent.is()) - pParent = VCLUnoHelper::GetWindow(m_xParent); - - m_pExtMgrDialog = VclPtr<ExtMgrDialog>::Create( pParent, this ); + m_pExtMgrDialog = VclPtr<ExtMgrDialog>::Create( VCLUnoHelper::GetWindow(m_xParent), this ); + else + m_pExtMgrDialog = VclPtr<ExtMgrDialog>::Create( nullptr, this, Dialog::InitFlag::NoParent ); delete m_pExecuteCmdQueue; m_pExecuteCmdQueue = new ExtensionCmdQueue( m_pExtMgrDialog.get(), this, m_xContext ); m_pExtMgrDialog->setGetExtensionsURL( m_sGetExtensionsURL ); |