Related: tdf#120277 inherit from SfxDialogController

where the dialog originally inherited from SfxModalDialog.

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

10 files changed, 19 insertions, 19 deletions

diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx
index 84a55e3e2d71..ae4c5bcf1491 100644
--- a/sw/source/ui/config/mailconfigpage.cxx
+++ b/sw/source/ui/config/mailconfigpage.cxx
@@ -41,7 +41,7 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::mail;
 using namespace ::com::sun::star::beans;
 
-class SwTestAccountSettingsDialog : public weld::GenericDialogController
+class SwTestAccountSettingsDialog : public SfxDialogController
 {
     ImplSVEvent*        m_pPostedEvent;
     OUString            m_sCompleted;
@@ -70,7 +70,7 @@ public:
     virtual ~SwTestAccountSettingsDialog() override;
 };
 
-class SwAuthenticationSettingsDialog : public weld::GenericDialogController
+class SwAuthenticationSettingsDialog : public SfxDialogController
 {
     SwMailMergeConfigItem& m_rConfigItem;
 
@@ -226,7 +226,7 @@ IMPL_LINK(SwMailConfigPage, SecureHdl, Button*, pBox, void)
 }
 
 SwTestAccountSettingsDialog::SwTestAccountSettingsDialog(SwMailConfigPage* pParent)
-    : GenericDialogController(pParent->GetFrameWeld(), "modules/swriter/ui/testmailsettings.ui", "TestMailSettings")
+    : SfxDialogController(pParent->GetFrameWeld(), "modules/swriter/ui/testmailsettings.ui", "TestMailSettings")
     , m_bStop(false)
     , m_pParent(pParent)
     , m_xStopPB(m_xBuilder->weld_button("stop"))
@@ -383,7 +383,7 @@ SwMailConfigDlg::SwMailConfigDlg(weld::Window* pParent, SfxItemSet& rSet)
 
 SwAuthenticationSettingsDialog::SwAuthenticationSettingsDialog(
     weld::Window* pParent, SwMailMergeConfigItem& rItem)
-    : GenericDialogController(pParent, "modules/swriter/ui/authenticationsettingsdialog.ui", "AuthenticationSettingsDialog")
+    : SfxDialogController(pParent, "modules/swriter/ui/authenticationsettingsdialog.ui", "AuthenticationSettingsDialog")
     , m_rConfigItem(rItem)
     , m_xAuthenticationCB(m_xBuilder->weld_check_button("authentication"))
     , m_xSeparateAuthenticationRB(m_xBuilder->weld_radio_button("separateauthentication"))
diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx b/sw/source/ui/dbui/mmresultdialogs.cxx
index e54ba944f16c..9de7406d7b09 100644
--- a/sw/source/ui/dbui/mmresultdialogs.cxx
+++ b/sw/source/ui/dbui/mmresultdialogs.cxx
@@ -192,14 +192,14 @@ IMPL_LINK( SwSendQueryBox_Impl, ModifyHdl, weld::Entry&, rEdit, void)
     m_xOKPB->set_sensitive(bIsEmptyAllowed  || !rEdit.get_text().isEmpty());
 }
 
-class SwCopyToDialog : public weld::GenericDialogController
+class SwCopyToDialog : public SfxDialogController
 {
     std::unique_ptr<weld::Entry> m_xCCED;
     std::unique_ptr<weld::Entry> m_xBCCED;
 
 public:
     explicit SwCopyToDialog(weld::Window* pParent)
-        : GenericDialogController(pParent, "modules/swriter/ui/ccdialog.ui", "CCDialog")
+        : SfxDialogController(pParent, "modules/swriter/ui/ccdialog.ui", "CCDialog")
         , m_xCCED(m_xBuilder->weld_entry("cc"))
         , m_xBCCED(m_xBuilder->weld_entry("bcc"))
     {
@@ -213,7 +213,7 @@ public:
 };
 
 SwMMResultSaveDialog::SwMMResultSaveDialog(weld::Window* pParent)
-    : GenericDialogController(pParent, "modules/swriter/ui/mmresultsavedialog.ui", "MMResultSaveDialog")
+    : SfxDialogController(pParent, "modules/swriter/ui/mmresultsavedialog.ui", "MMResultSaveDialog")
     , m_bCancelSaving(false)
     , m_xSaveAsOneRB(m_xBuilder->weld_radio_button("singlerb"))
     , m_xSaveIndividualRB(m_xBuilder->weld_radio_button("individualrb"))
@@ -245,7 +245,7 @@ SwMMResultSaveDialog::~SwMMResultSaveDialog()
 }
 
 SwMMResultPrintDialog::SwMMResultPrintDialog(weld::Window* pParent)
