diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-29 17:43:42 +1100 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-31 04:31:13 +0000 |
| commit | 3187193a6142b4b1c974ae1e1de572fa74a3c8ee (patch) | |
| tree | 6d9350492186d06a38703821336ba79cb72a8583 /svx/source/dialog/fntctrl.cxx | |
| parent | 0bc3af3c1f719f9758ac01ff0b526abea7af0490 (diff) | |
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>
Diffstat (limited to 'svx/source/dialog/fntctrl.cxx')
| -rw-r--r-- | svx/source/dialog/fntctrl.cxx | 24 |
1 files changed, 12 insertions, 12 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 ); |