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>

13 files changed, 58 insertions, 58 deletions

diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index 34bde58e7d54..23fcff86a175 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -954,30 +954,30 @@ void SvxFontPrevWindow::SetFromItemSet(const SfxItemSet &rSet, bool bPreviewBack
     }
 
     // Underline
-    FontUnderline eUnderline;
+    FontLineStyle eUnderline;
     if( GetWhich( rSet, SID_ATTR_CHAR_UNDERLINE, nWhich ) )
     {
         const SvxUnderlineItem& rItem = static_cast<const SvxUnderlineItem&>( rSet.Get( nWhich ) );
-        eUnderline = ( FontUnderline ) rItem.GetValue();
+        eUnderline = ( FontLineStyle ) rItem.GetValue();
         SetTextLineColor( rItem.GetColor() );
     }
     else
-        eUnderline = UNDERLINE_NONE;
+        eUnderline = LINESTYLE_NONE;
 
     rFont.SetUnderline( eUnderline );
     rCJKFont.SetUnderline( eUnderline );
     rCTLFont.SetUnderline( eUnderline );
 
     // Overline
-    FontUnderline eOverline;
+    FontLineStyle eOverline;
     if( GetWhich( rSet, SID_ATTR_CHAR_OVERLINE, nWhich ) )
     {
         const SvxOverlineItem& rItem = static_cast<const SvxOverlineItem&>( rSet.Get( nWhich ) );
-        eOverline = ( FontUnderline ) rItem.GetValue();
+        eOverline = ( FontLineStyle ) rItem.GetValue();
         SetOverlineColor( rItem.GetColor() );
     }
     else
-        eOverline = UNDERLINE_NONE;
+        eOverline = LINESTYLE_NONE;
 
     rFont.SetOverline( eOverline );
     rCJKFont.SetOverline( eOverline );
@@ -1189,32 +1189,32 @@ void SvxFontPrevWindow::Init(const SfxItemSet& rSet)
     }
 
     // Underline
-    FontUnderline eUnderline;
+    FontLineStyle eUnderline;
     nWhich = rSet.GetPool()->GetWhich( SID_ATTR_CHAR_UNDERLINE );
     if( ISITEMSET )
     {
         const SvxUnderlineItem& rItem = static_cast<const SvxUnderlineItem&>( rSet.Get( nWhich ) );
-        eUnderline = ( FontUnderline ) rItem.GetValue();
+        eUnderline = ( FontLineStyle ) rItem.GetValue();
         SetTextLineColor( rItem.GetColor() );
     }
     else
-        eUnderline = UNDERLINE_NONE;
+        eUnderline = LINESTYLE_NONE;
 
     rFont.SetUnderline( eUnderline );
     rCJKFont.SetUnderline( eUnderline );
     rCTLFont.SetUnderline( eUnderline );
 
     // Overline
-    FontUnderline eOverline;
+    FontLineStyle eOverline;
     nWhich = rSet.GetPool()->GetWhich( SID_ATTR_CHAR_OVERLINE );
     if( ISITEMSET )
     {
         const SvxOverlineItem& rItem = static_cast<const SvxOverlineItem&>( rSet.Get( nWhich ) );
-        eOverline = ( FontUnderline ) rItem.GetValue();
+        eOverline = ( FontLineStyle ) rItem.GetValue();
         SetOverlineColor( rItem.GetColor() );
     }
     else
-        eOverline = UNDERLINE_NONE;
+        eOverline = LINESTYLE_NONE;
 
     rFont.SetOverline( eOverline );
     rCJKFont.SetOverline( eOverline );
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 6e589fe441f6..5e63d62a3334 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -114,7 +114,7 @@ vcl::Font ImplCreateFont( const css::awt::FontDescriptor& rDescr )
     aFont.SetWidthType( VCLUnoHelper::ConvertFontWidth( rDescr.CharacterWidth ) );
     aFont.SetWeight( VCLUnoHelper::ConvertFontWeight( rDescr.Weight ) );
     aFont.SetItalic( (FontItalic)rDescr.Slant );
-    aFont.SetUnderline( (::FontUnderline)rDescr.Underline );
+    aFont.SetUnderline( (::FontLineStyle)rDescr.Underline );
     aFont.SetStrikeout( (::FontStrikeout)rDescr.Strikeout );
     aFont.SetOrientation( (sal_Int16)rDescr.Orientation );
     aFont.SetKerning( static_cast<FontKerning>(rDescr.Kerning) );
diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx
index c3dbf76259c9..ed77e61673eb 100644
--- a/svx/source/form/fmtextcontrolshell.cxx
+++ b/svx/source/form/fmtextcontrolshell.cxx
@@ -861,11 +861,11 @@ namespace svx
                     DBG_ASSERT( pTextLine, "FmTextControlShell::ExecuteTextAttribute: ooops - no underline/overline item!" );
                     if ( pTextLine )
                     {
-                        FontUnderline eTL = pTextLine->GetLineStyle();
+                        FontLineStyle eTL = pTextLine->GetLineStyle();
                         if ( SID_ATTR_CHAR_UNDERLINE == nSlot ) {
-                            aToggled.Put( SvxUnderlineItem( eTL == UNDERLINE_SINGLE ? UNDERLINE_NONE : UNDERLINE_SINGLE, nWhich ) );
+                            aToggled.Put( SvxUnderlineItem( eTL == LINESTYLE_SINGLE ? LINESTYLE_NONE : LINESTYLE_SINGLE, nWhich ) );
                         } else {
-                            aToggled.Put( SvxOverlineItem( eTL == UNDERLINE_SINGLE ? UNDERLINE_NONE : UNDERLINE_SINGLE, nWhich ) );
+                            aToggled.Put( SvxOverlineItem( eTL == LINESTYLE_SINGLE ? LINESTYLE_NONE : LINESTYLE_SINGLE, nWhich ) );
                         }
                     }
                 }
diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx b/svx/source/sidebar/text/TextPropertyPanel.cxx
index 38484e7c3988..110031252405 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.cxx
+++ b/svx/source/sidebar/text/TextPropertyPanel.cxx
@@ -107,7 +107,7 @@ TextPropertyPanel::TextPropertyPanel ( vcl::Window* pParent, const css::uno::Ref
 
     //init state
     mpHeightItem = nullptr;
-    meUnderline = UNDERLINE_NONE;
+    meUnderline = LINESTYLE_NONE;
     meUnderlineColor = COL_AUTO;
     mbKernAvailable = true;
     mbKernLBAvailable = true;
@@ -272,11 +272,11 @@ void TextPropertyPanel::NotifyItemUpdate (
             if( eState >= SfxItemState::DEFAULT && dynamic_cast<const SvxUnderlineItem*>( pState) !=  nullptr )
             {
                 const SvxUnderlineItem* pItem = static_cast<const SvxUnderlineItem*>(pState);
-                meUnderline = (FontUnderline)pItem->GetValue();
+                meUnderline = (FontLineStyle)pItem->GetValue();
                 meUnderlineColor = pItem->GetColor();
             }
             else
-                meUnderline = UNDERLINE_NONE;
+                meUnderline = LINESTYLE_NONE;
         }
         break;
     case SID_ATTR_CHAR_KERNING:
diff --git a/svx/source/sidebar/text/TextPropertyPanel.hxx b/svx/source/sidebar/text/TextPropertyPanel.hxx
index 414b2b52c750..16e62cefaa01 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.hxx
+++ b/svx/source/sidebar/text/TextPropertyPanel.hxx
@@ -94,7 +94,7 @@ private:
     ::sfx2::sidebar::ControllerItem maUnderlineControl;
     ::sfx2::sidebar::ControllerItem maSpacingControl;
 
-    FontUnderline               meUnderline;
+    FontLineStyle               meUnderline;
     Color                       meUnderlineColor;
     bool                        mbKernAvailable;
     bool                        mbKernLBAvailable;
diff --git a/svx/source/sidebar/text/TextUnderlineControl.cxx b/svx/source/sidebar/text/TextUnderlineControl.cxx
index 99bfab2e3342..f9eb44651164 100644
--- a/svx/source/sidebar/text/TextUnderlineControl.cxx
+++ b/svx/source/sidebar/text/TextUnderlineControl.cxx
@@ -96,34 +96,34 @@ void TextUnderlineControl::initial()
     maVSUnderline->SetText( SVX_RESSTR(STR_WITHOUT) );
 
     maVSUnderline->InsertItem(1, maIMGSingle, SVX_RESSTR(STR_SINGLE));
-    maVSUnderline->SetItemData(1, reinterpret_cast<void*>(UNDERLINE_SINGLE));
+    maVSUnderline->SetItemData(1, reinterpret_cast<void*>(LINESTYLE_SINGLE));
 
     maVSUnderline->InsertItem(2, maIMGDouble, SVX_RESSTR(STR_DOUBLE));
-    maVSUnderline->SetItemData(2, reinterpret_cast<void*>(UNDERLINE_DOUBLE));
+    maVSUnderline->SetItemData(2, reinterpret_cast<void*>(LINESTYLE_DOUBLE));
 
     maVSUnderline->InsertItem(3, maIMGBold, SVX_RESSTR(STR_BOLD));
-    maVSUnderline->SetItemData(3, reinterpret_cast<void*>(UNDERLINE_BOLD));
+    maVSUnderline->SetItemData(3, reinterpret_cast<void*>(LINESTYLE_BOLD));
 
     maVSUnderline->InsertItem(4, maIMGDot, SVX_RESSTR(STR_DOT));
-    maVSUnderline->SetItemData(4, reinterpret_cast<void*>(UNDERLINE_DOTTED));
+    maVSUnderline->SetItemData(4, reinterpret_cast<void*>(LINESTYLE_DOTTED));
 
     maVSUnderline->InsertItem(5, maIMGDotBold, SVX_RESSTR(STR_DOT_BOLD));
-    maVSUnderline->SetItemData(5, reinterpret_cast<void*>(UNDERLINE_BOLDDOTTED));
+    maVSUnderline->SetItemData(5, reinterpret_cast<void*>(LINESTYLE_BOLDDOTTED));
 
     maVSUnderline->InsertItem(6, maIMGDash, SVX_RESSTR(STR_DASH));
-    maVSUnderline->SetItemData(6, reinterpret_cast<void*>(UNDERLINE_DASH));
+    maVSUnderline->SetItemData(6, reinterpret_cast<void*>(LINESTYLE_DASH));
 
     maVSUnderline->InsertItem(7, maIMGDashLong, SVX_RESSTR(STR_DASH_LONG));
-    maVSUnderline->SetItemData(7, reinterpret_cast<void*>(UNDERLINE_LONGDASH));
+    maVSUnderline->SetItemData(7, reinterpret_cast<void*>(LINESTYLE_LONGDASH));
 
     maVSUnderline->InsertItem(8, maIMGDashDot, SVX_RESSTR(STR_DASH_DOT));
-    maVSUnderline->SetItemData(8, reinterpret_cast<void*>(UNDERLINE_DASHDOT));
+    maVSUnderline->SetItemData(8, reinterpret_cast<void*>(LINESTYLE_DASHDOT));
 
     maVSUnderline->InsertItem(9, maIMGDashDotDot, SVX_RESSTR(STR_DASH_DOT_DOT));
-    maVSUnderline->SetItemData(9, reinterpret_cast<void*>(UNDERLINE_DASHDOTDOT));
+    maVSUnderline->SetItemData(9, reinterpret_cast<void*>(LINESTYLE_DASHDOTDOT));
 
     maVSUnderline->InsertItem(10, maIMGWave, SVX_RESSTR(STR_WAVE));
-    maVSUnderline->SetItemData(10, reinterpret_cast<void*>(UNDERLINE_WAVE));
+    maVSUnderline->SetItemData(10, reinterpret_cast<void*>(LINESTYLE_WAVE));
 
     maVSUnderline->SetColCount();
     maVSUnderline->SetSelectHdl(LINK( this, TextUnderlineControl, VSSelectHdl ));
@@ -132,7 +132,7 @@ void TextUnderlineControl::initial()
     maVSUnderline->Show();
 }
 
-void TextUnderlineControl::Rearrange(FontUnderline eLine)
+void TextUnderlineControl::Rearrange(FontLineStyle eLine)
 {
     maVSUnderline->SetItemImage(1, maIMGSingle);
     maVSUnderline->SetItemImage(2, maIMGDouble );
@@ -147,57 +147,57 @@ void TextUnderlineControl::Rearrange(FontUnderline eLine)
 
     switch(eLine)
     {
-    case UNDERLINE_SINGLE:
+    case LINESTYLE_SINGLE:
         maVSUnderline->SetItemImage(1, maIMGSingleSel);
         maVSUnderline->SelectItem(1);
         maVSUnderline->GrabFocus();
         break;
-    case UNDERLINE_DOUBLE:
+    case LINESTYLE_DOUBLE:
         maVSUnderline->SetItemImage(2, maIMGDoubleSel);
         maVSUnderline->SelectItem(2);
         maVSUnderline->GrabFocus();
         break;
-    case UNDERLINE_BOLD:
+    case LINESTYLE_BOLD:
         maVSUnderline->SetItemImage(3, maIMGBoldSel);
         maVSUnderline->SelectItem(3);
         maVSUnderline->GrabFocus();
         break;
-    case UNDERLINE_DOTTED:
+    case LINESTYLE_DOTTED:
         maVSUnderline->SetItemImage(4, maIMGDotSel);
         maVSUnderline->SelectItem(4);
         maVSUnderline->GrabFocus();
         break;
-    case UNDERLINE_BOLDDOTTED:
+    case LINESTYLE_BOLDDOTTED:
         maVSUnderline->SetItemImage(5, maIMGDotBoldSel);
         maVSUnderline->SelectItem(5);
         maVSUnderline->GrabFocus();
         break;
-    case UNDERLINE_DASH:
+    case LINESTYLE_DASH:
         maVSUnderline->SetItemImage(6, maIMGDashSel);
         maVSUnderline->SelectItem(6);
         maVSUnderline->GrabFocus();
         break;
-    case UNDERLINE_LONGDASH:
+    case LINESTYLE_LONGDASH:
         maVSUnderline->SetItemImage(7, maIMGDashLongSel);
         maVSUnderline->SelectItem(7);
         maVSUnderline->GrabFocus();
         break;
-    case UNDERLINE_DASHDOT:
+    case LINESTYLE_DASHDOT:
         maVSUnderline->SetItemImage(8, maIMGDashDotSel);
         maVSUnderline->SelectItem(8);
         maVSUnderline->GrabFocus();
         break;
-    case UNDERLINE_DASHDOTDOT:
+    case LINESTYLE_DASHDOTDOT:
         maVSUnderline->SetItemImage(9, maIMGDashDotDotSel);
         maVSUnderline->SelectItem(9);
         maVSUnderline->GrabFocus();
         break;
-    case UNDERLINE_WAVE:
+    case LINESTYLE_WAVE:
         maVSUnderline->SetItemImage(10, maIMGWaveSel);
         maVSUnderline->SelectItem(10);
         maVSUnderline->GrabFocus();
         break;
-    case UNDERLINE_NONE:
+    case LINESTYLE_NONE:
         maVSUnderline->SelectItem(0);
         maVSUnderline->GrabFocus();
         break;
@@ -214,9 +214,9 @@ IMPL_LINK_TYPED(TextUnderlineControl, VSSelectHdl, ValueSet*, pControl, void)
     if ( pControl == maVSUnderline.get() )
     {
         const sal_uInt16 iPos = maVSUnderline->GetSelectItemId();
-        const FontUnderline eUnderline = ( iPos == 0 )
-                                         ? UNDERLINE_NONE
-                                         : static_cast<FontUnderline>(reinterpret_cast<sal_uInt64>(maVSUnderline->GetItemData( iPos )));
+        const FontLineStyle eUnderline = ( iPos == 0 )
+                                         ? LINESTYLE_NONE
+                                         : static_cast<FontLineStyle>(reinterpret_cast<sal_uInt64>(maVSUnderline->GetItemData( iPos )));
 
         SvxUnderlineItem aLineItem(eUnderline, SID_ATTR_CHAR_UNDERLINE);
 
diff --git a/svx/source/sidebar/text/TextUnderlineControl.hxx b/svx/source/sidebar/text/TextUnderlineControl.hxx
index 8acd252358b6..2e8b85e4463c 100644
--- a/svx/source/sidebar/text/TextUnderlineControl.hxx
+++ b/svx/source/sidebar/text/TextUnderlineControl.hxx
@@ -38,7 +38,7 @@ public:
         SfxBindings* pBindings);
     virtual ~TextUnderlineControl();
     virtual void dispose() override;
-    void Rearrange(FontUnderline eLine);
+    void Rearrange(FontLineStyle eLine);
 
 private:
     svx::sidebar::TextPropertyPanel&     mrTextPropertyPanel;
diff --git a/svx/source/sidebar/text/TextUnderlinePopup.cxx b/svx/source/sidebar/text/TextUnderlinePopup.cxx
index f4c342ee9cd9..b776346f47b4 100644
--- a/svx/source/sidebar/text/TextUnderlinePopup.cxx
+++ b/svx/source/sidebar/text/TextUnderlinePopup.cxx
@@ -35,7 +35,7 @@ TextUnderlinePopup::~TextUnderlinePopup()
 {
 }
 
-void TextUnderlinePopup::Rearrange (FontUnderline eLine)
+void TextUnderlinePopup::Rearrange (FontLineStyle eLine)
 {
     ProvideContainerAndControl();
 
diff --git a/svx/source/sidebar/text/TextUnderlinePopup.hxx b/svx/source/sidebar/text/TextUnderlinePopup.hxx
index b9da6418693d..10fdc5fedbd8 100644
--- a/svx/source/sidebar/text/TextUnderlinePopup.hxx
+++ b/svx/source/sidebar/text/TextUnderlinePopup.hxx
@@ -36,7 +36,7 @@ public:
         const ::std::function<PopupControl* (PopupContainer*)>& rControlCreator);
     virtual ~TextUnderlinePopup();
 
-    void Rearrange (FontUnderline eLine);
+    void Rearrange (FontLineStyle eLine);
 };
 
 } } // end of namespace svx::sidebar
