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

[Caolán McNamara (via logerrit)]

 svx/source/tbxctrls/tbunosearchcontrollers.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 54fd77a368208cc759024c05b7f1df7eb85d294e
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Nov 16 14:21:48 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Nov 16 21:18:58 2020 +0100

    tdf#138232 don't grab focus if we already have it
    
    Change-Id: I6fe852c87937ea4353822474ae1b7e20c9436f94
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105941
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index 9d389139f18f..a1860eea7126 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -143,7 +143,7 @@ void impl_executeSearch( const css::uno::Reference< css::uno::XComponentContext
                 if (pItemWin)
                 {
                     sFindText = pItemWin->get_active_text();
-                    if (aFindAll)
+                    if (aFindAll && !pItemWin->ControlHasFocus())
                         pItemWin->GetFocus();
                 }
             } else if ( sItemCommand == COMMAND_MATCHCASE )