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

1 files changed, 12 insertions, 12 deletions

diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index 0f7c783dfe4b..7af457e8344a 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -74,13 +74,13 @@ FontMetric OutputDevice::GetDevFont( int nDevFontIndex ) const
     if( nDevFontIndex < nCount )
     {
         const PhysicalFontFace& rData = *mpDeviceFontList->Get( nDevFontIndex );
-        aFontMetric.SetFamilyName( rData.GetFamilyName() );
+        aFontMetric.SetName( rData.GetFamilyName() );
         aFontMetric.SetStyleName( rData.GetStyleName() );
         aFontMetric.SetCharSet( rData.GetCharSet() );
         aFontMetric.SetFamily( rData.GetFamilyType() );
         aFontMetric.SetPitch( rData.GetPitch() );
         aFontMetric.SetWeight( rData.GetWeight() );
-        aFontMetric.SetItalic( rData.GetItalic() );
+        aFontMetric.SetItalic( rData.GetSlantType() );
         aFontMetric.SetWidthType( rData.GetWidthType() );
         aFontMetric.SetScalableFlag( rData.IsScalable() );
         aFontMetric.SetBuiltInFontFlag( rData.IsBuiltInFont() );
@@ -112,7 +112,7 @@ int OutputDevice::GetDevFontSizeCount( const vcl::Font& rFont ) const
     delete mpDeviceFontSizeList;
 
     ImplInitFontList();
-    mpDeviceFontSizeList = mpFontCollection->GetDeviceFontSizeList( rFont.GetFamilyName() );
+    mpDeviceFontSizeList = mpFontCollection->GetDeviceFontSizeList( rFont.GetName() );
     return mpDeviceFontSizeList->Count();
 }
 
@@ -195,14 +195,14 @@ FontMetric OutputDevice::GetFontMetric() const
     aMetric.Font::operator=( maFont );
 
     // set aMetric with info from font
-    aMetric.SetFamilyName( maFont.GetFamilyName() );
+    aMetric.SetName( maFont.GetName() );
     aMetric.SetStyleName( xFontMetric->GetStyleName() );
     aMetric.SetSize( PixelToLogic( Size( xFontMetric->GetWidth(), xFontMetric->GetAscent() + xFontMetric->GetDescent() - xFontMetric->GetInternalLeading() ) ) );
     aMetric.SetCharSet( xFontMetric->IsSymbolFont() ? RTL_TEXTENCODING_SYMBOL : RTL_TEXTENCODING_UNICODE );
     aMetric.SetFamily( xFontMetric->GetFamilyType() );
     aMetric.SetPitch( xFontMetric->GetPitch() );
     aMetric.SetWeight( xFontMetric->GetWeight() );
-    aMetric.SetItalic( xFontMetric->GetItalic() );
+    aMetric.SetItalic( xFontMetric->GetSlantType() );
     aMetric.SetWidthType( xFontMetric->GetWidthType() );
     if ( pFontInstance->mnOwnOrientation )
         aMetric.SetOrientation( pFontInstance->mnOwnOrientation );
@@ -879,11 +879,11 @@ vcl::Font OutputDevice::GetDefaultFont( DefaultFontType nType, LanguageType eLan
                 }
             }
             while ( nIndex != -1 );
-            aFont.SetFamilyName( aName );
+            aFont.SetName( aName );
         }
 
         // No Name, than set all names
-        if ( aFont.GetFamilyName().isEmpty() )
+        if ( aFont.GetName().isEmpty() )
         {
             if ( nFlags & GetDefaultFontFlags::OnlyOne )
             {
@@ -891,13 +891,13 @@ vcl::Font OutputDevice::GetDefaultFont( DefaultFontType nType, LanguageType eLan
                 {
                     SAL_WARN ("vcl.gdi", "No default window has been set for the application - we really shouldn't be able to get here");
                     sal_Int32 nIndex = 0;
-                    aFont.SetFamilyName( aSearch.getToken( 0, ';', nIndex ) );
+                    aFont.SetName( aSearch.getToken( 0, ';', nIndex ) );
                 }
                 else
                 {
                     pOutDev->ImplInitFontList();
 
-                    aFont.SetFamilyName( aSearch );
+                    aFont.SetName( aSearch );
 
                     // convert to pixel height
                     Size aSize = pOutDev->ImplLogicToDevicePixel( aFont.GetSize() );
@@ -920,15 +920,15 @@ vcl::Font OutputDevice::GetDefaultFont( DefaultFontType nType, LanguageType eLan
                     if (pFontInstance)
                     {
                         if( pFontInstance->maFontSelData.mpFontData )
-                            aFont.SetFamilyName( pFontInstance->maFontSelData.mpFontData->GetFamilyName() );
+                            aFont.SetName( pFontInstance->maFontSelData.mpFontData->GetFamilyName() );
                         else
-                            aFont.SetFamilyName( pFontInstance->maFontSelData.maTargetName );
+                            aFont.SetName( pFontInstance->maFontSelData.maTargetName );
                         pOutDev->mpFontCache->Release(pFontInstance);
                     }
                 }
             }
             else
-                aFont.SetFamilyName( aSearch );
+                aFont.SetName( aSearch );
         }
     }