summaryrefslogtreecommitdiff
path: root/unotools
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2018-10-09 10:28:48 +0200
committerStephan Bergmann <sbergman@redhat.com>2018-10-09 14:47:17 +0200
commit7ceee0f1ec0e349d0df4980d7fdedbd13c7917c5 (patch)
tree616ab419fe0f01e94740de7faacb393775420589 /unotools
parent664db0d945fbb23e115eeea8377e3a4e88541da1 (diff)
Extend loplugin:redundantinline to catch inline functions w/o external linkage
...where "inline" (in its meaning of "this function can be defined in multiple translation units") thus doesn't make much sense. (As discussed in compilerplugins/clang/redundantinline.cxx, exempt such "static inline" functions in include files for now.) All the rewriting has been done automatically by the plugin, except for one instance in sw/source/ui/frmdlg/column.cxx that used to involve an #if), plus some subsequent solenv/clang-format/reformat-formatted-files. Change-Id: Ib8b996b651aeafc03bbdc8890faa05ed50517224 Reviewed-on: https://gerrit.libreoffice.org/61573 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'unotools')
-rw-r--r--unotools/source/config/bootstrap.cxx4
-rw-r--r--unotools/source/config/configitem.cxx3
-rw-r--r--unotools/source/config/configpaths.cxx3
-rw-r--r--unotools/source/config/lingucfg.cxx2
-rw-r--r--unotools/source/i18n/localedatawrapper.cxx8
-rw-r--r--unotools/source/misc/datetime.cxx4
6 files changed, 11 insertions, 13 deletions
diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx
index 7934e171e326..a084375aedda 100644
--- a/unotools/source/config/bootstrap.cxx
+++ b/unotools/source/config/bootstrap.cxx
@@ -354,7 +354,7 @@ static PathStatus getDerivedPath(
return aStatus;
}
-static inline PathStatus getDerivedPath(
+static PathStatus getDerivedPath(
OUString& _rURL,
Bootstrap::Impl::PathData const& _aBaseData,
OUString const& _sRelativeURL,
@@ -389,7 +389,7 @@ static OUString getExecutableBaseName()
return sExecutable;
}
-static inline Bootstrap::PathStatus updateStatus(Bootstrap::Impl::PathData & _rResult)
+static Bootstrap::PathStatus updateStatus(Bootstrap::Impl::PathData & _rResult)
{
return _rResult.status = checkStatusAndNormalizeURL(_rResult.path);
}
diff --git a/unotools/source/config/configitem.cxx b/unotools/source/config/configitem.cxx
index e2f68df9388d..b9aec85c5a2a 100644
--- a/unotools/source/config/configitem.cxx
+++ b/unotools/source/config/configitem.cxx
@@ -744,8 +744,7 @@ bool ConfigItem::ClearNodeElements(const OUString& rNode, Sequence< OUString > c
return bRet;
}
-static inline
-OUString lcl_extractSetPropertyName( const OUString& rInPath, const OUString& rPrefix )
+static OUString lcl_extractSetPropertyName( const OUString& rInPath, const OUString& rPrefix )
{
OUString const sSubPath = dropPrefixFromConfigurationPath( rInPath, rPrefix);
return extractFirstFromConfigurationPath( sSubPath );
diff --git a/unotools/source/config/configpaths.cxx b/unotools/source/config/configpaths.cxx
index cd2e9c7f06a7..6625b3d382d4 100644
--- a/unotools/source/config/configpaths.cxx
+++ b/unotools/source/config/configpaths.cxx
@@ -178,8 +178,7 @@ OUString extractFirstFromConfigurationPath(OUString const& _sInPath, OUString* _
}
// find the position after the prefix in the nested path
-static inline
-sal_Int32 lcl_findPrefixEnd(OUString const& _sNestedPath, OUString const& _sPrefixPath)
+static sal_Int32 lcl_findPrefixEnd(OUString const& _sNestedPath, OUString const& _sPrefixPath)
{
// TODO: currently handles only exact prefix matches
sal_Int32 nPrefixLength = _sPrefixPath.getLength();
diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx
index 42506f20027a..3dfacf08a875 100644
--- a/unotools/source/config/lingucfg.cxx
+++ b/unotools/source/config/lingucfg.cxx
@@ -68,7 +68,7 @@ static bool lcl_SetLocale( LanguageType &rLanguage, const uno::Any &rVal )
return bSucc;
}
-static inline const OUString lcl_LanguageToCfgLocaleStr( LanguageType nLanguage )
+static const OUString lcl_LanguageToCfgLocaleStr( LanguageType nLanguage )
{
OUString aRes;
if (LANGUAGE_SYSTEM != nLanguage)
diff --git a/unotools/source/i18n/localedatawrapper.cxx b/unotools/source/i18n/localedatawrapper.cxx
index 11f09a68fe95..a17c81f2ca8a 100644
--- a/unotools/source/i18n/localedatawrapper.cxx
+++ b/unotools/source/i18n/localedatawrapper.cxx
@@ -1230,7 +1230,7 @@ static sal_Unicode* ImplAdd9UNum( sal_Unicode* pBuf, sal_uInt32 nNumber )
return pBuf;
}
-static inline sal_Unicode* ImplAddString( sal_Unicode* pBuf, const OUString& rStr )
+static sal_Unicode* ImplAddString( sal_Unicode* pBuf, const OUString& rStr )
{
if ( rStr.getLength() == 1 )
*pBuf++ = rStr[0];
@@ -1244,14 +1244,14 @@ static inline sal_Unicode* ImplAddString( sal_Unicode* pBuf, const OUString& rSt
return pBuf;
}
-static inline sal_Unicode* ImplAddString( sal_Unicode* pBuf, sal_Unicode c )
+static sal_Unicode* ImplAddString( sal_Unicode* pBuf, sal_Unicode c )
{
*pBuf = c;
pBuf++;
return pBuf;
}
-static inline sal_Unicode* ImplAddString( sal_Unicode* pBuf, const sal_Unicode* pCopyBuf, sal_Int32 nLen )
+static sal_Unicode* ImplAddString( sal_Unicode* pBuf, const sal_Unicode* pCopyBuf, sal_Int32 nLen )
{
memcpy( pBuf, pCopyBuf, nLen * sizeof(sal_Unicode) );
return pBuf + nLen;
@@ -1514,7 +1514,7 @@ OUString LocaleDataWrapper::getDuration( const tools::Time& rTime, bool bSec, bo
// --- simple number formatting ---------------------------------------
-static inline size_t ImplGetNumberStringLengthGuess( const LocaleDataWrapper& rLoc, sal_uInt16 nDecimals )
+static size_t ImplGetNumberStringLengthGuess( const LocaleDataWrapper& rLoc, sal_uInt16 nDecimals )
{
// approximately 3.2 bits per digit
const size_t nDig = ((sizeof(sal_Int64) * 8) / 3) + 1;
diff --git a/unotools/source/misc/datetime.cxx b/unotools/source/misc/datetime.cxx
index 6a10c1e6f1ac..b2b25d6df1b5 100644
--- a/unotools/source/misc/datetime.cxx
+++ b/unotools/source/misc/datetime.cxx
@@ -144,7 +144,7 @@ namespace
else
return false;
}
- inline bool getISO8601TimeToken(const OUString &i_str, sal_Int32 &io_index, OUString &o_strInt, bool &o_bFraction, OUString &o_strFrac)
+ bool getISO8601TimeToken(const OUString &i_str, sal_Int32 &io_index, OUString &o_strInt, bool &o_bFraction, OUString &o_strFrac)
{
OUString resInt;
OUString resFrac;
@@ -161,7 +161,7 @@ namespace
return true;
}
}
- inline bool getISO8601TimeZoneToken(const OUString &i_str, sal_Int32 &io_index, OUString &o_strInt)
+ bool getISO8601TimeZoneToken(const OUString &i_str, sal_Int32 &io_index, OUString &o_strInt)
{
const sal_Unicode c0 = '0';
const sal_Unicode c9 = '9';