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/quartz | |
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/quartz')
-rw-r--r-- | vcl/quartz/salgdi.cxx | 2 | ||||
-rw-r--r-- | vcl/quartz/salgdicommon.cxx | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx index 252a025edf56..91ff6cb1bc9e 100644 --- a/vcl/quartz/salgdi.cxx +++ b/vcl/quartz/salgdi.cxx @@ -596,7 +596,7 @@ bool AquaSalGraphics::GetRawFontData( const PhysicalFontFace* pFontData, // prepare a byte buffer for a fake font int nTableCount = 7; - nTableCount += (nPrepSize>0) + (nCvtSize>0) + (nFpgmSize>0) + (nGlyfSize>0); + nTableCount += (nPrepSize>0?1:0) + (nCvtSize>0?1:0) + (nFpgmSize>0?1:0) + (nGlyfSize>0?1:0); const ByteCount nFdirSize = 12 + 16*nTableCount; ByteCount nTotalSize = nFdirSize; nTotalSize += nHeadSize + nMaxpSize + nNameSize + nCmapSize; diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx index b1c81212fa63..06a3cfe487b9 100644 --- a/vcl/quartz/salgdicommon.cxx +++ b/vcl/quartz/salgdicommon.cxx @@ -154,7 +154,7 @@ bool AquaSalGraphics::CreateFontSubset( const OUString& rToFile, // prepare the requested file name for writing the font-subset file OUString aSysPath; if( osl_File_E_None != osl_getSystemPathFromFileURL( rToFile.pData, &aSysPath.pData ) ) - return sal_False; + return false; const rtl_TextEncoding aThreadEncoding = osl_getThreadTextEncoding(); const OString aToFile( OUStringToOString( aSysPath, aThreadEncoding ) ); @@ -162,7 +162,7 @@ bool AquaSalGraphics::CreateFontSubset( const OUString& rToFile, ByteVector aBuffer; bool bCffOnly = false; if( !GetRawFontData( pFontData, aBuffer, &bCffOnly ) ) - return sal_False; + return false; // handle CFF-subsetting if( bCffOnly ) @@ -189,7 +189,7 @@ bool AquaSalGraphics::CreateFontSubset( const OUString& rToFile, TrueTypeFont* pSftFont = NULL; int nRC = ::OpenTTFontBuffer( (void*)&aBuffer[0], aBuffer.size(), 0, &pSftFont); if( nRC != SF_OK ) - return sal_False; + return false; // get details about the subsetted font TTGlobalFontInfo aTTInfo; @@ -264,7 +264,7 @@ bool AquaSalGraphics::CreateFontSubset( const OUString& rToFile, TTSimpleGlyphMetrics* pGlyphMetrics = ::GetTTSimpleGlyphMetrics( pSftFont, aShortIDs, nGlyphCount, bVertical ); if( !pGlyphMetrics ) - return sal_False; + return false; sal_uInt16 nNotDefAdv = pGlyphMetrics[0].adv; pGlyphMetrics[0].adv = pGlyphMetrics[nNotDef].adv; pGlyphMetrics[nNotDef].adv = nNotDefAdv; @@ -859,7 +859,7 @@ bool AquaSalGraphics::drawPolyLine( bool AquaSalGraphics::drawPolyLineBezier( sal_uInt32, const SalPoint*, const sal_uInt8* ) { - return sal_False; + return false; } bool AquaSalGraphics::drawPolyPolygon( const ::basegfx::B2DPolyPolygon& rPolyPoly, @@ -1084,13 +1084,13 @@ void AquaSalGraphics::drawPolygon( sal_uInt32 nPoints, const SalPoint *pPtAry ) bool AquaSalGraphics::drawPolygonBezier( sal_uInt32, const SalPoint*, const sal_uInt8* ) { - return sal_False; + return false; } bool AquaSalGraphics::drawPolyPolygonBezier( sal_uInt32, const sal_uInt32*, const SalPoint* const*, const sal_uInt8* const* ) { - return sal_False; + return false; } void AquaSalGraphics::drawRect( long nX, long nY, long nWidth, long nHeight ) |