| commit | 02e20dfa733d050e9d37285ad36323b2aad46ffe | [log] |
|---|---|---|
| author | Caolán McNamara <caolanm@redhat.com> | Mon Jun 08 21:22:58 2020 +0100 |
| committer | Caolán McNamara <caolanm@redhat.com> | Fri Jun 19 17:13:44 2020 +0200 |
| tree | 73b945888e85a2868954040d95f34af9747c3395 | |
| parent | 2f00ece21d4d51b553fd905b9a2e8eed12adf195 [diff] |
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 <caolanm@redhat.com>
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index e9adb01..1961a72 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx
@@ -1742,7 +1742,12 @@ // 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; }