diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-21 23:46:33 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-21 23:47:23 +0100 |
| commit | fe7a4bccfdc6ff7e10789e5512ac469a4dc44f55 (patch) | |
| tree | 2da6d63a8ff02d78999427a700fe823f07db2f70 /vcl/win | |
| parent | Special handling of __builtin_expect in boolean expressions (diff) | |
| download | core-fe7a4bccfdc6ff7e10789e5512ac469a4dc44f55.tar.gz core-fe7a4bccfdc6ff7e10789e5512ac469a4dc44f55.zip | |
Adapt vcl to various loplugin warnings on Mac OS X
Change-Id: I4553ce218fbcf2ac681b284c71e7d558a451511c
Diffstat (limited to 'vcl/win')
| -rw-r--r-- | vcl/win/source/gdi/salgdi3.cxx | 6 | ||||
| -rw-r--r-- | vcl/win/source/window/salframe.cxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index fb33dfa0aadd..be8ea7845218 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -1339,7 +1339,7 @@ void ImplWinFontData::ReadGsubTable( HDC hDC ) const for( const sal_Unicode* pPair = aGSUBCandidates; *pPair; pPair += 2 ) for( sal_Unicode cChar = pPair[0]; cChar < pPair[1]; ++cChar ) - if( ::MapChar( pTTFont, cChar, 0 ) != ::MapChar( pTTFont, cChar, 1 ) ) + if( ::MapChar( pTTFont, cChar, false ) != ::MapChar( pTTFont, cChar, true ) ) maGsubTable.insert( cChar ); // insert GSUBbed unicodes CloseTTFont( pTTFont ); @@ -2826,7 +2826,7 @@ void WinSalGraphics::GetGlyphWidths( const PhysicalFontFace* pFont, TTSimpleGlyphMetrics* pMetrics = ::GetTTSimpleGlyphMetrics( aSftTTF.get(), &aGlyphIds[0], nGlyphs, - bVertical ? 1 : 0 ); + bVertical ); if( pMetrics ) { for( int i = 0; i< nGlyphs; i++ ) @@ -2847,7 +2847,7 @@ void WinSalGraphics::GetGlyphWidths( const PhysicalFontFace* pFont, { sal_uInt16 nGlyph = ::MapChar( aSftTTF.get(), static_cast<sal_Ucs>(nChar), - bVertical ? 1 : 0 ); + bVertical ); if( nGlyph ) rUnicodeEnc[ static_cast<sal_Unicode>(nChar) ] = nGlyph; } diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx index 74fbe8adccdf..a2171127a1b5 100644 --- a/vcl/win/source/window/salframe.cxx +++ b/vcl/win/source/window/salframe.cxx @@ -1946,7 +1946,7 @@ void WinSalFrame::SetApplicationID( const OUString &rApplicationID ) // ----------------------------------------------------------------------- -void WinSalFrame::ShowFullScreen( sal_Bool bFullScreen, sal_Int32 nDisplay ) +void WinSalFrame::ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay ) { if ( (mbFullScreen == bFullScreen) && (!bFullScreen || (mnDisplay == nDisplay)) ) return; |