vcl: rename Font::GetName to Font::GetFamilyName

Reviewed-on: https://gerrit.libreoffice.org/21529
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
(cherry picked from commit 28c96fc2553a5c3dee108f1e2060d7bc081a7e7e)

Change-Id: Ie20871a3078bf875c1782b7761d60591a9c9704f

5 files changed, 14 insertions, 14 deletions

diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx
index bd38ef5a1af4..8249bf42e76d 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -355,7 +355,7 @@ void Writer::setClipping( const tools::PolyPolygon* pClipPolyPolygon )
 //  that we care about.
 bool compare_fonts_for_me(const vcl::Font& rFont1, const vcl::Font& rFont2)
 {
-    return rFont1.GetName() == rFont2.GetName() &&
+    return rFont1.GetFamilyName() == rFont2.GetFamilyName() &&
             rFont1.GetWeight() == rFont2.GetWeight() &&
             rFont1.GetItalic() == rFont2.GetItalic() &&
             rFont1.IsOutline() == rFont2.IsOutline() &&
diff --git a/filter/source/graphicfilter/eos2met/eos2met.cxx b/filter/source/graphicfilter/eos2met/eos2met.cxx
index 96e1137558de..36295b70902e 100644
--- a/filter/source/graphicfilter/eos2met/eos2met.cxx
+++ b/filter/source/graphicfilter/eos2met/eos2met.cxx
@@ -430,7 +430,7 @@ void METWriter::CreateChrSet(const vcl::Font & rFont)
         pCS = new METChrSet;
         pCS->pSucc = pChrSetList; pChrSetList=pCS;
         pCS->nSet = nNextChrSetId++;
-        pCS->aName = rFont.GetName();
+        pCS->aName = rFont.GetFamilyName();
         pCS->eWeight = rFont.GetWeight();
     }
 }
@@ -442,7 +442,7 @@ sal_uInt8 METWriter::FindChrSet(const vcl::Font & rFont)
 
     for (pCS=pChrSetList; pCS!=nullptr; pCS=pCS->pSucc)
     {
-        if (pCS->aName==rFont.GetName() && pCS->eWeight==rFont.GetWeight() )
+        if (pCS->aName==rFont.GetFamilyName() && pCS->eWeight==rFont.GetWeight() )
             return pCS->nSet;
     }
 
diff --git a/filter/source/graphicfilter/epict/epict.cxx b/filter/source/graphicfilter/epict/epict.cxx
index 5000ae76c93b..edf5d060fb6e 100644
--- a/filter/source/graphicfilter/epict/epict.cxx
+++ b/filter/source/graphicfilter/epict/epict.cxx
@@ -687,20 +687,20 @@ void PictWriter::WriteOpcode_FontName(const vcl::Font & rFont)
         default:                nFontId=1;
     }
 
-    if (!bDstFontNameValid || nDstFontNameId!=nFontId || aDstFontName!=rFont.GetName())
+    if (!bDstFontNameValid || nDstFontNameId!=nFontId || aDstFontName!=rFont.GetFamilyName())
     {
-        OString aString(OUStringToOString(rFont.GetName(), osl_getThreadTextEncoding()));
+        OString aString(OUStringToOString(rFont.GetFamilyName(), osl_getThreadTextEncoding()));
         sal_uInt16 nFontNameLen = aString.getLength();
         if ( nFontNameLen )
         {
             nDataLen = 3 + nFontNameLen;
             pPict->WriteUInt16( 0x002c ).WriteUInt16( nDataLen ).WriteUInt16( nFontId );
-            WriteString( rFont.GetName() );
+            WriteString( rFont.GetFamilyName() );
             if ( ( nFontNameLen & 1 ) == 0 )
                 pPict->WriteUChar( 0 );
         }
         pPict->WriteUInt16( 0x0003 ).WriteUInt16( nFontId );
-        aDstFontName=rFont.GetName();
+        aDstFontName=rFont.GetFamilyName();
         nDstFontNameId=nFontId;
         bDstFontNameValid=true;
     }
