diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-04-12 13:42:04 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-04-13 09:58:31 +0200 |
| commit | 2b2fe50f33f7d677098f3ebafa8357aea848c0ea (patch) | |
| tree | e0c57d555ae443ecb93b2219cc6dbf972debb595 /uui | |
| parent | 34d362b5c249f78ed05c5b069fa90e9597d29c04 (diff) | |
weld SwAsciiFilterDlg and set an explicit parent for the dialog
Change-Id: Ie2a52a9e2ea7f41a336b227de670cd5f688d7cd4
Reviewed-on: https://gerrit.libreoffice.org/52778
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'uui')
| -rw-r--r-- | uui/source/iahndl-filter.cxx | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/uui/source/iahndl-filter.cxx b/uui/source/iahndl-filter.cxx index 421ce727592e..38c98375f3e5 100644 --- a/uui/source/iahndl-filter.cxx +++ b/uui/source/iahndl-filter.cxx @@ -30,6 +30,7 @@ #include <com/sun/star/task/XInteractionRequest.hpp> #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> +#include <comphelper/propertysequence.hxx> #include <comphelper/sequenceashashmap.hxx> #include <vcl/svapp.hxx> @@ -178,6 +179,7 @@ handleNoSuchFilterRequest_( void handleFilterOptionsRequest_( + uno::Reference<awt::XWindow> const & rWindow, uno::Reference< uno::XComponentContext > const & xContext, document::FilterOptionsRequest const & rRequest, uno::Sequence< uno::Reference< task::XInteractionContinuation > > const & @@ -226,11 +228,17 @@ handleFilterOptionsRequest_( aProps[nProperty].Value >>= aServiceName; if( !aServiceName.isEmpty() ) { + uno::Sequence<uno::Any> aDialogArgs(comphelper::InitAnyPropertySequence( + { + {"ParentWindow", uno::Any(rWindow)}, + })); + uno::Reference< ui::dialogs::XExecutableDialog > xFilterDialog( - xContext->getServiceManager()->createInstanceWithContext( - aServiceName, xContext ), + xContext->getServiceManager()->createInstanceWithArgumentsAndContext( + aServiceName, aDialogArgs, xContext ), uno::UNO_QUERY ); + uno::Reference< beans::XPropertyAccess > xFilterProperties( xFilterDialog, uno::UNO_QUERY ); @@ -302,7 +310,8 @@ UUIInteractionHelper::handleFilterOptionsRequest( document::FilterOptionsRequest aFilterOptionsRequest; if (aAnyRequest >>= aFilterOptionsRequest) { - handleFilterOptionsRequest_(m_xContext, + handleFilterOptionsRequest_(getParentXWindow(), + m_xContext, aFilterOptionsRequest, rRequest->getContinuations()); return true; |