merge duplicate GetFocus implementations

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

2 files changed, 10 insertions, 46 deletions

diff --git a/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx b/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx
index d887a942d6c1..f08211984dd0 100644
--- a/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx
+++ b/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx
@@ -105,43 +105,30 @@ IMPL_LINK_NOARG(ParaULSpacingWindow, ModifySpacingHdl, weld::MetricSpinButton&,
 }
 
 // ParaAboveSpacingWindow
-
 ParaAboveSpacingWindow::ParaAboveSpacingWindow(vcl::Window* pParent)
     : ParaULSpacingWindow(pParent)
 {
+    InitControlBase(&m_xAboveSpacing->get_widget());
+
     m_xAboveContainer->show();
     m_xBelowContainer->hide();
 
     SetSizePixel(get_preferred_size());
 }
 
-void ParaAboveSpacingWindow::GetFocus()
-{
-    if (m_xAboveSpacing)
-        m_xAboveSpacing->grab_focus();
-    ParaULSpacingWindow::GetFocus();
-}
-
 // ParaBelowSpacingWindow
-
 ParaBelowSpacingWindow::ParaBelowSpacingWindow(vcl::Window* pParent)
     : ParaULSpacingWindow(pParent)
 {
+    InitControlBase(&m_xBelowSpacing->get_widget());
+
     m_xAboveContainer->hide();
     m_xBelowContainer->show();
 
     SetSizePixel(get_preferred_size());
 }
 
-void ParaBelowSpacingWindow::GetFocus()
-{
-    if (m_xBelowSpacing)
-        m_xBelowSpacing->grab_focus();
-    ParaULSpacingWindow::GetFocus();
-}
-
 // ParaLRSpacingWindow
-
 ParaLRSpacingWindow::ParaLRSpacingWindow(vcl::Window* pParent)
     : InterimItemWindow(pParent, "svx/ui/paralrspacing.ui", "ParaLRSpacingWindow")
     , m_eUnit(MapUnit::MapTwip)
@@ -309,10 +296,11 @@ IMPL_LINK_NOARG(ParaLRSpacingWindow, ModifySpacingHdl, weld::MetricSpinButton&,
 }
 
 // ParaLeftSpacingWindow
-
 ParaLeftSpacingWindow::ParaLeftSpacingWindow(vcl::Window* pParent)
     : ParaLRSpacingWindow(pParent)
 {
+    InitControlBase(&m_xBeforeSpacing->get_widget());
+
     m_xBeforeContainer->show();
     m_xAfterContainer->hide();
     m_xFirstLineContainer->hide();
@@ -320,18 +308,12 @@ ParaLeftSpacingWindow::ParaLeftSpacingWindow(vcl::Window* pParent)
     SetSizePixel(get_preferred_size());
 }
 
-void ParaLeftSpacingWindow::GetFocus()
-{
-    if (m_xBeforeSpacing)
-        m_xBeforeSpacing->grab_focus();
-    ParaLRSpacingWindow::GetFocus();
-}
-
 // ParaRightSpacingWindow
-
 ParaRightSpacingWindow::ParaRightSpacingWindow(vcl::Window* pParent)
     : ParaLRSpacingWindow(pParent)
 {
+    InitControlBase(&m_xAfterSpacing->get_widget());
+
     m_xBeforeContainer->hide();
     m_xAfterContainer->show();
     m_xFirstLineContainer->hide();
@@ -339,18 +321,12 @@ ParaRightSpacingWindow::ParaRightSpacingWindow(vcl::Window* pParent)
     SetSizePixel(get_preferred_size());
 }
 
-void ParaRightSpacingWindow::GetFocus()
-{
-    if (m_xAfterSpacing)
-        m_xAfterSpacing->grab_focus();
-    ParaLRSpacingWindow::GetFocus();
-}
-
 // ParaFirstLineSpacingWindow
-
 ParaFirstLineSpacingWindow::ParaFirstLineSpacingWindow(vcl::Window* pParent)
     : ParaLRSpacingWindow(pParent)
 {
+    InitControlBase(&m_xFLSpacing->get_widget());
+
     m_xBeforeContainer->hide();
     m_xAfterContainer->hide();
     m_xFirstLineContainer->show();
@@ -358,11 +334,4 @@ ParaFirstLineSpacingWindow::ParaFirstLineSpacingWindow(vcl::Window* pParent)
     SetSizePixel(get_preferred_size());
 }
 
-void ParaFirstLineSpacingWindow::GetFocus()
-{
-    if (m_xFLSpacing)
-        m_xFLSpacing->grab_focus();
-    ParaLRSpacingWindow::GetFocus();
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx b/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx
index 3f18dbb3e3ad..f1730f93387b 100644
--- a/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx
+++ b/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx
@@ -53,14 +53,12 @@ class ParaAboveSpacingWindow : public ParaULSpacingWindow
 {
 public:
     explicit ParaAboveSpacingWindow(vcl::Window* pParent);
-    virtual void GetFocus() override;
 };
 
 class ParaBelowSpacingWindow : public ParaULSpacingWindow
 {
 public:
     explicit ParaBelowSpacingWindow(vcl::Window* pParent);
-    virtual void GetFocus() override;
 };
 
 class ParaLRSpacingWindow : public InterimItemWindow
@@ -94,21 +92,18 @@ class ParaLeftSpacingWindow : public ParaLRSpacingWindow
 {
 public:
     explicit ParaLeftSpacingWindow(vcl::Window* pParent);
-    virtual void GetFocus() override;
 };
 
 class ParaRightSpacingWindow : public ParaLRSpacingWindow
 {
 public:
     explicit ParaRightSpacingWindow(vcl::Window* pParent);
-    virtual void GetFocus() override;
 };
 
 class ParaFirstLineSpacingWindow : public ParaLRSpacingWindow
 {
 public:
     explicit ParaFirstLineSpacingWindow(vcl::Window* pParent);
-    virtual void GetFocus() override;
 };
 }