diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-10-09 10:28:48 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-10-09 14:47:17 +0200 |
| commit | 7ceee0f1ec0e349d0df4980d7fdedbd13c7917c5 (patch) | |
| tree | 616ab419fe0f01e94740de7faacb393775420589 /sd | |
| parent | 664db0d945fbb23e115eeea8377e3a4e88541da1 (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 'sd')
| -rw-r--r-- | sd/qa/unit/export-tests-ooxml2.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx | 6 |
2 files changed, 5 insertions, 5 deletions
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 |