Kaydet (Commit) a54c1d1a authored tarafından Caolán McNamara's avatar Caolán McNamara

give SvFilterOptionsDialog a proper parent

Change-Id: Ie6545844546dc78d14e1fabdf28f4e1938cf2dd4
Reviewed-on: https://gerrit.libreoffice.org/61413Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst c98578f9
......@@ -69,6 +69,7 @@ class SvFilterOptionsDialog : public cppu::WeakImplHelper
uno::Reference< lang::XComponent >
mxSourceDocument;
css::uno::Reference<css::awt::XWindow> mxParent;
OUString maDialogTitle;
FieldUnit meFieldUnit;
bool mbExportSelection;
......@@ -123,8 +124,19 @@ void SAL_CALL SvFilterOptionsDialog::release() throw()
}
// XInitialization
void SAL_CALL SvFilterOptionsDialog::initialize( const uno::Sequence< uno::Any > & )
void SAL_CALL SvFilterOptionsDialog::initialize(const uno::Sequence<uno::Any>& rArguments)
{
for(const uno::Any& rArgument : rArguments)
{
beans::PropertyValue aProperty;
if (rArgument >>= aProperty)
{
if( aProperty.Name == "ParentWindow" )
{
aProperty.Value >>= mxParent;
}
}
}
}
// XServiceInfo
......@@ -222,9 +234,7 @@ sal_Int16 SvFilterOptionsDialog::execute()
}
if ( nFormat < nFilterCount )
{
vcl::Window* pParent = Application::GetDefDialogParent();
//TODO
FltCallDialogParameter aFltCallDlgPara(pParent ? pParent->GetFrameWeld() : nullptr, meFieldUnit);
FltCallDialogParameter aFltCallDlgPara(Application::GetFrameWeld(mxParent), meFieldUnit);
aFltCallDlgPara.aFilterData = maFilterDataSequence;
aFltCallDlgPara.aFilterExt = aGraphicFilter.GetExportFormatShortName( nFormat );
bool bIsPixelFormat( aGraphicFilter.IsExportPixelFormat( nFormat ) );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment