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

8 files changed, 23 insertions, 23 deletions

diff --git a/sw/source/uibase/app/docshini.cxx b/sw/source/uibase/app/docshini.cxx
index 448986570fb5..2844b23cde5b 100644
--- a/sw/source/uibase/app/docshini.cxx
+++ b/sw/source/uibase/app/docshini.cxx
@@ -196,7 +196,7 @@ bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor )
                     aFont = pPrt->GetFontMetric( aFont );
                 }
 
-                pFontItem.reset(new SvxFontItem(aFont.GetFamily(), aFont.GetFamilyName(),
+                pFontItem.reset(new SvxFontItem(aFont.GetFamily(), aFont.GetName(),
                                                 aEmptyOUStr, aFont.GetPitch(), aFont.GetCharSet(), nFontWhich));
             }
             else
@@ -213,7 +213,7 @@ bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor )
                     nFontTypes[i],
                     eLanguage,
                     GetDefaultFontFlags::OnlyOne );
-                pFontItem.reset(new SvxFontItem(aLangDefFont.GetFamily(), aLangDefFont.GetFamilyName(),
+                pFontItem.reset(new SvxFontItem(aLangDefFont.GetFamily(), aLangDefFont.GetName(),
                                                 aEmptyOUStr, aLangDefFont.GetPitch(), aLangDefFont.GetCharSet(), nFontWhich));
             }
             m_pDoc->SetDefault(*pFontItem);
@@ -281,7 +281,7 @@ bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor )
                     SfxItemState::SET != pColl->GetAttrSet().GetItemState(
                                                     nFontWhich, false ) )
                 {
-                    pColl->SetFormatAttr(SvxFontItem(aFont.GetFamily(), aFont.GetFamilyName(),
+                    pColl->SetFormatAttr(SvxFontItem(aFont.GetFamily(), aFont.GetName(),
                                                   aEmptyOUStr, aFont.GetPitch(), aFont.GetCharSet(), nFontWhich));
                 }
             }
diff --git a/sw/source/uibase/config/fontcfg.cxx b/sw/source/uibase/config/fontcfg.cxx
index 1f30c3920c51..8aa42336a9d5 100644
--- a/sw/source/uibase/config/fontcfg.cxx
+++ b/sw/source/uibase/config/fontcfg.cxx
@@ -257,7 +257,7 @@ OUString  SwStdFontConfig::GetDefaultFor(sal_uInt16 nFontType, LanguageType eLan
             nFontId = DefaultFontType::LATIN_TEXT;
     }
     vcl::Font aFont = OutputDevice::GetDefaultFont(nFontId, eLang, GetDefaultFontFlags::OnlyOne);
-    return  aFont.GetFamilyName();
+    return  aFont.GetName();
 }
 
 sal_Int32 SwStdFontConfig::GetDefaultHeightFor(sal_uInt16 nFontType, LanguageType eLang)
diff --git a/sw/source/uibase/docvw/srcedtw.cxx b/sw/source/uibase/docvw/srcedtw.cxx
index 353397e2b3d8..3a06617af7fa 100644
--- a/sw/source/uibase/docvw/srcedtw.cxx
+++ b/sw/source/uibase/docvw/srcedtw.cxx
@@ -983,7 +983,7 @@ void SwSrcEditWindow::SetFont()
         else
             aFont = OutputDevice::GetDefaultFont(DefaultFontType::SANS_UNICODE,
                         Application::GetSettings().GetLanguageTag().getLanguageType(), GetDefaultFontFlags::NONE, this);
-        sFontName = aFont.GetFamilyName();
+        sFontName = aFont.GetName();
     }
     const SvxFontListItem* pFontListItem =
         static_cast<const SvxFontListItem* >(pSrcView->GetDocShell()->GetItem( SID_ATTR_CHAR_FONTLIST ));
