diff options
| author | Xiaofei Zhang <Zhangxiaofei@openoffice.org> | 2010-11-05 10:31:15 +0800 |
|---|---|---|
| committer | Xiaofei Zhang <Zhangxiaofei@openoffice.org> | 2010-11-05 10:31:15 +0800 |
| commit | cef41c30dd562e129b864b87c85f59bf038423a2 (patch) | |
| tree | b698f3898ac3600263df76a36933ca27ec7606b0 /toolkit/source/awt/vclxfont.cxx | |
| parent | 1fa45c8a636ff3e4732cfdf5dd0dc8e833707bc5 (diff) | |
removetooltypes01: #i112600# remove tooltypes from toolkit, svtools and framework
Diffstat (limited to 'toolkit/source/awt/vclxfont.cxx')
| -rw-r--r-- | toolkit/source/awt/vclxfont.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/toolkit/source/awt/vclxfont.cxx b/toolkit/source/awt/vclxfont.cxx index 53175ec79d24..a07e53f8adf9 100644 --- a/toolkit/source/awt/vclxfont.cxx +++ b/toolkit/source/awt/vclxfont.cxx @@ -62,7 +62,7 @@ void VCLXFont::Init( ::com::sun::star::awt::XDevice& rxDev, const Font& rFont ) maFont = rFont; } -BOOL VCLXFont::ImplAssertValidFontMetric() +sal_Bool VCLXFont::ImplAssertValidFontMetric() { if ( !mpFontMetric && mxDevice.is() ) { @@ -75,7 +75,7 @@ BOOL VCLXFont::ImplAssertValidFontMetric() pOutDev->SetFont( aOldFont ); } } - return mpFontMetric ? TRUE : FALSE; + return mpFontMetric ? sal_True : sal_False; } @@ -149,7 +149,7 @@ sal_Int16 VCLXFont::getCharWidth( sal_Unicode c ) throw(::com::sun::star::uno::R sal_Int16 nCount = nLast-nFirst + 1; aSeq = ::com::sun::star::uno::Sequence<sal_Int16>( nCount ); - for ( USHORT n = 0; n < nCount; n++ ) + for ( sal_uInt16 n = 0; n < nCount; n++ ) { aSeq.getArray()[n] = sal::static_int_cast< sal_Int16 >( pOutDev->GetTextWidth( @@ -204,7 +204,7 @@ void VCLXFont::getKernPairs( ::com::sun::star::uno::Sequence< sal_Unicode >& rnC Font aOldFont = pOutDev->GetFont(); pOutDev->SetFont( maFont ); - ULONG nPairs = pOutDev->GetKerningPairCount(); + sal_uIntPtr nPairs = pOutDev->GetKerningPairCount(); if ( nPairs ) { KerningPair* pData = new KerningPair[ nPairs ]; @@ -218,7 +218,7 @@ void VCLXFont::getKernPairs( ::com::sun::star::uno::Sequence< sal_Unicode >& rnC sal_Unicode* pChars2 = rnChars2.getArray(); sal_Int16* pKerns = rnKerns.getArray(); - for ( ULONG n = 0; n < nPairs; n++ ) + for ( sal_uIntPtr n = 0; n < nPairs; n++ ) { pChars1[n] = pData[n].nChar1; pChars2[n] = pData[n].nChar2; |