common/JsonUtil.hpp | 5 ++---
wsd/ClientSession.cpp | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
New commits:
commit 3cf27ee2c26ce82c417d18089fc0d8a3ce1c93fc
Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk>
AuthorDate: Sat Aug 15 12:40:42 2020 -0400
Commit: Ashod Nakashian <a...@collabora.com>
CommitDate: Mon Aug 17 14:15:37 2020 +0200
wsd: minor cosmetics
Change-Id: I9e67cf870c92197a5c53d45f479d8c9f70818049
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100833
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Tested-by: Jenkins
Reviewed-by: Ashod Nakashian <a...@collabora.com>
diff --git a/common/JsonUtil.hpp b/common/JsonUtil.hpp
index 8f4e9d926..4fdc260c1 100644
--- a/common/JsonUtil.hpp
+++ b/common/JsonUtil.hpp
@@ -26,7 +26,6 @@ namespace JsonUtil
// Returns true if parsing successful otherwise false
inline bool parseJSON(const std::string& json, Poco::JSON::Object::Ptr& object)
{
- bool success = false;
const size_t index = json.find_first_of('{');
if (index != std::string::npos)
{
@@ -34,10 +33,10 @@ inline bool parseJSON(const std::string& json,
Poco::JSON::Object::Ptr& object)
Poco::JSON::Parser parser;
const Poco::Dynamic::Var result = parser.parse(stringJSON);
object = result.extract<Poco::JSON::Object::Ptr>();
- success = true;
+ return true;
}
- return success;
+ return false;
}
inline
diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp
index a3fa8e078..7c4ac6fdb 100644
--- a/wsd/ClientSession.cpp
+++ b/wsd/ClientSession.cpp
@@ -207,7 +207,7 @@ void ClientSession::rotateClipboardKey(bool notifyClient)
std::string ClientSession::getClipboardURI(bool encode)
{
if (_wopiFileInfo && _wopiFileInfo->getDisableCopy())
- return "";
+ return std::string();
std::string encodedFrom;
Poco::URI wopiSrc = getDocumentBroker()->getPublicUri();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
