From 7ceee0f1ec0e349d0df4980d7fdedbd13c7917c5 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann 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 --- vcl/source/app/i18nhelp.cxx | 2 +- vcl/source/app/scheduler.cxx | 12 ++++++------ vcl/source/app/svapp.cxx | 2 +- vcl/source/bitmap/BitmapDuoToneFilter.cxx | 3 +-- vcl/source/control/field.cxx | 2 +- vcl/source/control/longcurr.cxx | 2 +- vcl/source/edit/texteng.cxx | 2 +- vcl/source/filter/graphicfilter.cxx | 2 +- vcl/source/filter/ipdf/pdfread.cxx | 2 +- vcl/source/fontsubset/cff.cxx | 2 +- vcl/source/gdi/bmpfast.cxx | 18 +++++++++--------- vcl/source/gdi/dibtools.cxx | 4 ++-- vcl/source/gdi/metaact.cxx | 8 ++++---- vcl/source/gdi/pdfwriter_impl.cxx | 6 +++--- vcl/source/gdi/pdfwriter_impl2.cxx | 2 +- vcl/source/gdi/region.cxx | 2 +- vcl/source/gdi/sallayout.cxx | 2 +- vcl/source/gdi/scrptrun.cxx | 2 +- vcl/source/helper/canvasbitmap.cxx | 2 +- vcl/source/helper/canvastools.cxx | 2 +- vcl/source/helper/strhelper.cxx | 8 ++++---- vcl/source/outdev/bitmap.cxx | 4 ++-- vcl/source/outdev/gradient.cxx | 2 +- vcl/source/outdev/map.cxx | 2 +- vcl/source/window/status.cxx | 2 +- vcl/source/window/window2.cxx | 2 +- vcl/source/window/winproc.cxx | 8 ++++---- 27 files changed, 53 insertions(+), 54 deletions(-) (limited to 'vcl/source') diff --git a/vcl/source/app/i18nhelp.cxx b/vcl/source/app/i18nhelp.cxx index 45234e9bab00..657588f3beda 100644 --- a/vcl/source/app/i18nhelp.cxx +++ b/vcl/source/app/i18nhelp.cxx @@ -75,7 +75,7 @@ LocaleDataWrapper& vcl::I18nHelper::ImplGetLocaleDataWrapper() const return *mpLocaleDataWrapper; } -static inline bool is_formatting_mark( sal_Unicode c ) +static bool is_formatting_mark( sal_Unicode c ) { if( (c >= 0x200B) && (c <= 0x200F) ) // BiDi and zero-width-markers return true; diff --git a/vcl/source/app/scheduler.cxx b/vcl/source/app/scheduler.cxx index 506638cc0ee5..e647cab8de65 100644 --- a/vcl/source/app/scheduler.cxx +++ b/vcl/source/app/scheduler.cxx @@ -41,7 +41,7 @@ namespace { template< typename charT, typename traits > -inline std::basic_ostream & operator <<( +std::basic_ostream & operator <<( std::basic_ostream & stream, const Task& task ) { stream << "a: " << task.IsActive() << " p: " << static_cast(task.GetPriority()); @@ -60,7 +60,7 @@ inline std::basic_ostream & operator <<( * @see http://clang.llvm.org/compatibility.html#undep_incomplete */ template< typename charT, typename traits > -inline std::basic_ostream & operator <<( +std::basic_ostream & operator <<( std::basic_ostream & stream, const Timer& timer ) { bool bIsIdle = (dynamic_cast( &timer ) != nullptr); @@ -78,14 +78,14 @@ inline std::basic_ostream & operator <<( } template< typename charT, typename traits > -inline std::basic_ostream & operator <<( +std::basic_ostream & operator <<( std::basic_ostream & stream, const Idle& idle ) { return stream << static_cast( &idle ); } template< typename charT, typename traits > -inline std::basic_ostream & operator <<( +std::basic_ostream & operator <<( std::basic_ostream & stream, const ImplSchedulerData& data ) { stream << " i: " << data.mbInScheduler; @@ -311,7 +311,7 @@ inline void Scheduler::UpdateSystemTimer( ImplSchedulerContext &rSchedCtx, Scheduler::ImplStartTimer( nMinPeriod, bForce, nTime ); } -static inline void AppendSchedulerData( ImplSchedulerContext &rSchedCtx, +static void AppendSchedulerData( ImplSchedulerContext &rSchedCtx, ImplSchedulerData * const pSchedulerData) { assert(pSchedulerData->mpTask); @@ -329,7 +329,7 @@ static inline void AppendSchedulerData( ImplSchedulerContext &rSchedCtx, pSchedulerData->mpNext = nullptr; } -static inline ImplSchedulerData* DropSchedulerData( +static ImplSchedulerData* DropSchedulerData( ImplSchedulerContext &rSchedCtx, ImplSchedulerData * const pPrevSchedulerData, const ImplSchedulerData * const pSchedulerData, const int nTaskPriority) { diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 09f80fbd0af7..43cdf894e3c2 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -451,7 +451,7 @@ void Application::Execute() pSVData->maAppData.mbInAppExecute = false; } -static inline bool ImplYield(bool i_bWait, bool i_bAllEvents) +static bool ImplYield(bool i_bWait, bool i_bAllEvents) { ImplSVData* pSVData = ImplGetSVData(); diff --git a/vcl/source/bitmap/BitmapDuoToneFilter.cxx b/vcl/source/bitmap/BitmapDuoToneFilter.cxx index 521d1cc6d98e..65d4b3f41442 100644 --- a/vcl/source/bitmap/BitmapDuoToneFilter.cxx +++ b/vcl/source/bitmap/BitmapDuoToneFilter.cxx @@ -15,8 +15,7 @@ #include -static inline sal_uInt8 lcl_getDuotoneColorComponent(sal_uInt8 base, sal_uInt16 color1, - sal_uInt16 color2) +static sal_uInt8 lcl_getDuotoneColorComponent(sal_uInt8 base, sal_uInt16 color1, sal_uInt16 color2) { color2 = color2 * base / 0xFF; color1 = color1 * (0xFF - base) / 0xFF; diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx index e724730dff99..07c10c50a138 100644 --- a/vcl/source/control/field.cxx +++ b/vcl/source/control/field.cxx @@ -1774,7 +1774,7 @@ static bool ImplCurrencyProcessKeyInput( const KeyEvent& rKEvt, return ImplNumericProcessKeyInput( rKEvt, false, bUseThousandSep, rWrapper ); } -static inline bool ImplCurrencyGetValue( const OUString& rStr, sal_Int64& rValue, +static bool ImplCurrencyGetValue( const OUString& rStr, sal_Int64& rValue, sal_uInt16 nDecDigits, const LocaleDataWrapper& rWrapper ) { // fetch number diff --git a/vcl/source/control/longcurr.cxx b/vcl/source/control/longcurr.cxx index 3a0a0b9da8f2..6418e1cb30e1 100644 --- a/vcl/source/control/longcurr.cxx +++ b/vcl/source/control/longcurr.cxx @@ -212,7 +212,7 @@ bool ImplCurrencyGetValue( const OUString& rStr, BigInt& rValue, } // namespace -static inline bool ImplLongCurrencyGetValue( const OUString& rStr, BigInt& rValue, +static bool ImplLongCurrencyGetValue( const OUString& rStr, BigInt& rValue, sal_uInt16 nDecDigits, const LocaleDataWrapper& rLocaleDataWrapper ) { return ImplCurrencyGetValue( rStr, rValue, nDecDigits, rLocaleDataWrapper ); diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx index 287b80c09710..b701185d6c3a 100644 --- a/vcl/source/edit/texteng.cxx +++ b/vcl/source/edit/texteng.cxx @@ -227,7 +227,7 @@ static const sal_Unicode static_aLFText[] = { '\n', 0 }; static const sal_Unicode static_aCRText[] = { '\r', 0 }; static const sal_Unicode static_aCRLFText[] = { '\r', '\n', 0 }; -static inline const sal_Unicode* static_getLineEndText( LineEnd aLineEnd ) +static const sal_Unicode* static_getLineEndText( LineEnd aLineEnd ) { const sal_Unicode* pRet = nullptr; diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index c2146b962248..be79226ffbef 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -167,7 +167,7 @@ sal_uInt8* ImplSearchEntry( sal_uInt8* pSource, sal_uInt8 const * pDest, sal_uLo return nullptr; } -static inline OUString ImpGetExtension( const OUString &rPath ) +static OUString ImpGetExtension( const OUString &rPath ) { OUString aExt; INetURLObject aURL( rPath ); diff --git a/vcl/source/filter/ipdf/pdfread.cxx b/vcl/source/filter/ipdf/pdfread.cxx index 3101056824ad..0f14529eec5c 100644 --- a/vcl/source/filter/ipdf/pdfread.cxx +++ b/vcl/source/filter/ipdf/pdfread.cxx @@ -53,7 +53,7 @@ int CompatibleWriter::WriteBlockCallback(FPDF_FILEWRITE* pFileWrite, const void* } /// Convert to inch, then assume 96 DPI. -inline double pointToPixel(const double fPoint, const double fResolutionDPI) +double pointToPixel(const double fPoint, const double fResolutionDPI) { return fPoint * fResolutionDPI / 72.; } diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx index f91c0fbee9d1..3c19112a6f72 100644 --- a/vcl/source/fontsubset/cff.cxx +++ b/vcl/source/fontsubset/cff.cxx @@ -1703,7 +1703,7 @@ void Type1Emitter::emitAllCrypted() // #i110387# quick-and-dirty double->ascii conversion // needed because sprintf/ecvt/etc. alone are too localized (LC_NUMERIC) // also strip off trailing zeros in fraction while we are at it -static inline int dbl2str( char* pOut, double fVal) +static int dbl2str( char* pOut, double fVal) { const int nLen = psp::getValueOfDouble( pOut, fVal, 6); return nLen; diff --git a/vcl/source/gdi/bmpfast.cxx b/vcl/source/gdi/bmpfast.cxx index 76f083663ba0..93318fbd30ae 100644 --- a/vcl/source/gdi/bmpfast.cxx +++ b/vcl/source/gdi/bmpfast.cxx @@ -232,7 +232,7 @@ class TrueColorPixelPtr // converting truecolor formats template -static inline void ImplConvertPixel( const TrueColorPixelPtr& rDst, +static void ImplConvertPixel( const TrueColorPixelPtr& rDst, const TrueColorPixelPtr& rSrc ) { rDst.SetColor( rSrc.GetRed(), rSrc.GetGreen(), rSrc.GetBlue() ); @@ -240,7 +240,7 @@ static inline void ImplConvertPixel( const TrueColorPixelPtr& rDst, } template <> -inline void ImplConvertPixel ( +void ImplConvertPixel ( const TrueColorPixelPtr& rDst, const TrueColorPixelPtr& rSrc ) { @@ -252,7 +252,7 @@ inline void ImplConvertPixel -static inline void ImplConvertLine( const TrueColorPixelPtr& rDst, +static void ImplConvertLine( const TrueColorPixelPtr& rDst, const TrueColorPixelPtr& rSrc, int nPixelCount ) { TrueColorPixelPtr aDst( rDst ); @@ -267,7 +267,7 @@ static inline void ImplConvertLine( const TrueColorPixelPtr& rDst, // alpha blending truecolor pixels template -static inline void ImplBlendPixels( const TrueColorPixelPtr& rDst, +static void ImplBlendPixels( const TrueColorPixelPtr& rDst, const TrueColorPixelPtr& rSrc, unsigned nAlphaVal ) { static const unsigned nAlphaShift = 8; @@ -294,7 +294,7 @@ static inline void ImplBlendPixels( const TrueColorPixelPtr& rDst, } template -static inline void ImplBlendLines( const TrueColorPixelPtr& rDst, +static void ImplBlendLines( const TrueColorPixelPtr& rDst, const TrueColorPixelPtr& rSrc, const TrueColorPixelPtr& rMsk, int nPixelCount ) { @@ -376,7 +376,7 @@ static bool ImplConvertToBitmap( TrueColorPixelPtr& rSrcLine, } template -static inline bool ImplConvertFromBitmap( BitmapBuffer& rDst, const BitmapBuffer& rSrc ) +static bool ImplConvertFromBitmap( BitmapBuffer& rDst, const BitmapBuffer& rSrc ) { TrueColorPixelPtr aSrcType; aSrcType.SetRawPtr( rSrc.mpBits ); @@ -581,7 +581,7 @@ static bool ImplBlendToBitmap( TrueColorPixelPtr& rSrcLine, // some specializations to reduce the code size template <> -inline bool ImplBlendToBitmap( +bool ImplBlendToBitmap( TrueColorPixelPtr&, BitmapBuffer& rDstBuffer, const BitmapBuffer& rSrcBuffer, const BitmapBuffer& rMskBuffer ) @@ -591,7 +591,7 @@ inline bool ImplBlendToBitmap -inline bool ImplBlendToBitmap( +bool ImplBlendToBitmap( TrueColorPixelPtr&, BitmapBuffer& rDstBuffer, const BitmapBuffer& rSrcBuffer, const BitmapBuffer& rMskBuffer ) @@ -601,7 +601,7 @@ inline bool ImplBlendToBitmap -inline bool ImplBlendToBitmap( +bool ImplBlendToBitmap( TrueColorPixelPtr&, BitmapBuffer& rDstBuffer, const BitmapBuffer& rSrcBuffer, const BitmapBuffer& rMskBuffer ) diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx index 62262bae7990..1b4c13458ea6 100644 --- a/vcl/source/gdi/dibtools.cxx +++ b/vcl/source/gdi/dibtools.cxx @@ -135,14 +135,14 @@ struct DIBV5Header : public DIBInfoHeader {} }; -inline sal_uInt16 discretizeBitcount( sal_uInt16 nInputCount ) +sal_uInt16 discretizeBitcount( sal_uInt16 nInputCount ) { return ( nInputCount <= 1 ) ? 1 : ( nInputCount <= 4 ) ? 4 : ( nInputCount <= 8 ) ? 8 : 24; } -inline bool isBitfieldCompression( ScanlineFormat nScanlineFormat ) +bool isBitfieldCompression( ScanlineFormat nScanlineFormat ) { return (ScanlineFormat::N16BitTcLsbMask == nScanlineFormat) || (ScanlineFormat::N32BitTcMask == nScanlineFormat); } diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx index 5a733c8dd9f2..8a6bbbd5cf76 100644 --- a/vcl/source/gdi/metaact.cxx +++ b/vcl/source/gdi/metaact.cxx @@ -108,13 +108,13 @@ meta_action_name(MetaActionType nMetaAction) #endif } -inline void ImplScalePoint( Point& rPt, double fScaleX, double fScaleY ) +void ImplScalePoint( Point& rPt, double fScaleX, double fScaleY ) { rPt.setX( FRound( fScaleX * rPt.X() ) ); rPt.setY( FRound( fScaleY * rPt.Y() ) ); } -inline void ImplScaleRect( tools::Rectangle& rRect, double fScaleX, double fScaleY ) +void ImplScaleRect( tools::Rectangle& rRect, double fScaleX, double fScaleY ) { Point aTL( rRect.TopLeft() ); Point aBR( rRect.BottomRight() ); @@ -126,13 +126,13 @@ inline void ImplScaleRect( tools::Rectangle& rRect, double fScaleX, double fScal rRect.Justify(); } -inline void ImplScalePoly( tools::Polygon& rPoly, double fScaleX, double fScaleY ) +void ImplScalePoly( tools::Polygon& rPoly, double fScaleX, double fScaleY ) { for( sal_uInt16 i = 0, nCount = rPoly.GetSize(); i < nCount; i++ ) ImplScalePoint( rPoly[ i ], fScaleX, fScaleY ); } -inline void ImplScaleLineInfo( LineInfo& rLineInfo, double fScaleX, double fScaleY ) +void ImplScaleLineInfo( LineInfo& rLineInfo, double fScaleX, double fScaleY ) { if( !rLineInfo.IsDefault() ) { diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 59c605349dc1..a70c73c3a2ed 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -508,8 +508,8 @@ void doTestCode() static const sal_Int32 nLog10Divisor = 3; static const double fDivisor = 1000.0; -static inline double pixelToPoint( double px ) { return px/fDivisor; } -static inline sal_Int32 pointToPixel( double pt ) { return sal_Int32(pt*fDivisor); } +static double pixelToPoint( double px ) { return px/fDivisor; } +static sal_Int32 pointToPixel( double pt ) { return sal_Int32(pt*fDivisor); } const sal_uInt8 PDFWriterImpl::s_nPadString[32] = { @@ -4093,7 +4093,7 @@ sal_Int32 PDFWriterImpl::getBestBuiltinFont( const vcl::Font& rFont ) return nBest; } -static inline const Color& replaceColor( const Color& rCol1, const Color& rCol2 ) +static const Color& replaceColor( const Color& rCol1, const Color& rCol2 ) { return (rCol1 == COL_TRANSPARENT) ? rCol2 : rCol1; } diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx index 59448f1f8635..a4ce58af0e20 100644 --- a/vcl/source/gdi/pdfwriter_impl2.cxx +++ b/vcl/source/gdi/pdfwriter_impl2.cxx @@ -1547,7 +1547,7 @@ static const long setRun[256] = 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 7, 8, /* 0xf0 - 0xff */ }; -static inline bool isSet( const Scanline i_pLine, long i_nIndex ) +static bool isSet( const Scanline i_pLine, long i_nIndex ) { return (i_pLine[ i_nIndex/8 ] & (0x80 >> (i_nIndex&7))) != 0; } diff --git a/vcl/source/gdi/region.cxx b/vcl/source/gdi/region.cxx index 5af7829b0e03..ce2d60ba7d66 100644 --- a/vcl/source/gdi/region.cxx +++ b/vcl/source/gdi/region.cxx @@ -1677,7 +1677,7 @@ void vcl::Region::GetRegionRectangles(RectangleVector& rTarget) const } } -static inline bool ImplPolygonRectTest( const tools::Polygon& rPoly, tools::Rectangle* pRectOut = nullptr ) +static bool ImplPolygonRectTest( const tools::Polygon& rPoly, tools::Rectangle* pRectOut = nullptr ) { bool bIsRect = false; const Point* pPoints = rPoly.GetConstPointAry(); diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx index e2fd9aeb88a3..510120b9c068 100644 --- a/vcl/source/gdi/sallayout.cxx +++ b/vcl/source/gdi/sallayout.cxx @@ -210,7 +210,7 @@ sal_UCS4 GetLocalizedChar( sal_UCS4 nChar, LanguageType eLang ) return nChar; } -static inline bool IsControlChar( sal_UCS4 cChar ) +static bool IsControlChar( sal_UCS4 cChar ) { // C0 control characters if( (0x0001 <= cChar) && (cChar <= 0x001F) ) diff --git a/vcl/source/gdi/scrptrun.cxx b/vcl/source/gdi/scrptrun.cxx index 38db1ac2fa35..cbf16d6e85bd 100644 --- a/vcl/source/gdi/scrptrun.cxx +++ b/vcl/source/gdi/scrptrun.cxx @@ -124,7 +124,7 @@ namespace vcl { const char ScriptRun::fgClassID=0; -static inline UBool sameScript(int32_t scriptOne, int32_t scriptTwo) +static UBool sameScript(int32_t scriptOne, int32_t scriptTwo) { return scriptOne <= USCRIPT_INHERITED || scriptTwo <= USCRIPT_INHERITED || scriptOne == scriptTwo; } diff --git a/vcl/source/helper/canvasbitmap.cxx b/vcl/source/helper/canvasbitmap.cxx index bcc431e15d11..97f1d987e6d5 100644 --- a/vcl/source/helper/canvasbitmap.cxx +++ b/vcl/source/helper/canvasbitmap.cxx @@ -44,7 +44,7 @@ namespace // Good ole HAKMEM tradition. Calc number of 1 bits in 32bit word, // unrolled loop. See e.g. Hackers Delight, p. 66 - inline sal_Int32 bitcount( sal_uInt32 val ) + sal_Int32 bitcount( sal_uInt32 val ) { val = val - ((val >> 1) & 0x55555555); val = (val & 0x33333333) + ((val >> 2) & 0x33333333); diff --git a/vcl/source/helper/canvastools.cxx b/vcl/source/helper/canvastools.cxx index aa3cce22863d..b78625fb54ad 100644 --- a/vcl/source/helper/canvastools.cxx +++ b/vcl/source/helper/canvastools.cxx @@ -76,7 +76,7 @@ namespace vcl namespace { - inline bool equalsLayout( const rendering::IntegerBitmapLayout& rLHS, + bool equalsLayout( const rendering::IntegerBitmapLayout& rLHS, const rendering::IntegerBitmapLayout& rRHS ) { return diff --git a/vcl/source/helper/strhelper.cxx b/vcl/source/helper/strhelper.cxx index 4d0f1d993cd6..60507cb3b188 100644 --- a/vcl/source/helper/strhelper.cxx +++ b/vcl/source/helper/strhelper.cxx @@ -22,7 +22,7 @@ namespace { -inline bool isSpace( sal_Unicode cChar ) +bool isSpace( sal_Unicode cChar ) { return cChar == ' ' || cChar == '\t' || @@ -30,12 +30,12 @@ inline bool isSpace( sal_Unicode cChar ) cChar == 0x0c || cChar == 0x0b; } -inline bool isProtect( sal_Unicode cChar ) +bool isProtect( sal_Unicode cChar ) { return cChar == '`' || cChar == '\'' || cChar == '"'; } -inline void CopyUntil( char*& pTo, const char*& pFrom, char cUntil, bool bIncludeUntil = false ) +void CopyUntil( char*& pTo, const char*& pFrom, char cUntil, bool bIncludeUntil = false ) { do { @@ -66,7 +66,7 @@ inline void CopyUntil( char*& pTo, const char*& pFrom, char cUntil, bool bInclud pFrom++; } -inline void CopyUntil( sal_Unicode*& pTo, const sal_Unicode*& pFrom, sal_Unicode cUntil, bool bIncludeUntil = false ) +void CopyUntil( sal_Unicode*& pTo, const sal_Unicode*& pFrom, sal_Unicode cUntil, bool bIncludeUntil = false ) { do { diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx index ffc1299925d8..fbd4624ce4b8 100644 --- a/vcl/source/outdev/bitmap.cxx +++ b/vcl/source/outdev/bitmap.cxx @@ -1340,7 +1340,7 @@ namespace { // Co = Cs + Cd*(1-As) premultiplied alpha -or- // Co = (AsCs + AdCd*(1-As)) / Ao - inline sal_uInt8 CalcColor( const sal_uInt8 nSourceColor, const sal_uInt8 nSourceAlpha, + sal_uInt8 CalcColor( const sal_uInt8 nSourceColor, const sal_uInt8 nSourceAlpha, const sal_uInt8 nDstAlpha, const sal_uInt8 nResAlpha, const sal_uInt8 nDestColor ) { int c = nResAlpha ? ( static_cast(nSourceAlpha)*nSourceColor + static_cast(nDstAlpha)*nDestColor - @@ -1348,7 +1348,7 @@ namespace return sal_uInt8( c ); } - inline BitmapColor AlphaBlend( int nX, int nY, + BitmapColor AlphaBlend( int nX, int nY, const long nMapX, const long nMapY, BitmapReadAccess const * pP, diff --git a/vcl/source/outdev/gradient.cxx b/vcl/source/outdev/gradient.cxx index 739955bd00af..2b2eff84978d 100644 --- a/vcl/source/outdev/gradient.cxx +++ b/vcl/source/outdev/gradient.cxx @@ -249,7 +249,7 @@ void OutputDevice::DrawGradientToMetafile ( const tools::PolyPolygon& rPolyPoly, namespace { - inline sal_uInt8 GetGradientColorValue( long nValue ) + sal_uInt8 GetGradientColorValue( long nValue ) { if ( nValue < 0 ) return 0; diff --git a/vcl/source/outdev/map.cxx b/vcl/source/outdev/map.cxx index c890037017e7..17cda2bf157e 100644 --- a/vcl/source/outdev/map.cxx +++ b/vcl/source/outdev/map.cxx @@ -313,7 +313,7 @@ static void ImplCalcMapResolution( const MapMode& rMapMode, rMapRes.mnMapScDenomY = aTempY.GetDenominator(); } -static inline void ImplCalcMapResolution( const MapMode& rMapMode, +static void ImplCalcMapResolution( const MapMode& rMapMode, long nDPIX, long nDPIY, ImplMapRes& rMapRes, ImplThresholdRes& rThresRes ) diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx index 86d1c6eadc3e..0ad3226ed0de 100644 --- a/vcl/source/window/status.cxx +++ b/vcl/source/window/status.cxx @@ -79,7 +79,7 @@ struct ImplStatusItem std::unique_ptr mxLayoutCache; }; -static inline long ImplCalcProgressWidth( sal_uInt16 nMax, long nSize ) +static long ImplCalcProgressWidth( sal_uInt16 nMax, long nSize ) { return ((nMax*(nSize+(nSize/2)))-(nSize/2)+(STATUSBAR_PRGS_OFFSET*2)); } diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index 9c75767561ea..a105df5f6e36 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -382,7 +382,7 @@ void Window::SetZoom( const Fraction& rZoom ) } } -static inline long WinFloatRound( double fVal ) +static long WinFloatRound( double fVal ) { return( fVal > 0.0 ? static_cast( fVal + 0.5 ) : -static_cast( -fVal + 0.5 ) ); } diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index 590032d10753..57f37695e1d2 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -1961,7 +1961,7 @@ static MouseEventModifiers ImplGetMouseButtonMode( SalMouseEvent const * pEvent return nMode; } -static inline bool ImplHandleSalMouseLeave( vcl::Window* pWindow, SalMouseEvent const * pEvent ) +static bool ImplHandleSalMouseLeave( vcl::Window* pWindow, SalMouseEvent const * pEvent ) { return ImplHandleMouseEvent( pWindow, MouseNotifyEvent::MOUSEMOVE, true, pEvent->mnX, pEvent->mnY, @@ -1969,7 +1969,7 @@ static inline bool ImplHandleSalMouseLeave( vcl::Window* pWindow, SalMouseEvent ImplGetMouseMoveMode( pEvent ) ); } -static inline bool ImplHandleSalMouseMove( vcl::Window* pWindow, SalMouseEvent const * pEvent ) +static bool ImplHandleSalMouseMove( vcl::Window* pWindow, SalMouseEvent const * pEvent ) { return ImplHandleMouseEvent( pWindow, MouseNotifyEvent::MOUSEMOVE, false, pEvent->mnX, pEvent->mnY, @@ -1977,7 +1977,7 @@ static inline bool ImplHandleSalMouseMove( vcl::Window* pWindow, SalMouseEvent c ImplGetMouseMoveMode( pEvent ) ); } -static inline bool ImplHandleSalMouseButtonDown( vcl::Window* pWindow, SalMouseEvent const * pEvent ) +static bool ImplHandleSalMouseButtonDown( vcl::Window* pWindow, SalMouseEvent const * pEvent ) { return ImplHandleMouseEvent( pWindow, MouseNotifyEvent::MOUSEBUTTONDOWN, false, pEvent->mnX, pEvent->mnY, @@ -1990,7 +1990,7 @@ static inline bool ImplHandleSalMouseButtonDown( vcl::Window* pWindow, SalMouseE ImplGetMouseButtonMode( pEvent ) ); } -static inline bool ImplHandleSalMouseButtonUp( vcl::Window* pWindow, SalMouseEvent const * pEvent ) +static bool ImplHandleSalMouseButtonUp( vcl::Window* pWindow, SalMouseEvent const * pEvent ) { return ImplHandleMouseEvent( pWindow, MouseNotifyEvent::MOUSEBUTTONUP, false, pEvent->mnX, pEvent->mnY, -- cgit