[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4' - wsd/DocumentBroker.cpp wsd/Storage.hpp

[Libreoffice Gerrit user]

 wsd/DocumentBroker.cpp |    2 +-
 wsd/Storage.hpp        |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 93c89b858bc21b6bc8155daebeb00bb5ed6be21d
Author:     Andras Timar <andras.ti...@collabora.com>
AuthorDate: Sat Dec 15 15:23:58 2018 +0100
Commit:     Andras Timar <andras.ti...@collabora.com>
CommitDate: Sat Dec 15 15:24:30 2018 +0100

    _hideUserList is private
    
    Change-Id: I1cded189783d897fa7aa1c65853dc506518b125e
    (cherry picked from commit 892117eb37b86f87c7b4f52ecc1ea8655e839564)

diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 2ea017bc2..631f95a39 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -552,7 +552,7 @@ bool DocumentBroker::load(const 
std::shared_ptr<ClientSession>& session, const s
         wopiInfo->set("UserCanNotWriteRelative", 
wopifileinfo->getUserCanNotWriteRelative());
         wopiInfo->set("EnableInsertRemoteImage", 
wopifileinfo->getEnableInsertRemoteImage());
         wopiInfo->set("EnableShare", wopifileinfo->getEnableShare());
-        wopiInfo->set("HideUserList", wopifileinfo->_hideUserList);
+        wopiInfo->set("HideUserList", wopifileinfo->getHideUserList());
         if (wopifileinfo->getHideChangeTrackingControls() != 
WopiStorage::WOPIFileInfo::TriState::Unset)
             wopiInfo->set("HideChangeTrackingControls", 
wopifileinfo->getHideChangeTrackingControls() == 
WopiStorage::WOPIFileInfo::TriState::True);
 
diff --git a/wsd/Storage.hpp b/wsd/Storage.hpp
index fd70515c4..467deea40 100644
--- a/wsd/Storage.hpp
+++ b/wsd/Storage.hpp
@@ -393,6 +393,8 @@ public:
 
         bool getEnableShare() const { return _enableShare; }
 
+        std::string& getHideUserList() const { return _hideUserList; }
+
         TriState getDisableChangeTrackingShow() const { return 
_disableChangeTrackingShow; }
 
         TriState getDisableChangeTrackingRecord() const { return 
_disableChangeTrackingRecord; }
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits