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

[Caolán McNamara (via logerrit)]

 sc/source/ui/app/inputwin.cxx      |    1 -
 sc/source/ui/inc/inputwin.hxx      |    2 --
 svx/source/dialog/weldeditview.cxx |    3 ---
 3 files changed, 6 deletions(-)

New commits:
commit 8ecfd2b84fddb37482539702208374d2af56a44d
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Sep 9 10:28:57 2021 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Sep 9 12:42:22 2021 +0200

    don't need to explicitly call GetFocus()
    
    if GrabFocus() succeeds the GetFocus() should be called anyway
    
    Change-Id: I2a448659acd990bf570fe56907ac826138cc9938
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121840
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 1a0bcc828767..bee2461fa85d 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -2172,7 +2172,6 @@ void ScTextWnd::StyleUpdated()
 void ScTextWnd::TextGrabFocus()
 {
     GrabFocus();
-    GetFocus();
 }
 
 // Position window
diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx
index 86cc6594910c..aa90dc7c4f3e 100644
--- a/sc/source/ui/inc/inputwin.hxx
+++ b/sc/source/ui/inc/inputwin.hxx
@@ -125,8 +125,6 @@ protected:
 
     virtual bool    StartDrag() override;
 
-//TODO    virtual OUString  GetText() const override;
-
 private:
     void            ImplInitSettings();
     void            UpdateAutoCorrFlag();
diff --git a/svx/source/dialog/weldeditview.cxx 
b/svx/source/dialog/weldeditview.cxx
index a0f5e5e1cd03..513de53d89f8 100644
--- a/svx/source/dialog/weldeditview.cxx
+++ b/svx/source/dialog/weldeditview.cxx
@@ -260,10 +260,7 @@ bool WeldEditView::MouseButtonDown(const MouseEvent& rMEvt)
         CaptureMouse();
 
     if (!HasFocus() && CanFocus())
-    {
         GrabFocus();
-        GetFocus();
-    }
 
     EditView* pEditView = GetEditView();
     return pEditView && pEditView->MouseButtonDown(rMEvt);