From 8ed2fb306ffa8c7fef336b858fc5074c309c3c9f Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 4 Apr 2018 14:33:16 +0100 Subject: weld linkeditdialog MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit which enables changing FileDialogHelper over to welded Change-Id: I988342a6574cb7ed09b2724929e8c7117474a56c Reviewed-on: https://gerrit.libreoffice.org/52388 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- forms/source/component/ImageControl.cxx | 3 ++- forms/source/richtext/richtextvclcontrol.cxx | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'forms') diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx index 1f0c99bdf5e7..8e76aefc7d52 100644 --- a/forms/source/component/ImageControl.cxx +++ b/forms/source/component/ImageControl.cxx @@ -774,8 +774,9 @@ bool OImageControlControl::implInsertGraphics() try { Reference< XWindowPeer > xWindowPeer = getPeer(); + VclPtr xWin = VCLUnoHelper::GetWindow(xWindowPeer); ::sfx2::FileDialogHelper aDialog(TemplateDescription::FILEOPEN_LINK_PREVIEW, FileDialogFlags::Graphic, - VCLUnoHelper::GetWindow(xWindowPeer)); + xWin ? xWin->GetFrameWeld() : nullptr); aDialog.SetTitle( sTitle ); Reference< XFilePickerControlAccess > xController( aDialog.GetFilePicker(), UNO_QUERY_THROW ); diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx index 230f1cfe1510..fd466cf25b2c 100644 --- a/forms/source/richtext/richtextvclcontrol.cxx +++ b/forms/source/richtext/richtextvclcontrol.cxx @@ -234,7 +234,7 @@ namespace frm { "Text (*.txt)", "*.txt", EETextFormat::Text } }; - ::sfx2::FileDialogHelper aFP( bLoad ? css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE : css::ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION, FileDialogFlags::NONE, this ); + ::sfx2::FileDialogHelper aFP( bLoad ? css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE : css::ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION, FileDialogFlags::NONE, GetFrameWeld() ); for (auto & aExportFormat : aExportFormats) { -- cgit