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 /svtools | |
| 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 'svtools')
| -rw-r--r-- | svtools/source/control/breadcrumb.cxx | 6 | ||||
| -rw-r--r-- | svtools/source/control/hyperlabel.cxx | 4 | ||||
| -rw-r--r-- | svtools/source/control/roadmap.cxx | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/svtools/source/control/breadcrumb.cxx b/svtools/source/control/breadcrumb.cxx index adac26df0724..5ad6bf30af4d 100644 --- a/svtools/source/control/breadcrumb.cxx +++ b/svtools/source/control/breadcrumb.cxx @@ -16,7 +16,7 @@ public: : FixedHyperlink( pParent, nWinStyle ) { vcl::Font aFont = GetControlFont( ); - aFont.SetUnderline( UNDERLINE_NONE ); + aFont.SetUnderline( LINESTYLE_NONE ); SetControlFont( aFont ); } @@ -27,13 +27,13 @@ protected: if ( !rMEvt.IsLeaveWindow() && IsEnabled() ) { vcl::Font aFont = GetControlFont( ); - aFont.SetUnderline( UNDERLINE_SINGLE ); + aFont.SetUnderline( LINESTYLE_SINGLE ); SetControlFont( aFont ); } else { vcl::Font aFont = GetControlFont( ); - aFont.SetUnderline( UNDERLINE_NONE ); + aFont.SetUnderline( LINESTYLE_NONE ); SetControlFont( aFont ); } diff --git a/svtools/source/control/hyperlabel.cxx b/svtools/source/control/hyperlabel.cxx index 1814bc03da64..73077943d7b6 100644 --- a/svtools/source/control/hyperlabel.cxx +++ b/svtools/source/control/hyperlabel.cxx @@ -113,7 +113,7 @@ namespace svt void HyperLabel::ActivateHyperMode(vcl::Font aFont, const Color aColor) { - aFont.SetUnderline(UNDERLINE_SINGLE); + aFont.SetUnderline(LINESTYLE_SINGLE); m_pImpl->m_bHyperMode = true; SetPointer( PointerStyle::RefHand ); SetControlFont( aFont); @@ -124,7 +124,7 @@ namespace svt void HyperLabel::DeactivateHyperMode(vcl::Font aFont, const Color aColor) { m_pImpl->m_bHyperMode = false; - aFont.SetUnderline(UNDERLINE_NONE); + aFont.SetUnderline(LINESTYLE_NONE); SetPointer( PointerStyle::Arrow ); SetControlFont( aFont); SetTextColor( aColor); diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx index 216d3db6bd43..de94b791eadf 100644 --- a/svtools/source/control/roadmap.cxx +++ b/svtools/source/control/roadmap.cxx @@ -209,7 +209,7 @@ void ORoadmap::implInit(vcl::RenderContext& rRenderContext) vcl::Font aFont = rRenderContext.GetFont(); aFont.SetColor(aTextColor); aFont.SetWeight(WEIGHT_BOLD); - aFont.SetUnderline(UNDERLINE_SINGLE); + aFont.SetUnderline(LINESTYLE_SINGLE); rRenderContext.SetFont(aFont); rRenderContext.SetBackground(Wallpaper(rStyleSettings.GetFieldColor())); m_pImpl->InCompleteHyperLabel = nullptr; @@ -589,7 +589,7 @@ void ORoadmap::DrawHeadline(vcl::RenderContext& rRenderContext) // draw it rRenderContext.DrawText(Rectangle(aTextPos, aOutputSize), GetText(), DrawTextFlags::Left | DrawTextFlags::Top | DrawTextFlags::MultiLine | DrawTextFlags::WordBreak); - rRenderContext.DrawTextLine(aTextPos, aOutputSize.Width(), STRIKEOUT_NONE, UNDERLINE_SINGLE, UNDERLINE_NONE); + rRenderContext.DrawTextLine(aTextPos, aOutputSize.Width(), STRIKEOUT_NONE, LINESTYLE_SINGLE, LINESTYLE_NONE); const StyleSettings& rStyleSettings = rRenderContext.GetSettings().GetStyleSettings(); rRenderContext.SetLineColor(rStyleSettings.GetFieldTextColor()); rRenderContext.SetTextColor(rStyleSettings.GetFieldTextColor()); |