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>

5 files changed, 14 insertions, 14 deletions

diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx
index 44b1c495884d..4c724285203b 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -558,7 +558,7 @@ void Writer::Impl_writeText( const Point& rPos, const OUString& rText, const lon
         vcl::Font aFont(aOldFont);
         short nOrientation = aFont.GetOrientation();
         aFont.SetOrientation( 0 );
-        aFont.SetUnderline(UNDERLINE_NONE);
+        aFont.SetUnderline(LINESTYLE_NONE);
         aFont.SetStrikeout(STRIKEOUT_NONE);
         mpVDev->SetFont( aFont );
 
@@ -677,7 +677,7 @@ void Writer::Impl_writeText( const Point& rPos, const OUString& rText, const lon
         //  numbers, but the flash lines up very well with the original OOo document.  All of this should
         //  probably be converted to polygons as part of the meta file, though, as we don't handle any
         //  fancy lines (like dashes).
-        if( ( aOldFont.GetStrikeout() != STRIKEOUT_NONE ) || ( aOldFont.GetUnderline() != UNDERLINE_NONE ) )
+        if( ( aOldFont.GetStrikeout() != STRIKEOUT_NONE ) || ( aOldFont.GetUnderline() != LINESTYLE_NONE ) )
         {
             tools::Polygon aPoly( 4 );
             const long  nLineHeight = std::max( (long) FRound( aMetric.GetLineHeight() * 0.05 ), (long) 1 );
@@ -698,7 +698,7 @@ void Writer::Impl_writeText( const Point& rPos, const OUString& rText, const lon
 
             // AS: The factor of 1.5 on the nLineHeight is a magic number.  I'm not sure why it works,
             //  but it looks good to me.
-            if( aOldFont.GetUnderline() != UNDERLINE_NONE )
+            if( aOldFont.GetUnderline() != LINESTYLE_NONE )
             {
                 aPoly[ 0 ].X() = aBaseLinePos.X();
                 aPoly[ 0 ].Y() = static_cast<long>(aBaseLinePos.Y() + 1.5*nLineHeight);
diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx
index c76c989fb37b..63ddfdbc2623 100644
--- a/filter/source/graphicfilter/ipict/ipict.cxx
+++ b/filter/source/graphicfilter/ipict/ipict.cxx
@@ -1337,8 +1337,8 @@ sal_uLong PictReader::ReadData(sal_uInt16 nOpcode)
         else                     aActFont.SetWeight(WEIGHT_NORMAL);
         if ( (nFace & 0x02)!=0 ) aActFont.SetItalic(ITALIC_NORMAL);
         else                     aActFont.SetItalic(ITALIC_NONE);
-        if ( (nFace & 0x04)!=0 ) aActFont.SetUnderline(UNDERLINE_SINGLE);
-        else                     aActFont.SetUnderline(UNDERLINE_NONE);
+        if ( (nFace & 0x04)!=0 ) aActFont.SetUnderline(LINESTYLE_SINGLE);
+        else                     aActFont.SetUnderline(LINESTYLE_NONE);
         if ( (nFace & 0x08)!=0 ) aActFont.SetOutline(true);
         else                     aActFont.SetOutline(false);
         if ( (nFace & 0x10)!=0 ) aActFont.SetShadow(true);
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index e88d9e85d411..6cb3b25e83a6 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -2562,7 +2562,7 @@ void DffPropertyReader::ApplyAttributes( SvStream& rIn, SfxItemSet& rSet, DffObj
     if ( nFontAttributes & 0x10 )
         rSet.Put( SvxPostureItem( nFontAttributes & 0x10 ? ITALIC_NORMAL : ITALIC_NONE, EE_CHAR_ITALIC ) );
     if ( nFontAttributes & 0x08 )
-        rSet.Put( SvxUnderlineItem( nFontAttributes & 0x08 ? UNDERLINE_SINGLE : UNDERLINE_NONE, EE_CHAR_UNDERLINE ) );
+        rSet.Put( SvxUnderlineItem( nFontAttributes & 0x08 ? LINESTYLE_SINGLE : LINESTYLE_NONE, EE_CHAR_UNDERLINE ) );
     if ( nFontAttributes & 0x40 )
         rSet.Put( SvxShadowedItem( (nFontAttributes & 0x40) != 0, EE_CHAR_SHADOW ) );
 //    if ( nFontAttributes & 0x02 )
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 971b5717b52e..a7a6b45b8b53 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -5612,7 +5612,7 @@ void PPTPortionObj::ApplyTo(  SfxItemSet& rSet, SdrPowerPointImport& rManager, s
         rSet.Put( SvxPostureItem( nVal != 0 ? ITALIC_NORMAL : ITALIC_NONE, EE_CHAR_ITALIC_CTL ) );
     }
     if ( GetAttrib( PPT_CharAttr_Underline, nVal, nDestinationInstance ) )
-        rSet.Put( SvxUnderlineItem( nVal != 0 ? UNDERLINE_SINGLE : UNDERLINE_NONE, EE_CHAR_UNDERLINE ) );
+        rSet.Put( SvxUnderlineItem( nVal != 0 ? LINESTYLE_SINGLE : LINESTYLE_NONE, EE_CHAR_UNDERLINE ) );
 
     if ( GetAttrib( PPT_CharAttr_Shadow, nVal, nDestinationInstance ) )
         rSet.Put( SvxShadowedItem( nVal != 0, EE_CHAR_SHADOW ) );
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index ee07784fab6d..3baee145fcbc 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -333,9 +333,9 @@ void SVGAttributeWriter::SetFontAttr( const vcl::Font& rFont )
 
         if( mrExport.IsUseNativeTextDecoration() )
         {
-            if( rFont.GetUnderline() != UNDERLINE_NONE || rFont.GetStrikeout() != STRIKEOUT_NONE )
+            if( rFont.GetUnderline() != LINESTYLE_NONE || rFont.GetStrikeout() != STRIKEOUT_NONE )
             {
-                if( rFont.GetUnderline() != UNDERLINE_NONE )
+                if( rFont.GetUnderline() != LINESTYLE_NONE )
                     aTextDecoration = "underline ";
 
                 if( rFont.GetStrikeout() != STRIKEOUT_NONE )
@@ -795,17 +795,17 @@ void SVGTextWriter::addFontAttributes( bool bIsTextContainer )
 
         if( mrExport.IsUseNativeTextDecoration() )
         {
-            FontUnderline eCurFontUnderline         = maCurrentFont.GetUnderline();
+            FontLineStyle eCurFontLineStyle         = maCurrentFont.GetUnderline();
             FontStrikeout eCurFontStrikeout         = maCurrentFont.GetStrikeout();
 
-            FontUnderline eParFontUnderline         = maParentFont.GetUnderline();
+            FontLineStyle eParFontLineStyle         = maParentFont.GetUnderline();
             FontStrikeout eParFontStrikeout         = maParentFont.GetStrikeout();
 
             OUString sTextDecoration;
             bool bIsDecorationChanged = false;
-            if( eCurFontUnderline != eParFontUnderline )
+            if( eCurFontLineStyle != eParFontLineStyle )
             {
-                if( eCurFontUnderline != UNDERLINE_NONE )
+                if( eCurFontLineStyle != LINESTYLE_NONE )
                     sTextDecoration = "underline";
                 bIsDecorationChanged = true;
             }
@@ -2576,7 +2576,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const OUString& rText,
 
     if( !mrExport.IsUseNativeTextDecoration() )
     {
-        if( rFont.GetStrikeout() != STRIKEOUT_NONE || rFont.GetUnderline() != UNDERLINE_NONE )
+        if( rFont.GetStrikeout() != STRIKEOUT_NONE || rFont.GetUnderline() != LINESTYLE_NONE )
         {
             tools::Polygon aPoly( 4 );
             const long  nLineHeight = std::max( (long) FRound( aMetric.GetLineHeight() * 0.05 ), (long) 1 );