diff --git a/sw/source/uibase/lingu/hhcwrp.cxx b/sw/source/uibase/lingu/hhcwrp.cxx
index 7a9b020743e3..fde324abb0f0 100644
--- a/sw/source/uibase/lingu/hhcwrp.cxx
+++ b/sw/source/uibase/lingu/hhcwrp.cxx
@@ -151,7 +151,7 @@ SwHHCWrapper::~SwHHCWrapper()
         const vcl::Font *pFont = GetTargetFont();
         if (pFont)
         {
-            SvxFontItem aFontItem( pFont->GetFamily(), pFont->GetFamilyName(),
+            SvxFontItem aFontItem( pFont->GetFamily(), pFont->GetName(),
                     pFont->GetStyleName(), pFont->GetPitch(),
                     pFont->GetCharSet(), RES_CHRATR_CJK_FONT );
             pDoc->SetDefault( aFontItem );
@@ -492,7 +492,7 @@ void SwHHCWrapper::ReplaceUnit(
             if (pTargetFont && pNewUnitLanguage)
             {
                 SvxFontItem aFontItem(static_cast<const SvxFontItem&>( aSet.Get( RES_CHRATR_CJK_FONT ) ));
-                aFontItem.SetFamilyName(    pTargetFont->GetFamilyName());
+                aFontItem.SetFamilyName(    pTargetFont->GetName());
                 aFontItem.SetFamily(        pTargetFont->GetFamily());
                 aFontItem.SetStyleName(     pTargetFont->GetStyleName());
                 aFontItem.SetPitch(         pTargetFont->GetPitch());
diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx
index 23fc94c27914..2d46ca8ceda0 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@@ -1714,7 +1714,7 @@ void SwAnnotationShell::InsertSymbol(SfxRequest& rReq)
             const SvxFontItem* pFontItem = SfxItemSet::GetItem<SvxFontItem>(pDlg->GetOutputItemSet(), SID_ATTR_CHAR_FONT, false);
             if ( pFontItem )
             {
-                aFont.SetFamilyName( pFontItem->GetFamilyName() );
+                aFont.SetName( pFontItem->GetFamilyName() );
                 aFont.SetStyleName( pFontItem->GetStyleName() );
                 aFont.SetCharSet( pFontItem->GetCharSet() );
                 aFont.SetPitch( pFontItem->GetPitch() );
@@ -1723,7 +1723,7 @@ void SwAnnotationShell::InsertSymbol(SfxRequest& rReq)
             if ( pCItem )
             {
                 sSym  = pCItem->GetValue();
-                aOpt.SetSymbolFont(aFont.GetFamilyName());
+                aOpt.SetSymbolFont(aFont.GetName());
                 SW_MOD()->ApplyUsrPref(aOpt, &rView);
             }
         }
@@ -1749,7 +1749,7 @@ void SwAnnotationShell::InsertSymbol(SfxRequest& rReq)
 
         // Attributing (set font)
         SfxItemSet aSetFont( *aFontSet.GetPool(), aFontSet.GetRanges() );
-        SvxFontItem aFontItem (aFont.GetFamily(), aFont.GetFamilyName(),
+        SvxFontItem aFontItem (aFont.GetFamily(),    aFont.GetName(),
                                 aFont.GetStyleName(), aFont.GetPitch(),
                                 aFont.GetCharSet(),
                                 EE_CHAR_FONTINFO );
@@ -1776,8 +1776,8 @@ void SwAnnotationShell::InsertSymbol(SfxRequest& rReq)
         pOLV->ShowCursor();
 
         rReq.AppendItem( SfxStringItem( GetPool().GetWhich(SID_CHARMAP), sSym ) );
-        if(!aFont.GetFamilyName().isEmpty())
-            rReq.AppendItem( SfxStringItem( SID_ATTR_SPECIALCHAR, aFont.GetFamilyName() ) );
+        if(!aFont.GetName().isEmpty())
+            rReq.AppendItem( SfxStringItem( SID_ATTR_SPECIALCHAR, aFont.GetName() ) );
         rReq.Done();
     }
 }
diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx
index b11d402ffc32..65785150f0a3 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -2111,7 +2111,7 @@ void SwBaseShell::GetTextFontCtrlState( SfxItemSet& rSet )
                     vcl::Font aFont;
                     if(pI && dynamic_cast< const SvxFontItem *>( pI ) !=  nullptr)
                     {
-                        aFont.SetFamilyName( static_cast<const SvxFontItem*>(pI)->GetFamilyName());
+                        aFont.SetName( static_cast<const SvxFontItem*>(pI)->GetFamilyName());
                         aFont.SetStyleName(static_cast<const SvxFontItem*>(pI)->GetStyleName());
                         aFont.SetFamily(static_cast<const SvxFontItem*>(pI)->GetFamily());
                         aFont.SetPitch(static_cast<const SvxFontItem*>(pI)->GetPitch());
diff --git a/sw/source/uibase/shells/drwtxtsh.cxx b/sw/source/uibase/shells/drwtxtsh.cxx
index e7de13dc4e65..391d0f175f6d 100644
--- a/sw/source/uibase/shells/drwtxtsh.cxx
+++ b/sw/source/uibase/shells/drwtxtsh.cxx
@@ -751,7 +751,7 @@ void SwDrawTextShell::InsertSymbol(SfxRequest& rReq)
             const SvxFontItem* pFontItem = SfxItemSet::GetItem<SvxFontItem>(pDlg->GetOutputItemSet(), SID_ATTR_CHAR_FONT, false);
             if ( pFontItem )
             {
-                aFont.SetFamilyName( pFontItem->GetFamilyName() );
+                aFont.SetName( pFontItem->GetFamilyName() );
                 aFont.SetStyleName( pFontItem->GetStyleName() );
                 aFont.SetCharSet( pFontItem->GetCharSet() );
                 aFont.SetPitch( pFontItem->GetPitch() );
@@ -760,7 +760,7 @@ void SwDrawTextShell::InsertSymbol(SfxRequest& rReq)
             if ( pCItem )
             {
                 sSym  = pCItem->GetValue();
-                aOpt.SetSymbolFont(aFont.GetFamilyName());
+                aOpt.SetSymbolFont(aFont.GetName());
                 SW_MOD()->ApplyUsrPref(aOpt, &rView);
             }
         }
@@ -786,7 +786,7 @@ void SwDrawTextShell::InsertSymbol(SfxRequest& rReq)
 
         // assign attributes (Set font)
         SfxItemSet aFontAttribSet( *aFontSet.GetPool(), aFontSet.GetRanges() );
-        SvxFontItem aFontItem (aFont.GetFamily(), aFont.GetFamilyName(),
+        SvxFontItem aFontItem (aFont.GetFamily(),    aFont.GetName(),
                                 aFont.GetStyleName(), aFont.GetPitch(),
                                 aFont.GetCharSet(),
                                 EE_CHAR_FONTINFO );
@@ -813,8 +813,8 @@ void SwDrawTextShell::InsertSymbol(SfxRequest& rReq)
         pOLV->ShowCursor();
 
         rReq.AppendItem( SfxStringItem( GetPool().GetWhich(SID_CHARMAP), sSym ) );
-        if(!aFont.GetFamilyName().isEmpty())
-            rReq.AppendItem( SfxStringItem( SID_ATTR_SPECIALCHAR, aFont.GetFamilyName() ) );
+        if(!aFont.GetName().isEmpty())
+            rReq.AppendItem( SfxStringItem( SID_ATTR_SPECIALCHAR, aFont.GetName() ) );
         rReq.Done();
     }
 }
diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx
index d63b8cf1b2b1..3a91e23780e2 100644
--- a/sw/source/uibase/shells/textsh.cxx
+++ b/sw/source/uibase/shells/textsh.cxx
@@ -946,7 +946,7 @@ void SwTextShell::InsertSymbol( SfxRequest& rReq )
             const SvxFontItem* pFontItem = SfxItemSet::GetItem<SvxFontItem>(pDlg->GetOutputItemSet(), SID_ATTR_CHAR_FONT, false);
             if ( pFontItem )
             {
-                aNewFont.SetFamilyName( pFontItem->GetFamilyName() );
+                aNewFont.SetName( pFontItem->GetFamilyName() );
                 aNewFont.SetStyleName( pFontItem->GetStyleName() );
                 aNewFont.SetCharSet( pFontItem->GetCharSet() );
                 aNewFont.SetPitch( pFontItem->GetPitch() );
@@ -955,7 +955,7 @@ void SwTextShell::InsertSymbol( SfxRequest& rReq )
             if ( pCItem )
             {
                 aChars  = pCItem->GetValue();
-                aOpt.SetSymbolFont(aNewFont.GetFamilyName());
+                aOpt.SetSymbolFont(aNewFont.GetName());
                 SW_MOD()->ApplyUsrPref(aOpt, &GetView());
             }
         }
@@ -991,10 +991,10 @@ void SwTextShell::InsertSymbol( SfxRequest& rReq )
         rSh.Insert( aChars );
 
         // #108876# a font attribute has to be set always due to a guessed script type
-        if( !aNewFont.GetFamilyName().isEmpty() )
+        if( !aNewFont.GetName().isEmpty() )
         {
             SvxFontItem aNewFontItem( aFont );
-            aNewFontItem.SetFamilyName( aNewFont.GetFamilyName() );
+            aNewFontItem.SetFamilyName( aNewFont.GetName());
             aNewFontItem.SetFamily(  aNewFont.GetFamily());
             aNewFontItem.SetPitch(   aNewFont.GetPitch());
             aNewFontItem.SetCharSet( aNewFont.GetCharSet() );
@@ -1045,7 +1045,7 @@ void SwTextShell::InsertSymbol( SfxRequest& rReq )
         if ( !aChars.isEmpty() )
         {
             rReq.AppendItem( SfxStringItem( GetPool().GetWhich(SID_CHARMAP), aChars ) );
-            rReq.AppendItem( SfxStringItem( SID_ATTR_SPECIALCHAR, aNewFont.GetFamilyName() ) );
+            rReq.AppendItem( SfxStringItem( SID_ATTR_SPECIALCHAR, aNewFont.GetName() ) );
             rReq.Done();
         }
     }