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

Robert Roth robert.roth.off at gmail.com
Sat Feb 1 03:22:09 PST 2014


 sfx2/source/dialog/backingwindow.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit e5b654a056d407cf8db975ee8042a0328627d4d8
Author: Robert Roth <robert.roth.off at gmail.com>
Date:   Sat Feb 1 01:10:37 2014 +0200

    fdo#64337 Do not show empty findbar in startcenter.
    
    Using the shortcut for search on the start center displayed an empty
    toolbar on the start center. This commit adds a check to see whether
    the command to execute in the startcenter is FocusToFindbar, and if
    it is, it skips executing it.
    
    Change-Id: I0835e87d4a1eef0fc9ff17c184b531592b3e2d5a

diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx
index 70605d8..5f849cd 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -355,7 +355,8 @@ bool BackingWindow::Notify( NotifyEvent& rNEvt )
         }
         const KeyEvent* pEvt = rNEvt.GetKeyEvent();
         const KeyCode& rKeyCode(pEvt->GetKeyCode());
-        if( pEvt && mpAccExec->execute(rKeyCode) )
+        const OUString aCommand = mpAccExec->findCommand(svt::AcceleratorExecute::st_VCLKey2AWTKey(rKeyCode));
+        if((aCommand != "vnd.sun.star.findbar:FocusToFindbar") && pEvt && mpAccExec->execute(rKeyCode))
             return true;
     }
 


More information about the Libreoffice-commits mailing list