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>

11 files changed, 91 insertions, 91 deletions

diff --git a/editeng/source/editeng/editattr.cxx b/editeng/source/editeng/editattr.cxx
index fdc9d6a65e02..ff71dbf40d99 100644
--- a/editeng/source/editeng/editattr.cxx
+++ b/editeng/source/editeng/editattr.cxx
@@ -128,7 +128,7 @@ EditCharAttribUnderline::EditCharAttribUnderline( const SvxUnderlineItem& rAttr,
 
 void EditCharAttribUnderline::SetFont( SvxFont& rFont, OutputDevice* pOutDev )
 {
-    rFont.SetUnderline( (FontUnderline)static_cast<const SvxUnderlineItem*>(GetItem())->GetValue() );
+    rFont.SetUnderline( (FontLineStyle)static_cast<const SvxUnderlineItem*>(GetItem())->GetValue() );
 
     if ( pOutDev )
         pOutDev->SetTextLineColor( static_cast<const SvxUnderlineItem*>(GetItem())->GetColor() );
@@ -146,7 +146,7 @@ EditCharAttribOverline::EditCharAttribOverline( const SvxOverlineItem& rAttr, sa
 
 void EditCharAttribOverline::SetFont( SvxFont& rFont, OutputDevice* pOutDev )
 {
-    rFont.SetOverline( (FontUnderline)static_cast<const SvxOverlineItem*>(GetItem())->GetValue() );
+    rFont.SetOverline( (FontLineStyle)static_cast<const SvxOverlineItem*>(GetItem())->GetValue() );
     if ( pOutDev )
         pOutDev->SetOverlineColor( static_cast<const SvxOverlineItem*>(GetItem())->GetColor() );
 }
diff --git a/editeng/source/editeng/eerdll.cxx b/editeng/source/editeng/eerdll.cxx
index fad7bb14689e..1be1ce37516c 100644
--- a/editeng/source/editeng/eerdll.cxx
+++ b/editeng/source/editeng/eerdll.cxx
@@ -130,7 +130,7 @@ SfxPoolItem** GlobalEditData::GetDefItems()
         ppDefItems[20] = new SvxFontHeightItem( 240, 100, EE_CHAR_FONTHEIGHT );
         ppDefItems[21] = new SvxCharScaleWidthItem( 100, EE_CHAR_FONTWIDTH );
         ppDefItems[22] = new SvxWeightItem( WEIGHT_NORMAL, EE_CHAR_WEIGHT );
-        ppDefItems[23] = new SvxUnderlineItem( UNDERLINE_NONE, EE_CHAR_UNDERLINE );
+        ppDefItems[23] = new SvxUnderlineItem( LINESTYLE_NONE, EE_CHAR_UNDERLINE );
         ppDefItems[24] = new SvxCrossedOutItem( STRIKEOUT_NONE, EE_CHAR_STRIKEOUT );
         ppDefItems[25] = new SvxPostureItem( ITALIC_NONE, EE_CHAR_ITALIC );
         ppDefItems[26] = new SvxContourItem( false, EE_CHAR_OUTLINE );
@@ -154,7 +154,7 @@ SfxPoolItem** GlobalEditData::GetDefItems()
         ppDefItems[44] = new SvxCharReliefItem( RELIEF_NONE, EE_CHAR_RELIEF );
         ppDefItems[45] = new SfxVoidItem( EE_CHAR_RUBI_DUMMY );
         ppDefItems[46] = new SvXMLAttrContainerItem( EE_CHAR_XMLATTRIBS );
-        ppDefItems[47] = new SvxOverlineItem( UNDERLINE_NONE, EE_CHAR_OVERLINE );
+        ppDefItems[47] = new SvxOverlineItem( LINESTYLE_NONE, EE_CHAR_OVERLINE );
         ppDefItems[48] = new SvxCaseMapItem( SVX_CASEMAP_NOT_MAPPED, EE_CHAR_CASEMAP );
         ppDefItems[49] = new SfxGrabBagItem( EE_CHAR_GRABBAG );
         ppDefItems[50] = new SvxBackgroundColorItem( Color( COL_AUTO ), EE_CHAR_BKGCOLOR );
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 1cc860aa9a76..d6b668c3b266 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -2784,13 +2784,13 @@ void ImpEditEngine::SeekCursor( ContentNode* pNode, sal_Int32 nPos, SvxFont& rFo
     {
         sal_uInt16 nAttr = mpIMEInfos->pAttribs[ nPos - mpIMEInfos->aPos.GetIndex() - 1 ];
         if ( nAttr & EXTTEXTINPUT_ATTR_UNDERLINE )
-            rFont.SetUnderline( UNDERLINE_SINGLE );
+            rFont.SetUnderline( LINESTYLE_SINGLE );
         else if ( nAttr & EXTTEXTINPUT_ATTR_BOLDUNDERLINE )
-            rFont.SetUnderline( UNDERLINE_BOLD );
+            rFont.SetUnderline( LINESTYLE_BOLD );
         else if ( nAttr & EXTTEXTINPUT_ATTR_DOTTEDUNDERLINE )
-            rFont.SetUnderline( UNDERLINE_DOTTED );
+            rFont.SetUnderline( LINESTYLE_DOTTED );
         else if ( nAttr & EXTTEXTINPUT_ATTR_DASHDOTUNDERLINE )
-            rFont.SetUnderline( UNDERLINE_DOTTED );
+            rFont.SetUnderline( LINESTYLE_DOTTED );
         else if ( nAttr & EXTTEXTINPUT_ATTR_REDTEXT )
             rFont.SetColor( Color( COL_RED ) );
         else if ( nAttr & EXTTEXTINPUT_ATTR_HALFTONETEXT )
@@ -2804,7 +2804,7 @@ void ImpEditEngine::SeekCursor( ContentNode* pNode, sal_Int32 nPos, SvxFont& rFo
         }
         else if ( nAttr & EXTTEXTINPUT_ATTR_GRAYWAVELINE )
         {
-            rFont.SetUnderline( UNDERLINE_WAVE );
+            rFont.SetUnderline( LINESTYLE_WAVE );
             if( pOut )
                 pOut->SetTextLineColor( Color( COL_LIGHTGRAY ) );
         }
@@ -3394,7 +3394,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aSt
                                     if ( nOrientation || ( !IsVertical() && ( ( aTmpPos.X() + nTxtWidth ) >= nFirstVisXPos ) )
                                             || ( IsVertical() && ( ( aTmpPos.Y() + nTxtWidth ) >= nFirstVisYPos ) ) )
                                     {
-                                        if ( nEsc && ( ( aTmpFont.GetUnderline() != UNDERLINE_NONE ) ) )
+                                        if ( nEsc && ( ( aTmpFont.GetUnderline() != LINESTYLE_NONE ) ) )
                                         {
                                             // Paint the high/low without underline,
                                             // Display the Underline on the
@@ -3409,13 +3409,13 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aSt
                                                 if ( pPrev->GetStart() )
                                                 {
                                                     SeekCursor( pPortion->GetNode(), pPrev->GetStart(), aDummy );
-                                                    if ( aDummy.GetUnderline() != UNDERLINE_NONE )
+                                                    if ( aDummy.GetUnderline() != LINESTYLE_NONE )
                                                         bSpecialUnderline = true;
                                                 }
                                                 if ( !bSpecialUnderline && ( pPrev->GetEnd() < pPortion->GetNode()->Len() ) )
                                                 {
                                                     SeekCursor( pPortion->GetNode(), pPrev->GetEnd()+1, aDummy );
-                                                    if ( aDummy.GetUnderline() != UNDERLINE_NONE )
+                                                    if ( aDummy.GetUnderline() != LINESTYLE_NONE )
                                                         bSpecialUnderline = true;
                                                 }
                                             }
@@ -3433,7 +3433,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aSt
                                                     aUnderlinePos = lcl_ImplCalcRotatedPos( aTmpPos, aOrigin, nSin, nCos );
                                                 pOutDev->DrawStretchText( aUnderlinePos, aSz.Width(), aBlanks.makeStringAndClear(), 0, nTextLen );
 
-                                                aTmpFont.SetUnderline( UNDERLINE_NONE );
+                                                aTmpFont.SetUnderline( LINESTYLE_NONE );
                                                 if ( !nOrientation )
                                                     aTmpFont.SetEscapement( nEsc );
                                                 aTmpFont.SetPropr( nProp );
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index 36eaa05b4d8e..0ca6114b1093 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -849,13 +849,13 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput,
         {
             // Must underlined if in WordLineMode, but the information is
             // missing here
-            FontUnderline e = static_cast<const SvxUnderlineItem&>(rItem).GetLineStyle();
+            FontLineStyle e = static_cast<const SvxUnderlineItem&>(rItem).GetLineStyle();
             switch ( e )
             {
-                case UNDERLINE_NONE:    rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ULNONE );       break;
-                case UNDERLINE_SINGLE:  rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_UL );       break;
-                case UNDERLINE_DOUBLE:  rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ULDB );     break;
-                case UNDERLINE_DOTTED:  rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ULD );      break;
+                case LINESTYLE_NONE:    rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ULNONE );       break;
+                case LINESTYLE_SINGLE:  rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_UL );       break;
+                case LINESTYLE_DOUBLE:  rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ULDB );     break;
+                case LINESTYLE_DOTTED:  rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ULD );      break;
                 default:
                     break;
             }
