diff options
| -rw-r--r-- | vcl/inc/impfont.hxx | 8 | ||||
| -rw-r--r-- | vcl/source/gdi/font.cxx | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx index 434db48ef1d8..3c42f6e1a465 100644 --- a/vcl/inc/impfont.hxx +++ b/vcl/inc/impfont.hxx @@ -31,8 +31,6 @@ // - Impl_Font - -typedef sal_uInt32 FontRefCount; - class Impl_Font { public: @@ -51,7 +49,7 @@ private: friend class vcl::Font; void AskConfig(); - FontRefCount mnRefCount; + sal_uInt32 mnRefCount; OUString maFamilyName; OUString maStyleName; Size maSize; @@ -98,7 +96,7 @@ private: long mnLineHeight; // Ascent+Descent+EmphasisMark long mnSlant; // Slant sal_uInt16 mnMiscFlags; // Misc Flags - FontRefCount mnRefCount; // Reference Counter + sal_uInt32 mnRefCount; // Reference Counter enum { DEVICE_FLAG=1, SCALABLE_FLAG=2, LATIN_FLAG=4, CJK_FLAG=8, CTL_FLAG=16 }; @@ -194,7 +192,7 @@ private: const sal_uInt16* mpGlyphIds; // individual glyphid mappings int mnRangeCount; int mnCharCount; // covered codepoints - mutable FontRefCount mnRefCount; + mutable sal_uInt32 mnRefCount; }; // CmapResult is a normalized version of the many CMAP formats diff --git a/vcl/source/gdi/font.cxx b/vcl/source/gdi/font.cxx index 269527e848ec..81270c0adb4f 100644 --- a/vcl/source/gdi/font.cxx +++ b/vcl/source/gdi/font.cxx @@ -234,7 +234,7 @@ Font::Font() Font::Font( const vcl::Font& rFont ) { - bool bRefIncrementable = rFont.mpImplFont->mnRefCount < ::std::numeric_limits<FontRefCount>::max(); + bool bRefIncrementable = rFont.mpImplFont->mnRefCount < ::std::numeric_limits<sal_uInt32>::max(); DBG_ASSERT( bRefIncrementable, "Font: RefCount overflow" ); mpImplFont = rFont.mpImplFont; @@ -565,7 +565,7 @@ void Font::SetWordLineMode( bool bWordLine ) Font& Font::operator=( const vcl::Font& rFont ) { - bool bRefIncrementable = rFont.mpImplFont->mnRefCount < ::std::numeric_limits<FontRefCount>::max(); + bool bRefIncrementable = rFont.mpImplFont->mnRefCount < ::std::numeric_limits<sal_uInt32>::max(); DBG_ASSERT( bRefIncrementable, "Font: RefCount overflow" ); // Increment RefCount first, so that we can reference ourselves |