inherit welded dialogs from a common ancestor

Change-Id: Ifa6c871a134cf89bfba71b1049a115cf7c953c42
Reviewed-on: https://gerrit.libreoffice.org/50936
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

3 files changed, 9 insertions, 14 deletions

diff --git a/sw/source/ui/table/convert.cxx b/sw/source/ui/table/convert.cxx
index f6df42e9c9bd..f33d262bba41 100644
--- a/sw/source/ui/table/convert.cxx
+++ b/sw/source/ui/table/convert.cxx
@@ -94,8 +94,8 @@ void SwConvertTableDlg::GetValues(  sal_Unicode& rDelim,
 }
 
 SwConvertTableDlg::SwConvertTableDlg(SwView& rView, bool bToTable)
-    : m_xBuilder(Application::CreateBuilder(rView.GetViewFrame()->GetWindow().GetFrameWeld(), "modules/swriter/ui/converttexttable.ui"))
-    , m_xDialog(m_xBuilder->weld_dialog("ConvertTextTableDialog"))
+    : GenericDialogController(rView.GetViewFrame()->GetWindow().GetFrameWeld(),
+            "modules/swriter/ui/converttexttable.ui", "ConvertTextTableDialog")
     , m_xTabBtn(m_xBuilder->weld_radio_button("tabs"))
     , m_xSemiBtn(m_xBuilder->weld_radio_button("semicolons"))
     , m_xParaBtn(m_xBuilder->weld_radio_button("paragraph"))
diff --git a/sw/source/ui/table/splittbl.cxx b/sw/source/ui/table/splittbl.cxx
index f78041b06cfa..e322bd8462a0 100644
--- a/sw/source/ui/table/splittbl.cxx
+++ b/sw/source/ui/table/splittbl.cxx
@@ -22,8 +22,7 @@
 #include <tblenum.hxx>
 
 SwSplitTableDlg::SwSplitTableDlg(weld::Window *pParent, SwWrtShell &rSh)
-    : m_xBuilder(Application::CreateBuilder(pParent, "modules/swriter/ui/splittable.ui"))
-    , m_xDialog(m_xBuilder->weld_dialog("SplitTableDialog"))
+    : GenericDialogController(pParent, "modules/swriter/ui/splittable.ui", "SplitTableDialog")
     , m_xContentCopyRB(m_xBuilder->weld_radio_button("copyheading"))
     , m_xBoxAttrCopyWithParaRB(m_xBuilder->weld_radio_button("customheadingapplystyle"))
     , m_xBoxAttrCopyNoParaRB(m_xBuilder->weld_radio_button("customheading"))
diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx
index fcbae6f6d46c..5adc8ca51fcd 100644
--- a/sw/source/ui/table/tautofmt.cxx
+++ b/sw/source/ui/table/tautofmt.cxx
@@ -24,19 +24,17 @@
 #include <shellres.hxx>
 #include <tautofmt.hxx>
 
-class SwStringInputDlg
+class SwStringInputDlg : public weld::GenericDialogController
 {
 private:
-    std::unique_ptr<weld::Builder> m_xBuilder;
-    std::unique_ptr<weld::Dialog> m_xDialog;
     std::unique_ptr<weld::Label> m_xLabel;
     std::unique_ptr<weld::Entry> m_xEdInput; // Edit obtains the focus.
 
 public:
     SwStringInputDlg(weld::Window* pParent, const OUString& rTitle,
         const OUString& rEditTitle, const OUString& rDefault)
-        : m_xBuilder(Application::CreateBuilder(pParent, "modules/swriter/ui/stringinput.ui"))
-        , m_xDialog(m_xBuilder->weld_dialog("StringInputDialog"))
+        : GenericDialogController(pParent, "modules/swriter/ui/stringinput.ui",
+                "StringInputDialog")
         , m_xLabel(m_xBuilder->weld_label("name"))
         , m_xEdInput(m_xBuilder->weld_entry("edit"))
     {
@@ -50,15 +48,13 @@ public:
     {
         return m_xEdInput->get_text();
     }
-
-    short run() {  return m_xDialog->run(); }
 };
 
 // AutoFormat-Dialogue:
 SwAutoFormatDlg::SwAutoFormatDlg(weld::Window* pParent, SwWrtShell* pWrtShell,
                                  bool bAutoFormat, const SwTableAutoFormat* pSelFormat)
-    : m_xBuilder(Application::CreateBuilder(pParent, "modules/swriter/ui/autoformattable.ui"))
-    , m_xDialog(m_xBuilder->weld_dialog("AutoFormatTableDialog"))
+    : GenericDialogController(pParent, "modules/swriter/ui/autoformattable.ui",
+            "AutoFormatTableDialog")
     , m_xLbFormat(m_xBuilder->weld_tree_view("formatlb"))
     , m_xBtnNumFormat(m_xBuilder->weld_check_button("numformatcb"))
     , m_xBtnBorder(m_xBuilder->weld_check_button("bordercb"))
@@ -394,7 +390,7 @@ IMPL_LINK_NOARG(SwAutoFormatDlg, SelFormatHdl, weld::TreeView&, void)
     m_xBtnRename->set_sensitive(bBtnEnable);
 }
 
-short SwAutoFormatDlg::run()
+short SwAutoFormatDlg::execute()
 {
     short nRet = m_xDialog->run();
     if (nRet == RET_OK && bSetAutoFormat)