@@ -863,13 +863,13 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput,
         break;
         case EE_CHAR_OVERLINE:
         {
-            FontUnderline e = static_cast<const SvxOverlineItem&>(rItem).GetLineStyle();
+            FontLineStyle e = static_cast<const SvxOverlineItem&>(rItem).GetLineStyle();
             switch ( e )
             {
-                case UNDERLINE_NONE:    rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_OLNONE );       break;
-                case UNDERLINE_SINGLE:  rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_OL );       break;
-                case UNDERLINE_DOUBLE:  rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_OLDB );     break;
-                case UNDERLINE_DOTTED:  rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_OLD );      break;
+                case LINESTYLE_NONE:    rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_OLNONE );       break;
+                case LINESTYLE_SINGLE:  rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_OL );       break;
+                case LINESTYLE_DOUBLE:  rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_OLDB );     break;
+                case LINESTYLE_DOTTED:  rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_OLD );      break;
                 default:
                     break;
             }
diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx
index 2f258620279c..8b41023f79f2 100644
--- a/editeng/source/items/bulitem.cxx
+++ b/editeng/source/items/bulitem.cxx
@@ -75,7 +75,7 @@ vcl::Font SvxBulletItem::CreateFont( SvStream& rStream, sal_uInt16 nVer )
     rStream.ReadUInt16( nTemp ); aFont.SetPitch((FontPitch)nTemp);
     rStream.ReadUInt16( nTemp ); aFont.SetAlignment((FontAlign)nTemp);
     rStream.ReadUInt16( nTemp ); aFont.SetWeight((FontWeight)nTemp);
