[Libreoffice-commits] online.git: loolwsd/ChildProcessSession.cpp loolwsd/ChildProcessSession.hpp
Miklos Vajna
vmiklos at collabora.co.uk
Mon Jan 11 00:19:00 PST 2016
loolwsd/ChildProcessSession.cpp | 3 +--
loolwsd/ChildProcessSession.hpp | 1 -
2 files changed, 1 insertion(+), 3 deletions(-)
New commits:
commit 1fbe0580e1fb07e00038c08e04792c3f76e88d12
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Mon Jan 11 09:18:37 2016 +0100
loolwsd: -Werror,-Wunused-private-field
diff --git a/loolwsd/ChildProcessSession.cpp b/loolwsd/ChildProcessSession.cpp
index 7db9964..ac2ed50 100644
--- a/loolwsd/ChildProcessSession.cpp
+++ b/loolwsd/ChildProcessSession.cpp
@@ -42,7 +42,7 @@ std::mutex ChildProcessSession::_mutex;
ChildProcessSession::ChildProcessSession(const std::string& id,
std::shared_ptr<Poco::Net::WebSocket> ws,
- LibreOfficeKit *loKit,
+ LibreOfficeKit* /*loKit*/,
LibreOfficeKitDocument * loKitDocument,
const std::string& jailId,
std::function<LibreOfficeKitDocument*(const std::string&, const std::string&)> onLoad,
@@ -50,7 +50,6 @@ ChildProcessSession::ChildProcessSession(const std::string& id,
LOOLSession(id, Kind::ToMaster, ws),
_loKitDocument(loKitDocument),
_multiView(getenv("LOK_VIEW_CALLBACK")),
- _loKit(loKit),
_jailId(jailId),
_viewId(0),
_clientPart(0),
diff --git a/loolwsd/ChildProcessSession.hpp b/loolwsd/ChildProcessSession.hpp
index 61ae15a..7642399 100644
--- a/loolwsd/ChildProcessSession.hpp
+++ b/loolwsd/ChildProcessSession.hpp
@@ -86,7 +86,6 @@ private:
LibreOfficeKitDocument *_loKitDocument;
std::string _docType;
const bool _multiView;
- LibreOfficeKit *_loKit;
const std::string _jailId;
/// View ID, returned by createView() or 0 by default.
int _viewId;
More information about the Libreoffice-commits
mailing list