diff --git a/svx/source/styles/CommonStylePreviewRenderer.cxx b/svx/source/styles/CommonStylePreviewRenderer.cxx
index a3b6c015e72d..b67864354468 100644
--- a/svx/source/styles/CommonStylePreviewRenderer.cxx
+++ b/svx/source/styles/CommonStylePreviewRenderer.cxx
@@ -96,7 +96,7 @@ bool CommonStylePreviewRenderer::recalculate()
     }
     if ((pItem = pItemSet->GetItem(SID_ATTR_CHAR_OVERLINE)) != nullptr)
     {
-        pFont->SetOverline(static_cast<FontUnderline>(static_cast<const SvxOverlineItem*>(pItem)->GetValue()));
+        pFont->SetOverline(static_cast<FontLineStyle>(static_cast<const SvxOverlineItem*>(pItem)->GetValue()));
     }
     if ((pItem = pItemSet->GetItem(SID_ATTR_CHAR_STRIKEOUT)) != nullptr)
     {
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx
index 0218d04cec2a..e1ecafd576a6 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -275,8 +275,8 @@ namespace
             // prepare new primitive
             drawinglayer::primitive2d::BasePrimitive2D* pNewPrimitive = nullptr;
             const bool bDecoratedIsNeeded(
-                   UNDERLINE_NONE != rInfo.mrFont.GetOverline()
-                || UNDERLINE_NONE != rInfo.mrFont.GetUnderline()
+                   LINESTYLE_NONE != rInfo.mrFont.GetOverline()
+                || LINESTYLE_NONE != rInfo.mrFont.GetUnderline()
                 || STRIKEOUT_NONE != rInfo.mrFont.GetStrikeout()
                 || EMPHASISMARK_NONE != (rInfo.mrFont.GetEmphasisMark() & EMPHASISMARK_STYLE)
                 || RELIEF_NONE != rInfo.mrFont.GetRelief()
@@ -294,13 +294,13 @@ namespace
 
                 // prepare overline and underline data
                 const drawinglayer::primitive2d::TextLine eFontOverline(
-                    drawinglayer::primitive2d::mapFontUnderlineToTextLine(rInfo.mrFont.GetOverline()));
-                const drawinglayer::primitive2d::TextLine eFontUnderline(
-                    drawinglayer::primitive2d::mapFontUnderlineToTextLine(rInfo.mrFont.GetUnderline()));
+                    drawinglayer::primitive2d::mapFontLineStyleToTextLine(rInfo.mrFont.GetOverline()));
+                const drawinglayer::primitive2d::TextLine eFontLineStyle(
+                    drawinglayer::primitive2d::mapFontLineStyleToTextLine(rInfo.mrFont.GetUnderline()));
 
                 // check UnderlineAbove
                 const bool bUnderlineAbove(
-                    drawinglayer::primitive2d::TEXT_LINE_NONE != eFontUnderline && impIsUnderlineAbove(rInfo.mrFont));
+                    drawinglayer::primitive2d::TEXT_LINE_NONE != eFontLineStyle && impIsUnderlineAbove(rInfo.mrFont));
 
                 // prepare strikeout data
                 const drawinglayer::primitive2d::TextStrikeout eTextStrikeout(
@@ -351,7 +351,7 @@ namespace
                     aBOverlineColor,
                     aBUnderlineColor,
                     eFontOverline,
-                    eFontUnderline,
+                    eFontLineStyle,
                     bUnderlineAbove,
                     eTextStrikeout,
                     bWordLineMode,
diff --git a/svx/source/table/tablertfexporter.cxx b/svx/source/table/tablertfexporter.cxx
index 854d0bf630ed..fdbc15e5043b 100644
--- a/svx/source/table/tablertfexporter.cxx
+++ b/svx/source/table/tablertfexporter.cxx
@@ -228,7 +228,7 @@ void SdrTableRtfExporter::WriteCell( sal_Int32 nCol, sal_Int32 nRow )
         bResetAttr = true;
         mrStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_I );
     }
-    if ( rUnderlineItem.GetLineStyle() != UNDERLINE_NONE )
+    if ( rUnderlineItem.GetLineStyle() != LINESTYLE_NONE )
     {   // underline
         bResetAttr = true;
         mrStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_UL );
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index b5e84b939114..591a811af21f 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -687,7 +687,7 @@ void SvxStyleBox_Impl::SetupEntry(vcl::RenderContext& rRenderContext, vcl::Windo
 
                 pItem = pItemSet->GetItem( SID_ATTR_CHAR_OVERLINE );
                 if ( pItem )
-                    aFont.SetOverline( static_cast< FontUnderline >( static_cast< const SvxOverlineItem* >( pItem )->GetValue() ) );
+                    aFont.SetOverline( static_cast< FontLineStyle >( static_cast< const SvxOverlineItem* >( pItem )->GetValue() ) );
 
                 pItem = pItemSet->GetItem( SID_ATTR_CHAR_STRIKEOUT );
                 if ( pItem )