[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-0' - wsd/DocumentBroker.cpp

[Andras Timar (via logerrit)]

 wsd/DocumentBroker.cpp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 141baf6f6a0242f3e21f37f8a8b3aea21d25448e
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Fri Dec 13 16:03:26 2019 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Fri Dec 13 16:03:26 2019 +0100

    fix error: declaration of ‘load’ shadows a member of 'this' [-Werror=shadow]
    
    Change-Id: I4bd4fb3ae6f01c0d03d622f90e1dfb872c396494

diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 77204dd69..fecea32bc 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -2244,8 +2244,8 @@ bool ConvertToBroker::startConversion(SocketDisposition &disposition, const std:
                      // Load the document manually and request saving in the target format.
                      std::string encodedFrom;
                      Poco::URI::encode(docBroker->getPublicUri().getPath(), "", encodedFrom);
-                     const std::string load = "load url=" + encodedFrom;
-                     std::vector<char> loadRequest(load.begin(), load.end());
+                     const std::string _load = "load url=" + encodedFrom;
+                     std::vector<char> loadRequest(_load.begin(), _load.end());
                      docBroker->_clientSession->handleMessage(true, WSOpCode::Text, loadRequest);
 
                      // Save is done in the setLoaded