[Libreoffice-commits] core.git: vcl/inc vcl/source

[Chris Sherlock]

 vcl/inc/PhysicalFontFamily.hxx         |    4 ++--
 vcl/source/font/PhysicalFontFamily.cxx |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 1a263563f5ba84e05f336ac035524f6eb014594e
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Sun Dec 27 00:40:30 2015 +1100

    vcl: change PhysicaFontFamily::maName to maFamilyName
    
    Change-Id: I505ae4509c96fe3a93e5ac5e3d7718941b2faa0c

diff --git a/vcl/inc/PhysicalFontFamily.hxx b/vcl/inc/PhysicalFontFamily.hxx
index b3ba21b..e945406 100644
--- a/vcl/inc/PhysicalFontFamily.hxx
+++ b/vcl/inc/PhysicalFontFamily.hxx
@@ -45,7 +45,7 @@ public:
                         PhysicalFontFamily( const OUString& rSearchName );
                        ~PhysicalFontFamily();
 
-    const OUString&     GetFamilyName() const    { return maName; }
+    const OUString&     GetFamilyName() const    { return maFamilyName; }
     const OUString&     GetSearchName() const    { return maSearchName; }
     const OUString&     GetAliasNames() const    { return maMapNames; }
     const OUString&     GetMatchFamilyName() const { return maMatchFamilyName; }
@@ -71,7 +71,7 @@ static void             CalcType( ImplFontAttrs& rType, FontWeight& rWeight, Fon
 private:
     std::vector< PhysicalFontFace* > maFontFaces;
 
-    OUString            maName;             // Fontname (original font family name)
+    OUString            maFamilyName;       // original font family name
     OUString            maSearchName;       // normalized font family name
     OUString            maMapNames;         // fontname aliases
     int                 mnTypeFaces;        // Typeface Flags
diff --git a/vcl/source/font/PhysicalFontFamily.cxx b/vcl/source/font/PhysicalFontFamily.cxx
index c58f38b..9ee2def 100644
--- a/vcl/source/font/PhysicalFontFamily.cxx
+++ b/vcl/source/font/PhysicalFontFamily.cxx
@@ -115,7 +115,7 @@ bool PhysicalFontFamily::AddFontFace( PhysicalFontFace* pNewFontFace )
 {
     if( maFontFaces.empty() )
     {
-        maName         = pNewFontFace->GetFamilyName();
+        maFamilyName   = pNewFontFace->GetFamilyName();
         maMapNames     = pNewFontFace->maMapNames;
         meFamily       = pNewFontFace->GetFamilyType();
         mePitch        = pNewFontFace->GetPitch();
@@ -206,7 +206,7 @@ void PhysicalFontFamily::InitMatchData( const utl::FontSubstConfiguration& rFont
         if( aShortName != rSearchName )
             pFontAttr = rFontSubst.getSubstInfo( aShortName );
     CalcType( mnMatchType, meMatchWeight, meMatchWidth, meFamily, pFontAttr );
-    mnMatchType |= lcl_IsCJKFont( maName );
+    mnMatchType |= lcl_IsCJKFont( maFamilyName );
 }
 
 PhysicalFontFace* PhysicalFontFamily::FindBestFontFace( const FontSelectPattern& rFSD ) const