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

[Libreoffice Gerrit user]

 svx/source/tbxctrls/itemwin.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 74e1281955782ca5c8a2dfb6d668a53e097b9be1
Author:     Jim Raykowski <raykowj at gmail.com>
AuthorDate: Sat Dec 1 16:08:30 2018 -0900
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri Dec 7 08:27:34 2018 +0100

    tdf#121448 Check if fill box event notify is already handled
    
    Change-Id: I8b2e1e7a7bf711e78feb3c0532d597f1e9f14c03
    Reviewed-on: https://gerrit.libreoffice.org/64419
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx
index c41ba2a86dc1..03725e3868f4 100644
--- a/svx/source/tbxctrls/itemwin.cxx
+++ b/svx/source/tbxctrls/itemwin.cxx
@@ -420,7 +420,7 @@ bool SvxFillTypeBox::EventNotify( NotifyEvent& rNEvt )
     if (isDisposed())
         return false;
 
-    if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
+    if ( !bHandled && rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
     {
         const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
         switch ( pKEvt->GetKeyCode().GetCode() )
@@ -482,7 +482,7 @@ bool SvxFillAttrBox::EventNotify( NotifyEvent& rNEvt )
 {
     bool bHandled = ListBox::EventNotify( rNEvt );
 
-    if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
+    if ( !bHandled && rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
     {
         const KeyEvent* pKEvt = rNEvt.GetKeyEvent();