rebase to DEV300_m100

1 files changed, 18 insertions, 18 deletions

diff --git a/vcl/source/gdi/metric.cxx b/vcl/source/gdi/metric.cxx
index 1f0d89e6926c..b05ae27a8f5f 100644
--- a/vcl/source/gdi/metric.cxx
+++ b/vcl/source/gdi/metric.cxx
@@ -126,15 +126,15 @@ FontInfo& FontInfo::operator=( const FontInfo& rInfo )
 
 // -----------------------------------------------------------------------
 
-BOOL FontInfo::operator==( const FontInfo& rInfo ) const
+sal_Bool FontInfo::operator==( const FontInfo& rInfo ) const
 {
     if( !Font::operator==( rInfo ) )
-        return FALSE;
+        return sal_False;
     if( mpImplMetric == rInfo.mpImplMetric )
-        return TRUE;
+        return sal_True;
     if( *mpImplMetric == *rInfo.mpImplMetric  )
-        return TRUE;
-    return FALSE;
+        return sal_True;
+    return sal_False;
 }
 
 // -----------------------------------------------------------------------
@@ -146,28 +146,28 @@ FontType FontInfo::GetType() const
 
 // -----------------------------------------------------------------------
 
-BOOL FontInfo::IsDeviceFont() const
+sal_Bool FontInfo::IsDeviceFont() const
 {
     return mpImplMetric->IsDeviceFont();
 }
 
 // -----------------------------------------------------------------------
 
-BOOL FontInfo::SupportsLatin() const
+sal_Bool FontInfo::SupportsLatin() const
 {
     return mpImplMetric->SupportsLatin();
 }
 
 // -----------------------------------------------------------------------
 
-BOOL FontInfo::SupportsCJK() const
+sal_Bool FontInfo::SupportsCJK() const
 {
     return mpImplMetric->SupportsCJK();
 }
 
 // -----------------------------------------------------------------------
 
-BOOL FontInfo::SupportsCTL() const
+sal_Bool FontInfo::SupportsCTL() const
 {
     return mpImplMetric->SupportsCTL();
 }
@@ -230,7 +230,7 @@ FontMetric& FontMetric::operator =( const FontMetric& rMetric )
 
 // -----------------------------------------------------------------------
 
-BOOL FontMetric::operator==( const FontMetric& rMetric ) const
+sal_Bool FontMetric::operator==( const FontMetric& rMetric ) const
 {
     return FontInfo::operator==( rMetric );
 }
@@ -239,7 +239,7 @@ BOOL FontMetric::operator==( const FontMetric& rMetric ) const
 
 CmapResult::CmapResult( bool bSymbolic,
     const sal_uInt32* pRangeCodes, int nRangeCount,
-    const int* pStartGlyphs, const USHORT* pExtraGlyphIds )
+    const int* pStartGlyphs, const sal_uInt16* pExtraGlyphIds )
 :   mpRangeCodes( pRangeCodes)
 ,   mpStartGlyphs( pStartGlyphs)
 ,   mpGlyphIds( pExtraGlyphIds)
@@ -627,7 +627,7 @@ bool ParseCMAP( const unsigned char* pCmap, int nLength, CmapResult& rResult )
     sal_uInt32* pCodePairs = NULL;
     int* pStartGlyphs = NULL;
 
-    typedef std::vector<USHORT> U16Vector;
+    typedef std::vector<sal_uInt16> U16Vector;
     U16Vector aGlyphIdArray;
     aGlyphIdArray.reserve( 0x1000 );
     aGlyphIdArray.push_back( 0 );
@@ -665,7 +665,7 @@ bool ParseCMAP( const unsigned char* pCmap, int nLength, CmapResult& rResult )
                 const unsigned char* pGlyphIdPtr = pOffsetBase + 2*i + nRangeOffset;
                 for( sal_uInt32 c = cMinChar; c <= cMaxChar; ++c, pGlyphIdPtr+=2 ) {
                     const int nGlyphIndex = GetUShort( pGlyphIdPtr ) + nGlyphDelta;
-                    aGlyphIdArray.push_back( static_cast<USHORT>(nGlyphIndex) );
+                    aGlyphIdArray.push_back( static_cast<sal_uInt16>(nGlyphIndex) );
                 }
             }
         }
@@ -814,11 +814,11 @@ bool ParseCMAP( const unsigned char* pCmap, int nLength, CmapResult& rResult )
 
     // prepare the glyphid-array if needed
     // TODO: merge ranges if they are close enough?
-    USHORT* pGlyphIds = NULL;
+    sal_uInt16* pGlyphIds = NULL;
     if( !aGlyphIdArray.empty())
     {
-        pGlyphIds = new USHORT[ aGlyphIdArray.size() ];
-        USHORT* pOut = pGlyphIds;
+        pGlyphIds = new sal_uInt16[ aGlyphIdArray.size() ];
+        sal_uInt16* pOut = pGlyphIds;
         U16Vector::const_iterator it = aGlyphIdArray.begin();
         while( it != aGlyphIdArray.end() )
             *(pOut++) = *(it++);
@@ -876,14 +876,14 @@ void FontCharMap::Reset( const ImplFontCharMap* pNewMap )
 
 // -----------------------------------------------------------------------
 
-BOOL FontCharMap::IsDefaultMap() const
+sal_Bool FontCharMap::IsDefaultMap() const
 {
     return mpImpl->IsDefaultMap();
 }
 
 // -----------------------------------------------------------------------
 
-BOOL FontCharMap::HasChar( sal_uInt32 cChar ) const
+sal_Bool FontCharMap::HasChar( sal_uInt32 cChar ) const
 {
     return mpImpl->HasChar( cChar );
 }