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 /basic | |
| 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 'basic')
| -rw-r--r-- | basic/source/runtime/methods.cxx | 4 | ||||
| -rw-r--r-- | basic/source/runtime/methods1.cxx | 6 | ||||
| -rw-r--r-- | basic/source/runtime/runtime.cxx | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index 629e3728980c..1a17454e6a76 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -140,7 +140,7 @@ static const CharClass& GetCharClass() return aCharClass; } -static inline bool isFolder( FileStatus::Type aType ) +static bool isFolder( FileStatus::Type aType ) { return ( aType == FileStatus::Directory || aType == FileStatus::Volume ); } @@ -2587,7 +2587,7 @@ static OUString implSetupWildcard( const OUString& rFileParam, SbiRTLData* pRTLD return aPathStr; } -static inline bool implCheckWildcard( const OUString& rName, SbiRTLData const * pRTLData ) +static bool implCheckWildcard( const OUString& rName, SbiRTLData const * pRTLData ) { bool bMatch = true; diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx index 514c8e1e85b0..92cd189ca587 100644 --- a/basic/source/runtime/methods1.cxx +++ b/basic/source/runtime/methods1.cxx @@ -1828,7 +1828,7 @@ static IntervalInfo const * getIntervalInfo( const OUString& rStringCode ) return nullptr; } -static inline void implGetDayMonthYear( sal_Int16& rnYear, sal_Int16& rnMonth, sal_Int16& rnDay, double dDate ) +static void implGetDayMonthYear( sal_Int16& rnYear, sal_Int16& rnMonth, sal_Int16& rnDay, double dDate ) { rnDay = implGetDateDay( dDate ); rnMonth = implGetDateMonth( dDate ); @@ -1840,7 +1840,7 @@ static inline void implGetDayMonthYear( sal_Int16& rnYear, sal_Int16& rnMonth, s @return the year number, truncated if necessary and in that case also rMonth and rDay adjusted. */ -static inline sal_Int16 limitDate( sal_Int32 n32Year, sal_Int16& rMonth, sal_Int16& rDay ) +static sal_Int16 limitDate( sal_Int32 n32Year, sal_Int16& rMonth, sal_Int16& rDay ) { if( n32Year > SAL_MAX_INT16 ) { @@ -1957,7 +1957,7 @@ void SbRtl_DateAdd(StarBASIC *, SbxArray & rPar, bool) rPar.Get(0)->PutDate( dNewDate ); } -static inline double RoundImpl( double d ) +static double RoundImpl( double d ) { return ( d >= 0 ) ? floor( d + 0.5 ) : -floor( -d + 0.5 ); } diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx index b8d16c79578e..e2c1e2ef7920 100644 --- a/basic/source/runtime/runtime.cxx +++ b/basic/source/runtime/runtime.cxx @@ -1568,7 +1568,7 @@ void SbiRuntime::StepGET() } // #67607 copy Uno-Structs -static inline bool checkUnoStructCopy( bool bVBA, SbxVariableRef const & refVal, SbxVariableRef const & refVar ) +static bool checkUnoStructCopy( bool bVBA, SbxVariableRef const & refVal, SbxVariableRef const & refVar ) { SbxDataType eVarType = refVar->GetType(); SbxDataType eValType = refVal->GetType(); |