[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3-0' - wsd/DocumentBroker.hpp wsd/LOOLWSD.cpp
Pranav Kant
pranavk at collabora.co.uk
Thu Feb 15 13:05:56 UTC 2018
wsd/DocumentBroker.hpp | 3 ---
wsd/LOOLWSD.cpp | 3 +--
2 files changed, 1 insertion(+), 5 deletions(-)
New commits:
commit 30e867946ebfb668565387204171b975f55d7c2e
Author: Pranav Kant <pranavk at collabora.co.uk>
Date: Fri Feb 2 00:36:53 2018 +0530
wsd: Bin superfluous public method
Passing the reason to stop() method also does the same thing.
Change-Id: I16b648495382c14f31839acca815835df76d8dca
Reviewed-on: https://gerrit.libreoffice.org/49750
Reviewed-by: Andras Timar <andras.timar at collabora.com>
Tested-by: Andras Timar <andras.timar at collabora.com>
diff --git a/wsd/DocumentBroker.hpp b/wsd/DocumentBroker.hpp
index 1571e426..a398e701 100644
--- a/wsd/DocumentBroker.hpp
+++ b/wsd/DocumentBroker.hpp
@@ -349,9 +349,6 @@ public:
/// Sends a message to all sessions
void broadcastMessage(const std::string& message);
- /// Sets the reason for closing document;
- void setCloseReason(const std::string& closeReason) { _closeReason = closeReason; }
-
private:
/// Shutdown all client connections with the given reason.
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 1f60f24b..b713ac0c 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -1547,8 +1547,7 @@ private:
{
auto lock = docBroker->getLock();
docBroker->assertCorrectThread();
- docBroker->setCloseReason("docdisconnected");
- docBroker->stop("Lost connection with LOKit.");
+ docBroker->stop("docisdisconnected");
}
}
More information about the Libreoffice-commits
mailing list