diff options
| author | Noel Grandin <noel@peralex.com> | 2015-10-07 10:00:59 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-10-07 12:32:23 +0200 |
| commit | 349700228e4449ace956b30bc65208b9196f0a78 (patch) | |
| tree | b42008d0fcd5b13576e4d0f3748bb27276d06d68 /vcl/inc | |
| parent | 64d0de92ab06e6550be7dd59ae887750166d15a9 (diff) | |
loplugin:mergeclasses
Change-Id: I9f56beebae1ea02a8914b7b25fe7565f7b0df053
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/PhysicalFontCollection.hxx | 4 | ||||
| -rw-r--r-- | vcl/inc/outdev.h | 10 | ||||
| -rw-r--r-- | vcl/inc/outfont.hxx | 2 |
3 files changed, 10 insertions, 6 deletions
diff --git a/vcl/inc/PhysicalFontCollection.hxx b/vcl/inc/PhysicalFontCollection.hxx index 1625a358f2af..e2d78d999c53 100644 --- a/vcl/inc/PhysicalFontCollection.hxx +++ b/vcl/inc/PhysicalFontCollection.hxx @@ -40,7 +40,7 @@ private: typedef std::unordered_map<OUString, PhysicalFontFamily*,OUStringHash> PhysicalFontFamilies; PhysicalFontFamilies maPhysicalFontFamilies; - ImplPreMatchFontSubstitution* mpPreMatchHook; // device specific prematch substitution + PreMatchFontSubstititution* mpPreMatchHook; // device specific prematch substitution ImplGlyphFallbackFontSubstitution* mpFallbackHook; // device specific glyph fallback substitution public: @@ -63,7 +63,7 @@ public: OUString& rMissingCodes, int nFallbackLevel ) const; // prepare platform specific font substitutions - void SetPreMatchHook( ImplPreMatchFontSubstitution* ); + void SetPreMatchHook( PreMatchFontSubstititution* ); void SetFallbackHook( ImplGlyphFallbackFontSubstitution* ); // misc utilities diff --git a/vcl/inc/outdev.h b/vcl/inc/outdev.h index 628329ea77e4..7032958d4903 100644 --- a/vcl/inc/outdev.h +++ b/vcl/inc/outdev.h @@ -112,13 +112,17 @@ public: // PreMatchFontSubstitution // abstracts the concept of a configured font substitution // before the availability of the originally selected font has been checked -class ImplPreMatchFontSubstitution -: public ImplFontSubstitution +class PreMatchFontSubstititution { public: - virtual bool FindFontSubstitute( FontSelectPattern& ) const = 0; + bool FindFontSubstitute( FontSelectPattern& ) const; + typedef ::std::pair<FontSelectPatternAttributes, FontSelectPatternAttributes> value_type; +private: + typedef ::std::list<value_type> CachedFontMapType; + mutable CachedFontMapType maCachedFontMap; }; + // ImplGlyphFallbackFontSubstitution // abstracts the concept of finding the best font to support an incomplete font class ImplGlyphFallbackFontSubstitution diff --git a/vcl/inc/outfont.hxx b/vcl/inc/outfont.hxx index 2b56acd4fdea..860f76779d8b 100644 --- a/vcl/inc/outfont.hxx +++ b/vcl/inc/outfont.hxx @@ -37,7 +37,7 @@ class ImplGetDevFontList; class ImplGetDevSizeList; class ImplFontEntry; class ImplFontCache; -class ImplPreMatchFontSubstitution; +class PreMatchFontSubstititution; class ImplGlyphFallbackFontSubstitution; class FontSelectPattern; namespace vcl { class Font; } |