[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4' - wsd/DocumentBroker.cpp

[Libreoffice Gerrit user]

 wsd/DocumentBroker.cpp |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 41a1ebca3d39439d21b0393aa1fa194b0887793b
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Tue Dec 18 13:14:38 2018 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Dec 20 13:00:39 2018 +0100

    TemplateSaveAs: Don't forward to the client if not specified.
    
    So that we don't attempt saving as the first thing after opening.
    
    Change-Id: I30864ccdc766ec8843a60b40e991461f1be9cf8f
    Reviewed-on: https://gerrit.libreoffice.org/65484
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 449ef0353..4199ece0c 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -542,7 +542,10 @@ bool DocumentBroker::load(const std::shared_ptr<ClientSession>& session, const s
             wopifileinfo->setHideExportOption(true);
 
         wopiInfo->set("BaseFileName", wopiStorage->getFileInfo().getFilename());
-        wopiInfo->set("TemplateSaveAs", wopifileinfo->getTemplateSaveAs());
+
+        if (!wopifileinfo->getTemplateSaveAs().empty())
+            wopiInfo->set("TemplateSaveAs", wopifileinfo->getTemplateSaveAs());
+
         wopiInfo->set("HidePrintOption", wopifileinfo->getHidePrintOption());
         wopiInfo->set("HideSaveOption", wopifileinfo->getHideSaveOption());
         wopiInfo->set("HideExportOption", wopifileinfo->getHideExportOption());