wsd/DocumentBroker.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 8a783a7890afe3c94c316c40fb6c767e0a22f649
Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk>
AuthorDate: Tue Nov 19 09:19:21 2019 -0500
Commit: Michael Meeks <michael.me...@collabora.com>
CommitDate: Fri Nov 22 11:22:22 2019 +0100
wsd: notify clients of WOPI CONFLICT response
Change-Id: I7ad7d88066af7f2bba7fd3307c688ab85ba561eb
Reviewed-on: https://gerrit.libreoffice.org/83217
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Michael Meeks <michael.me...@collabora.com>
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index cc634af80..2fdf4a2fc 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -971,7 +971,8 @@ bool DocumentBroker::saveToStorageInternal(const
std::string& sessionId, bool su
oss << "error: cmd=storage kind=" << (isRename ? "renamefailed" :
"savefailed");
it->second->sendTextFrame(oss.str());
}
- else if (storageSaveResult.getResult() ==
StorageBase::SaveResult::DOC_CHANGED)
+ else if (storageSaveResult.getResult() ==
StorageBase::SaveResult::DOC_CHANGED
+ || storageSaveResult.getResult() ==
StorageBase::SaveResult::CONFLICT)
{
LOG_ERR("PutFile says that Document changed in storage");
_documentChangedInStorage = true;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