-    rStream.ReadUInt16( nTemp ); aFont.SetUnderline((FontUnderline)nTemp);
+    rStream.ReadUInt16( nTemp ); aFont.SetUnderline((FontLineStyle)nTemp);
     rStream.ReadUInt16( nTemp ); aFont.SetStrikeout((FontStrikeout)nTemp);
     rStream.ReadUInt16( nTemp ); aFont.SetItalic((FontItalic)nTemp);
 
diff --git a/editeng/source/items/svxfont.cxx b/editeng/source/items/svxfont.cxx
index 1cacdbedc89b..83b21f675859 100644
--- a/editeng/source/items/svxfont.cxx
+++ b/editeng/source/items/svxfont.cxx
@@ -693,9 +693,9 @@ void SvxDoDrawCapital::Do( const OUString &_rTxt, const sal_Int32 _nIdx,
     Size aPartSize;
 
     // Set the desired font
-    FontUnderline eUnder = pFont->GetUnderline();
+    FontLineStyle eUnder = pFont->GetUnderline();
     FontStrikeout eStrike = pFont->GetStrikeout();
-    pFont->SetUnderline( UNDERLINE_NONE );
+    pFont->SetUnderline( LINESTYLE_NONE );
     pFont->SetStrikeout( STRIKEOUT_NONE );
     if ( !bUpper )
     {
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index 4806948d0615..218cb2b6def9 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -107,9 +107,9 @@ SfxPoolItem* SvxPostureItem::CreateDefault() { return new SvxPostureItem(ITALIC_
 SfxPoolItem* SvxWeightItem::CreateDefault() {return new SvxWeightItem(WEIGHT_NORMAL, 0);}
 SfxPoolItem* SvxFontHeightItem::CreateDefault() {return new SvxFontHeightItem(240, 100, 0);}
 SfxPoolItem* SvxFontWidthItem::CreateDefault() {return new SvxFontWidthItem(0, 100, 0);}
-SfxPoolItem* SvxTextLineItem::CreateDefault() {return new SvxTextLineItem(UNDERLINE_NONE, 0);}
-SfxPoolItem* SvxUnderlineItem::CreateDefault() {return new SvxUnderlineItem(UNDERLINE_NONE, 0);}
-SfxPoolItem* SvxOverlineItem::CreateDefault() {return new SvxOverlineItem(UNDERLINE_NONE, 0);}
+SfxPoolItem* SvxTextLineItem::CreateDefault() {return new SvxTextLineItem(LINESTYLE_NONE, 0);}
+SfxPoolItem* SvxUnderlineItem::CreateDefault() {return new SvxUnderlineItem(LINESTYLE_NONE, 0);}
+SfxPoolItem* SvxOverlineItem::CreateDefault() {return new SvxOverlineItem(LINESTYLE_NONE, 0);}
 SfxPoolItem* SvxCrossedOutItem::CreateDefault() {return new SvxCrossedOutItem(STRIKEOUT_NONE, 0);}
 SfxPoolItem* SvxShadowedItem::CreateDefault() {return new SvxShadowedItem(false, 0);}
 SfxPoolItem* SvxAutoKernItem::CreateDefault() {return new SvxAutoKernItem(false, 0);}
@@ -1250,7 +1250,7 @@ bool SvxFontWidthItem::GetPresentation
 
 // class SvxTextLineItem ------------------------------------------------
 
-SvxTextLineItem::SvxTextLineItem( const FontUnderline eSt, const sal_uInt16 nId )
+SvxTextLineItem::SvxTextLineItem( const FontLineStyle eSt, const sal_uInt16 nId )
     : SfxEnumItem( nId, (sal_uInt16)eSt ), mColor( COL_TRANSPARENT )
 {
 }
@@ -1266,14 +1266,14 @@ bool SvxTextLineItem::HasBoolValue() const
 
 bool SvxTextLineItem::GetBoolValue() const
 {
-    return  (FontUnderline)GetValue() != UNDERLINE_NONE;
+    return  (FontLineStyle)GetValue() != LINESTYLE_NONE;
 }
 
 
 
 void SvxTextLineItem::SetBoolValue( bool bVal )
 {
-    SetValue( (sal_uInt16)(bVal ? UNDERLINE_SINGLE : UNDERLINE_NONE) );
+    SetValue( (sal_uInt16)(bVal ? LINESTYLE_SINGLE : LINESTYLE_NONE) );
 }
 
 
@@ -1289,7 +1289,7 @@ SfxPoolItem* SvxTextLineItem::Clone( SfxItemPool * ) const
 
 sal_uInt16 SvxTextLineItem::GetValueCount() const
 {
-    return UNDERLINE_DOTTED + 1;    // UNDERLINE_NONE also belongs here
+    return LINESTYLE_DOTTED + 1;    // LINESTYLE_NONE also belongs here
 }
 
 
@@ -1306,7 +1306,7 @@ SfxPoolItem* SvxTextLineItem::Create(SvStream& rStrm, sal_uInt16) const
 {
     sal_uInt8 nState;
     rStrm.ReadUChar( nState );
-    return new SvxTextLineItem(  (FontUnderline)nState, Which() );
+    return new SvxTextLineItem(  (FontLineStyle)nState, Which() );
 }
 
 
@@ -1404,7 +1404,7 @@ bool SvxTextLineItem::operator==( const SfxPoolItem& rItem ) const
 
 // class SvxUnderlineItem ------------------------------------------------
 
-SvxUnderlineItem::SvxUnderlineItem( const FontUnderline eSt, const sal_uInt16 nId )
+SvxUnderlineItem::SvxUnderlineItem( const FontLineStyle eSt, const sal_uInt16 nId )
     : SvxTextLineItem( eSt, nId )
 {
 }
@@ -1424,20 +1424,20 @@ SfxPoolItem* SvxUnderlineItem::Create(SvStream& rStrm, sal_uInt16) const
 {
     sal_uInt8 nState;
     rStrm.ReadUChar( nState );
-    return new SvxUnderlineItem(  (FontUnderline)nState, Which() );
+    return new SvxUnderlineItem(  (FontLineStyle)nState, Which() );
 }
 
 
 
 OUString SvxUnderlineItem::GetValueTextByPos( sal_uInt16 nPos ) const
 {
-    DBG_ASSERT( nPos <= (sal_uInt16)UNDERLINE_BOLDWAVE, "enum overflow!" );
+    DBG_ASSERT( nPos <= (sal_uInt16)LINESTYLE_BOLDWAVE, "enum overflow!" );
     return EE_RESSTR(RID_SVXITEMS_UL_BEGIN + nPos);
 }
 
 // class SvxOverlineItem ------------------------------------------------
 
-SvxOverlineItem::SvxOverlineItem( const FontUnderline eSt, const sal_uInt16 nId )
+SvxOverlineItem::SvxOverlineItem( const FontLineStyle eSt, const sal_uInt16 nId )
     : SvxTextLineItem( eSt, nId )
 {
 }
@@ -1457,14 +1457,14 @@ SfxPoolItem* SvxOverlineItem::Create(SvStream& rStrm, sal_uInt16) const
 {
     sal_uInt8 nState;
     rStrm.ReadUChar( nState );
-    return new SvxOverlineItem(  (FontUnderline)nState, Which() );
+    return new SvxOverlineItem(  (FontLineStyle)nState, Which() );
 }
 
 
 
 OUString SvxOverlineItem::GetValueTextByPos( sal_uInt16 nPos ) const
 {
-    DBG_ASSERT( nPos <= (sal_uInt16)UNDERLINE_BOLDWAVE, "enum overflow!" );
+    DBG_ASSERT( nPos <= (sal_uInt16)LINESTYLE_BOLDWAVE, "enum overflow!" );
     return EE_RESSTR(RID_SVXITEMS_OL_BEGIN + nPos);
 }
 
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 5f46cf4616ed..bbc861bc5d9c 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -777,7 +777,7 @@ bool SvxAutoCorrect::FnChgWeightUnderl( SvxAutoCorrDoc& rDoc, const OUString& rT
         }
         else                            // underline
         {
-            SvxUnderlineItem aSvxUnderlineItem( UNDERLINE_SINGLE, SID_ATTR_CHAR_UNDERLINE );
+            SvxUnderlineItem aSvxUnderlineItem( LINESTYLE_SINGLE, SID_ATTR_CHAR_UNDERLINE );
             rDoc.SetAttr( nFndPos, nEndPos - 1,
                             SID_ATTR_CHAR_UNDERLINE,
                             aSvxUnderlineItem);
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index d19e62ba11ea..f741f1371d2f 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -877,8 +877,8 @@ vcl::Font Outliner::ImpCalcBulletFont( sal_Int32 nPara ) const
     else
     {
         aBulletFont = aStdFont;
-        aBulletFont.SetUnderline( UNDERLINE_NONE );
-        aBulletFont.SetOverline( UNDERLINE_NONE );
+        aBulletFont.SetUnderline( LINESTYLE_NONE );
+        aBulletFont.SetOverline( LINESTYLE_NONE );
         aBulletFont.SetStrikeout( STRIKEOUT_NONE );
         aBulletFont.SetEmphasisMark( EMPHASISMARK_NONE );
         aBulletFont.SetRelief( RELIEF_NONE );
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index ee0282ad823c..54ba22c91cc4 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -206,8 +206,8 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
     DBG_ASSERT( pSet, "A SfxItemSet has to be provided as argument!" );
     bool bFirstToken = true;
     bool bContinue = true;
-    FontUnderline eUnderline;
-    FontUnderline eOverline;
+    FontLineStyle eUnderline;
+    FontLineStyle eOverline;
     FontEmphasisMark eEmphasis;
     bPardTokenRead = false;
     RTF_CharTypeDef eCharType = NOTDEF_CHARTYPE;
@@ -725,60 +725,60 @@ SET_FONTALIGNMENT:
             case RTF_UL:
                 if( !IsAttrSttPos() )
                     break;
-                eUnderline = nTokenValue ? UNDERLINE_SINGLE : UNDERLINE_NONE;
+                eUnderline = nTokenValue ? LINESTYLE_SINGLE : LINESTYLE_NONE;
                 goto ATTR_SETUNDERLINE;
 
             case RTF_ULD:
-                eUnderline = UNDERLINE_DOTTED;
+                eUnderline = LINESTYLE_DOTTED;
                 goto ATTR_SETUNDERLINE;
             case RTF_ULDASH:
-                eUnderline = UNDERLINE_DASH;
+                eUnderline = LINESTYLE_DASH;
                 goto ATTR_SETUNDERLINE;
             case RTF_ULDASHD:
-                eUnderline = UNDERLINE_DASHDOT;
+                eUnderline = LINESTYLE_DASHDOT;
                 goto ATTR_SETUNDERLINE;
             case RTF_ULDASHDD:
-                eUnderline = UNDERLINE_DASHDOTDOT;
+                eUnderline = LINESTYLE_DASHDOTDOT;
                 goto ATTR_SETUNDERLINE;
             case RTF_ULDB:
-                eUnderline = UNDERLINE_DOUBLE;
+                eUnderline = LINESTYLE_DOUBLE;
                 goto ATTR_SETUNDERLINE;
             case RTF_ULNONE:
-                eUnderline = UNDERLINE_NONE;
+                eUnderline = LINESTYLE_NONE;
                 goto ATTR_SETUNDERLINE;
             case RTF_ULTH:
-                eUnderline = UNDERLINE_BOLD;
+                eUnderline = LINESTYLE_BOLD;
                 goto ATTR_SETUNDERLINE;
             case RTF_ULWAVE:
-                eUnderline = UNDERLINE_WAVE;
+                eUnderline = LINESTYLE_WAVE;
                 goto ATTR_SETUNDERLINE;
             case RTF_ULTHD:
-                eUnderline = UNDERLINE_BOLDDOTTED;
+                eUnderline = LINESTYLE_BOLDDOTTED;
                 goto ATTR_SETUNDERLINE;
             case RTF_ULTHDASH:
-                eUnderline = UNDERLINE_BOLDDASH;
+                eUnderline = LINESTYLE_BOLDDASH;
                 goto ATTR_SETUNDERLINE;
             case RTF_ULLDASH:
-                eUnderline = UNDERLINE_LONGDASH;
+                eUnderline = LINESTYLE_LONGDASH;
                 goto ATTR_SETUNDERLINE;
             case RTF_ULTHLDASH:
-                eUnderline = UNDERLINE_BOLDLONGDASH;
+                eUnderline = LINESTYLE_BOLDLONGDASH;
                 goto ATTR_SETUNDERLINE;
             case RTF_ULTHDASHD:
-                eUnderline = UNDERLINE_BOLDDASHDOT;
+                eUnderline = LINESTYLE_BOLDDASHDOT;
                 goto ATTR_SETUNDERLINE;
             case RTF_ULTHDASHDD:
-                eUnderline = UNDERLINE_BOLDDASHDOTDOT;
+                eUnderline = LINESTYLE_BOLDDASHDOTDOT;
                 goto ATTR_SETUNDERLINE;
             case RTF_ULHWAVE:
-                eUnderline = UNDERLINE_BOLDWAVE;
+                eUnderline = LINESTYLE_BOLDWAVE;
                 goto ATTR_SETUNDERLINE;
             case RTF_ULULDBWAVE:
-                eUnderline = UNDERLINE_DOUBLEWAVE;
+                eUnderline = LINESTYLE_DOUBLEWAVE;
                 goto ATTR_SETUNDERLINE;
 
             case RTF_ULW:
-                eUnderline = UNDERLINE_SINGLE;
+                eUnderline = LINESTYLE_SINGLE;
 
                 if( aPlainMap.nWordlineMode )
                 {
@@ -796,13 +796,13 @@ ATTR_SETUNDERLINE:
             case RTF_ULC:
                 if( aPlainMap.nUnderline )
                 {
-                    SvxUnderlineItem aUL( UNDERLINE_SINGLE, aPlainMap.nUnderline );
+                    SvxUnderlineItem aUL( LINESTYLE_SINGLE, aPlainMap.nUnderline );
                     const SfxPoolItem* pItem;
                     if( SfxItemState::SET == pSet->GetItemState(
                         aPlainMap.nUnderline, false, &pItem ) )
                     {
                         // is switched off ?
-                        if( UNDERLINE_NONE ==
+                        if( LINESTYLE_NONE ==
                             static_cast<const SvxUnderlineItem*>(pItem)->GetLineStyle() )
                             break;
                         aUL = *static_cast<const SvxUnderlineItem*>(pItem);
@@ -810,8 +810,8 @@ ATTR_SETUNDERLINE:
                     else
                         aUL = static_cast<const SvxUnderlineItem&>(pSet->Get( aPlainMap.nUnderline, false ));
 
-                    if( UNDERLINE_NONE == aUL.GetLineStyle() )
-                        aUL.SetLineStyle( UNDERLINE_SINGLE );
+                    if( LINESTYLE_NONE == aUL.GetLineStyle() )
+                        aUL.SetLineStyle( LINESTYLE_SINGLE );
                     aUL.SetColor( GetColor( sal_uInt16(nTokenValue) ));
                     pSet->Put( aUL );
                 }
@@ -820,60 +820,60 @@ ATTR_SETUNDERLINE:
             case RTF_OL:
                 if( !IsAttrSttPos() )
                     break;
-                eOverline = nTokenValue ? UNDERLINE_SINGLE : UNDERLINE_NONE;
+                eOverline = nTokenValue ? LINESTYLE_SINGLE : LINESTYLE_NONE;
                 goto ATTR_SETOVERLINE;
 
             case RTF_OLD:
-                eOverline = UNDERLINE_DOTTED;
+                eOverline = LINESTYLE_DOTTED;
                 goto ATTR_SETOVERLINE;
             case RTF_OLDASH:
-                eOverline = UNDERLINE_DASH;
+                eOverline = LINESTYLE_DASH;
                 goto ATTR_SETOVERLINE;
             case RTF_OLDASHD:
-                eOverline = UNDERLINE_DASHDOT;
+                eOverline = LINESTYLE_DASHDOT;
                 goto ATTR_SETOVERLINE;
             case RTF_OLDASHDD:
-                eOverline = UNDERLINE_DASHDOTDOT;
+                eOverline = LINESTYLE_DASHDOTDOT;
                 goto ATTR_SETOVERLINE;
             case RTF_OLDB:
-                eOverline = UNDERLINE_DOUBLE;
+                eOverline = LINESTYLE_DOUBLE;
                 goto ATTR_SETOVERLINE;
             case RTF_OLNONE:
-                eOverline = UNDERLINE_NONE;
+                eOverline = LINESTYLE_NONE;
                 goto ATTR_SETOVERLINE;
             case RTF_OLTH:
-                eOverline = UNDERLINE_BOLD;
+                eOverline = LINESTYLE_BOLD;
                 goto ATTR_SETOVERLINE;
             case RTF_OLWAVE:
-                eOverline = UNDERLINE_WAVE;
+                eOverline = LINESTYLE_WAVE;
                 goto ATTR_SETOVERLINE;
             case RTF_OLTHD:
-                eOverline = UNDERLINE_BOLDDOTTED;
+                eOverline = LINESTYLE_BOLDDOTTED;
                 goto ATTR_SETOVERLINE;
             case RTF_OLTHDASH:
-                eOverline = UNDERLINE_BOLDDASH;
+                eOverline = LINESTYLE_BOLDDASH;
                 goto ATTR_SETOVERLINE;
             case RTF_OLLDASH:
-                eOverline = UNDERLINE_LONGDASH;
+                eOverline = LINESTYLE_LONGDASH;
                 goto ATTR_SETOVERLINE;
             case RTF_OLTHLDASH:
-                eOverline = UNDERLINE_BOLDLONGDASH;
+                eOverline = LINESTYLE_BOLDLONGDASH;
                 goto ATTR_SETOVERLINE;
             case RTF_OLTHDASHD:
-                eOverline = UNDERLINE_BOLDDASHDOT;
+                eOverline = LINESTYLE_BOLDDASHDOT;
                 goto ATTR_SETOVERLINE;
             case RTF_OLTHDASHDD:
-                eOverline = UNDERLINE_BOLDDASHDOTDOT;
+                eOverline = LINESTYLE_BOLDDASHDOTDOT;
                 goto ATTR_SETOVERLINE;
             case RTF_OLHWAVE:
-                eOverline = UNDERLINE_BOLDWAVE;
+                eOverline = LINESTYLE_BOLDWAVE;
                 goto ATTR_SETOVERLINE;
             case RTF_OLOLDBWAVE:
-                eOverline = UNDERLINE_DOUBLEWAVE;
+                eOverline = LINESTYLE_DOUBLEWAVE;
                 goto ATTR_SETOVERLINE;
 
             case RTF_OLW:
-                eOverline = UNDERLINE_SINGLE;
+                eOverline = LINESTYLE_SINGLE;
 
                 if( aPlainMap.nWordlineMode )
                 {
@@ -891,13 +891,13 @@ ATTR_SETOVERLINE:
             case RTF_OLC:
                 if( aPlainMap.nOverline )
                 {
-                    SvxOverlineItem aOL( UNDERLINE_SINGLE, aPlainMap.nOverline );
+                    SvxOverlineItem aOL( LINESTYLE_SINGLE, aPlainMap.nOverline );
                     const SfxPoolItem* pItem;
                     if( SfxItemState::SET == pSet->GetItemState(
                         aPlainMap.nOverline, false, &pItem ) )
                     {
                         // is switched off ?
-                        if( UNDERLINE_NONE ==
+                        if( LINESTYLE_NONE ==
                             static_cast<const SvxOverlineItem*>(pItem)->GetLineStyle() )
                             break;
                         aOL = *static_cast<const SvxOverlineItem*>(pItem);
@@ -905,8 +905,8 @@ ATTR_SETOVERLINE:
                     else
                         aOL = static_cast<const SvxOverlineItem&>(pSet->Get( aPlainMap.nOverline, false ));
 
-                    if( UNDERLINE_NONE == aOL.GetLineStyle() )
-                        aOL.SetLineStyle( UNDERLINE_SINGLE );
+                    if( LINESTYLE_NONE == aOL.GetLineStyle() )
+                        aOL.SetLineStyle( LINESTYLE_SINGLE );
                     aOL.SetColor( GetColor( sal_uInt16(nTokenValue) ));
                     pSet->Put( aOL );
                 }
diff --git a/editeng/source/uno/unofdesc.cxx b/editeng/source/uno/unofdesc.cxx
index 996b43f9eb1f..59390d2034b6 100644
--- a/editeng/source/uno/unofdesc.cxx
+++ b/editeng/source/uno/unofdesc.cxx
@@ -50,7 +50,7 @@ void SvxUnoFontDescriptor::ConvertToFont( const awt::FontDescriptor& rDesc, vcl:
     rFont.SetKerning( rDesc.Kerning ? FontKerning::FontSpecific : FontKerning::NONE );
     rFont.SetWeight( VCLUnoHelper::ConvertFontWeight(rDesc.Weight) );
     rFont.SetItalic( (FontItalic)rDesc.Slant );
-    rFont.SetUnderline( (FontUnderline)rDesc.Underline );
+    rFont.SetUnderline( (FontLineStyle)rDesc.Underline );
     rFont.SetStrikeout( (FontStrikeout)rDesc.Strikeout );
     rFont.SetWordLineMode( rDesc.WordLineMode );
 }
@@ -102,7 +102,7 @@ void SvxUnoFontDescriptor::FillItemSet( const awt::FontDescriptor& rDesc, SfxIte
     }
 
     {
-        SvxUnderlineItem aUnderlineItem( (FontUnderline)0, EE_CHAR_UNDERLINE );
+        SvxUnderlineItem aUnderlineItem( (FontLineStyle)0, EE_CHAR_UNDERLINE );
         aTemp <<= (sal_Int16)rDesc.Underline;
         static_cast<SfxPoolItem*>(&aUnderlineItem)->PutValue( aTemp, MID_TL_STYLE );
         rSet.Put( aUnderlineItem );