Kaydet (Commit) d244a0c1 authored tarafından Chris Sherlock's avatar Chris Sherlock

vcl: remove FontRefCount typedef

There is honestly no real need for FontRefCount. I really cannot see
why this typedef was ever introduced into the codebase

Change-Id: Ifa24a95cf6c788b4b11a4425520a2f6bc0e61169
üst bcfa2ea2
...@@ -31,8 +31,6 @@ ...@@ -31,8 +31,6 @@
// - Impl_Font - // - Impl_Font -
typedef sal_uInt32 FontRefCount;
class Impl_Font class Impl_Font
{ {
public: public:
...@@ -51,7 +49,7 @@ private: ...@@ -51,7 +49,7 @@ private:
friend class vcl::Font; friend class vcl::Font;
void AskConfig(); void AskConfig();
FontRefCount mnRefCount; sal_uInt32 mnRefCount;
OUString maFamilyName; OUString maFamilyName;
OUString maStyleName; OUString maStyleName;
Size maSize; Size maSize;
...@@ -98,7 +96,7 @@ private: ...@@ -98,7 +96,7 @@ private:
long mnLineHeight; // Ascent+Descent+EmphasisMark long mnLineHeight; // Ascent+Descent+EmphasisMark
long mnSlant; // Slant long mnSlant; // Slant
sal_uInt16 mnMiscFlags; // Misc Flags 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 }; enum { DEVICE_FLAG=1, SCALABLE_FLAG=2, LATIN_FLAG=4, CJK_FLAG=8, CTL_FLAG=16 };
...@@ -194,7 +192,7 @@ private: ...@@ -194,7 +192,7 @@ private:
const sal_uInt16* mpGlyphIds; // individual glyphid mappings const sal_uInt16* mpGlyphIds; // individual glyphid mappings
int mnRangeCount; int mnRangeCount;
int mnCharCount; // covered codepoints int mnCharCount; // covered codepoints
mutable FontRefCount mnRefCount; mutable sal_uInt32 mnRefCount;
}; };
// CmapResult is a normalized version of the many CMAP formats // CmapResult is a normalized version of the many CMAP formats
......
...@@ -234,7 +234,7 @@ Font::Font() ...@@ -234,7 +234,7 @@ Font::Font()
Font::Font( const vcl::Font& rFont ) 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" ); DBG_ASSERT( bRefIncrementable, "Font: RefCount overflow" );
mpImplFont = rFont.mpImplFont; mpImplFont = rFont.mpImplFont;
...@@ -565,7 +565,7 @@ void Font::SetWordLineMode( bool bWordLine ) ...@@ -565,7 +565,7 @@ void Font::SetWordLineMode( bool bWordLine )
Font& Font::operator=( const vcl::Font& rFont ) 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" ); DBG_ASSERT( bRefIncrementable, "Font: RefCount overflow" );
// Increment RefCount first, so that we can reference ourselves // Increment RefCount first, so that we can reference ourselves
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment