| commit | ac65ade24aa10c0a39d7d38576ad54bd00724455 | [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:14:31 2020 +0200 |
| tree | 0ac7f8f39fe0110b81f8b759faa14aa45403d3ec | |
| parent | 2479ae3ee20fc5f3cbb0c88eb09110a36e86710c [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/+/96210 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 e3e07dd..7f0656d 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx
@@ -1744,7 +1744,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; }