summaryrefslogtreecommitdiff
path: root/vcl/generic
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-01-28 19:59:13 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-01-28 20:26:19 +0100
commitc1d37365c42a0627a66310c46d4beb2337633654 (patch)
tree5eccb263b481a3112c8d400054120cbd5db2963f /vcl/generic
parent946f6132f9172fc7f79a1d99051011426767bf90 (diff)
bool improvements
Change-Id: Iede12ed1e35581cf48d64b898f22949d0c1aa6de
Diffstat (limited to 'vcl/generic')
-rw-r--r--vcl/generic/fontmanager/fontconfig.cxx2
-rw-r--r--vcl/generic/fontmanager/fontmanager.cxx2
-rw-r--r--vcl/generic/fontmanager/parseAFM.cxx4
-rw-r--r--vcl/generic/print/genpspgraphics.cxx10
4 files changed, 9 insertions, 9 deletions
diff --git a/vcl/generic/fontmanager/fontconfig.cxx b/vcl/generic/fontmanager/fontconfig.cxx
index d6bc5565b8cc..4ff925aff0bc 100644
--- a/vcl/generic/fontmanager/fontconfig.cxx
+++ b/vcl/generic/fontmanager/fontconfig.cxx
@@ -343,7 +343,7 @@ FcResult FontCfgWrapper::LocalizedElementFromPattern(FcPattern* pPattern, FcChar
std::vector< lang_and_element > lang_and_elements;
lang_and_elements.push_back(lang_and_element(elementlang, *element));
int k = 1;
- while (1)
+ while (true)
{
if (FcPatternGetString( pPattern, elementlangtype, k, &elementlang ) != FcResultMatch)
break;
diff --git a/vcl/generic/fontmanager/fontmanager.cxx b/vcl/generic/fontmanager/fontmanager.cxx
index 7f20679d1691..cc3a32e7a18b 100644
--- a/vcl/generic/fontmanager/fontmanager.cxx
+++ b/vcl/generic/fontmanager/fontmanager.cxx
@@ -264,7 +264,7 @@ bool PrintFontManager::TrueTypeFontFile::queryMetricPage( int nPage, MultiAtomPr
rChar.width = m_aGlobalMetricY.width;
rChar.height = pMetrics[ i ].adv;
if( table_vert[i] != table[i] )
- m_pMetrics->m_bVerticalSubstitutions[ nPage*256 + i ] = 1;
+ m_pMetrics->m_bVerticalSubstitutions[ nPage*256 + i ] = true;
}
}
free( pMetrics );
diff --git a/vcl/generic/fontmanager/parseAFM.cxx b/vcl/generic/fontmanager/parseAFM.cxx
index 2bff647b27a6..cac5b13c5e54 100644
--- a/vcl/generic/fontmanager/parseAFM.cxx
+++ b/vcl/generic/fontmanager/parseAFM.cxx
@@ -445,9 +445,9 @@ static int parseGlobals( FileInputStream* fp, GlobalFontInfo* gfi )
if ((keyword = token(fp,tokenlen)) != NULL)
{
if (MATCH(keyword, False))
- gfi->isFixedPitch = 0;
+ gfi->isFixedPitch = false;
else
- gfi->isFixedPitch = 1;
+ gfi->isFixedPitch = true;
}
break;
case UNDERLINEPOSITION:
diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx
index 938c9083c4c0..ad4d43f97801 100644
--- a/vcl/generic/print/genpspgraphics.cxx
+++ b/vcl/generic/print/genpspgraphics.cxx
@@ -391,12 +391,12 @@ void GenPspGraphics::SetFillColor( SalColor nSalColor )
void GenPspGraphics::SetROPLineColor( SalROPColor )
{
- DBG_ASSERT( 0, "Error: PrinterGfx::SetROPLineColor() not implemented" );
+ DBG_ASSERT( false, "Error: PrinterGfx::SetROPLineColor() not implemented" );
}
void GenPspGraphics::SetROPFillColor( SalROPColor )
{
- DBG_ASSERT( 0, "Error: PrinterGfx::SetROPFillColor() not implemented" );
+ DBG_ASSERT( false, "Error: PrinterGfx::SetROPFillColor() not implemented" );
}
void GenPspGraphics::SetXORMode( bool bSet, bool )
@@ -489,7 +489,7 @@ void GenPspGraphics::invert( sal_uInt32,
const SalPoint*,
SalInvert )
{
- DBG_ASSERT( 0, "Error: PrinterGfx::Invert() not implemented" );
+ DBG_ASSERT( false, "Error: PrinterGfx::Invert() not implemented" );
}
sal_Bool GenPspGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize )
@@ -515,12 +515,12 @@ void GenPspGraphics::drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rSa
Rectangle aDst (Point(rPosAry.mnDestX, rPosAry.mnDestY),
Size(rPosAry.mnDestWidth, rPosAry.mnDestHeight));
- BitmapBuffer* pBuffer= const_cast<SalBitmap&>(rSalBitmap).AcquireBuffer(sal_True);
+ BitmapBuffer* pBuffer= const_cast<SalBitmap&>(rSalBitmap).AcquireBuffer(true);
SalPrinterBmp aBmp (pBuffer);
m_pPrinterGfx->DrawBitmap (aDst, aSrc, aBmp);
- const_cast<SalBitmap&>(rSalBitmap).ReleaseBuffer (pBuffer, sal_True);
+ const_cast<SalBitmap&>(rSalBitmap).ReleaseBuffer (pBuffer, true);
}
void GenPspGraphics::drawBitmap( const SalTwoRect&,