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

3 files changed, 6 insertions, 10 deletions

diff --git a/vcl/inc/PhysicalFontCollection.hxx b/vcl/inc/PhysicalFontCollection.hxx
index e2d78d999c53..1625a358f2af 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;
 
-    PreMatchFontSubstititution* mpPreMatchHook;       // device specific prematch substitution
+    ImplPreMatchFontSubstitution* 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( PreMatchFontSubstititution* );
+    void                    SetPreMatchHook( ImplPreMatchFontSubstitution* );
     void                    SetFallbackHook( ImplGlyphFallbackFontSubstitution* );
 
     // misc utilities
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
diff --git a/vcl/inc/outfont.hxx b/vcl/inc/outfont.hxx
index 860f76779d8b..2b56acd4fdea 100644
--- a/vcl/inc/outfont.hxx
+++ b/vcl/inc/outfont.hxx
@@ -37,7 +37,7 @@ class ImplGetDevFontList;
 class ImplGetDevSizeList;
 class ImplFontEntry;
 class ImplFontCache;
-class PreMatchFontSubstititution;
+class ImplPreMatchFontSubstitution;
 class ImplGlyphFallbackFontSubstitution;
 class FontSelectPattern;
 namespace vcl { class Font; }