-    : GenericDialogController(pParent, "modules/swriter/ui/mmresultprintdialog.ui", "MMResultPrintDialog")
+    : SfxDialogController(pParent, "modules/swriter/ui/mmresultprintdialog.ui", "MMResultPrintDialog")
     , m_xPrinterFT(m_xBuilder->weld_label("printerft"))
     , m_xPrinterLB(m_xBuilder->weld_combo_box("printers"))
     , m_xPrinterSettingsPB(m_xBuilder->weld_button("printersettings"))
diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx
index 025441896349..2be497a2701b 100644
--- a/sw/source/ui/dialog/ascfldlg.cxx
+++ b/sw/source/ui/dialog/ascfldlg.cxx
@@ -61,7 +61,7 @@ const sal_Int32 nDialogExtraDataLen = 11;      // 12345678901
 
 SwAsciiFilterDlg::SwAsciiFilterDlg( weld::Window* pParent, SwDocShell& rDocSh,
                                     SvStream* pStream )
-    : GenericDialogController(pParent, "modules/swriter/ui/asciifilterdialog.ui", "AsciiFilterDialog")
+    : SfxDialogController(pParent, "modules/swriter/ui/asciifilterdialog.ui", "AsciiFilterDialog")
     , m_bSaveLineStatus(true)
     , m_xCharSetLB(new TextEncodingBox(m_xBuilder->weld_combo_box("charset")))
     , m_xFontFT(m_xBuilder->weld_label("fontft"))
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index e06f3aa78eec..6fef435bd6a9 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -84,7 +84,7 @@ static inline bool IsMarkInSameSection( SwWrtShell& rWrtSh, const SwSection* pSe
 }
 
 SwColumnDlg::SwColumnDlg(weld::Window* pParent, SwWrtShell& rSh)
-    : GenericDialogController(pParent, "modules/swriter/ui/columndialog.ui", "ColumnDialog")
+    : SfxDialogController(pParent, "modules/swriter/ui/columndialog.ui", "ColumnDialog")
     , m_rWrtShell(rSh)
     , m_pFrameSet(nullptr)
     , m_nOldSelection(0)
diff --git a/sw/source/ui/inc/mmresultdialogs.hxx b/sw/source/ui/inc/mmresultdialogs.hxx
index 6652be9e1962..7f7dad562b9a 100644
--- a/sw/source/ui/inc/mmresultdialogs.hxx
+++ b/sw/source/ui/inc/mmresultdialogs.hxx
@@ -44,7 +44,7 @@ namespace com{ namespace sun{ namespace star{
 }}}
 
 /// Dialog implementing the saving as of the result document.
-class SwMMResultSaveDialog : public weld::GenericDialogController
+class SwMMResultSaveDialog : public SfxDialogController
 {
     bool                   m_bCancelSaving;
 
@@ -65,7 +65,7 @@ public:
 };
 
 /// Dialog implementing the printing of the result document.
