vcl: rename variables from metric names to font attribute names

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

1 files changed, 31 insertions, 31 deletions

diff --git a/vcl/source/outdev/textline.cxx b/vcl/source/outdev/textline.cxx
index 50707b5de757..ca8c45d2b935 100644
--- a/vcl/source/outdev/textline.cxx
+++ b/vcl/source/outdev/textline.cxx
@@ -56,12 +56,12 @@ bool OutputDevice::ImplIsUnderlineAbove( const vcl::Font& rFont )
 
 void OutputDevice::ImplInitTextLineSize()
 {
-    mpFontEntry->maMetric.ImplInitTextLineSize( this );
+    mpFontEntry->maFontAttributes.ImplInitTextLineSize( this );
 }
 
 void OutputDevice::ImplInitAboveTextLineSize()
 {
-    mpFontEntry->maMetric.ImplInitAboveTextLineSize();
+    mpFontEntry->maFontAttributes.ImplInitAboveTextLineSize();
 }
 
 void OutputDevice::ImplDrawWavePixel( long nOriginX, long nOriginY,
@@ -221,13 +221,13 @@ void OutputDevice::ImplDrawWaveTextLine( long nBaseX, long nBaseY,
 
     if ( bIsAbove )
     {
-        nLineHeight = pFontEntry->maMetric.GetAboveWavelineUnderlineSize();
-        nLinePos = pFontEntry->maMetric.GetAboveWavelineUnderlineOffset();
+        nLineHeight = pFontEntry->maFontAttributes.GetAboveWavelineUnderlineSize();
+        nLinePos = pFontEntry->maFontAttributes.GetAboveWavelineUnderlineOffset();
     }
     else
     {
-        nLineHeight = pFontEntry->maMetric.GetWavelineUnderlineSize();
-        nLinePos = pFontEntry->maMetric.GetWavelineUnderlineOffset();
+        nLineHeight = pFontEntry->maFontAttributes.GetWavelineUnderlineSize();
+        nLinePos = pFontEntry->maFontAttributes.GetWavelineUnderlineOffset();
     }
     if ( (eTextLine == UNDERLINE_SMALLWAVE) && (nLineHeight > 3) )
         nLineHeight = 3;
@@ -303,13 +303,13 @@ void OutputDevice::ImplDrawStraightTextLine( long nBaseX, long nBaseY,
     case UNDERLINE_DASHDOTDOT:
         if ( bIsAbove )
         {
-            nLineHeight = pFontEntry->maMetric.GetAboveUnderlineSize();
-            nLinePos    = nY + pFontEntry->maMetric.GetAboveUnderlineOffset();
+            nLineHeight = pFontEntry->maFontAttributes.GetAboveUnderlineSize();
+            nLinePos    = nY + pFontEntry->maFontAttributes.GetAboveUnderlineOffset();
         }
         else
         {
-            nLineHeight = pFontEntry->maMetric.GetUnderlineSize();
-            nLinePos    = nY + pFontEntry->maMetric.GetUnderlineOffset();
+            nLineHeight = pFontEntry->maFontAttributes.GetUnderlineSize();
+            nLinePos    = nY + pFontEntry->maFontAttributes.GetUnderlineOffset();
         }
         break;
     case UNDERLINE_BOLD:
@@ -320,27 +320,27 @@ void OutputDevice::ImplDrawStraightTextLine( long nBaseX, long nBaseY,
     case UNDERLINE_BOLDDASHDOTDOT:
         if ( bIsAbove )
         {
-            nLineHeight = pFontEntry->maMetric.GetAboveBoldUnderlineSize();
-            nLinePos    = nY + pFontEntry->maMetric.GetAboveBoldUnderlineOffset();
+            nLineHeight = pFontEntry->maFontAttributes.GetAboveBoldUnderlineSize();
+            nLinePos    = nY + pFontEntry->maFontAttributes.GetAboveBoldUnderlineOffset();
         }
         else
         {
-            nLineHeight = pFontEntry->maMetric.GetBoldUnderlineSize();
-            nLinePos    = nY + pFontEntry->maMetric.GetBoldUnderlineOffset();
+            nLineHeight = pFontEntry->maFontAttributes.GetBoldUnderlineSize();
+            nLinePos    = nY + pFontEntry->maFontAttributes.GetBoldUnderlineOffset();
         }
         break;
     case UNDERLINE_DOUBLE:
         if ( bIsAbove )
         {
-            nLineHeight = pFontEntry->maMetric.GetAboveDoubleUnderlineSize();
-            nLinePos    = nY + pFontEntry->maMetric.GetAboveDoubleUnderlineOffset1();
-            nLinePos2   = nY + pFontEntry->maMetric.GetAboveDoubleUnderlineOffset2();
+            nLineHeight = pFontEntry->maFontAttributes.GetAboveDoubleUnderlineSize();
+            nLinePos    = nY + pFontEntry->maFontAttributes.GetAboveDoubleUnderlineOffset1();
+            nLinePos2   = nY + pFontEntry->maFontAttributes.GetAboveDoubleUnderlineOffset2();
         }
         else
         {
-            nLineHeight = pFontEntry->maMetric.GetDoubleUnderlineSize();
-            nLinePos    = nY + pFontEntry->maMetric.GetDoubleUnderlineOffset1();
-            nLinePos2   = nY + pFontEntry->maMetric.GetDoubleUnderlineOffset2();
+            nLineHeight = pFontEntry->maFontAttributes.GetDoubleUnderlineSize();
+            nLinePos    = nY + pFontEntry->maFontAttributes.GetDoubleUnderlineOffset1();
+            nLinePos2   = nY + pFontEntry->maFontAttributes.GetDoubleUnderlineOffset2();
         }
         break;
     default:
@@ -538,17 +538,17 @@ void OutputDevice::ImplDrawStrikeoutLine( long nBaseX, long nBaseY,
     switch ( eStrikeout )
     {
     case STRIKEOUT_SINGLE:
-        nLineHeight = pFontEntry->maMetric.GetStrikeoutSize();
-        nLinePos    = nY + pFontEntry->maMetric.GetStrikeoutOffset();
+        nLineHeight = pFontEntry->maFontAttributes.GetStrikeoutSize();
+        nLinePos    = nY + pFontEntry->maFontAttributes.GetStrikeoutOffset();
         break;
     case STRIKEOUT_BOLD:
-        nLineHeight = pFontEntry->maMetric.GetBoldStrikeoutSize();
-        nLinePos    = nY + pFontEntry->maMetric.GetBoldStrikeoutOffset();
+        nLineHeight = pFontEntry->maFontAttributes.GetBoldStrikeoutSize();
+        nLinePos    = nY + pFontEntry->maFontAttributes.GetBoldStrikeoutOffset();
         break;
     case STRIKEOUT_DOUBLE:
-        nLineHeight = pFontEntry->maMetric.GetDoubleStrikeoutSize();
-        nLinePos    = nY + pFontEntry->maMetric.GetDoubleStrikeoutOffset1();
-        nLinePos2   = nY + pFontEntry->maMetric.GetDoubleStrikeoutOffset2();
+        nLineHeight = pFontEntry->maFontAttributes.GetDoubleStrikeoutSize();
+        nLinePos    = nY + pFontEntry->maFontAttributes.GetDoubleStrikeoutOffset1();
+        nLinePos2   = nY + pFontEntry->maFontAttributes.GetDoubleStrikeoutOffset2();
         break;
     default:
         break;
@@ -652,8 +652,8 @@ void OutputDevice::ImplDrawStrikeoutChar( long nBaseX, long nBaseY,
     Rectangle aPixelRect;
     aPixelRect.Left() = nBaseX+mnTextOffX;
     aPixelRect.Right() = aPixelRect.Left()+nWidth;
-    aPixelRect.Bottom() = nBaseY+mpFontEntry->maMetric.GetDescent();
-    aPixelRect.Top() = nBaseY-mpFontEntry->maMetric.GetAscent();
+    aPixelRect.Bottom() = nBaseY+mpFontEntry->maFontAttributes.GetDescent();
+    aPixelRect.Top() = nBaseY-mpFontEntry->maFontAttributes.GetAscent();
 
     if (mpFontEntry->mnOrientation)
     {
@@ -1043,9 +1043,9 @@ void OutputDevice::DrawWaveLine( const Point& rStartPos, const Point& rEndPos )
 
     // #109280# make sure the waveline does not exceed the descent to avoid paint problems
     ImplFontEntry* pFontEntry = mpFontEntry;
-    if( nWaveHeight > pFontEntry->maMetric.GetWavelineUnderlineSize() )
+    if( nWaveHeight > pFontEntry->maFontAttributes.GetWavelineUnderlineSize() )
     {
-        nWaveHeight = pFontEntry->maMetric.GetWavelineUnderlineSize();
+        nWaveHeight = pFontEntry->maFontAttributes.GetWavelineUnderlineSize();
     }
     ImplDrawWaveLine(nStartX, nStartY, 0, 0,
                      nEndX-nStartX, nWaveHeight,