configure.ac | 2 +-
wsd/DocumentBroker.cpp | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 19d05057fa660d2189a769ae053e0b1aa57af872
Author: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
AuthorDate: Tue Sep 8 08:13:11 2020 +0200
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Tue Sep 8 08:42:26 2020 +0200
Release 6.2.12.0
Change-Id: I552114d06222705e77cb9c266887b5ae80583af8
diff --git a/configure.ac b/configure.ac
index ea556501b..092eb9b06 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ([2.63])
-AC_INIT([loolwsd], [6.2.11.0], [libreoffice@lists.freedesktop.org])
+AC_INIT([loolwsd], [6.2.12.0], [libreoffice@lists.freedesktop.org])
LT_INIT([shared, disable-static, dlopen])
AM_INIT_AUTOMAKE([1.10 subdir-objects tar-pax -Wno-portability])
commit ccb6581fbaf7d5b9591598fbd7b1bd15f0a7436f
Author: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
AuthorDate: Tue Sep 8 08:41:31 2020 +0200
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Tue Sep 8 08:42:26 2020 +0200
Consider save successful also when doc changed in storage
Ported from master fix 8c602e179e8afe44f2a1fe513bdc7640cd57ed2a
Change-Id: Iaf52e950cc635d625c1415754b9d411d0a009927
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 3c3ca28bc..83f942b5d 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -833,7 +833,10 @@ bool DocumentBroker::saveToStorageInternal(const
std::string& sessionId,
assert(_storage && _tileCache);
StorageBase::SaveResult storageSaveResult =
_storage->saveLocalFileToStorage(auth, saveAsPath, saveAsFilename);
- _lastStorageSaveSuccessful = storageSaveResult.getResult() ==
StorageBase::SaveResult::OK;
+ // Storage save is considered successful when either storage returns OK or
the document on the storage
+ // was changed and it was used to overwrite local changes
+ _lastStorageSaveSuccessful = storageSaveResult.getResult() ==
StorageBase::SaveResult::OK ||
+ storageSaveResult.getResult() ==
StorageBase::SaveResult::DOC_CHANGED;
if (storageSaveResult.getResult() == StorageBase::SaveResult::OK)
{
if (!isSaveAs)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
