1 files changed, 4 insertions, 14 deletions
diff --git a/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx b/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx
index e2cff7390d09..00f9a079fbb7 100644
--- a/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx
+++ b/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx
@@ -47,6 +47,8 @@ public:
         : InterimItemWindow(pParent, "modules/swriter/ui/editbox.ui", "EditBox")
         , m_xWidget(m_xBuilder->weld_entry("entry"))
     {
+        InitControlBase(m_xWidget.get());
+
         m_xWidget->connect_key_press(LINK(this, CurrentEdit, KeyInputHdl));
         SetSizePixel(m_xWidget->get_preferred_size());
     }
@@ -57,13 +59,6 @@ public:
         InterimItemWindow::dispose();
     }
 
-    virtual void GetFocus() override
-    {
-        if (m_xWidget)
-            m_xWidget->grab_focus();
-        InterimItemWindow::GetFocus();
-    }
-
     void set_sensitive(bool bSensitive)
     {
         Enable(bSensitive);
@@ -172,6 +167,8 @@ public:
         : InterimItemWindow(pParent, "modules/swriter/ui/checkbox.ui", "CheckBox")
         , m_xWidget(m_xBuilder->weld_check_button("checkbutton"))
     {
+        InitControlBase(m_xWidget.get());
+
         m_xWidget->set_label(SwResId(ST_EXCLUDE));
         m_xWidget->connect_key_press(LINK(this, ExcludeCheckBox, KeyInputHdl));
         SetSizePixel(m_xWidget->get_preferred_size());
@@ -183,13 +180,6 @@ public:
         InterimItemWindow::dispose();
     }
 
-    virtual void GetFocus() override
-    {
-        if (m_xWidget)
-            m_xWidget->grab_focus();
-        InterimItemWindow::GetFocus();
-    }
-
     void set_sensitive(bool bSensitive)
     {
         Enable(bSensitive);