[Libreoffice-commits] core.git: extensions/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sun Oct 14 06:32:09 UTC 2018
extensions/source/update/check/download.cxx | 4 ++--
extensions/source/update/check/updatecheck.cxx | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 5487df9cf7c9d14de9b855f178b5d1194b4ae869
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Sun Oct 14 08:08:05 2018 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sun Oct 14 08:30:49 2018 +0200
loplugin:redundantinline
Change-Id: I67ee39655193517a7d79eeb7d686cbd564fff7a1
diff --git a/extensions/source/update/check/download.cxx b/extensions/source/update/check/download.cxx
index 75579ca0f8f2..de8b4cc8747e 100644
--- a/extensions/source/update/check/download.cxx
+++ b/extensions/source/update/check/download.cxx
@@ -91,7 +91,7 @@ static void openFile( OutData& out )
}
-static inline OString
+static OString
getStringValue(const uno::Reference< container::XNameAccess >& xNameAccess, const OUString& aName)
{
OSL_ASSERT(xNameAccess->hasByName(aName));
@@ -101,7 +101,7 @@ getStringValue(const uno::Reference< container::XNameAccess >& xNameAccess, cons
}
-static inline sal_Int32
+static sal_Int32
getInt32Value(const uno::Reference< container::XNameAccess >& xNameAccess,
const OUString& aName)
{
diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx
index 1120643ba3bc..dd07258df128 100644
--- a/extensions/source/update/check/updatecheck.cxx
+++ b/extensions/source/update/check/updatecheck.cxx
@@ -84,7 +84,7 @@ OUString getReleaseNote(const UpdateInfo& rInfo, sal_uInt8 pos, bool autoDownloa
namespace
{
-inline OUString getBuildId()
+OUString getBuildId()
{
OUString aPathVal("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("version") ":buildid}");
rtl::Bootstrap::expandMacros(aPathVal);
@@ -93,7 +93,7 @@ inline OUString getBuildId()
#if (defined LINUX || defined __sun)
-inline OUString getBaseInstallation()
+OUString getBaseInstallation()
{
OUString aPathVal("$BRAND_BASE_DIR");
rtl::Bootstrap::expandMacros(aPathVal);
@@ -102,7 +102,7 @@ inline OUString getBaseInstallation()
#endif
-inline bool isObsoleteUpdateInfo(const OUString& rBuildId)
+bool isObsoleteUpdateInfo(const OUString& rBuildId)
{
return rBuildId != getBuildId() && !rBuildId.isEmpty();
}
More information about the Libreoffice-commits
mailing list