tools: rename FontUnderline to FontLineStyle

Change-Id: I4750ad8569a1003b2f8c29052f3e25003ee433ca
Reviewed-on: https://gerrit.libreoffice.org/21892
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>

3 files changed, 51 insertions, 51 deletions

diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
index 94d04c0d15a1..ac7b01fe4451 100644
--- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
@@ -1299,8 +1299,8 @@ namespace
             const bool bWordLineMode(rFont.IsWordLineMode());
 
             const bool bDecoratedIsNeeded(
-                   UNDERLINE_NONE != rFont.GetOverline()
-                || UNDERLINE_NONE != rFont.GetUnderline()
+                   LINESTYLE_NONE != rFont.GetOverline()
+                || LINESTYLE_NONE != rFont.GetUnderline()
                 || STRIKEOUT_NONE != rFont.GetStrikeout()
                 || EMPHASISMARK_NONE != (rFont.GetEmphasisMark() & EMPHASISMARK_STYLE)
                 || RELIEF_NONE != rFont.GetRelief()
@@ -1310,12 +1310,12 @@ namespace
             if(bDecoratedIsNeeded)
             {
                 // prepare overline, underline and strikeout data
-                const drawinglayer::primitive2d::TextLine eFontOverline(drawinglayer::primitive2d::mapFontUnderlineToTextLine(rFont.GetOverline()));
-                const drawinglayer::primitive2d::TextLine eFontUnderline(drawinglayer::primitive2d::mapFontUnderlineToTextLine(rFont.GetUnderline()));
+                const drawinglayer::primitive2d::TextLine eFontOverline(drawinglayer::primitive2d::mapFontLineStyleToTextLine(rFont.GetOverline()));
+                const drawinglayer::primitive2d::TextLine eFontLineStyle(drawinglayer::primitive2d::mapFontLineStyleToTextLine(rFont.GetUnderline()));
                 const drawinglayer::primitive2d::TextStrikeout eTextStrikeout(drawinglayer::primitive2d::mapFontStrikeoutToTextStrikeout(rFont.GetStrikeout()));
 
                 // check UndelineAbove
-                const bool bUnderlineAbove(drawinglayer::primitive2d::TEXT_LINE_NONE != eFontUnderline && isUnderlineAbove(rFont));
+                const bool bUnderlineAbove(drawinglayer::primitive2d::TEXT_LINE_NONE != eFontLineStyle && isUnderlineAbove(rFont));
 
                 // prepare emphasis mark data
                 drawinglayer::primitive2d::TextEmphasisMark eTextEmphasisMark(drawinglayer::primitive2d::TEXT_EMPHASISMARK_NONE);
@@ -1362,7 +1362,7 @@ namespace
                     rProperty.getOverlineColorActive() ? rProperty.getOverlineColor() : aFontColor,
                     rProperty.getTextLineColorActive() ? rProperty.getTextLineColor() : aFontColor,
                     eFontOverline,
-                    eFontUnderline,
+                    eFontLineStyle,
                     bUnderlineAbove,
                     eTextStrikeout,
                     bWordLineMode,
@@ -1472,8 +1472,8 @@ namespace
 
         if(fLineWidth > 0.0)
         {
-            const drawinglayer::primitive2d::TextLine aOverlineMode(drawinglayer::primitive2d::mapFontUnderlineToTextLine(rAction.GetOverline()));
-            const drawinglayer::primitive2d::TextLine aUnderlineMode(drawinglayer::primitive2d::mapFontUnderlineToTextLine(rAction.GetUnderline()));
+            const drawinglayer::primitive2d::TextLine aOverlineMode(drawinglayer::primitive2d::mapFontLineStyleToTextLine(rAction.GetOverline()));
+            const drawinglayer::primitive2d::TextLine aUnderlineMode(drawinglayer::primitive2d::mapFontLineStyleToTextLine(rAction.GetUnderline()));
             const drawinglayer::primitive2d::TextStrikeout aTextStrikeout(drawinglayer::primitive2d::mapFontStrikeoutToTextStrikeout(rAction.GetStrikeout()));
 
             const bool bOverlineUsed(drawinglayer::primitive2d::TEXT_LINE_NONE != aOverlineMode);
diff --git a/drawinglayer/source/primitive2d/textenumsprimitive2d.cxx b/drawinglayer/source/primitive2d/textenumsprimitive2d.cxx
index f8cf72259ab0..8232e2b9f673 100644
--- a/drawinglayer/source/primitive2d/textenumsprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/textenumsprimitive2d.cxx
@@ -25,54 +25,54 @@ namespace drawinglayer
 {
     namespace primitive2d
     {
-        TextLine mapFontUnderlineToTextLine(FontUnderline eLineStyle)
+        TextLine mapFontLineStyleToTextLine(FontLineStyle eLineStyle)
         {
             switch(eLineStyle)
             {
-                case UNDERLINE_SINGLE:          return TEXT_LINE_SINGLE;
-                case UNDERLINE_DOUBLE:          return TEXT_LINE_DOUBLE;
-                case UNDERLINE_DOTTED:          return TEXT_LINE_DOTTED;
-                case UNDERLINE_DASH:            return TEXT_LINE_DASH;
-                case UNDERLINE_LONGDASH:        return TEXT_LINE_LONGDASH;
-                case UNDERLINE_DASHDOT:         return TEXT_LINE_DASHDOT;
-                case UNDERLINE_DASHDOTDOT:      return TEXT_LINE_DASHDOTDOT;
-                case UNDERLINE_SMALLWAVE:       return TEXT_LINE_SMALLWAVE;
-                case UNDERLINE_WAVE:            return TEXT_LINE_WAVE;
-                case UNDERLINE_DOUBLEWAVE:      return TEXT_LINE_DOUBLEWAVE;
-                case UNDERLINE_BOLD:            return TEXT_LINE_BOLD;
-                case UNDERLINE_BOLDDOTTED:      return TEXT_LINE_BOLDDOTTED;
-                case UNDERLINE_BOLDDASH:        return TEXT_LINE_BOLDDASH;
-                case UNDERLINE_BOLDLONGDASH:    return TEXT_LINE_BOLDLONGDASH;
-                case UNDERLINE_BOLDDASHDOT:     return TEXT_LINE_BOLDDASHDOT;
-                case UNDERLINE_BOLDDASHDOTDOT:  return TEXT_LINE_BOLDDASHDOTDOT;
-                case UNDERLINE_BOLDWAVE:        return TEXT_LINE_BOLDWAVE;
-                // FontUnderline_FORCE_EQUAL_SIZE, UNDERLINE_DONTKNOW, UNDERLINE_NONE
+                case LINESTYLE_SINGLE:          return TEXT_LINE_SINGLE;
+                case LINESTYLE_DOUBLE:          return TEXT_LINE_DOUBLE;
+                case LINESTYLE_DOTTED:          return TEXT_LINE_DOTTED;
+                case LINESTYLE_DASH:            return TEXT_LINE_DASH;
+                case LINESTYLE_LONGDASH:        return TEXT_LINE_LONGDASH;
+                case LINESTYLE_DASHDOT:         return TEXT_LINE_DASHDOT;
+                case LINESTYLE_DASHDOTDOT:      return TEXT_LINE_DASHDOTDOT;
+                case LINESTYLE_SMALLWAVE:       return TEXT_LINE_SMALLWAVE;
+                case LINESTYLE_WAVE:            return TEXT_LINE_WAVE;
+                case LINESTYLE_DOUBLEWAVE:      return TEXT_LINE_DOUBLEWAVE;
+                case LINESTYLE_BOLD:            return TEXT_LINE_BOLD;
+                case LINESTYLE_BOLDDOTTED:      return TEXT_LINE_BOLDDOTTED;
+                case LINESTYLE_BOLDDASH:        return TEXT_LINE_BOLDDASH;
+                case LINESTYLE_BOLDLONGDASH:    return TEXT_LINE_BOLDLONGDASH;
+                case LINESTYLE_BOLDDASHDOT:     return TEXT_LINE_BOLDDASHDOT;
+                case LINESTYLE_BOLDDASHDOTDOT:  return TEXT_LINE_BOLDDASHDOTDOT;
+                case LINESTYLE_BOLDWAVE:        return TEXT_LINE_BOLDWAVE;
+                // FontLineStyle_FORCE_EQUAL_SIZE, LINESTYLE_DONTKNOW, LINESTYLE_NONE
                 default:                        return TEXT_LINE_NONE;
             }
         }
 
-        FontUnderline mapTextLineToFontUnderline(TextLine eLineStyle)
+        FontLineStyle mapTextLineToFontLineStyle(TextLine eLineStyle)
         {
             switch(eLineStyle)
             {
-                default: /*TEXT_LINE_NONE*/   return UNDERLINE_NONE;
-                case TEXT_LINE_SINGLE:        return UNDERLINE_SINGLE;
-                case TEXT_LINE_DOUBLE:        return UNDERLINE_DOUBLE;
-                case TEXT_LINE_DOTTED:        return UNDERLINE_DOTTED;
-                case TEXT_LINE_DASH:          return UNDERLINE_DASH;
-                case TEXT_LINE_LONGDASH:      return UNDERLINE_LONGDASH;
-                case TEXT_LINE_DASHDOT:       return UNDERLINE_DASHDOT;
-                case TEXT_LINE_DASHDOTDOT:    return UNDERLINE_DASHDOTDOT;
-                case TEXT_LINE_SMALLWAVE:     return UNDERLINE_SMALLWAVE;
-                case TEXT_LINE_WAVE:          return UNDERLINE_WAVE;
-                case TEXT_LINE_DOUBLEWAVE:    return UNDERLINE_DOUBLEWAVE;
-                case TEXT_LINE_BOLD:          return UNDERLINE_BOLD;
-                case TEXT_LINE_BOLDDOTTED:    return UNDERLINE_BOLDDOTTED;
-                case TEXT_LINE_BOLDDASH:      return UNDERLINE_BOLDDASH;
-                case TEXT_LINE_BOLDLONGDASH:  return UNDERLINE_LONGDASH;
-                case TEXT_LINE_BOLDDASHDOT:   return UNDERLINE_BOLDDASHDOT;
-                case TEXT_LINE_BOLDDASHDOTDOT:return UNDERLINE_BOLDDASHDOT;
-                case TEXT_LINE_BOLDWAVE:      return UNDERLINE_BOLDWAVE;
+                default: /*TEXT_LINE_NONE*/   return LINESTYLE_NONE;
+                case TEXT_LINE_SINGLE:        return LINESTYLE_SINGLE;
+                case TEXT_LINE_DOUBLE:        return LINESTYLE_DOUBLE;
+                case TEXT_LINE_DOTTED:        return LINESTYLE_DOTTED;
+                case TEXT_LINE_DASH:          return LINESTYLE_DASH;
+                case TEXT_LINE_LONGDASH:      return LINESTYLE_LONGDASH;
+                case TEXT_LINE_DASHDOT:       return LINESTYLE_DASHDOT;
+                case TEXT_LINE_DASHDOTDOT:    return LINESTYLE_DASHDOTDOT;
+                case TEXT_LINE_SMALLWAVE:     return LINESTYLE_SMALLWAVE;
+                case TEXT_LINE_WAVE:          return LINESTYLE_WAVE;
+                case TEXT_LINE_DOUBLEWAVE:    return LINESTYLE_DOUBLEWAVE;
+                case TEXT_LINE_BOLD:          return LINESTYLE_BOLD;
+                case TEXT_LINE_BOLDDOTTED:    return LINESTYLE_BOLDDOTTED;
+                case TEXT_LINE_BOLDDASH:      return LINESTYLE_BOLDDASH;
+                case TEXT_LINE_BOLDLONGDASH:  return LINESTYLE_LONGDASH;
+                case TEXT_LINE_BOLDDASHDOT:   return LINESTYLE_BOLDDASHDOT;
+                case TEXT_LINE_BOLDDASHDOTDOT:return LINESTYLE_BOLDDASHDOT;
+                case TEXT_LINE_BOLDWAVE:      return LINESTYLE_BOLDWAVE;
             }
         }
 
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index c76560267be9..c8e7257eff78 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -152,8 +152,8 @@ namespace drawinglayer
                         mpOutputDevice->SetTextLineColor( Color(aTextlineColor) );
 
                         // set Overline attribute
-                        const FontUnderline eFontOverline(primitive2d::mapTextLineToFontUnderline( pTCPP->getFontOverline() ));
-                        if( eFontOverline != UNDERLINE_NONE )
+                        const FontLineStyle eFontOverline(primitive2d::mapTextLineToFontLineStyle( pTCPP->getFontOverline() ));
+                        if( eFontOverline != LINESTYLE_NONE )
                         {
                             aFont.SetOverline( eFontOverline );
                             const basegfx::BColor aOverlineColor = maBColorModifierStack.getModifiedColor(pTCPP->getOverlineColor());
@@ -163,10 +163,10 @@ namespace drawinglayer
                         }
 
                         // set Underline attribute
-                        const FontUnderline eFontUnderline(primitive2d::mapTextLineToFontUnderline( pTCPP->getFontUnderline() ));
-                        if( eFontUnderline != UNDERLINE_NONE )
+                        const FontLineStyle eFontLineStyle(primitive2d::mapTextLineToFontLineStyle( pTCPP->getFontUnderline() ));
+                        if( eFontLineStyle != LINESTYLE_NONE )
                         {
-                            aFont.SetUnderline( eFontUnderline );
+                            aFont.SetUnderline( eFontLineStyle );
                             if( pTCPP->getWordLineMode() )
                                 aFont.SetWordLineMode( true );
                         }