[Libreoffice-commits] core.git: sfx2/source

[Mike Kaganski (via logerrit)]

 sfx2/source/doc/docfile.cxx |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

New commits:
commit 7cb59a86d45d06836723c93b063060f27f9669c6
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Tue Feb 23 09:43:24 2021 +0100
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Wed Feb 24 08:56:26 2021 +0100

    Don't build URL only to drop the result immediately
    
    Change-Id: I128ce053c78caa5212dc69ee617fd4985e3bbfd7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111323
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index b1f96440fb8a..0908d025852d 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -3637,7 +3637,8 @@ OUString GetLogicBase(const INetURLObject& rURL, std::unique_ptr<SfxMedium_Impl>
     (void) pImpl;
 #else
 
-    if (rURL.GetProtocol() == INetProtocol::File && !pImpl->m_pInStream)
+    if (!pImpl->m_bHasEmbeddedObjects // Embedded objects would mean a special base, ignore that.
+        && rURL.GetProtocol() == INetProtocol::File && !pImpl->m_pInStream)
     {
         // Try to create the temp file in the same directory when storing.
         INetURLObject aURL(rURL);
@@ -3645,10 +3646,6 @@ OUString GetLogicBase(const INetURLObject& rURL, std::unique_ptr<SfxMedium_Impl>
         aLogicBase = aURL.GetMainURL(INetURLObject::DecodeMechanism::WithCharset);
     }
 
-    if (pImpl->m_bHasEmbeddedObjects)
-        // Embedded objects would mean a special base, ignore that.
-        aLogicBase.clear();
-
 #endif // !HAVE_FEATURE_MACOSX_SANDBOX
 
     return aLogicBase;