vcl: rename Font::GetFamily to Font::GetFamilyType

Change-Id: Ie427a43bd126dcdd89c6f66582736e67130f2254
Reviewed-on: https://gerrit.libreoffice.org/21633
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Tested-by: Chris Sherlock <chris.sherlock79@gmail.com>

5 files changed, 6 insertions, 6 deletions

diff --git a/vcl/source/components/fontident.cxx b/vcl/source/components/fontident.cxx
index bbf3b5f63624..10acf82a32a4 100644
--- a/vcl/source/components/fontident.cxx
+++ b/vcl/source/components/fontident.cxx
@@ -105,7 +105,7 @@ Any SAL_CALL FontIdentificator::getMaterial() throw(RuntimeException, std::excep
     aFD.Kerning             = false;
     aFD.WordLineMode        = false;
     aFD.Type                = 0;
-    switch( m_aFont.GetFamily() )
+    switch( m_aFont.GetFamilyType() )
     {
     case FAMILY_DECORATIVE: aFD.Family = css::awt::FontFamily::DECORATIVE;break;
     case FAMILY_MODERN: aFD.Family = css::awt::FontFamily::MODERN;break;
diff --git a/vcl/source/filter/wmf/emfwr.cxx b/vcl/source/filter/wmf/emfwr.cxx
index f583729c0b11..4785f3660cfa 100644
--- a/vcl/source/filter/wmf/emfwr.cxx
+++ b/vcl/source/filter/wmf/emfwr.cxx
@@ -544,7 +544,7 @@ void EMFWriter::ImplCheckTextAttr()
             default:             nPitchAndFamily = 0x00; break;
         }
 
-        switch( rFont.GetFamily() )
+        switch( rFont.GetFamilyType() )
         {
             case FAMILY_DECORATIVE: nPitchAndFamily |= 0x50; break;
             case FAMILY_MODERN:     nPitchAndFamily |= 0x30; break;
diff --git a/vcl/source/filter/wmf/wmfwr.cxx b/vcl/source/filter/wmf/wmfwr.cxx
index 816e536cab37..aa873e311d78 100644
--- a/vcl/source/filter/wmf/wmfwr.cxx
+++ b/vcl/source/filter/wmf/wmfwr.cxx
@@ -349,7 +349,7 @@ void WMFWriter::WMFRecord_CreateFontIndirect(const vcl::Font & rFont)
         case PITCH_VARIABLE: nPitchFamily=W_VARIABLE_PITCH; break;
         default:             nPitchFamily=W_DEFAULT_PITCH;
     }
-    switch (rFont.GetFamily()) {
+    switch (rFont.GetFamilyType()) {
         case FAMILY_DECORATIVE: nPitchFamily|=W_FF_DECORATIVE; break;
         case FAMILY_MODERN:     nPitchFamily|=W_FF_MODERN;     break;
         case FAMILY_ROMAN:      nPitchFamily|=W_FF_ROMAN;      break;
diff --git a/vcl/source/font/font.cxx b/vcl/source/font/font.cxx
index 6022ebb35978..ad38744ac358 100644
--- a/vcl/source/font/font.cxx
+++ b/vcl/source/font/font.cxx
@@ -800,13 +800,13 @@ FontPitch Font::GetPitch() { return mpImplFont->GetPitch(); }
 FontWeight Font::GetWeight() { return mpImplFont->GetWeight(); }
 FontWidth Font::GetWidthType() { return mpImplFont->GetWidthType(); }
 FontItalic Font::GetItalic() { return mpImplFont->GetItalic(); }
-FontFamily Font::GetFamily() { return mpImplFont->GetFamily(); }
+FontFamily Font::GetFamilyType() { return mpImplFont->GetFamily(); }
 
 FontPitch Font::GetPitch() const { return mpImplFont->GetPitchNoAsk(); }
 FontWeight Font::GetWeight() const { return mpImplFont->GetWeightNoAsk(); }
 FontWidth Font::GetWidthType() const { return mpImplFont->GetWidthTypeNoAsk(); }
 FontItalic Font::GetItalic() const { return mpImplFont->GetItalicNoAsk(); }
-FontFamily Font::GetFamily() const { return mpImplFont->GetFamilyNoAsk(); }
+FontFamily Font::GetFamilyType() const { return mpImplFont->GetFamilyNoAsk(); }
 
 int Font::GetQuality() const { return mpImplFont->GetQuality(); }
 void Font::SetQuality( int nQuality ) { mpImplFont->SetQuality( nQuality ); }
diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx
index c561a3954bfa..1df3d78a74f4 100644
--- a/vcl/source/gdi/cvtsvm.cxx
+++ b/vcl/source/gdi/cvtsvm.cxx
@@ -246,7 +246,7 @@ void ImplWriteFont( SvStream& rOStm, const vcl::Font& rFont,
     rOStm.WriteInt16( 0 ); // no character orientation anymore
     rOStm.WriteInt16( rFont.GetOrientation() );
     rOStm.WriteInt16( rActualCharSet );
-    rOStm.WriteInt16( rFont.GetFamily() );
+    rOStm.WriteInt16( rFont.GetFamilyType() );
     rOStm.WriteInt16( rFont.GetPitch() );
     rOStm.WriteInt16( rFont.GetAlign() );
     rOStm.WriteInt16( nWeight );