diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-10-07 12:55:17 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-10-07 12:57:44 +0100 |
commit | 71bb6d6b7273f49189fa2d10010bac4f8dafa7c1 (patch) | |
tree | 941bfac0a3a43f5084338d598a72123dcd976b23 /vcl/inc/outdev.h | |
parent | b72e63fd5a7caf373eb42bedb2f7db49cef04e91 (diff) |
Revert "loplugin:mergeclasses" to fix mac build
because fontsubst.cxx is not built on mac.
move PreMatchFontSubstitution to PhysicalFontCollection.cxx ?
This reverts commit 349700228e4449ace956b30bc65208b9196f0a78.
Change-Id: I007f24313ddfd0eb3db3fd599abcf1eae3da4e9c
Diffstat (limited to 'vcl/inc/outdev.h')
-rw-r--r-- | vcl/inc/outdev.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/vcl/inc/outdev.h b/vcl/inc/outdev.h index 7032958d4903..628329ea77e4 100644 --- a/vcl/inc/outdev.h +++ b/vcl/inc/outdev.h @@ -112,17 +112,13 @@ public: // PreMatchFontSubstitution // abstracts the concept of a configured font substitution // before the availability of the originally selected font has been checked -class PreMatchFontSubstititution +class ImplPreMatchFontSubstitution +: public ImplFontSubstitution { public: - bool FindFontSubstitute( FontSelectPattern& ) const; - typedef ::std::pair<FontSelectPatternAttributes, FontSelectPatternAttributes> value_type; -private: - typedef ::std::list<value_type> CachedFontMapType; - mutable CachedFontMapType maCachedFontMap; + virtual bool FindFontSubstitute( FontSelectPattern& ) const = 0; }; - // ImplGlyphFallbackFontSubstitution // abstracts the concept of finding the best font to support an incomplete font class ImplGlyphFallbackFontSubstitution |