summaryrefslogtreecommitdiff
path: root/sfx2
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 /sfx2
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 'sfx2')
-rw-r--r--sfx2/source/bastyp/fltfnc.cxx2
-rw-r--r--sfx2/source/dialog/templdlg.cxx2
-rw-r--r--sfx2/source/view/lokcharthelper.cxx4
3 files changed, 4 insertions, 4 deletions
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index 563d07cd65d5..a5abc61b5022 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -119,7 +119,7 @@ static void CreateFilterArr()
theSfxFilterListener::get();
}
-static inline OUString ToUpper_Impl( const OUString &rStr )
+static OUString ToUpper_Impl( const OUString &rStr )
{
return SvtSysLocale().GetCharClass().uppercase( rStr );
}
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 86440fbc0bf8..226e59ba7431 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -564,7 +564,7 @@ static void MakeTree_Impl(StyleTreeArr_Impl& rArr)
});
}
-static inline bool IsExpanded_Impl( const std::vector<OUString>& rEntries,
+static bool IsExpanded_Impl( const std::vector<OUString>& rEntries,
const OUString &rStr)
{
for (const auto & rEntry : rEntries)
diff --git a/sfx2/source/view/lokcharthelper.cxx b/sfx2/source/view/lokcharthelper.cxx
index 04fade568a21..5369b803a692 100644
--- a/sfx2/source/view/lokcharthelper.cxx
+++ b/sfx2/source/view/lokcharthelper.cxx
@@ -31,12 +31,12 @@ using namespace com::sun::star;
namespace {
-inline Point lcl_TwipsToHMM( const Point& rPoint )
+Point lcl_TwipsToHMM( const Point& rPoint )
{
return Point(convertTwipToMm100(rPoint.getX()), convertTwipToMm100(rPoint.getY()));
}
-inline Size lcl_TwipsToHMM( const Size& rSize )
+Size lcl_TwipsToHMM( const Size& rSize )
{
return Size(convertTwipToMm100(rSize.getWidth()), convertTwipToMm100(rSize.getHeight()));
}