-class SwMMResultPrintDialog : public weld::GenericDialogController
+class SwMMResultPrintDialog : public SfxDialogController
 {
     VclPtr<Printer>        m_pTempPrinter;
 
diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx
index 418ee444d47b..0c46aa3f4463 100644
--- a/sw/source/ui/misc/linenum.cxx
+++ b/sw/source/ui/misc/linenum.cxx
@@ -64,7 +64,7 @@ static void lcl_setLineNumbering(const OUString& rName, SwWrtShell* pSh, bool bL
 }
 
 SwLineNumberingDlg::SwLineNumberingDlg(const SwView& rVw)
-    : GenericDialogController(rVw.GetViewFrame()->GetWindow().GetFrameWeld(),
+    : SfxDialogController(rVw.GetViewFrame()->GetWindow().GetFrameWeld(),
             "modules/swriter/ui/linenumbering.ui", "LineNumberingDialog")
     , m_pSh(rVw.GetWrtShellPtr())
     , m_xBodyContent(m_xBuilder->weld_widget("content"))
diff --git a/sw/source/ui/misc/titlepage.cxx b/sw/source/ui/misc/titlepage.cxx
index f1f3a023d3ea..0fbb74ad874f 100644
--- a/sw/source/ui/misc/titlepage.cxx
+++ b/sw/source/ui/misc/titlepage.cxx
@@ -148,7 +148,7 @@ sal_uInt16 SwTitlePageDlg::GetInsertPosition() const
 }
 
 SwTitlePageDlg::SwTitlePageDlg(weld::Window *pParent)
-    : GenericDialogController(pParent, "modules/swriter/ui/titlepage.ui", "DLG_TITLEPAGE")
+    : SfxDialogController(pParent, "modules/swriter/ui/titlepage.ui", "DLG_TITLEPAGE")
     , m_xUseExistingPagesRB(m_xBuilder->weld_radio_button("RB_USE_EXISTING_PAGES"))
     , m_xPageCountNF(m_xBuilder->weld_spin_button("NF_PAGE_COUNT"))
     , m_xDocumentStartRB(m_xBuilder->weld_radio_button("RB_DOCUMENT_START"))
diff --git a/sw/source/ui/table/convert.cxx b/sw/source/ui/table/convert.cxx
index e399982fac24..3fff72fbd012 100644
--- a/sw/source/ui/table/convert.cxx
+++ b/sw/source/ui/table/convert.cxx
@@ -91,7 +91,7 @@ void SwConvertTableDlg::GetValues(  sal_Unicode& rDelim,
 }
 
 SwConvertTableDlg::SwConvertTableDlg(SwView& rView, bool bToTable)
-    : GenericDialogController(rView.GetFrameWeld(),
+    : SfxDialogController(rView.GetFrameWeld(),
             "modules/swriter/ui/converttexttable.ui", "ConvertTextTableDialog")
     , m_xTabBtn(m_xBuilder->weld_radio_button("tabs"))
     , m_xSemiBtn(m_xBuilder->weld_radio_button("semicolons"))
diff --git a/sw/source/ui/table/instable.cxx b/sw/source/ui/table/instable.cxx
index a964b644f72d..b960dcb4f168 100644
--- a/sw/source/ui/table/instable.cxx
+++ b/sw/source/ui/table/instable.cxx
@@ -60,7 +60,7 @@ IMPL_LINK(SwInsTableDlg, TextFilterHdl, OUString&, rTest, bool)
 }
 
 SwInsTableDlg::SwInsTableDlg(SwView& rView)
-    : GenericDialogController(rView.GetFrameWeld(), "modules/swriter/ui/inserttable.ui", "InsertTableDialog")
+    : SfxDialogController(rView.GetFrameWeld(), "modules/swriter/ui/inserttable.ui", "InsertTableDialog")
     , m_aTextFilter(" .<>")
     , pShell(&rView.GetWrtShell())
     , pTAutoFormat(nullptr)
diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx
index 09fe5be864ad..5e666a2e31bc 100644
--- a/sw/source/ui/table/tautofmt.cxx
+++ b/sw/source/ui/table/tautofmt.cxx
@@ -25,7 +25,7 @@
 #include <shellres.hxx>
 #include <tautofmt.hxx>
 
-class SwStringInputDlg : public weld::GenericDialogController
+class SwStringInputDlg : public SfxDialogController
 {
 private:
     std::unique_ptr<weld::Label> m_xLabel;
@@ -34,7 +34,7 @@ private:
 public:
     SwStringInputDlg(weld::Window* pParent, const OUString& rTitle,
         const OUString& rEditTitle, const OUString& rDefault)
-        : GenericDialogController(pParent, "modules/swriter/ui/stringinput.ui",
+        : SfxDialogController(pParent, "modules/swriter/ui/stringinput.ui",
                 "StringInputDialog")
         , m_xLabel(m_xBuilder->weld_label("name"))
         , m_xEdInput(m_xBuilder->weld_entry("edit"))
@@ -54,7 +54,7 @@ public:
 // AutoFormat-Dialogue:
 SwAutoFormatDlg::SwAutoFormatDlg(weld::Window* pParent, SwWrtShell* pWrtShell,
                                  bool bAutoFormat, const SwTableAutoFormat* pSelFormat)
-    : GenericDialogController(pParent, "modules/swriter/ui/autoformattable.ui",
+    : SfxDialogController(pParent, "modules/swriter/ui/autoformattable.ui",
             "AutoFormatTableDialog")
     , m_aStrTitle(SwResId(STR_ADD_AUTOFORMAT_TITLE))
     , m_aStrLabel(SwResId(STR_ADD_AUTOFORMAT_LABEL))