diff options
| -rw-r--r-- | extensions/source/bibliography/general.cxx | 14 | ||||
| -rw-r--r-- | sw/source/ui/index/swuiidxmrk.cxx | 8 |
2 files changed, 22 insertions, 0 deletions
diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx index 3992f55e5ebc..08880534eea6 100644 --- a/extensions/source/bibliography/general.cxx +++ b/extensions/source/bibliography/general.cxx @@ -46,6 +46,7 @@ #include <algorithm> #include <tools/urlobj.hxx> #include <sfx2/filedlghelper.hxx> +#include <sfx2/objsh.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -363,6 +364,19 @@ IMPL_LINK_NOARG(BibGeneralPage, BrowseHdl, weld::Button&, void) { aFileDlg.SetDisplayDirectory(aPath); } + else + { + SfxObjectShell* pShell = SfxObjectShell::Current(); + OUString aBaseURL; + if (pShell) + { + aBaseURL = pShell->getDocumentBaseURL(); + } + if (!aBaseURL.isEmpty()) + { + aFileDlg.SetDisplayDirectory(aBaseURL); + } + } if (aFileDlg.Execute() != ERRCODE_NONE) { diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index 7b0787caf5ff..fb5ae141563c 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -1810,6 +1810,14 @@ IMPL_LINK(SwCreateAuthEntryDlg_Impl, BrowseHdl, weld::Button&, rButton, void) { aFileDlg.SetDisplayDirectory(aPath); } + else + { + OUString aBaseURL = rWrtSh.GetDoc()->GetDocShell()->getDocumentBaseURL(); + if (!aBaseURL.isEmpty()) + { + aFileDlg.SetDisplayDirectory(aBaseURL); + } + } if (aFileDlg.Execute() != ERRCODE_NONE) { |