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 /oox | |
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 'oox')
-rw-r--r-- | oox/source/core/filterbase.cxx | 2 | ||||
-rw-r--r-- | oox/source/core/recordparser.cxx | 2 | ||||
-rw-r--r-- | oox/source/drawingml/chart/axisconverter.cxx | 2 | ||||
-rw-r--r-- | oox/source/drawingml/color.cxx | 10 | ||||
-rw-r--r-- | oox/source/drawingml/shape.cxx | 8 | ||||
-rw-r--r-- | oox/source/export/vmlexport.cxx | 4 | ||||
-rw-r--r-- | oox/source/helper/graphichelper.cxx | 2 | ||||
-rw-r--r-- | oox/source/ole/olehelper.cxx | 4 | ||||
-rw-r--r-- | oox/source/vml/vmlinputstream.cxx | 6 |
9 files changed, 20 insertions, 20 deletions
diff --git a/oox/source/core/filterbase.cxx b/oox/source/core/filterbase.cxx index c24c61c2fa15..57226a5a3e5b 100644 --- a/oox/source/core/filterbase.cxx +++ b/oox/source/core/filterbase.cxx @@ -263,7 +263,7 @@ const OUString& FilterBase::getFileUrl() const namespace { -inline bool lclIsDosDrive( const OUString& rUrl, sal_Int32 nPos = 0 ) +bool lclIsDosDrive( const OUString& rUrl, sal_Int32 nPos = 0 ) { return (rUrl.getLength() >= nPos + 3) && diff --git a/oox/source/core/recordparser.cxx b/oox/source/core/recordparser.cxx index f5de48c30133..02d070a71a9d 100644 --- a/oox/source/core/recordparser.cxx +++ b/oox/source/core/recordparser.cxx @@ -157,7 +157,7 @@ void ContextStack::popContext() namespace { /** Reads a byte from the passed stream, returns true on success. */ -inline bool lclReadByte( sal_uInt8& ornByte, BinaryInputStream& rStrm ) +bool lclReadByte( sal_uInt8& ornByte, BinaryInputStream& rStrm ) { return rStrm.readMemory( &ornByte, 1 ) == 1; } diff --git a/oox/source/drawingml/chart/axisconverter.cxx b/oox/source/drawingml/chart/axisconverter.cxx index 5aead418e983..7bcba408ffbb 100644 --- a/oox/source/drawingml/chart/axisconverter.cxx +++ b/oox/source/drawingml/chart/axisconverter.cxx @@ -52,7 +52,7 @@ using namespace ::com::sun::star::uno; namespace { -inline void lclSetValueOrClearAny( Any& orAny, const OptValue< double >& rofValue ) +void lclSetValueOrClearAny( Any& orAny, const OptValue< double >& rofValue ) { if( rofValue.has() ) orAny <<= rofValue.get(); else orAny.clear(); } diff --git a/oox/source/drawingml/color.cxx b/oox/source/drawingml/color.cxx index 625adf5fca78..44662584da84 100644 --- a/oox/source/drawingml/color.cxx +++ b/oox/source/drawingml/color.cxx @@ -146,29 +146,29 @@ struct StaticPresetColorsPool : public ::rtl::Static< PresetColorsPool, StaticPr const double DEC_GAMMA = 2.3; const double INC_GAMMA = 1.0 / DEC_GAMMA; -inline void lclRgbToRgbComponents( sal_Int32& ornR, sal_Int32& ornG, sal_Int32& ornB, ::Color nRgb ) +void lclRgbToRgbComponents( sal_Int32& ornR, sal_Int32& ornG, sal_Int32& ornB, ::Color nRgb ) { ornR = nRgb.GetRed(); ornG = nRgb.GetGreen(); ornB = nRgb.GetBlue(); } -inline sal_Int32 lclRgbComponentsToRgb( sal_Int32 nR, sal_Int32 nG, sal_Int32 nB ) +sal_Int32 lclRgbComponentsToRgb( sal_Int32 nR, sal_Int32 nG, sal_Int32 nB ) { return static_cast< sal_Int32 >( (nR << 16) | (nG << 8) | nB ); } -inline sal_Int32 lclRgbCompToCrgbComp( sal_Int32 nRgbComp ) +sal_Int32 lclRgbCompToCrgbComp( sal_Int32 nRgbComp ) { return static_cast< sal_Int32 >( nRgbComp * MAX_PERCENT / 255 ); } -inline sal_Int32 lclCrgbCompToRgbComp( sal_Int32 nCrgbComp ) +sal_Int32 lclCrgbCompToRgbComp( sal_Int32 nCrgbComp ) { return static_cast< sal_Int32 >( nCrgbComp * 255 / MAX_PERCENT ); } -inline sal_Int32 lclGamma( sal_Int32 nComp, double fGamma ) +sal_Int32 lclGamma( sal_Int32 nComp, double fGamma ) { return static_cast< sal_Int32 >( pow( static_cast< double >( nComp ) / MAX_PERCENT, fGamma ) * MAX_PERCENT + 0.5 ); } diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index 0f5437dc9519..2676d43060fb 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -400,7 +400,7 @@ void Shape::addChildren( } } -static inline void lcl_resetPropertyValue( std::vector<beans::PropertyValue>& rPropVec, const OUString& rName ) +static void lcl_resetPropertyValue( std::vector<beans::PropertyValue>& rPropVec, const OUString& rName ) { auto aIterator = std::find_if( rPropVec.begin(), rPropVec.end(), [rName]( const beans::PropertyValue& rValue ) { return rValue.Name == rName; } ); @@ -409,7 +409,7 @@ static inline void lcl_resetPropertyValue( std::vector<beans::PropertyValue>& rP rPropVec.erase( aIterator ); } -static inline void lcl_setPropertyValue( std::vector<beans::PropertyValue>& rPropVec, +static void lcl_setPropertyValue( std::vector<beans::PropertyValue>& rPropVec, const OUString& rName, const beans::PropertyValue& rPropertyValue ) { @@ -418,7 +418,7 @@ static inline void lcl_setPropertyValue( std::vector<beans::PropertyValue>& rPro rPropVec.push_back( rPropertyValue ); } -static inline SdrTextHorzAdjust lcl_convertAdjust( ParagraphAdjust eAdjust ) +static SdrTextHorzAdjust lcl_convertAdjust( ParagraphAdjust eAdjust ) { if (eAdjust == ParagraphAdjust_LEFT) return SDRTEXTHORZADJUST_LEFT; @@ -429,7 +429,7 @@ static inline SdrTextHorzAdjust lcl_convertAdjust( ParagraphAdjust eAdjust ) return SDRTEXTHORZADJUST_LEFT; } -static inline void lcl_createPresetShape(uno::Reference<drawing::XShape>& xShape, +static void lcl_createPresetShape(uno::Reference<drawing::XShape>& xShape, const OUString& rClass, const OUString& rPresetType, const CustomShapePropertiesPtr& pCustomShapePropertiesPtr, const TextBodyPtr& pTextBody, diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx index ef30786b6f3d..ed7b6fb11d3a 100644 --- a/oox/source/export/vmlexport.cxx +++ b/oox/source/export/vmlexport.cxx @@ -335,14 +335,14 @@ static void impl_AddInt( sax_fastparser::FastAttributeList *pAttrList, sal_Int32 pAttrList->add( nElement, OString::number( nValue ).getStr() ); } -static inline sal_uInt16 impl_GetUInt16( const sal_uInt8* &pVal ) +static sal_uInt16 impl_GetUInt16( const sal_uInt8* &pVal ) { sal_uInt16 nRet = *pVal++; nRet += ( *pVal++ ) << 8; return nRet; } -static inline sal_Int32 impl_GetPointComponent( const sal_uInt8* &pVal, sal_uInt16 nPointSize ) +static sal_Int32 impl_GetPointComponent( const sal_uInt8* &pVal, sal_uInt16 nPointSize ) { sal_Int32 nRet = 0; if ( ( nPointSize == 0xfff0 ) || ( nPointSize == 4 ) ) diff --git a/oox/source/helper/graphichelper.cxx b/oox/source/helper/graphichelper.cxx index 63f0ec24f8e9..bb8d0d9a1929 100644 --- a/oox/source/helper/graphichelper.cxx +++ b/oox/source/helper/graphichelper.cxx @@ -56,7 +56,7 @@ using namespace ::com::sun::star::uno; namespace { -inline sal_Int32 lclConvertScreenPixelToHmm( double fPixel, double fPixelPerHmm ) +sal_Int32 lclConvertScreenPixelToHmm( double fPixel, double fPixelPerHmm ) { return static_cast< sal_Int32 >( (fPixelPerHmm > 0.0) ? (fPixel / fPixelPerHmm + 0.5) : 0.0 ); } diff --git a/oox/source/ole/olehelper.cxx b/oox/source/ole/olehelper.cxx index a8cc9a02ba77..badce2a89fc4 100644 --- a/oox/source/ole/olehelper.cxx +++ b/oox/source/ole/olehelper.cxx @@ -75,13 +75,13 @@ const sal_uInt32 OLE_PALETTECOLOR_MASK = 0x0000FFFF; const sal_uInt32 OLE_SYSTEMCOLOR_MASK = 0x0000FFFF; /** Swaps the red and blue component of the passed color. */ -inline sal_uInt32 lclSwapRedBlue( sal_uInt32 nColor ) +sal_uInt32 lclSwapRedBlue( sal_uInt32 nColor ) { return static_cast< sal_uInt32 >( (nColor & 0xFF00FF00) | ((nColor & 0x0000FF) << 16) | ((nColor & 0xFF0000) >> 16) ); } /** Returns the UNO RGB color from the passed encoded OLE BGR color. */ -inline ::Color lclDecodeBgrColor( sal_uInt32 nOleColor ) +::Color lclDecodeBgrColor( sal_uInt32 nOleColor ) { return ::Color( lclSwapRedBlue( nOleColor ) & 0xFFFFFF ); } diff --git a/oox/source/vml/vmlinputstream.cxx b/oox/source/vml/vmlinputstream.cxx index e33c66a87f21..2442fa9bc489 100644 --- a/oox/source/vml/vmlinputstream.cxx +++ b/oox/source/vml/vmlinputstream.cxx @@ -35,13 +35,13 @@ using namespace ::com::sun::star::uno; namespace { -inline const sal_Char* lclFindCharacter( const sal_Char* pcBeg, const sal_Char* pcEnd, sal_Char cChar ) +const sal_Char* lclFindCharacter( const sal_Char* pcBeg, const sal_Char* pcEnd, sal_Char cChar ) { sal_Int32 nIndex = rtl_str_indexOfChar_WithLength( pcBeg, static_cast< sal_Int32 >( pcEnd - pcBeg ), cChar ); return (nIndex < 0) ? pcEnd : (pcBeg + nIndex); } -inline bool lclIsWhiteSpace( sal_Char cChar ) +bool lclIsWhiteSpace( sal_Char cChar ) { return cChar <= 32; } @@ -69,7 +69,7 @@ const sal_Char* lclTrimWhiteSpaceFromEnd( const sal_Char* pcBeg, const sal_Char* return pcEnd; } -inline void lclAppendToBuffer( OStringBuffer& rBuffer, const sal_Char* pcBeg, const sal_Char* pcEnd ) +void lclAppendToBuffer( OStringBuffer& rBuffer, const sal_Char* pcBeg, const sal_Char* pcEnd ) { rBuffer.append( pcBeg, static_cast< sal_Int32 >( pcEnd - pcBeg ) ); } |