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 /filter | |
| 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 'filter')
| -rw-r--r-- | filter/source/xsltdialog/xmlfilterdialogcomponent.cxx | 9 | ||||
| -rw-r--r-- | filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 5 | ||||
| -rw-r--r-- | filter/source/xsltdialog/xmlfiltersettingsdialog.hxx | 3 |
3 files changed, 9 insertions, 8 deletions
diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx index 5d710e5b8e5d..ef70707dfd11 100644 --- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx +++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx @@ -326,12 +326,11 @@ sal_Int16 SAL_CALL XMLFilterDialogComponent::execute( ) throw(RuntimeException, if( nullptr == mpDialog ) { - vcl::Window* pParent = DIALOG_NO_PARENT; - if (mxParent.is()) - pParent = VCLUnoHelper::GetWindow(mxParent); - Reference< XComponent > xComp( this ); - mpDialog = VclPtr<XMLFilterSettingsDialog>::Create(pParent, mxContext); + if (mxParent.is()) + mpDialog = VclPtr<XMLFilterSettingsDialog>::Create(VCLUnoHelper::GetWindow(mxParent), mxContext); + else + mpDialog = VclPtr<XMLFilterSettingsDialog>::Create(nullptr, mxContext, Dialog::InitFlag::NoParent); mpDialog->Execute(); } else if( !mpDialog->IsVisible() ) diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx index 98e356c2a7fa..3a09f866b350 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx @@ -56,8 +56,9 @@ using namespace com::sun::star::util; using ::rtl::Uri; XMLFilterSettingsDialog::XMLFilterSettingsDialog(vcl::Window* pParent, - const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext) - : ModelessDialog(pParent, "XMLFilterSettingsDialog", "filter/ui/xmlfiltersettings.ui") + const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, + Dialog::InitFlag eFlag) + : ModelessDialog(pParent, "XMLFilterSettingsDialog", "filter/ui/xmlfiltersettings.ui", eFlag) , mxContext( rxContext ) , m_bIsClosable(true) , m_sTemplatePath("$(user)/template/") diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx index a6ef194eb081..0e40a14a24f3 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx @@ -86,7 +86,8 @@ class XMLFilterSettingsDialog : public ModelessDialog { public: XMLFilterSettingsDialog(vcl::Window* pParent, - const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext); + const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, + Dialog::InitFlag eFlag = Dialog::InitFlag::Default); virtual ~XMLFilterSettingsDialog(); virtual void dispose() SAL_OVERRIDE; |