revert vcl patch series that brok Mac and Windows

revert:
9bc2f3de8672e812f3a67541c6d7069b434a7e42
vcl: add comment about ImplFontMetric::{Get|Set}LineHeight()
26371f105bc44e04469ec03fc5bb12505e651c6b
vcl: FontAttributes::GetSlantType() -> FontAttributes::GetItalic()
2dd0b4317372b8022efe3911b38b4fa02956d8b9
vcl: font.hxx and metric.hxx cleanup, make ctors explicit and the dtor virtual
5ab13bf3ead3539e4ad847656da81e7eb6029652
vcl: tabify font.hxx
f99550dae55e40e49bf9c9875053fe2abb4c71ca
vcl: change Font::SetName() to Font::SetFamilyName()
2b297116cb6bb1061c43e5714e2609c8ee9f57d2
vcl: rename Font::GetName to Font::GetFamilyName

Change-Id: I23f38921187d66b970ca815eb30dda4222a2da62

7 files changed, 19 insertions, 19 deletions

diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx
index 24f626d3fd48..d6c91b76cb8a 100644
--- a/starmath/source/cfgitem.cxx
+++ b/starmath/source/cfgitem.cxx
@@ -160,7 +160,7 @@ SmFontFormat::SmFontFormat()
 
 SmFontFormat::SmFontFormat( const vcl::Font &rFont )
 {
-    aName       = rFont.GetFamilyName();
+    aName       = rFont.GetName();
     nCharSet    = (sal_Int16) rFont.GetCharSet();
     nFamily     = (sal_Int16) rFont.GetFamily();
     nPitch      = (sal_Int16) rFont.GetPitch();
@@ -172,7 +172,7 @@ SmFontFormat::SmFontFormat( const vcl::Font &rFont )
 const vcl::Font SmFontFormat::GetFont() const
 {
     vcl::Font aRes;
-    aRes.SetFamilyName( aName );
+    aRes.SetName( aName );
     aRes.SetCharSet( (rtl_TextEncoding) nCharSet );
     aRes.SetFamily( (FontFamily) nFamily );
     aRes.SetPitch( (FontPitch) nPitch );
@@ -881,7 +881,7 @@ void SmMathConfig::LoadFormat()
                 if (bUseDefaultFont)
                 {
                     aFnt = pFormat->GetFont( i );
-                    aFnt.SetFamilyName( GetDefaultFontName( nLang, i ) );
+                    aFnt.SetName( GetDefaultFontName( nLang, i ) );
                 }
                 else
                 {
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index b6e95594c612..852bc1b564ef 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -271,7 +271,7 @@ void SmShowFont::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRec
     rRenderContext.SetFont(aFont);
     rRenderContext.SetTextColor(aTextColor);
 
-    OUString sText(rRenderContext.GetFont().GetFamilyName());
+    OUString sText(rRenderContext.GetFont().GetName());
     Size aTextSize(rRenderContext.GetTextWidth(sText), rRenderContext.GetTextHeight());
 
     rRenderContext.DrawText(Point((rRenderContext.GetOutputSize().Width()  - aTextSize.Width())  / 2,
@@ -302,7 +302,7 @@ void SmShowFont::SetFont(const vcl::Font& rFont)
 
 IMPL_LINK_TYPED( SmFontDialog, FontSelectHdl, ComboBox&, rComboBox, void )
 {
-    maFont.SetFamilyName(rComboBox.GetText());
+    maFont.SetName(rComboBox.GetText());
     m_pShowFont->SetFont(maFont);
 }
 
@@ -336,7 +336,7 @@ void SmFontDialog::SetFont(const vcl::Font &rFont)
 {
     maFont = rFont;
 
-    m_pFontBox->SetText(maFont.GetFamilyName());
+    m_pFontBox->SetText(maFont.GetName());
     m_pBoldCheckBox->Check(IsBold(maFont));
     m_pItalicCheckBox->Check(IsItalic(maFont));
     m_pShowFont->SetFont(maFont);
@@ -360,7 +360,7 @@ SmFontDialog::SmFontDialog(vcl::Window * pParent, OutputDevice *pFntListDevice,
         sal_uInt16  nCount = aFontList.GetFontNameCount();
         for (sal_uInt16 i = 0;  i < nCount; ++i)
         {
-            m_pFontBox->InsertEntry( aFontList.GetFontName(i).GetFamilyName() );
+            m_pFontBox->InsertEntry( aFontList.GetFontName(i).GetName() );
         }
         maFont.SetSize(Size(0, 24));
         maFont.SetWeight(WEIGHT_NORMAL);
@@ -1758,7 +1758,7 @@ void SmSymDefineDialog::FillFonts(bool bDelete)
     {
         sal_uInt16  nCount = pFontList->GetFontNameCount();
         for (sal_uInt16 i = 0;  i < nCount;  i++)
-            pFonts->InsertEntry( pFontList->GetFontName(i).GetFamilyName() );
+            pFonts->InsertEntry( pFontList->GetFontName(i).GetName() );
     }
 }
 
@@ -2018,7 +2018,7 @@ void SmSymDefineDialog::UpdateButtons()
                     && aTmpSymbolSetName.equalsIgnoreAsciiCase(pOldSymbolSetName->GetText())
                     && aTmpSymbolName.equals(pOrigSymbol->GetName())
                     && pFonts->GetSelectEntry().equalsIgnoreAsciiCase(
-                            pOrigSymbol->GetFace().GetFamilyName())
+                            pOrigSymbol->GetFace().GetName())
                     && pStyles->GetText().equalsIgnoreAsciiCase(
                             GetFontStyles().GetStyleName(pOrigSymbol->GetFace()))
                     && pCharsetDisplay->GetSelectCharacter() == pOrigSymbol->GetCharacter();
@@ -2281,7 +2281,7 @@ bool SmSymDefineDialog::SelectSymbol(ComboBox &rComboBox,
             {
                 // choose font and style accordingly
                 const vcl::Font &rFont = pSymbol->GetFace();
-                SelectFont(rFont.GetFamilyName(), false);
+                SelectFont(rFont.GetName(), false);
                 SelectStyle(GetFontStyles().GetStyleName(rFont), false);
 
                 // Since setting the Font via the Style name of the SymbolFonts doesn't
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index 53f33fdf39b2..41c6d6cd1bcf 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -336,7 +336,7 @@ void SetEditEngineDefaultFonts(SfxItemPool &rEditEngineItemPool)
             vcl::Font aFont = OutputDevice::GetDefaultFont(
                         rFntDta.nFontType, nLang, GetDefaultFontFlags::OnlyOne );
             rEditEngineItemPool.SetPoolDefaultItem(
-                    SvxFontItem( aFont.GetFamily(), aFont.GetFamilyName(),
+                    SvxFontItem( aFont.GetFamily(), aFont.GetName(),
                         aFont.GetStyleName(), aFont.GetPitch(), aFont.GetCharSet(),
                         rFntDta.nFontInfoId ) );
         }
diff --git a/starmath/source/format.cxx b/starmath/source/format.cxx
index c1917dabb61f..94222820af1d 100644
--- a/starmath/source/format.cxx
+++ b/starmath/source/format.cxx
@@ -89,7 +89,7 @@ OUString GetDefaultFontName( LanguageType nLang, sal_uInt16 nIdent )
 
         return OutputDevice::GetDefaultFont(
                         pTable[ nIdent ], nLang,
-                        GetDefaultFontFlags::OnlyOne ).GetFamilyName();
+                        GetDefaultFontFlags::OnlyOne ).GetName();
     }
 }
 
diff --git a/starmath/source/rect.cxx b/starmath/source/rect.cxx
index ebacd2cc27b7..7e430252a14f 100644
--- a/starmath/source/rect.cxx
+++ b/starmath/source/rect.cxx
@@ -133,7 +133,7 @@ void SmRect::BuildRect(const OutputDevice &rDev, const SmFormat *pFormat,
     aSize = Size(rDev.GetTextWidth(rText), rDev.GetTextHeight());
 
     const FontMetric  aFM (rDev.GetFontMetric());
-    bool              bIsMath  = aFM.GetFamilyName().equalsIgnoreAsciiCase( FONTNAME_MATH );
+    bool              bIsMath  = aFM.GetName().equalsIgnoreAsciiCase( FONTNAME_MATH );
     bool              bAllowSmaller = bIsMath && !SmIsMathAlpha(rText);
     const long        nFontHeight = rDev.GetFont().GetSize().Height();
 
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index d0c7d79a2775..2c19f8a28e85 100644
--- a/starmath/source/unomodel.cxx
+++ b/starmath/source/unomodel.cxx
@@ -454,7 +454,7 @@ void SmModel::_setPropertyValues(const PropertyMapEntry** ppEntries, const Any*
                 if(sFontName.isEmpty())
                     throw IllegalArgumentException();
 
-                if(OUString(aFormat.GetFont((*ppEntries)->mnMemberId).GetFamilyName()) != sFontName)
+                if(OUString(aFormat.GetFont((*ppEntries)->mnMemberId).GetName()) != sFontName)
                 {
                     const SmFace rOld = aFormat.GetFont((*ppEntries)->mnMemberId);
 
@@ -661,7 +661,7 @@ void SmModel::_setPropertyValues(const PropertyMapEntry** ppEntries, const Any*
                     for (sal_uInt32 i = 0; i < nSize ; i++, pDescriptor++)
                     {
                         vcl::Font aFont;
-                        aFont.SetFamilyName ( pDescriptor->sFontName );
+                        aFont.SetName ( pDescriptor->sFontName );
                         aFont.SetCharSet ( static_cast < rtl_TextEncoding > (pDescriptor->nCharSet) );
                         aFont.SetFamily ( static_cast < FontFamily > (pDescriptor->nFamily ) );
                         aFont.SetPitch  ( static_cast < FontPitch >  (pDescriptor->nPitch ) );
@@ -727,7 +727,7 @@ void SmModel::_getPropertyValues( const PropertyMapEntry **ppEntries, Any *pValu
             case HANDLE_CUSTOM_FONT_NAME_FIXED             :
             {
                 const SmFace &  rFace = aFormat.GetFont((*ppEntries)->mnMemberId);
-                *pValue <<= OUString(rFace.GetFamilyName());
+                *pValue <<= OUString(rFace.GetName());
             }
             break;
             case HANDLE_CUSTOM_FONT_FIXED_POSTURE:
@@ -879,7 +879,7 @@ void SmModel::_getPropertyValues( const PropertyMapEntry **ppEntries, Any *pValu
                     pDescriptor->nCharacter = static_cast < sal_Int32 > ((*aIter)->GetCharacter());
 
                     vcl::Font rFont = (*aIter)->GetFace();
-                    pDescriptor->sFontName = rFont.GetFamilyName();
+                    pDescriptor->sFontName = rFont.GetName();
                     pDescriptor->nCharSet  = sal::static_int_cast< sal_Int16 >(rFont.GetCharSet());
                     pDescriptor->nFamily   = sal::static_int_cast< sal_Int16 >(rFont.GetFamily());
                     pDescriptor->nPitch    = sal::static_int_cast< sal_Int16 >(rFont.GetPitch());
diff --git a/starmath/source/utility.cxx b/starmath/source/utility.cxx
index cfb4917881e3..f66c385dc72d 100644
--- a/starmath/source/utility.cxx
+++ b/starmath/source/utility.cxx
@@ -73,7 +73,7 @@ vcl::Font SmFontPickList::Get(sal_uInt16 nPos) const
 
 bool SmFontPickList::CompareItem(const vcl::Font & rFirstFont, const vcl::Font & rSecondFont)
 {
-  return rFirstFont.GetFamilyName() == rSecondFont.GetFamilyName() &&
+  return rFirstFont.GetName() == rSecondFont.GetName() &&
         rFirstFont.GetFamily()  == rSecondFont.GetFamily()  &&
         rFirstFont.GetCharSet() == rSecondFont.GetCharSet() &&
         rFirstFont.GetWeight()  == rSecondFont.GetWeight()  &&
@@ -82,7 +82,7 @@ bool SmFontPickList::CompareItem(const vcl::Font & rFirstFont, const vcl::Font &
 
 OUString SmFontPickList::GetStringItem(const vcl::Font &rFont)
 {
-    OUStringBuffer aString(rFont.GetFamilyName());
+    OUStringBuffer aString(rFont.GetName());
 
     if (IsItalic( rFont ))
     {