[Libreoffice-commits] online.git: wsd/DocumentBroker.cpp wsd/Storage.hpp

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Tue Nov 27 08:09:48 UTC 2018


 wsd/DocumentBroker.cpp |    4 ++--
 wsd/Storage.hpp        |    4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 0f2fa202c04c0d06d3b0ac3ca237c9388d782143
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Tue Nov 27 09:09:21 2018 +0100
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Tue Nov 27 09:09:29 2018 +0100

    LocalStorage::LocalFileInfo: make members private
    
    Change-Id: Ibdbf35275e2b2f0b935a301fe77a54aef51e4514

diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 2b51934e1..9a2df5053 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -569,8 +569,8 @@ bool DocumentBroker::load(const std::shared_ptr<ClientSession>& session, const s
         if (localStorage != nullptr)
         {
             std::unique_ptr<LocalStorage::LocalFileInfo> localfileinfo = localStorage->getLocalFileInfo();
-            userId = localfileinfo->_userId;
-            username = localfileinfo->_username;
+            userId = localfileinfo->getUserId();
+            username = localfileinfo->getUsername();
 
             if (LOOLWSD::IsViewFileExtension(localStorage->getFileExtension()))
             {
diff --git a/wsd/Storage.hpp b/wsd/Storage.hpp
index 4d546725b..bccaa66a6 100644
--- a/wsd/Storage.hpp
+++ b/wsd/Storage.hpp
@@ -227,6 +227,10 @@ public:
         {
         }
 
+        const std::string& getUserId() const { return _userId; }
+        const std::string& getUsername() const { return _username; }
+
+    private:
         std::string _userId;
         std::string _username;
     };


More information about the Libreoffice-commits mailing list