wsd/DocumentBroker.cpp | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
New commits:
commit 61ffc7c0a15107db7ac7304584cf42b89946f3d6
Author: Pranav Kant <pran...@collabora.co.uk>
Date: Thu Feb 1 22:43:47 2018 +0530
wsd: DocumentBroker: Don't initiate the document close
Just broadcast the message and let clients deal with it. This is similar
to how we do it when we find the document conflict via CheckFileInfo
Change-Id: I52855fcb96a359b3915afe71d481321f79b4554b
Reviewed-on: https://gerrit.libreoffice.org/49748
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
Tested-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index c0d33348..4be7a88c 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -837,14 +837,11 @@ bool DocumentBroker::saveToStorageInternal(const
std::string& sessionId,
{
LOG_ERR("PutFile says that Document changed in storage");
_documentChangedInStorage = true;
+ std::string message = "close: documentconflict";
if (_isModified)
- {
- broadcastMessage("error: cmd=storage kind=documentconflict");
- }
- else
- {
- closeDocument("documentconflict");
- }
+ message = "error: cmd=storage kind=documentconflict";
+
+ broadcastMessage(message);
}
return false;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
