diff options
Diffstat (limited to 'vcl/inc/vcl/impfont.hxx')
| -rw-r--r-- | vcl/inc/vcl/impfont.hxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vcl/inc/vcl/impfont.hxx b/vcl/inc/vcl/impfont.hxx index e414ab883fcc..cc4271932b47 100644 --- a/vcl/inc/vcl/impfont.hxx +++ b/vcl/inc/vcl/impfont.hxx @@ -81,7 +81,7 @@ private: FontType meType; // used by metrics only short mnOrientation; FontKerning mnKerning; - BOOL mbWordLine:1, + sal_Bool mbWordLine:1, mbOutline:1, mbConfigLookup:1, // there was a config lookup mbShadow:1, @@ -107,8 +107,8 @@ private: long mnExtLeading; // External Leading long mnLineHeight; // Ascent+Descent+EmphasisMark long mnSlant; // Slant - USHORT mnMiscFlags; // Misc Flags - UINT32 mnRefCount; // Reference Counter + sal_uInt16 mnMiscFlags; // Misc Flags + sal_uInt32 mnRefCount; // Reference Counter enum { DEVICE_FLAG=1, SCALABLE_FLAG=2, LATIN_FLAG=4, CJK_FLAG=8, CTL_FLAG=16 }; @@ -211,7 +211,7 @@ private: private: const sal_uInt32* mpRangeCodes; // pairs of StartCode/(EndCode+1) const int* mpStartGlyphs; // range-specific mapper to glyphs - const USHORT* mpGlyphIds; // individual glyphid mappings + const sal_uInt16* mpGlyphIds; // individual glyphid mappings int mnRangeCount; int mnCharCount; // covered codepoints mutable int mnRefCount; @@ -223,11 +223,11 @@ class VCL_PLUGIN_PUBLIC CmapResult public: explicit CmapResult( bool bSymbolic = false, const sal_uInt32* pRangeCodes = NULL, int nRangeCount = 0, - const int* pStartGlyphs = 0, const USHORT* pGlyphIds = NULL ); + const int* pStartGlyphs = 0, const sal_uInt16* pGlyphIds = NULL ); const sal_uInt32* mpRangeCodes; const int* mpStartGlyphs; - const USHORT* mpGlyphIds; + const sal_uInt16* mpGlyphIds; int mnRangeCount; bool mbSymbolic; bool mbRecoded; |