diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2019-01-30 14:23:15 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2019-01-30 16:25:15 +0100 |
commit | d0265c128c5c2c7d12e2f955ccb02aa255a2bf3c (patch) | |
tree | 0560183165036f1c0f53959deadd51c85d6ab19b /vcl/win | |
parent | 9e8f11a722ee9cba37c4692a6ab7d74536261429 (diff) |
loplugin:redundantinline (clang-cl)
Change-Id: Ib6320ddc049e93cca4c5931ad28d1873d34bd8b4
Reviewed-on: https://gerrit.libreoffice.org/67137
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'vcl/win')
-rw-r--r-- | vcl/win/gdi/salbmp.cxx | 2 | ||||
-rw-r--r-- | vcl/win/gdi/salfont.cxx | 12 | ||||
-rw-r--r-- | vcl/win/window/salframe.cxx | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/vcl/win/gdi/salbmp.cxx b/vcl/win/gdi/salbmp.cxx index 87f88c88ce90..07e90d2efe82 100644 --- a/vcl/win/gdi/salbmp.cxx +++ b/vcl/win/gdi/salbmp.cxx @@ -49,7 +49,7 @@ #undef max #endif -static inline void ImplSetPixel4( sal_uInt8* pScanline, long nX, const BYTE cIndex ) +static void ImplSetPixel4( sal_uInt8* pScanline, long nX, const BYTE cIndex ) { BYTE& rByte = pScanline[ nX >> 1 ]; diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx index 9c4b4995f9ca..181bbcec633b 100644 --- a/vcl/win/gdi/salfont.cxx +++ b/vcl/win/gdi/salfont.cxx @@ -64,13 +64,13 @@ using namespace vcl; static const int MAXFONTHEIGHT = 2048; -static inline FIXED FixedFromDouble( double d ) +static FIXED FixedFromDouble( double d ) { const long l = static_cast<long>( d * 65536. ); return *reinterpret_cast<FIXED const *>(&l); } -static inline int IntTimes256FromFixed(FIXED f) +static int IntTimes256FromFixed(FIXED f) { int nFixedTimes256 = (f.value << 8) + ((f.fract+0x80) >> 8); return nFixedTimes256; @@ -490,7 +490,7 @@ static int ImplWeightToWin( FontWeight eWeight ) return 0; } -static inline FontPitch ImplLogPitchToSal( BYTE nPitch ) +static FontPitch ImplLogPitchToSal( BYTE nPitch ) { if ( nPitch & FIXED_PITCH ) return PITCH_FIXED; @@ -498,7 +498,7 @@ static inline FontPitch ImplLogPitchToSal( BYTE nPitch ) return PITCH_VARIABLE; } -static inline FontPitch ImplMetricPitchToSal( BYTE nPitch ) +static FontPitch ImplMetricPitchToSal( BYTE nPitch ) { // Grrrr! See NT help if ( !(nPitch & TMPF_FIXED_PITCH) ) @@ -507,7 +507,7 @@ static inline FontPitch ImplMetricPitchToSal( BYTE nPitch ) return PITCH_VARIABLE; } -static inline BYTE ImplPitchToWin( FontPitch ePitch ) +static BYTE ImplPitchToWin( FontPitch ePitch ) { if ( ePitch == PITCH_FIXED ) return FIXED_PITCH; @@ -661,7 +661,7 @@ rtl::Reference<LogicalFontInstance> WinFontFace::CreateFontInstance(const FontSe return new WinFontInstance(*this, rFSD); } -static inline DWORD CalcTag( const char p[5]) { return (p[0]+(p[1]<<8)+(p[2]<<16)+(p[3]<<24)); } +static DWORD CalcTag( const char p[5]) { return (p[0]+(p[1]<<8)+(p[2]<<16)+(p[3]<<24)); } void WinFontFace::UpdateFromHDC( HDC hDC ) const { diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx index 99c7694e7b13..27b55ffffa2e 100644 --- a/vcl/win/window/salframe.cxx +++ b/vcl/win/window/salframe.cxx @@ -2500,7 +2500,7 @@ OUString WinSalFrame::GetKeyName( sal_uInt16 nKeyCode ) return OUString( aKeyBuf, sal::static_int_cast< sal_uInt16 >(nKeyBufLen) ); } -static inline Color ImplWinColorToSal( COLORREF nColor ) +static Color ImplWinColorToSal( COLORREF nColor ) { return Color( GetRValue( nColor ), GetGValue( nColor ), GetBValue( nColor ) ); } @@ -3668,7 +3668,7 @@ enum class DeferPolicy }; // Remember to release the solar mutex on success! -static inline WinSalFrame* ProcessOrDeferMessage( HWND hWnd, INT nMsg, WPARAM pWParam = 0, +static WinSalFrame* ProcessOrDeferMessage( HWND hWnd, INT nMsg, WPARAM pWParam = 0, DeferPolicy eCanDefer = DeferPolicy::Allowed ) { bool bFailedCondition = false, bGotMutex = false; |