[Libreoffice-commits] online.git: loolwsd/ChildProcessSession.cpp loolwsd/ChildProcessSession.hpp loolwsd/LOOLKit.cpp
Ashod Nakashian
ashod.nakashian at collabora.co.uk
Mon Jan 4 17:02:16 PST 2016
loolwsd/ChildProcessSession.cpp | 2 +-
loolwsd/ChildProcessSession.hpp | 6 ++++--
loolwsd/LOOLKit.cpp | 2 +-
3 files changed, 6 insertions(+), 4 deletions(-)
New commits:
commit 790fecacbb75e3b9ecc4b7dcce37487a75625d49
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date: Sun Jan 3 10:56:41 2016 -0500
loolwsd: viewId now private
Change-Id: I307ff20cdaf517e96692d1b244f5bd1dd63015f3
Reviewed-on: https://gerrit.libreoffice.org/21092
Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
Tested-by: Ashod Nakashian <ashnakash at gmail.com>
diff --git a/loolwsd/ChildProcessSession.cpp b/loolwsd/ChildProcessSession.cpp
index f74e353..7180776 100644
--- a/loolwsd/ChildProcessSession.cpp
+++ b/loolwsd/ChildProcessSession.cpp
@@ -48,9 +48,9 @@ ChildProcessSession::ChildProcessSession(const std::string& id,
const std::string& childId) :
LOOLSession(id, Kind::ToMaster, ws),
_loKitDocument(loKitDocument),
- _viewId(0),
_loKit(loKit),
_childId(childId),
+ _viewId(0),
_clientPart(0)
{
Log::info("ChildProcessSession ctor [" + getName() + "].");
diff --git a/loolwsd/ChildProcessSession.hpp b/loolwsd/ChildProcessSession.hpp
index 2340f96..7f5aa05 100644
--- a/loolwsd/ChildProcessSession.hpp
+++ b/loolwsd/ChildProcessSession.hpp
@@ -38,10 +38,10 @@ public:
virtual bool getPartPageRectangles(const char *buffer, int length) override;
+ int getViewId() const { return _viewId; }
+
LibreOfficeKitDocument *_loKitDocument;
std::string _docType;
- /// View ID, returned by createView() or 0 by default.
- int _viewId;
static Poco::NotificationQueue _callbackQueue;
static Poco::Mutex _mutex;
@@ -77,6 +77,8 @@ private:
virtual bool _handleInput(const char *buffer, int length) override;
private:
+ /// View ID, returned by createView() or 0 by default.
+ int _viewId;
int _clientPart;
};
diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp
index 8205a4f..b17e188 100644
--- a/loolwsd/LOOLKit.cpp
+++ b/loolwsd/LOOLKit.cpp
@@ -146,7 +146,7 @@ public:
void callback(const int nType, const std::string& rPayload, void* pData)
{
ChildProcessSession *srv = reinterpret_cast<ChildProcessSession *>(pData);
- Log::trace() << "Callback [" << srv->_viewId << "] "
+ Log::trace() << "Callback [" << srv->getViewId() << "] "
<< callbackTypeToString(nType)
<< " [" << rPayload << "]." << Log::end;
More information about the Libreoffice-commits
mailing list