diff options
author | Noel Grandin <noel@peralex.com> | 2015-05-08 15:21:46 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2015-05-12 06:14:46 +0000 |
commit | 4c665178f49952138835fd318edef8978ac806e3 (patch) | |
tree | e9abf7d5c8beb4e4b2333daa44bbae8d4a9f4563 /vcl/source/control/spinfld.cxx | |
parent | 3fd5f8919ec2256c70ff26c14cb9f8065c5cb2f1 (diff) |
convert SYMBOL_DRAW constants to scoped enum
Change-Id: I1a2200782941b1c7b826fd9fb03193e009cce697
Reviewed-on: https://gerrit.libreoffice.org/15676
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'vcl/source/control/spinfld.cxx')
-rw-r--r-- | vcl/source/control/spinfld.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx index 450f51d2972d..6ba5d91224d1 100644 --- a/vcl/source/control/spinfld.cxx +++ b/vcl/source/control/spinfld.cxx @@ -144,7 +144,7 @@ void ImplDrawSpinButton(vcl::RenderContext& rRenderContext, vcl::Window* pWindow DecorationView aDecoView(&rRenderContext); sal_uInt16 nStyle = BUTTON_DRAW_NOLEFTLIGHTBORDER; - sal_uInt16 nSymStyle = 0; + DrawSymbolFlags nSymStyle = DrawSymbolFlags::NONE; SymbolType eType1, eType2; @@ -268,14 +268,14 @@ void ImplDrawSpinButton(vcl::RenderContext& rRenderContext, vcl::Window* pWindow aLowRect.Top()++; } - nTempStyle = nSymStyle; + DrawSymbolFlags nTempSymStyle = nSymStyle; if (!bUpperEnabled) - nTempStyle |= SYMBOL_DRAW_DISABLE; + nTempSymStyle |= DrawSymbolFlags::Disable; if (!bNativeOK) - aDecoView.DrawSymbol(aUpRect, eType1, rStyleSettings.GetButtonTextColor(), nTempStyle); + aDecoView.DrawSymbol(aUpRect, eType1, rStyleSettings.GetButtonTextColor(), nTempSymStyle); if (!bLowerEnabled) - nSymStyle |= SYMBOL_DRAW_DISABLE; + nSymStyle |= DrawSymbolFlags::Disable; if (!bNativeOK) aDecoView.DrawSymbol(aLowRect, eType2, rStyleSettings.GetButtonTextColor(), nSymStyle); } @@ -622,8 +622,8 @@ void SpinField::Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRec if (rRenderContext.GetSettings().GetStyleSettings().GetOptions() & STYLE_OPTION_SPINUPDOWN) eSymbol = SymbolType::SPIN_UPDOWN; - nStyle = IsEnabled() ? 0 : SYMBOL_DRAW_DISABLE; - aView.DrawSymbol(aInnerRect, eSymbol, rRenderContext.GetSettings().GetStyleSettings().GetButtonTextColor(), nStyle); + DrawSymbolFlags nSymbolStyle = IsEnabled() ? DrawSymbolFlags::NONE : DrawSymbolFlags::Disable; + aView.DrawSymbol(aInnerRect, eSymbol, rRenderContext.GetSettings().GetStyleSettings().GetButtonTextColor(), nSymbolStyle); } Edit::Paint(rRenderContext, rRect); @@ -1029,8 +1029,8 @@ void SpinField::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, if ( GetSettings().GetStyleSettings().GetOptions() & STYLE_OPTION_SPINUPDOWN ) eSymbol = SymbolType::SPIN_UPDOWN; - nStyle = ( IsEnabled() || ( nFlags & WINDOW_DRAW_NODISABLE ) ) ? 0 : SYMBOL_DRAW_DISABLE; - aView.DrawSymbol( aInnerRect, eSymbol, aButtonTextColor, nStyle ); + DrawSymbolFlags nSymbolStyle = ( IsEnabled() || ( nFlags & WINDOW_DRAW_NODISABLE ) ) ? DrawSymbolFlags::NONE : DrawSymbolFlags::Disable; + aView.DrawSymbol( aInnerRect, eSymbol, aButtonTextColor, nSymbolStyle ); } if ( GetStyle() & WB_SPIN ) |