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 /editeng | |
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 'editeng')
-rw-r--r-- | editeng/source/editeng/impedit.cxx | 2 | ||||
-rw-r--r-- | editeng/source/items/frmitems.cxx | 4 | ||||
-rw-r--r-- | editeng/source/items/paperinf.cxx | 2 | ||||
-rw-r--r-- | editeng/source/misc/svxacorr.cxx | 8 | ||||
-rw-r--r-- | editeng/source/rtf/rtfitem.cxx | 2 | ||||
-rw-r--r-- | editeng/source/uno/unofield.cxx | 4 |
6 files changed, 11 insertions, 11 deletions
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx index 3c033198344d..053b485cc46f 100644 --- a/editeng/source/editeng/impedit.cxx +++ b/editeng/source/editeng/impedit.cxx @@ -46,7 +46,7 @@ using namespace ::com::sun::star::linguistic2; #define SCRLRANGE 20 // Scroll 1/20 of the width/height, when in QueryDrop -static inline void lcl_AllignToPixel( Point& rPoint, OutputDevice const * pOutDev, short nDiffX, short nDiffY ) +static void lcl_AllignToPixel( Point& rPoint, OutputDevice const * pOutDev, short nDiffX, short nDiffY ) { rPoint = pOutDev->LogicToPixel( rPoint ); diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index ba9791f31a52..44b6ffaab159 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -1388,7 +1388,7 @@ SvxBoxItem& SvxBoxItem::operator=( const SvxBoxItem& rBox ) } -static inline bool CmpBrdLn( const std::unique_ptr<SvxBorderLine> & pBrd1, const SvxBorderLine* pBrd2 ) +static bool CmpBrdLn( const std::unique_ptr<SvxBorderLine> & pBrd1, const SvxBorderLine* pBrd2 ) { if( pBrd1.get() == pBrd2 ) return true; @@ -3272,7 +3272,7 @@ sal_uInt16 SvxBrushItem::GetVersion( sal_uInt16 /*nFileVersion*/ ) const } -static inline sal_Int8 lcl_PercentToTransparency(long nPercent) +static sal_Int8 lcl_PercentToTransparency(long nPercent) { // 0xff must not be returned! return sal_Int8(nPercent ? (50 + 0xfe * nPercent) / 100 : 0); diff --git a/editeng/source/items/paperinf.cxx b/editeng/source/items/paperinf.cxx index b528acb693d3..546c1e9c1d68 100644 --- a/editeng/source/items/paperinf.cxx +++ b/editeng/source/items/paperinf.cxx @@ -25,7 +25,7 @@ Description: Is the printer valid --------------------------------------------------------------------*/ -static inline bool IsValidPrinter( const Printer* pPtr ) +static bool IsValidPrinter( const Printer* pPtr ) { return !pPtr->GetName().isEmpty(); } diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index 91b558c756ce..f8514bb53a08 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -106,25 +106,25 @@ static const sal_Char static OUString EncryptBlockName_Imp(const OUString& rName); -static inline bool NonFieldWordDelim( const sal_Unicode c ) +static bool NonFieldWordDelim( const sal_Unicode c ) { return ' ' == c || '\t' == c || 0x0a == c || cNonBreakingSpace == c || 0x2011 == c; } -static inline bool IsWordDelim( const sal_Unicode c ) +static bool IsWordDelim( const sal_Unicode c ) { return c == 0x1 || NonFieldWordDelim(c); } -static inline bool IsLowerLetter( sal_Int32 nCharType ) +static bool IsLowerLetter( sal_Int32 nCharType ) { return CharClass::isLetterType( nCharType ) && ( css::i18n::KCharacterType::LOWER & nCharType); } -static inline bool IsUpperLetter( sal_Int32 nCharType ) +static bool IsUpperLetter( sal_Int32 nCharType ) { return CharClass::isLetterType( nCharType ) && ( css::i18n::KCharacterType::UPPER & nCharType); diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx index 9579b8e9eaa2..bf1f40585bf3 100644 --- a/editeng/source/rtf/rtfitem.cxx +++ b/editeng/source/rtf/rtfitem.cxx @@ -1548,7 +1548,7 @@ void SvxRTFParser::ReadBorderAttr( int nToken, SfxItemSet& rSet, SkipToken(); } -static inline sal_uInt32 CalcShading( sal_uInt32 nColor, sal_uInt32 nFillColor, sal_uInt8 nShading ) +static sal_uInt32 CalcShading( sal_uInt32 nColor, sal_uInt32 nFillColor, sal_uInt8 nShading ) { nColor = (nColor * nShading) / 100; nFillColor = (nFillColor * ( 100 - nShading )) / 100; diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx index 0ff93ac2ef83..b703f6333bc0 100644 --- a/editeng/source/uno/unofield.cxx +++ b/editeng/source/uno/unofield.cxx @@ -203,7 +203,7 @@ static util::DateTime getDate( sal_Int32 nDate ) return aDate; } -static inline Date setDate( util::DateTime const & rDate ) +static Date setDate( util::DateTime const & rDate ) { return Date( rDate.Day, rDate.Month, rDate.Year ); } @@ -222,7 +222,7 @@ static util::DateTime getTime(sal_Int64 const nTime) return aTime; } -static inline tools::Time setTime( util::DateTime const & rDate ) +static tools::Time setTime( util::DateTime const & rDate ) { return tools::Time( rDate ); } |