diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2015-12-30 20:11:08 +1100 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2015-12-30 22:31:59 +1100 |
| commit | d23e6f2e9261d97e8544591abe83a2c78d8eb70d (patch) | |
| tree | bf77edc775d294bf6820129efdee7f8d871defb2 /vcl | |
| parent | 398ef76d5dc3ec1ed22fa1d9fd9151b61cce54e2 (diff) | |
vcl: group functions and variables in PhysicalFontFamily
Change-Id: I9069ba0c48cdbb7ee08e70c8f3eb2d911e9ab442
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/PhysicalFontFamily.hxx | 20 | ||||
| -rw-r--r-- | vcl/source/font/PhysicalFontFamily.cxx | 8 |
2 files changed, 16 insertions, 12 deletions
diff --git a/vcl/inc/PhysicalFontFamily.hxx b/vcl/inc/PhysicalFontFamily.hxx index e945406a8c52..a80ffb97130e 100644 --- a/vcl/inc/PhysicalFontFamily.hxx +++ b/vcl/inc/PhysicalFontFamily.hxx @@ -48,19 +48,22 @@ public: const OUString& GetFamilyName() const { return maFamilyName; } const OUString& GetSearchName() const { return maSearchName; } const OUString& GetAliasNames() const { return maMapNames; } + bool IsScalable() const { return maFontFaces[0]->IsScalable(); } + int GetMinQuality() const { return mnMinQuality; } + int GetTypeFaces() const { return mnTypeFaces; } + void GetFontHeights( std::set<int>& rHeights ) const; + const OUString& GetMatchFamilyName() const { return maMatchFamilyName; } ImplFontAttrs GetMatchType() const { return mnMatchType ; } FontWeight GetMatchWeight() const { return meMatchWeight ; } FontWidth GetMatchWidth() const { return meMatchWidth ; } - bool IsScalable() const { return maFontFaces[0]->IsScalable(); } - int GetMinQuality() const { return mnMinQuality; } - int GetTypeFaces() const { return mnTypeFaces; } - bool AddFontFace( PhysicalFontFace* ); void InitMatchData( const utl::FontSubstConfiguration&, const OUString& rSearchName ); + + bool AddFontFace( PhysicalFontFace* ); + PhysicalFontFace* FindBestFontFace( const FontSelectPattern& rFSD ) const; - void GetFontHeights( std::set<int>& rHeights ) const; void UpdateDevFontList( ImplDeviceFontList& ) const; void UpdateCloneFontList( PhysicalFontCollection&, bool bScalable, bool bEmbeddable ) const; @@ -75,13 +78,14 @@ private: OUString maSearchName; // normalized font family name OUString maMapNames; // fontname aliases int mnTypeFaces; // Typeface Flags + FontFamily meFamily; + FontPitch mePitch; + int mnMinQuality; // quality of the worst font face + ImplFontAttrs mnMatchType; // MATCH - Type OUString maMatchFamilyName; // MATCH - FamilyName FontWeight meMatchWeight; // MATCH - Weight FontWidth meMatchWidth; // MATCH - Width - FontFamily meFamily; - FontPitch mePitch; - int mnMinQuality; // quality of the worst font face }; #endif // INCLUDED_VCL_INC_PHYSICALFONTFAMILY_HXX diff --git a/vcl/source/font/PhysicalFontFamily.cxx b/vcl/source/font/PhysicalFontFamily.cxx index 9ee2defb95af..01ca378b99fd 100644 --- a/vcl/source/font/PhysicalFontFamily.cxx +++ b/vcl/source/font/PhysicalFontFamily.cxx @@ -92,12 +92,12 @@ static ImplFontAttrs lcl_IsCJKFont( const OUString& rFontName ) PhysicalFontFamily::PhysicalFontFamily( const OUString& rSearchName ) : maSearchName( rSearchName ), mnTypeFaces( 0 ), - mnMatchType( ImplFontAttrs::None ), - meMatchWeight( WEIGHT_DONTKNOW ), - meMatchWidth( WIDTH_DONTKNOW ), meFamily( FAMILY_DONTKNOW ), mePitch( PITCH_DONTKNOW ), - mnMinQuality( -1 ) + mnMinQuality( -1 ), + mnMatchType( ImplFontAttrs::None ), + meMatchWeight( WEIGHT_DONTKNOW ), + meMatchWidth( WIDTH_DONTKNOW ) {} PhysicalFontFamily::~PhysicalFontFamily() |