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

[Caolán McNamara]

 vcl/source/window/toolbox.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6b9d91c924a5b2f41c4cab5f1e86291b5997a681
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Aug 15 15:32:02 2013 +0100

    Resolves: fdo#65546 whoops, lost vital mbKeyInputDisabled flag
    
    Change-Id: I6ab0007f232994a0ca55df817b3dbba06e6e7f9c

diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 6c6b992..7a3e0a4 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -5270,7 +5270,7 @@ void ToolBox::KeyInput( const KeyEvent& rKEvt )
     ImplRemoveDel( &aDelData );
 
     // #107251# move focus away if this toolbox was disabled during keyinput
-    if (HasFocus() && bParentIsContainer)
+    if (HasFocus() && mpData->mbKeyInputDisabled && bParentIsContainer)
     {
         sal_uInt16 n = 0;
         Window *pFocusControl = pParent->ImplGetDlgWindow( n, DLGWINDOW_FIRST );