diff options
author | Noel Grandin <noel@peralex.com> | 2016-05-24 09:32:18 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-24 13:07:18 +0000 |
commit | d31935043f7b4ce44811cd6de51f64eb207a6b3a (patch) | |
tree | 714429bc7bc3de9c1f4b1066b54bde431584b38e /vcl/source/window/mouse.cxx | |
parent | fe0bba96ac0682eeba1757ede42b5fdef22764b8 (diff) |
Convert WINDOW_HITTEST to scoped enum
Change-Id: I18c3798ae41eeffe96797828709f6ee42b32fcbe
Reviewed-on: https://gerrit.libreoffice.org/25395
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'vcl/source/window/mouse.cxx')
-rw-r--r-- | vcl/source/window/mouse.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/vcl/source/window/mouse.cxx b/vcl/source/window/mouse.cxx index 19cdc7334cbc..b47949d06446 100644 --- a/vcl/source/window/mouse.cxx +++ b/vcl/source/window/mouse.cxx @@ -50,7 +50,7 @@ using namespace ::com::sun::star::uno; namespace vcl { -sal_uInt16 Window::ImplHitTest( const Point& rFramePos ) +WindowHitTest Window::ImplHitTest( const Point& rFramePos ) { Point aFramePos( rFramePos ); if( ImplIsAntiparallel() ) @@ -61,19 +61,19 @@ sal_uInt16 Window::ImplHitTest( const Point& rFramePos ) } Rectangle aRect( Point( mnOutOffX, mnOutOffY ), Size( mnOutWidth, mnOutHeight ) ); if ( !aRect.IsInside( aFramePos ) ) - return 0; + return WindowHitTest::NONE; if ( mpWindowImpl->mbWinRegion ) { Point aTempPos = aFramePos; aTempPos.X() -= mnOutOffX; aTempPos.Y() -= mnOutOffY; if ( !mpWindowImpl->maWinRegion.IsInside( aTempPos ) ) - return 0; + return WindowHitTest::NONE; } - sal_uInt16 nHitTest = WINDOW_HITTEST_INSIDE; + WindowHitTest nHitTest = WindowHitTest::Inside; if ( mpWindowImpl->mbMouseTransparent ) - nHitTest |= WINDOW_HITTEST_TRANSPARENT; + nHitTest |= WindowHitTest::Transparent; return nHitTest; } |