summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-02-18 14:30:54 +0000
committerCaolán McNamara <caolanm@redhat.com>2016-02-18 15:48:31 +0000
commitcee3b45977d34f290e50a8fbc8b0dd60ef10faae (patch)
treefbae2d3fbf02e33ef6e240ab48cc8ac4f7ada2d6 /vcl
parent305a164e8b1094a041373ab9808aedcf4c76a1b6 (diff)
StyleSettingsOptions Only NONE, Mono and NoMnemonics are in use
ditch the rest Change-Id: I3383023958f528d9d0d6ba715356d8d6a6aecd5a
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/control/scrbar.cxx32
1 files changed, 6 insertions, 26 deletions
diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx
index 485d613afabd..40b6161dd29c 100644
--- a/vcl/source/control/scrbar.cxx
+++ b/vcl/source/control/scrbar.cxx
@@ -642,20 +642,10 @@ void ScrollBar::ImplDraw(vcl::RenderContext& rRenderContext, sal_uInt16 nDrawFla
DrawSymbolFlags nSymbolStyle = DrawSymbolFlags::NONE;
if ((mnStateFlags & SCRBAR_STATE_BTN1_DISABLE) || !bEnabled)
nSymbolStyle |= DrawSymbolFlags::Disable;
- if (rStyleSettings.GetOptions() & StyleSettingsOptions::ScrollArrow)
- {
- if (GetStyle() & WB_HORZ)
- eSymbolType = SymbolType::ARROW_LEFT;
- else
- eSymbolType = SymbolType::ARROW_UP;
- }
+ if (GetStyle() & WB_HORZ)
+ eSymbolType = SymbolType::SPIN_LEFT;
else
- {
- if (GetStyle() & WB_HORZ)
- eSymbolType = SymbolType::SPIN_LEFT;
- else
- eSymbolType = SymbolType::SPIN_UP;
- }
+ eSymbolType = SymbolType::SPIN_UP;
aDecoView.DrawSymbol(aTempRect, eSymbolType, rStyleSettings.GetButtonTextColor(), nSymbolStyle);
}
@@ -669,20 +659,10 @@ void ScrollBar::ImplDraw(vcl::RenderContext& rRenderContext, sal_uInt16 nDrawFla
DrawSymbolFlags nSymbolStyle = DrawSymbolFlags::NONE;
if ((mnStateFlags & SCRBAR_STATE_BTN2_DISABLE) || !bEnabled)
nSymbolStyle |= DrawSymbolFlags::Disable;
- if (rStyleSettings.GetOptions() & StyleSettingsOptions::ScrollArrow)
- {
- if (GetStyle() & WB_HORZ)
- eSymbolType = SymbolType::ARROW_RIGHT;
- else
- eSymbolType = SymbolType::ARROW_DOWN;
- }
+ if (GetStyle() & WB_HORZ)
+ eSymbolType = SymbolType::SPIN_RIGHT;
else
- {
- if (GetStyle() & WB_HORZ)
- eSymbolType = SymbolType::SPIN_RIGHT;
- else
- eSymbolType = SymbolType::SPIN_DOWN;
- }
+ eSymbolType = SymbolType::SPIN_DOWN;
aDecoView.DrawSymbol(aTempRect, eSymbolType, rStyleSettings.GetButtonTextColor(), nSymbolStyle);
}