[Libreoffice-commits] core.git: vcl/source

[Mike Kaganski]

 vcl/source/window/winproc.cxx |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

New commits:
commit 9d80d0199a0257124dd66e742766eff38087484d
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date:   Fri Dec 23 10:55:07 2016 +0300

    ImplHandliKey: remove redundant NotifyEvents
    
    Change-Id: I7c53b3428d035c36c0f83317b8f9185192ac001a
    Reviewed-on: https://gerrit.libreoffice.org/32372
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index effc5bb..210daa7 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -859,7 +859,6 @@ static bool ImplHandleKey( vcl::Window* pWindow, MouseNotifyEvent nSVEvent,
     // allow application key listeners to remove the key event
     // but make sure we're not forwarding external KeyEvents, (ie where bForward is false)
     // because those are coming back from the listener itself and MUST be processed
-    KeyEvent aKeyEvent( (sal_Unicode)nCharCode, aKeyCode, nRepeat );
     if( bForward )
     {
         VclEventId nVCLEvent;
@@ -875,7 +874,8 @@ static bool ImplHandleKey( vcl::Window* pWindow, MouseNotifyEvent nSVEvent,
                 nVCLEvent = VclEventId::NONE;
                 break;
         }
-        if( nVCLEvent != VclEventId::NONE && Application::HandleKey( nVCLEvent, pWindow, &aKeyEvent ) )
+        KeyEvent aKeyEvent((sal_Unicode)nCharCode, aKeyCode, nRepeat);
+        if (nVCLEvent != VclEventId::NONE && Application::HandleKey(nVCLEvent, pWindow, &aKeyEvent))
             return true;
     }
 
@@ -1088,8 +1088,7 @@ static bool ImplHandleKey( vcl::Window* pWindow, MouseNotifyEvent nSVEvent,
         pChild = pWindow->GetParent();
 
         // call handler
-        KeyEvent    aKEvt( (sal_Unicode)nCharCode, aKeyCode, nRepeat );
-        NotifyEvent aNEvt( nSVEvent, pChild, &aKEvt );
+        NotifyEvent aNEvt( nSVEvent, pChild, &aKeyEvt );
         bool bPreNotify = ImplCallPreNotify( aNEvt );
         if ( pChild->IsDisposed() )
             return true;
@@ -1099,12 +1098,12 @@ static bool ImplHandleKey( vcl::Window* pWindow, MouseNotifyEvent nSVEvent,
             if ( nSVEvent == MouseNotifyEvent::KEYINPUT )
             {
                 pChild->ImplGetWindowImpl()->mbKeyInput = false;
-                pChild->KeyInput( aKEvt );
+                pChild->KeyInput( aKeyEvt );
             }
             else
             {
                 pChild->ImplGetWindowImpl()->mbKeyUp = false;
-                pChild->KeyUp( aKEvt );
+                pChild->KeyUp( aKeyEvt );
             }
 
             if( !pChild->IsDisposed() )