sfx2/source/doc/objmisc.cxx | 5 +++++ 1 file changed, 5 insertions(+) New commits: commit 02e20dfa733d050e9d37285ad36323b2aad46ffe Author: Caolán McNamara <caol...@redhat.com> AuthorDate: Mon Jun 8 21:22:58 2020 +0100 Commit: Caolán McNamara <caol...@redhat.com> CommitDate: Fri Jun 19 17:13:44 2020 +0200
tdf#128006 allow documents inside odbs to be as trusted as their container Change-Id: Id19d3805ef2e3282c1a8e89dd8edcccbf4ac4db6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95861 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caol...@redhat.com> diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index e9adb018eae0..1961a7282ef5 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -1742,7 +1742,12 @@ OUString SfxObjectShell_Impl::getDocumentLocation() const // for documents made from a template: get the name of the template sLocation = rDocShell.getDocProperties()->getTemplateURL(); } + + // tdf#128006 take document base url as location + if (sLocation.isEmpty()) + sLocation = rDocShell.getDocumentBaseURL(); } + return sLocation; } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits