[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sfx2/source

[Caolán McNamara (via logerrit)]

 sfx2/source/doc/objmisc.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit f9bd290d08f08464103372633462421ba0918754
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Jun 8 21:22:58 2020 +0100
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Wed Jul 1 11:27:38 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/+/96210
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit ac65ade24aa10c0a39d7d38576ad54bd00724455)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97496
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>

diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 25db3d85238e..681940462720 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -1763,7 +1763,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;
 }