diff options
| author | Noel Grandin <noel@peralex.com> | 2015-05-27 16:01:34 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-05-28 12:47:07 +0200 |
| commit | 173aa749d50f904887e4aa1ce425c6807668bff0 (patch) | |
| tree | fc686ff759baf621029838d9a1d813a94443472c /vcl | |
| parent | 79db3fc0ee41a6284eb2175a4780f4157cb708f6 (diff) | |
convert INVERT flags to scoped enum
Change-Id: Iad8faee927de1ad646975157e36c3027c0ba8149
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/control/scrbar.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/cursor.cxx | 6 | ||||
| -rw-r--r-- | vcl/source/window/window2.cxx | 12 |
3 files changed, 10 insertions, 10 deletions
diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx index 699f8e87fc2c..31986b9025e7 100644 --- a/vcl/source/control/scrbar.cxx +++ b/vcl/source/control/scrbar.cxx @@ -1160,7 +1160,7 @@ void ScrollBar::ImplInvert() aRect.Bottom() -= 2; } - Invert( aRect, 0 ); + Invert( aRect ); } void ScrollBar::GetFocus() diff --git a/vcl/source/window/cursor.cxx b/vcl/source/window/cursor.cxx index bd96802997a7..b665be75352d 100644 --- a/vcl/source/window/cursor.cxx +++ b/vcl/source/window/cursor.cxx @@ -46,11 +46,11 @@ static void ImplCursorInvert( ImplCursorData* pData ) vcl::Window* pWindow = pData->mpWindow; bool bMapMode = pWindow->IsMapModeEnabled(); pWindow->EnableMapMode( false ); - sal_uInt16 nInvertStyle; + InvertFlags nInvertStyle; if ( pData->mnStyle & CURSOR_SHADOW ) - nInvertStyle = INVERT_50; + nInvertStyle = InvertFlags::N50; else - nInvertStyle = 0; + nInvertStyle = InvertFlags::NONE; Rectangle aRect( pData->maPixPos, pData->maPixSize ); if ( pData->mnDirection != CursorDirection::NONE || pData->mnOrientation || pData->mnPixSlant ) diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index bed0306a541f..717f5d7cf136 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -127,7 +127,7 @@ void Window::HideFocus() mpWindowImpl->mbInHideFocus = false; } -void Window::Invert( const Rectangle& rRect, sal_uInt16 nFlags ) +void Window::Invert( const Rectangle& rRect, InvertFlags nFlags ) { if ( !IsDeviceOutputNecessary() ) return; @@ -153,14 +153,14 @@ void Window::Invert( const Rectangle& rRect, sal_uInt16 nFlags ) return; SalInvert nSalFlags = 0; - if ( nFlags & INVERT_HIGHLIGHT ) + if ( nFlags & InvertFlags::Highlight ) nSalFlags |= SAL_INVERT_HIGHLIGHT; - if ( nFlags & INVERT_50 ) + if ( nFlags & InvertFlags::N50 ) nSalFlags |= SAL_INVERT_50; mpGraphics->Invert( aRect.Left(), aRect.Top(), aRect.GetWidth(), aRect.GetHeight(), nSalFlags, this ); } -void Window::Invert( const Polygon& rPoly, sal_uInt16 nFlags ) +void Window::Invert( const Polygon& rPoly, InvertFlags nFlags ) { if ( !IsDeviceOutputNecessary() ) return; @@ -187,9 +187,9 @@ void Window::Invert( const Polygon& rPoly, sal_uInt16 nFlags ) return; SalInvert nSalFlags = 0; - if ( nFlags & INVERT_HIGHLIGHT ) + if ( nFlags & InvertFlags::Highlight ) nSalFlags |= SAL_INVERT_HIGHLIGHT; - if ( nFlags & INVERT_50 ) + if ( nFlags & InvertFlags::N50 ) nSalFlags |= SAL_INVERT_50; const SalPoint* pPtAry = reinterpret_cast<const SalPoint*>(aPoly.GetConstPointAry()); mpGraphics->Invert( nPoints, pPtAry, nSalFlags, this ); |