diff --git a/filter/source/svg/svgfontexport.cxx b/filter/source/svg/svgfontexport.cxx
index 2d62da72117b..823f0e9bf6e5 100644
--- a/filter/source/svg/svgfontexport.cxx
+++ b/filter/source/svg/svgfontexport.cxx
@@ -53,7 +53,7 @@ SVGFontExport::GlyphSet& SVGFontExport::implGetGlyphSet( const vcl::Font& rFont
 {
     FontWeight      eWeight( WEIGHT_NORMAL );
     FontItalic      eItalic( ITALIC_NONE );
-    OUString aFontName( rFont.GetName() );
+    OUString aFontName( rFont.GetFamilyName() );
     sal_Int32       nNextTokenPos( 0 );
 
     switch( rFont.GetWeight() )
@@ -222,7 +222,7 @@ void SVGFontExport::implEmbedFont( const vcl::Font& rFont )
                     else
                         aFontStyle = "normal";
 
-                    mrExport.AddAttribute( XML_NAMESPACE_NONE, "font-family", GetMappedFontName( rFont.GetName() ) );
+                    mrExport.AddAttribute( XML_NAMESPACE_NONE, "font-family", GetMappedFontName( rFont.GetFamilyName() ) );
                     mrExport.AddAttribute( XML_NAMESPACE_NONE, "units-per-em", aUnitsPerEM );
                     mrExport.AddAttribute( XML_NAMESPACE_NONE, "font-weight", aFontWeight );
                     mrExport.AddAttribute( XML_NAMESPACE_NONE, "font-style", aFontStyle );
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 1f433540694b..3ca0618ebc16 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -440,12 +440,12 @@ void SVGAttributeWriter::setFontFamily()
 
     if( mrExport.IsUsePositionedCharacters() )
     {
-        mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrFontFamily, mrFontExport.GetMappedFontName( rCurFont.GetName() ) );
+        mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrFontFamily, mrFontExport.GetMappedFontName( rCurFont.GetFamilyName() ) );
     }
     else
     {
         sal_Int32       nNextTokenPos( 0 );
-        const OUString& rsFontName = rCurFont.GetName();
+        const OUString& rsFontName = rCurFont.GetFamilyName();
         OUString sFontFamily( rsFontName.getToken( 0, ';', nNextTokenPos ) );
         FontPitch ePitch = rCurFont.GetPitch();
         if( ePitch == PITCH_FIXED )
@@ -792,12 +792,12 @@ void SVGTextWriter::addFontAttributes( bool bIsTextContainer )
 
     if( maCurrentFont !=  maParentFont )
     {
-        const OUString& rsCurFontName               = maCurrentFont.GetName();
+        const OUString& rsCurFontName               = maCurrentFont.GetFamilyName();
         long int nCurFontSize                       = maCurrentFont.GetHeight();
         FontItalic eCurFontItalic                   = maCurrentFont.GetItalic();
         FontWeight eCurFontWeight                   = maCurrentFont.GetWeight();
 
-        const OUString& rsParFontName               = maParentFont.GetName();
+        const OUString& rsParFontName               = maParentFont.GetFamilyName();
         long int nParFontSize                       = maParentFont.GetHeight();
         FontItalic eParFontItalic                   = maParentFont.GetItalic();
         FontWeight eParFontWeight                   = maParentFont.GetWeight();
@@ -903,7 +903,7 @@ void SVGTextWriter::addFontAttributes( bool bIsTextContainer )
 void SVGTextWriter::implSetFontFamily()
 {
     sal_Int32       nNextTokenPos( 0 );
-    const OUString& rsFontName = maCurrentFont.GetName();
+    const OUString& rsFontName = maCurrentFont.GetFamilyName();
     OUString sFontFamily( rsFontName.getToken( 0, ';', nNextTokenPos ) );
     FontPitch ePitch = maCurrentFont.GetPitch();
     if( ePitch == PITCH_FIXED )