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

vcl: tab cleanup of vcl/inc/impfont.hxx

Change-Id: I54f669cd4ba472744f013f157baa035519d052bf
üst f33002aa
...@@ -36,10 +36,10 @@ typedef sal_uInt32 FontRefCount; ...@@ -36,10 +36,10 @@ typedef sal_uInt32 FontRefCount;
class Impl_Font class Impl_Font
{ {
public: public:
Impl_Font(); Impl_Font();
Impl_Font( const Impl_Font& ); Impl_Font( const Impl_Font& );
bool operator==( const Impl_Font& ) const; bool operator==( const Impl_Font& ) const;
FontPitch GetPitch() { if(mePitch==PITCH_DONTKNOW) AskConfig(); return mePitch; } FontPitch GetPitch() { if(mePitch==PITCH_DONTKNOW) AskConfig(); return mePitch; }
FontFamily GetFamily() { if(meFamily==FAMILY_DONTKNOW) AskConfig(); return meFamily; } FontFamily GetFamily() { if(meFamily==FAMILY_DONTKNOW) AskConfig(); return meFamily; }
...@@ -91,36 +91,36 @@ class ImplFontMetric ...@@ -91,36 +91,36 @@ class ImplFontMetric
friend class ::OutputDevice; friend class ::OutputDevice;
private: private:
long mnAscent; // Ascent long mnAscent; // Ascent
long mnDescent; // Descent long mnDescent; // Descent
long mnIntLeading; // Internal Leading long mnIntLeading; // Internal Leading
long mnExtLeading; // External Leading long mnExtLeading; // External Leading
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 FontRefCount 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 };
public: public:
ImplFontMetric(); ImplFontMetric();
void AddReference(); void AddReference();
void DeReference(); void DeReference();
long GetAscent() const { return mnAscent; } long GetAscent() const { return mnAscent; }
long GetDescent() const { return mnDescent; } long GetDescent() const { return mnDescent; }
long GetIntLeading() const { return mnIntLeading; } long GetIntLeading() const { return mnIntLeading; }
long GetExtLeading() const { return mnExtLeading; } long GetExtLeading() const { return mnExtLeading; }
long GetLineHeight() const { return mnLineHeight; } long GetLineHeight() const { return mnLineHeight; }
long GetSlant() const { return mnSlant; } long GetSlant() const { return mnSlant; }
bool IsDeviceFont() const { return ((mnMiscFlags & DEVICE_FLAG) != 0); } bool IsDeviceFont() const { return ((mnMiscFlags & DEVICE_FLAG) != 0); }
bool IsScalable() const { return ((mnMiscFlags & SCALABLE_FLAG) != 0); } bool IsScalable() const { return ((mnMiscFlags & SCALABLE_FLAG) != 0); }
bool SupportsLatin() const { return ((mnMiscFlags & LATIN_FLAG) != 0); } bool SupportsLatin() const { return ((mnMiscFlags & LATIN_FLAG) != 0); }
bool SupportsCJK() const { return ((mnMiscFlags & CJK_FLAG) != 0); } bool SupportsCJK() const { return ((mnMiscFlags & CJK_FLAG) != 0); }
bool SupportsCTL() const { return ((mnMiscFlags & CTL_FLAG) != 0); } bool SupportsCTL() const { return ((mnMiscFlags & CTL_FLAG) != 0); }
bool operator==( const ImplFontMetric& ) const; bool operator==( const ImplFontMetric& ) const;
}; };
// - ImplFontOptions - // - ImplFontOptions -
...@@ -134,27 +134,20 @@ public: ...@@ -134,27 +134,20 @@ public:
FontHinting meHinting; // whether the font should be hinted FontHinting meHinting; // whether the font should be hinted
FontHintStyle meHintStyle; // type of font hinting to be used FontHintStyle meHintStyle; // type of font hinting to be used
public: public:
ImplFontOptions() : ImplFontOptions() :
meEmbeddedBitmap(EMBEDDEDBITMAP_DONTKNOW), meEmbeddedBitmap(EMBEDDEDBITMAP_DONTKNOW),
meAntiAlias(ANTIALIAS_DONTKNOW), meAntiAlias(ANTIALIAS_DONTKNOW),
meAutoHint(AUTOHINT_DONTKNOW), meAutoHint(AUTOHINT_DONTKNOW),
meHinting(HINTING_DONTKNOW), meHinting(HINTING_DONTKNOW),
meHintStyle(HINT_SLIGHT) meHintStyle(HINT_SLIGHT) {}
{} virtual ~ImplFontOptions() {}
virtual ~ImplFontOptions()
{} FontAutoHint GetUseAutoHint() const { return meAutoHint; }
FontAutoHint GetUseAutoHint() const FontHintStyle GetHintStyle() const { return meHintStyle; }
{ return meAutoHint; } bool DontUseEmbeddedBitmaps() const { return meEmbeddedBitmap == EMBEDDEDBITMAP_FALSE; }
FontHintStyle GetHintStyle() const bool DontUseAntiAlias() const { return meAntiAlias == ANTIALIAS_FALSE; }
{ return meHintStyle; } bool DontUseHinting() const { return (meHinting == HINTING_FALSE) || (GetHintStyle() == HINT_NONE); }
bool DontUseEmbeddedBitmaps() const virtual void* GetPattern(void * /*pFace*/, bool /*bEmbolden*/, bool /*bVerticalMetrics*/) const { return NULL; }
{ return meEmbeddedBitmap == EMBEDDEDBITMAP_FALSE; }
bool DontUseAntiAlias() const
{ return meAntiAlias == ANTIALIAS_FALSE; }
bool DontUseHinting() const
{ return (meHinting == HINTING_FALSE) || (GetHintStyle() == HINT_NONE); }
virtual void *GetPattern(void * /*pFace*/, bool /*bEmbolden*/, bool /*bVerticalMetrics*/) const
{ return NULL; }
}; };
// - ImplFontCharMap - // - ImplFontCharMap -
...@@ -164,8 +157,8 @@ class CmapResult; ...@@ -164,8 +157,8 @@ class CmapResult;
class VCL_PLUGIN_PUBLIC ImplFontCharMap class VCL_PLUGIN_PUBLIC ImplFontCharMap
{ {
public: public:
explicit ImplFontCharMap( const CmapResult& ); explicit ImplFontCharMap( const CmapResult& );
virtual ~ImplFontCharMap(); virtual ~ImplFontCharMap();
static ImplFontCharMap* GetDefaultMap( bool bSymbols=false); static ImplFontCharMap* GetDefaultMap( bool bSymbols=false);
...@@ -198,26 +191,26 @@ private: ...@@ -198,26 +191,26 @@ private:
private: private:
const sal_uInt32* mpRangeCodes; // pairs of StartCode/(EndCode+1) const sal_uInt32* mpRangeCodes; // pairs of StartCode/(EndCode+1)
const int* mpStartGlyphs; // range-specific mapper to glyphs const int* mpStartGlyphs; // range-specific mapper to glyphs
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 FontRefCount mnRefCount;
}; };
// CmapResult is a normalized version of the many CMAP formats // CmapResult is a normalized version of the many CMAP formats
class VCL_PLUGIN_PUBLIC CmapResult class VCL_PLUGIN_PUBLIC CmapResult
{ {
public: public:
explicit CmapResult( bool bSymbolic = false, explicit CmapResult( bool bSymbolic = false,
const sal_uInt32* pRangeCodes = NULL, int nRangeCount = 0, const sal_uInt32* pRangeCodes = NULL, int nRangeCount = 0,
const int* pStartGlyphs = 0, const sal_uInt16* pGlyphIds = NULL ); const int* pStartGlyphs = 0, const sal_uInt16* pGlyphIds = NULL );
const sal_uInt32* mpRangeCodes; const sal_uInt32* mpRangeCodes;
const int* mpStartGlyphs; const int* mpStartGlyphs;
const sal_uInt16* mpGlyphIds; const sal_uInt16* mpGlyphIds;
int mnRangeCount; int mnRangeCount;
bool mbSymbolic; bool mbSymbolic;
bool mbRecoded; bool mbRecoded;
}; };
bool ParseCMAP( const unsigned char* pRawData, int nRawLength, CmapResult& ); bool ParseCMAP( const unsigned char* pRawData, int nRawLength, CmapResult& );
......
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