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>

6 files changed, 13 insertions, 13 deletions

diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 7e90868080c4..49e0720571a2 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -940,7 +940,7 @@ void FontStylePropertyBox::update()
     vcl::Font aFont( mpEdit->GetFont() );
     aFont.SetWeight( mfFontWeight == awt::FontWeight::BOLD ? WEIGHT_BOLD : WEIGHT_NORMAL );
     aFont.SetItalic( meFontSlant == awt::FontSlant_ITALIC ? ITALIC_NORMAL : ITALIC_NONE  );
-    aFont.SetUnderline( mnFontUnderline == awt::FontUnderline::NONE ? UNDERLINE_NONE : UNDERLINE_SINGLE );
+    aFont.SetUnderline( mnFontUnderline == awt::FontUnderline::NONE ? LINESTYLE_NONE : LINESTYLE_SINGLE );
     mpEdit->SetFont( aFont );
     mpEdit->Invalidate();
 }
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx
index 8377c06ab7ab..02f3ca3af02a 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -957,7 +957,7 @@ void AnnotationManagerImpl::ExecuteAnnotationContextMenu( Reference< XAnnotation
             }
             if ( aSet.GetItemState( EE_CHAR_UNDERLINE ) == SfxItemState::SET )
             {
-                if( static_cast<const SvxUnderlineItem&>(aSet.Get( EE_CHAR_UNDERLINE )).GetLineStyle() != UNDERLINE_NONE )
+                if( static_cast<const SvxUnderlineItem&>(aSet.Get( EE_CHAR_UNDERLINE )).GetLineStyle() != LINESTYLE_NONE )
                     pMenu->CheckItem( SID_ATTR_CHAR_UNDERLINE );
             }
 
diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx
index dcbeb2262a75..e0c42c49225a 100644
--- a/sd/source/ui/annotations/annotationwindow.cxx
+++ b/sd/source/ui/annotations/annotationwindow.cxx
@@ -780,8 +780,8 @@ void AnnotationWindow::ExecuteSlot( sal_uInt16 nSID )
         break;
         case SID_ATTR_CHAR_UNDERLINE:
         {
-            FontUnderline eFU = static_cast<const SvxUnderlineItem&>( aEditAttr. Get( EE_CHAR_UNDERLINE ) ).GetLineStyle();
-            aNewAttr.Put( SvxUnderlineItem( eFU == UNDERLINE_SINGLE ? UNDERLINE_NONE : UNDERLINE_SINGLE, EE_CHAR_UNDERLINE ) );
+            FontLineStyle eFU = static_cast<const SvxUnderlineItem&>( aEditAttr. Get( EE_CHAR_UNDERLINE ) ).GetLineStyle();
+            aNewAttr.Put( SvxUnderlineItem( eFU == LINESTYLE_SINGLE ? LINESTYLE_NONE : LINESTYLE_SINGLE, EE_CHAR_UNDERLINE ) );
         }
         break;
         case SID_ATTR_CHAR_STRIKEOUT:
diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index d18703f7cd07..3cf7623ca2d6 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -446,19 +446,19 @@ void TextObjectBar::Execute( SfxRequest &rReq )
                     break;
                     case SID_ATTR_CHAR_UNDERLINE:
                     {
-                        FontUnderline eFU = static_cast<const SvxUnderlineItem&>( aEditAttr.
+                        FontLineStyle eFU = static_cast<const SvxUnderlineItem&>( aEditAttr.
                                         Get( EE_CHAR_UNDERLINE ) ).GetLineStyle();
-                        aNewAttr.Put( SvxUnderlineItem( eFU == UNDERLINE_SINGLE ?
-                                            UNDERLINE_NONE : UNDERLINE_SINGLE,
+                        aNewAttr.Put( SvxUnderlineItem( eFU == LINESTYLE_SINGLE ?
+                                            LINESTYLE_NONE : LINESTYLE_SINGLE,
                                             EE_CHAR_UNDERLINE ) );
                     }
                     break;
                     case SID_ATTR_CHAR_OVERLINE:
                     {
-                        FontUnderline eFO = static_cast<const SvxOverlineItem&>( aEditAttr.
+                        FontLineStyle eFO = static_cast<const SvxOverlineItem&>( aEditAttr.
                                         Get( EE_CHAR_OVERLINE ) ).GetLineStyle();
-                        aNewAttr.Put( SvxOverlineItem( eFO == UNDERLINE_SINGLE ?
-                                            UNDERLINE_NONE : UNDERLINE_SINGLE,
+                        aNewAttr.Put( SvxOverlineItem( eFO == LINESTYLE_SINGLE ?
+                                            LINESTYLE_NONE : LINESTYLE_SINGLE,
                                             EE_CHAR_OVERLINE ) );
                     }
                     break;
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 72cbb03e5d54..3ee00b3bf899 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -2972,8 +2972,8 @@ void DrawViewShell::ExecChar( SfxRequest &rReq )
             }
             else
             {
-                FontUnderline eFU = static_cast<const SvxUnderlineItem&>( aEditAttr.Get( EE_CHAR_UNDERLINE ) ).GetLineStyle();
-                aNewAttr.Put( SvxUnderlineItem( eFU != UNDERLINE_NONE ?UNDERLINE_NONE : UNDERLINE_SINGLE,  EE_CHAR_UNDERLINE ) );
+                FontLineStyle eFU = static_cast<const SvxUnderlineItem&>( aEditAttr.Get( EE_CHAR_UNDERLINE ) ).GetLineStyle();
+                aNewAttr.Put( SvxUnderlineItem( eFU != LINESTYLE_NONE ?LINESTYLE_NONE : LINESTYLE_SINGLE,  EE_CHAR_UNDERLINE ) );
             }//aNewAttr.Put( (const SvxUnderlineItem&)aEditAttr.Get( EE_CHAR_UNDERLINE ) );
         }
         break;
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index 66bdc03540b5..d3c04c2a77de 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -136,7 +136,7 @@ OutlineView::OutlineView( DrawDocShell& rDocSh, vcl::Window* pWindow, OutlineVie
     maBulletFont.SetCharSet(RTL_TEXTENCODING_MS_1252);   // and replacing other values by standard
     maBulletFont.SetFamilyName( "StarSymbol" );
     maBulletFont.SetWeight(WEIGHT_NORMAL);
-    maBulletFont.SetUnderline(UNDERLINE_NONE);
+    maBulletFont.SetUnderline(LINESTYLE_NONE);
     maBulletFont.SetStrikeout(STRIKEOUT_NONE);
     maBulletFont.SetItalic(ITALIC_NONE);
     maBulletFont.SetOutline(false);