Cleanup after removing vcl::FontInfo class

Change-Id: I544eac439cb7277e47a23a90c6fbc45496161c3b

2 files changed, 23 insertions, 23 deletions

diff --git a/vcl/source/gdi/metric.cxx b/vcl/source/gdi/metric.cxx
index f5c9399c83e3..1a9d05fbdb8a 100644
--- a/vcl/source/gdi/metric.cxx
+++ b/vcl/source/gdi/metric.cxx
@@ -72,10 +72,10 @@ FontMetric::FontMetric()
 :   mpImplMetric( new ImplFontMetric )
 {}
 
-FontMetric::FontMetric( const FontMetric& rInfo )
-:  Font( rInfo )
+FontMetric::FontMetric( const FontMetric& rFontMetric )
+:  Font( rFontMetric )
 {
-    mpImplMetric = rInfo.mpImplMetric;
+    mpImplMetric = rFontMetric.mpImplMetric;
     mpImplMetric->AddReference();
 }
 
@@ -84,27 +84,27 @@ FontMetric::~FontMetric()
     mpImplMetric->DeReference();
 }
 
-FontMetric& FontMetric::operator=( const FontMetric& rInfo )
+FontMetric& FontMetric::operator=( const FontMetric& rFontMetric )
 {
-    Font::operator=( rInfo );
+    Font::operator=( rFontMetric );
 
-    if( mpImplMetric != rInfo.mpImplMetric )
+    if( mpImplMetric != rFontMetric.mpImplMetric )
     {
         mpImplMetric->DeReference();
-        mpImplMetric = rInfo.mpImplMetric;
+        mpImplMetric = rFontMetric.mpImplMetric;
         mpImplMetric->AddReference();
     }
 
     return *this;
 }
 
-bool FontMetric::operator==( const FontMetric& rInfo ) const
+bool FontMetric::operator==( const FontMetric& rFontMetric ) const
 {
-    if( !Font::operator==( rInfo ) )
+    if( !Font::operator==( rFontMetric ) )
         return false;
-    if( mpImplMetric == rInfo.mpImplMetric )
+    if( mpImplMetric == rFontMetric.mpImplMetric )
         return true;
-    if( *mpImplMetric == *rInfo.mpImplMetric  )
+    if( *mpImplMetric == *rFontMetric.mpImplMetric  )
         return true;
     return false;
 }
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index a48926f0d291..f328a4f7e64b 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -64,7 +64,7 @@ using namespace ::utl;
 
 FontMetric OutputDevice::GetDevFont( int nDevFontIndex ) const
 {
-    FontMetric aFontInfo;
+    FontMetric aFontMetric;
 
     ImplInitFontList();
 
@@ -72,21 +72,21 @@ FontMetric OutputDevice::GetDevFont( int nDevFontIndex ) const
     if( nDevFontIndex < nCount )
     {
         const PhysicalFontFace& rData = *mpDeviceFontList->Get( nDevFontIndex );
-        aFontInfo.SetName( rData.GetFamilyName() );
-        aFontInfo.SetStyleName( rData.GetStyleName() );
-        aFontInfo.SetCharSet( rData.IsSymbolFont() ? RTL_TEXTENCODING_SYMBOL : RTL_TEXTENCODING_UNICODE );
-        aFontInfo.SetFamily( rData.GetFamilyType() );
-        aFontInfo.SetPitch( rData.GetPitch() );
-        aFontInfo.SetWeight( rData.GetWeight() );
-        aFontInfo.SetItalic( rData.GetSlantType() );
-        aFontInfo.SetWidthType( rData.GetWidthType() );
+        aFontMetric.SetName( rData.GetFamilyName() );
+        aFontMetric.SetStyleName( rData.GetStyleName() );
+        aFontMetric.SetCharSet( rData.IsSymbolFont() ? RTL_TEXTENCODING_SYMBOL : RTL_TEXTENCODING_UNICODE );
+        aFontMetric.SetFamily( rData.GetFamilyType() );
+        aFontMetric.SetPitch( rData.GetPitch() );
+        aFontMetric.SetWeight( rData.GetWeight() );
+        aFontMetric.SetItalic( rData.GetSlantType() );
+        aFontMetric.SetWidthType( rData.GetWidthType() );
         if( rData.IsScalable() )
-            aFontInfo.mpImplMetric->mnMiscFlags |= ImplFontMetric::SCALABLE_FLAG;
+            aFontMetric.mpImplMetric->mnMiscFlags |= ImplFontMetric::SCALABLE_FLAG;
         if( rData.IsBuiltInFont() )
-            aFontInfo.mpImplMetric->mnMiscFlags |= ImplFontMetric::DEVICE_FLAG;
+            aFontMetric.mpImplMetric->mnMiscFlags |= ImplFontMetric::DEVICE_FLAG;
     }
 
-    return aFontInfo;
+    return aFontMetric;
 }
 
 int OutputDevice::GetDevFontCount() const