loplugin:mergeclasses

Change-Id: I9f56beebae1ea02a8914b7b25fe7565f7b0df053

7 files changed, 15 insertions, 26 deletions

diff --git a/compilerplugins/clang/mergeclasses.py b/compilerplugins/clang/mergeclasses.py
index 07b68f320f28..ebeb17e76819 100755
--- a/compilerplugins/clang/mergeclasses.py
+++ b/compilerplugins/clang/mergeclasses.py
@@ -66,7 +66,7 @@ for clazz in sorted(definitionSet - instantiatedSet):
     if clazz.find("mutex") != -1 or clazz.find("Mutex") != -1:
         continue
     otherclazz = next(iter(parentChildDict[clazz]))
-   # exclude combinations that span modules because we often use those to make cross-module dependencies more manageable.
+    # exclude combinations that span modules because we often use those to make cross-module dependencies more manageable.
     if extractModuleName(clazz) != extractModuleName(otherclazz):
         continue
     print "merge", clazz, "with", otherclazz
diff --git a/compilerplugins/clang/mergeclasses.results b/compilerplugins/clang/mergeclasses.results
index a92afb513002..e4d910d4ba3b 100644
--- a/compilerplugins/clang/mergeclasses.results
+++ b/compilerplugins/clang/mergeclasses.results
@@ -46,8 +46,6 @@ merge ISwFrameControl with SwFrameMenuButtonBase
 merge IXFAttrList with XFSaxAttrList
 merge IXFStream with XFSaxStream
 merge IXFStyle with XFStyle
-merge ImplGlyphFallbackFontSubstitution with FcGlyphFallbackSubstititution
-merge ImplPreMatchFontSubstitution with FcPreMatchSubstititution
 merge LwpDLList with LwpParaProperty
 merge LwpDLVListHead with LwpPropList
 merge OldBasicPassword with basic::SfxScriptLibraryContainer
diff --git a/vcl/generic/fontmanager/fontsubst.cxx b/vcl/generic/fontmanager/fontsubst.cxx
index c84b7ddbe4b1..26e502cce05b 100644
--- a/vcl/generic/fontmanager/fontsubst.cxx
+++ b/vcl/generic/fontmanager/fontsubst.cxx
@@ -35,19 +35,6 @@
 #include <unotools/fontdefs.hxx>
 #include <list>
 
-// platform specific font substitution hooks
-
-class FcPreMatchSubstititution
-:   public ImplPreMatchFontSubstitution
-{
-public:
-    bool FindFontSubstitute( FontSelectPattern& ) const SAL_OVERRIDE;
-    typedef ::std::pair<FontSelectPatternAttributes, FontSelectPatternAttributes> value_type;
-private:
-    typedef ::std::list<value_type> CachedFontMapType;
-    mutable CachedFontMapType maCachedFontMap;
-};
-
 class FcGlyphFallbackSubstititution
 :    public ImplGlyphFallbackFontSubstitution
 {
@@ -95,7 +82,7 @@ void SalGenericInstance::RegisterFontSubstitutors( PhysicalFontCollection* pFont
     // register font fallback substitutions (unless disabled by bit0)
     if( (nDisableBits & 1) == 0 )
     {
-        static FcPreMatchSubstititution aSubstPreMatch;
+        static PreMatchFontSubstititution aSubstPreMatch;
         pFontCollection->SetPreMatchHook( &aSubstPreMatch );
     }
 
@@ -138,12 +125,12 @@ namespace
             : mrAttributes(rAttributes)
         {
         }
-        bool operator()(const FcPreMatchSubstititution::value_type& rOther) const
+        bool operator()(const PreMatchFontSubstititution::value_type& rOther) const
             { return rOther.first == mrAttributes; }
     };
 }
 
-bool FcPreMatchSubstititution::FindFontSubstitute( FontSelectPattern &rFontSelData ) const
+bool PreMatchFontSubstititution::FindFontSubstitute( FontSelectPattern &rFontSelData ) const
 {
     // We don't actually want to talk to Fontconfig at all for symbol fonts
     if( rFontSelData.IsSymbolFont() )
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; }
diff --git a/vcl/source/font/PhysicalFontCollection.cxx b/vcl/source/font/PhysicalFontCollection.cxx
index cd89bdf0e6a1..9f01fe2291e0 100644
--- a/vcl/source/font/PhysicalFontCollection.cxx
+++ b/vcl/source/font/PhysicalFontCollection.cxx
@@ -84,7 +84,7 @@ PhysicalFontCollection::~PhysicalFontCollection()
     Clear();
 }
 
-void PhysicalFontCollection::SetPreMatchHook( ImplPreMatchFontSubstitution* pHook )
+void PhysicalFontCollection::SetPreMatchHook( PreMatchFontSubstititution* pHook )
 {
     mpPreMatchHook = pHook;
 }