diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-01-17 20:30:11 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-01-18 00:37:49 +0100 |
| commit | 9020ffa5e787543b7762a0ab4d8c973a093be7fd (patch) | |
| tree | 115c77dcedba50ea3838d57ef716f472f0325958 /vcl | |
| parent | 837a1856ef64fda2e0b7253f08189c877e1c82c7 (diff) | |
ImplCallPreNotify should return bool
Change-Id: I4b25d70c1009fbc714208452c2a646161189ff24
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/svdata.hxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/winproc.cxx | 16 |
2 files changed, 8 insertions, 10 deletions
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index 7b500e76ad91..1d713a1a885d 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -357,7 +357,7 @@ bool ImplCallHotKey( const KeyCode& rKeyCode ); void ImplFreeHotKeyData(); void ImplFreeEventHookData(); -long ImplCallPreNotify( NotifyEvent& rEvt ); +bool ImplCallPreNotify( NotifyEvent& rEvt ); extern VCL_PLUGIN_PUBLIC ImplSVData* pImplSVData; inline VCL_PLUGIN_PUBLIC ImplSVData* ImplGetSVData() { return pImplSVData; } diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index dd2ae9095600..ad61e89a821c 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -58,12 +58,10 @@ // ======================================================================= -long ImplCallPreNotify( NotifyEvent& rEvt ) +bool ImplCallPreNotify( NotifyEvent& rEvt ) { - long nRet = Application::CallEventHooks( rEvt ); - if ( !nRet ) - nRet = rEvt.GetWindow()->PreNotify( rEvt ); - return nRet; + return Application::CallEventHooks( rEvt ) + || rEvt.GetWindow()->PreNotify( rEvt ); } static sal_Bool ImplHandleMouseFloatMode( Window* pChild, const Point& rMousePos, @@ -236,7 +234,7 @@ static sal_Bool ImplCallCommand( Window* pChild, sal_uInt16 nEvt, void* pData = CommandEvent aCEvt( aPos, nEvt, bMouse, pData ); NotifyEvent aNCmdEvt( EVENT_COMMAND, pChild, &aCEvt ); ImplDelData aDelData( pChild ); - sal_Bool bPreNotify = (ImplCallPreNotify( aNCmdEvt ) != 0); + bool bPreNotify = ImplCallPreNotify( aNCmdEvt ); if ( aDelData.IsDead() ) return sal_False; if ( !bPreNotify ) @@ -1036,7 +1034,7 @@ static bool ImplHandleKey( Window* pWindow, sal_uInt16 nSVEvent, KeyEvent aKeyEvt( (sal_Unicode)nCharCode, aKeyCode, nRepeat ); NotifyEvent aNotifyEvt( nSVEvent, pChild, &aKeyEvt ); - sal_Bool bKeyPreNotify = (ImplCallPreNotify( aNotifyEvt ) != 0); + bool bKeyPreNotify = ImplCallPreNotify( aNotifyEvt ); bool nRet = true; if ( !bKeyPreNotify && !aDelData.IsDead() ) @@ -1149,7 +1147,7 @@ static bool ImplHandleKey( Window* pWindow, sal_uInt16 nSVEvent, ImplDelData aChildDelData( pChild ); KeyEvent aKEvt( (sal_Unicode)nCharCode, aKeyCode, nRepeat ); NotifyEvent aNEvt( nSVEvent, pChild, &aKEvt ); - sal_Bool bPreNotify = (ImplCallPreNotify( aNEvt ) != 0); + bool bPreNotify = ImplCallPreNotify( aNEvt ); if ( aChildDelData.IsDead() ) return true; @@ -1368,7 +1366,7 @@ static sal_Bool ImplCallWheelCommand( Window* pWindow, const Point& rPos, CommandEvent aCEvt( aCmdMousePos, COMMAND_WHEEL, sal_True, pWheelData ); NotifyEvent aNCmdEvt( EVENT_COMMAND, pWindow, &aCEvt ); ImplDelData aDelData( pWindow ); - sal_Bool bPreNotify = (ImplCallPreNotify( aNCmdEvt ) != 0); + bool bPreNotify = ImplCallPreNotify( aNCmdEvt ); if ( aDelData.IsDead() ) return sal_False; if ( !bPreNotify ) |