From 7ceee0f1ec0e349d0df4980d7fdedbd13c7917c5 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Tue, 9 Oct 2018 10:28:48 +0200
Subject: 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>
---
 sd/qa/unit/export-tests-ooxml2.cxx                    | 4 ++--
 sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'sd')

diff --git a/sd/qa/unit/export-tests-ooxml2.cxx b/sd/qa/unit/export-tests-ooxml2.cxx
index 116663fd2d57..3fa01dd159e2 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -1873,7 +1873,7 @@ void SdOOXMLExportTest2::testTdf118836()
     xDocShRef->DoClose();
 }
 
-static inline double getAdjustmentValue( uno::Reference<beans::XPropertySet>& xSet )
+static double getAdjustmentValue( uno::Reference<beans::XPropertySet>& xSet )
 {
     auto aGeomPropSeq = xSet->getPropertyValue( "CustomShapeGeometry" )
                             .get<uno::Sequence<beans::PropertyValue>>();
@@ -1898,7 +1898,7 @@ static inline double getAdjustmentValue( uno::Reference<beans::XPropertySet>& xS
     return -1.0;
 }
 
-static inline bool getScaleXValue(uno::Reference<beans::XPropertySet>& xSet)
+static bool getScaleXValue(uno::Reference<beans::XPropertySet>& xSet)
 {
     bool bScaleX = false;
 
diff --git a/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx b/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx
index 84382281b98b..9b2915024085 100644
--- a/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx
+++ b/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx
@@ -34,7 +34,7 @@ class PageEnumerationImpl
     : public Enumeration<SharedPageDescriptor>
 {
 public:
-    inline PageEnumerationImpl (
+    PageEnumerationImpl (
         const SlideSorterModel& rModel,
         const PageEnumeration::PagePredicate& rPredicate);
     PageEnumerationImpl(const PageEnumerationImpl&) = delete;
@@ -56,7 +56,7 @@ private:
         It does not call AdvanceToNextValidElement() to skip elements that
         do not fulfill Predicate.
     */
-    inline PageEnumerationImpl (
+    PageEnumerationImpl (
         const SlideSorterModel& rModel,
         const PageEnumeration::PagePredicate& rPredicate,
         int nIndex);
@@ -64,7 +64,7 @@ private:
     /** Skip all elements that do not fulfill Predicate starting with the
         one pointed to by mnIndex.
     */
-    inline void AdvanceToNextValidElement();
+    void AdvanceToNextValidElement();
 };
 
 } // end of anonymouse namespace
-- 
cgit v1.2.3