commit 0362d16527c2e33b9e0ab2d410b5f0a5b4cee91b
author Caolán McNamara <caolanm@redhat.com> Tue Dec 01 15:52:31 2020 +0000
committer Caolán McNamara <caolanm@redhat.com> Wed Dec 02 09:44:59 2020 +0100
tree 04452be05151302df5a2bb65c84d979983f259e8
parent b99771a0bf090fd58b14d03dc998d3a9cf201719

tdf#138427 focus set to wrong input box

Change-Id: I4c1d3aa720f280f0ec1a3764d55f1d95ebd3180d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106999
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

formula/source/ui/dlg/funcutl.cxx

diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx
index 68d1ec3b..f64b6af 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -350,6 +350,14 @@ bool RefEdit::KeyInput(const KeyEvent& rKEvt)
    return false;
}

void RefEdit::GrabFocus()
{
    bool bHadFocus = xEntry->has_focus();
    xEntry->grab_focus();
    if (!bHadFocus && xEntry->has_focus())
        GetFocus(*xEntry);
}

IMPL_LINK_NOARG(RefEdit, GetFocus, weld::Widget&, void)
{
    maGetFocusHdl.Call(*this);

include/formula/funcutl.hxx

diff --git a/include/formula/funcutl.hxx b/include/formula/funcutl.hxx
index 5c729da..9151524 100644
--- a/include/formula/funcutl.hxx
+++ b/include/formula/funcutl.hxx
@@ -84,10 +84,7 @@ public:
        Modify(*xEntry);
    }

    void GrabFocus()
    {
        xEntry->grab_focus();
    }
    void GrabFocus();

    void SelectAll()
    {