diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-04-04 14:33:16 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-04-06 16:48:12 +0200 |
| commit | 8ed2fb306ffa8c7fef336b858fc5074c309c3c9f (patch) | |
| tree | 8699322ccfd3bfef66af56437bb9dabfa249a719 /extensions | |
| parent | 79ae6cc6b3b19252473f6987106ea7d8aa17a5ea (diff) | |
weld linkeditdialog
which enables changing FileDialogHelper over to welded
Change-Id: I988342a6574cb7ed09b2724929e8c7117474a56c
Reviewed-on: https://gerrit.libreoffice.org/52388
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 'extensions')
| -rw-r--r-- | extensions/source/dbpilots/commonpagesdbp.cxx | 2 | ||||
| -rw-r--r-- | extensions/source/propctrlr/formcomponenthandler.cxx | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx index 4c2d7890c9c1..c811a0f90d8d 100644 --- a/extensions/source/dbpilots/commonpagesdbp.cxx +++ b/extensions/source/dbpilots/commonpagesdbp.cxx @@ -206,7 +206,7 @@ namespace dbp { ::sfx2::FileDialogHelper aFileDlg( ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, - FileDialogFlags::NONE, this); + FileDialogFlags::NONE, GetFrameWeld()); aFileDlg.SetDisplayDirectory( SvtPathOptions().GetWorkPath() ); std::shared_ptr<const SfxFilter> pFilter = SfxFilter::GetFilterByName("StarOffice XML (Base)"); diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index 5f94899b054e..9d8a6f43292b 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -2692,9 +2692,10 @@ namespace pcr bool bIsLink = true;// reflect the legacy behavior OUString aStrTrans = m_pInfoService->getPropertyTranslation( PROPERTY_ID_IMAGE_URL ); + vcl::Window* pWin = impl_getDefaultDialogParent_nothrow(); ::sfx2::FileDialogHelper aFileDlg( ui::dialogs::TemplateDescription::FILEOPEN_LINK_PREVIEW, - FileDialogFlags::Graphic, impl_getDefaultDialogParent_nothrow()); + FileDialogFlags::Graphic, pWin ? pWin->GetFrameWeld() : nullptr); aFileDlg.SetTitle(aStrTrans); // non-linked images ( e.g. those located in the document @@ -2759,9 +2760,10 @@ namespace pcr bool FormComponentPropertyHandler::impl_browseForTargetURL_nothrow( Any& _out_rNewValue, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const { + vcl::Window* pWin = impl_getDefaultDialogParent_nothrow(); ::sfx2::FileDialogHelper aFileDlg( ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, - FileDialogFlags::NONE, impl_getDefaultDialogParent_nothrow()); + FileDialogFlags::NONE, pWin ? pWin->GetFrameWeld() : nullptr); OUString sURL; OSL_VERIFY( impl_getPropertyValue_throw( PROPERTY_TARGET_URL ) >>= sURL ); @@ -2813,9 +2815,10 @@ namespace pcr bool FormComponentPropertyHandler::impl_browseForDatabaseDocument_throw( Any& _out_rNewValue, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const { + vcl::Window* pWin = impl_getDefaultDialogParent_nothrow(); ::sfx2::FileDialogHelper aFileDlg( ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, FileDialogFlags::NONE, - "sdatabase", SfxFilterFlags::NONE, SfxFilterFlags::NONE, impl_getDefaultDialogParent_nothrow()); + "sdatabase", SfxFilterFlags::NONE, SfxFilterFlags::NONE, pWin ? pWin->GetFrameWeld() : nullptr); OUString sDataSource; OSL_VERIFY( impl_getPropertyValue_throw( PROPERTY_DATASOURCE ) >>= sDataSource ); |