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>

4 files changed, 4 insertions, 17 deletions

diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx
index 6c960ce114da..5543d9cf1dea 100644
--- a/cui/source/inc/dlgname.hxx
+++ b/cui/source/inc/dlgname.hxx
@@ -28,11 +28,9 @@
 #include <vcl/weld.hxx>
 
 /// Dialog for editing a name
-class SvxNameDialog
+class SvxNameDialog : public weld::GenericDialogController
 {
 private:
-    std::unique_ptr<weld::Builder> m_xBuilder;
-    std::unique_ptr<weld::Dialog> m_xDialog;
     std::unique_ptr<weld::Entry> m_xEdtName;
     std::unique_ptr<weld::Label> m_xFtDescription;
     std::unique_ptr<weld::Button> m_xBtnOK;
@@ -44,12 +42,8 @@ private:
 public:
     SvxNameDialog(weld::Window* pWindow, const OUString& rName, const OUString& rDesc);
 
-    void set_title(const OUString& rTitle) { m_xDialog->set_title(rTitle); }
-    void set_help_id(const OString& rHelpId) { m_xDialog->set_help_id(rHelpId); }
     OUString GetName() const { return m_xEdtName->get_text(); }
 
-    short run() { return m_xDialog->run(); }
-
     /** add a callback Link that is called whenever the content of the edit
         field is changed.  The Link result determines whether the OK
         Button is enabled (> 0) or disabled (== 0).
diff --git a/cui/source/inc/insrc.hxx b/cui/source/inc/insrc.hxx
index b2e9cb96b70d..aed5617d8065 100644
--- a/cui/source/inc/insrc.hxx
+++ b/cui/source/inc/insrc.hxx
@@ -24,11 +24,9 @@
 #include <svx/stddlg.hxx>
 #include <vcl/weld.hxx>
 
-class SvxInsRowColDlg : public SvxAbstractInsRowColDlg
+class SvxInsRowColDlg : public SvxAbstractInsRowColDlg, public weld::GenericDialogController
 {
 private:
-    std::unique_ptr<weld::Builder> m_xBuilder;
-    std::unique_ptr<weld::Dialog> m_xDialog;
     std::unique_ptr<weld::SpinButton> m_xCountEdit;
     std::unique_ptr<weld::RadioButton> m_xBeforeBtn;
     std::unique_ptr<weld::RadioButton> m_xAfterBtn;
diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx
index 2b86a9ea515a..604c7a4c3f90 100644
--- a/cui/source/inc/scriptdlg.hxx
+++ b/cui/source/inc/scriptdlg.hxx
@@ -92,15 +92,12 @@ enum class InputDialogMode {
     RENAME        = 3,
 };
 
-class CuiInputDialog
+class CuiInputDialog : public weld::GenericDialogController
 {
 private:
-    std::unique_ptr<weld::Builder> m_xBuilder;
-    std::unique_ptr<weld::Dialog> m_xDialog;
     std::unique_ptr<weld::Entry> m_xEdit;
 public:
     CuiInputDialog(weld::Window * pParent, InputDialogMode nMode);
-    short run() { return m_xDialog->run(); }
     OUString GetObjectName() const { return m_xEdit->get_text(); }
     void SetObjectName(const OUString& rName)
     {
diff --git a/cui/source/inc/splitcelldlg.hxx b/cui/source/inc/splitcelldlg.hxx
index 868e6b7e72c5..02e7db683565 100644
--- a/cui/source/inc/splitcelldlg.hxx
+++ b/cui/source/inc/splitcelldlg.hxx
@@ -22,11 +22,9 @@
 #include <svx/svxdlg.hxx>
 #include <vcl/weld.hxx>
 
-class SvxSplitTableDlg : public SvxAbstractSplittTableDialog
+class SvxSplitTableDlg : public SvxAbstractSplittTableDialog, public weld::GenericDialogController
 {
 private:
-    std::unique_ptr<weld::Builder> m_xBuilder;
-    std::unique_ptr<weld::Dialog> m_xDialog;
     std::unique_ptr<weld::SpinButton> m_xCountEdit;
     std::unique_ptr<weld::RadioButton> m_xHorzBox;
     std::unique_ptr<weld::RadioButton> m_xVertBox;