commit a27fac3b8f2bae18f62bab315051732df1bb29ab
author Chris Sherlock <chris.sherlock79@gmail.com> Fri Jan 01 14:41:51 2016 +1100
committer Chris Sherlock <chris.sherlock79@gmail.com> Fri Jan 01 14:45:49 2016 +1100
tree a4608726d951a3ef4cbde2dee20cee4a56c70039
parent e9598378b55cc05c95bd3f410c396bd44a74341d

vcl: %s/Fc\(.*\)Substititution/Fc\1Substitution/g (thanks vim regexps!)

Change-Id: Ic56ed5b33f2a00bda27779b7b7450b95a1dfb14b

vcl/generic/fontmanager/fontsubst.cxx

diff --git a/vcl/generic/fontmanager/fontsubst.cxx b/vcl/generic/fontmanager/fontsubst.cxx
index c0b76e1..309cb18 100644
--- a/vcl/generic/fontmanager/fontsubst.cxx
+++ b/vcl/generic/fontmanager/fontsubst.cxx
@@ -37,7 +37,7 @@

// platform specific font substitution hooks

class FcPreMatchSubstititution
class FcPreMatchSubstitution
:   public ImplPreMatchFontSubstitution
{
public:
@@ -48,7 +48,7 @@ private:
    mutable CachedFontMapType maCachedFontMap;
};

class FcGlyphFallbackSubstititution
class FcGlyphFallbackSubstitution
:    public ImplGlyphFallbackFontSubstitution
{
    // TODO: add a cache
@@ -95,14 +95,14 @@ void SalGenericInstance::RegisterFontSubstitutors( PhysicalFontCollection* pFont
    // register font fallback substitutions (unless disabled by bit0)
    if( (nDisableBits & 1) == 0 )
    {
        static FcPreMatchSubstititution aSubstPreMatch;
        static FcPreMatchSubstitution aSubstPreMatch;
        pFontCollection->SetPreMatchHook( &aSubstPreMatch );
    }

    // register glyph fallback substitutions (unless disabled by bit1)
    if( (nDisableBits & 2) == 0 )
    {
        static FcGlyphFallbackSubstititution aSubstFallback;
        static FcGlyphFallbackSubstitution aSubstFallback;
        pFontCollection->SetFallbackHook( &aSubstFallback );
    }
}
@@ -138,12 +138,12 @@ namespace
            : mrAttributes(rAttributes)
        {
        }
        bool operator()(const FcPreMatchSubstititution::value_type& rOther) const
        bool operator()(const FcPreMatchSubstitution::value_type& rOther) const
            { return rOther.first == mrAttributes; }
    };
}

bool FcPreMatchSubstititution::FindFontSubstitute( FontSelectPattern &rFontSelData ) const
bool FcPreMatchSubstitution::FindFontSubstitute( FontSelectPattern &rFontSelData ) const
{
    // We don't actually want to talk to Fontconfig at all for symbol fonts
    if( rFontSelData.IsSymbolFont() )
@@ -185,7 +185,7 @@ bool FcPreMatchSubstititution::FindFontSubstitute( FontSelectPattern &rFontSelDa
        RTL_TEXTENCODING_UTF8));
    const OString aSubstName(OUStringToOString(aOut.maSearchName,
        RTL_TEXTENCODING_UTF8));
    printf( "FcPreMatchSubstititution \"%s\" bipw=%d%d%d%d -> ",
    printf( "FcPreMatchSubstitution \"%s\" bipw=%d%d%d%d -> ",
        aOrigName.getStr(), rFontSelData.GetWeight(), rFontSelData.GetSlant(),
        rFontSelData.GetPitch(), rFontSelData.GetWidthType() );
    if( !bHaveSubstitute )
@@ -208,7 +208,7 @@ bool FcPreMatchSubstititution::FindFontSubstitute( FontSelectPattern &rFontSelDa
    return bHaveSubstitute;
}

bool FcGlyphFallbackSubstititution::FindFontSubstitute( FontSelectPattern& rFontSelData,
bool FcGlyphFallbackSubstitution::FindFontSubstitute( FontSelectPattern& rFontSelData,
    OUString& rMissingCodes ) const
{
    // We don't actually want to talk to Fontconfig at all for symbol fonts
@@ -233,7 +233,7 @@ bool FcGlyphFallbackSubstititution::FindFontSubstitute( FontSelectPattern& rFont
        RTL_TEXTENCODING_UTF8));
    const OString aSubstName(OUStringToOString(aOut.maSearchName,
        RTL_TEXTENCODING_UTF8));
    printf( "FcGFSubstititution \"%s\" bipw=%d%d%d%d ->",
    printf( "FcGFSubstitution \"%s\" bipw=%d%d%d%d ->",
        aOrigName.getStr(), rFontSelData.GetWeight(), rFontSelData.GetSlant(),
        rFontSelData.GetPitch(), rFontSelData.GetWidthType() );
    if( !bHaveSubstitute )