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>
Reviewed-on: https://gerrit.libreoffice.org/61326
Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl>

6 files changed, 8 insertions, 9 deletions

diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx
index a5efbd0d6428..1d33a32e1321 100644
--- a/cui/source/dialogs/passwdomdlg.cxx
+++ b/cui/source/dialogs/passwdomdlg.cxx
@@ -70,7 +70,7 @@ IMPL_LINK_NOARG(PasswordToOpenModifyDialog, OkBtnClickHdl, weld::Button&, void)
 }
 
 PasswordToOpenModifyDialog::PasswordToOpenModifyDialog(weld::Window * pParent, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify)
-    : GenericDialogController(pParent, "cui/ui/password.ui", "PasswordDialog")
+    : SfxDialogController(pParent, "cui/ui/password.ui", "PasswordDialog")
     , m_xPasswdToOpenED(m_xBuilder->weld_entry("newpassEntry"))
     , m_xReenterPasswdToOpenED(m_xBuilder->weld_entry("confirmpassEntry"))
     , m_xOptionsExpander(m_xBuilder->weld_expander("expander"))
diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx
index dbf6436e14d0..e9408131c0c1 100644
--- a/cui/source/dialogs/postdlg.cxx
+++ b/cui/source/dialogs/postdlg.cxx
@@ -35,7 +35,7 @@
 
 SvxPostItDialog::SvxPostItDialog(weld::Window* pParent, const SfxItemSet& rCoreSet,
     bool bPrevNext)
-    : GenericDialogController(pParent, "cui/ui/comment.ui", "CommentDialog")
+    : SfxDialogController(pParent, "cui/ui/comment.ui", "CommentDialog")
     , m_rSet(rCoreSet)
     , m_xLastEditFT(m_xBuilder->weld_label("lastedit"))
     , m_xAltTitle(m_xBuilder->weld_label("alttitle"))
diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx
index 9ff5d03f9ace..39e3ee448830 100644
--- a/cui/source/dialogs/zoom.cxx
+++ b/cui/source/dialogs/zoom.cxx
@@ -124,7 +124,7 @@ const SfxItemSet* SvxZoomDialog::GetOutputItemSet() const
 }
 
 SvxZoomDialog::SvxZoomDialog(weld::Window* pParent, const SfxItemSet& rCoreSet)
-    : GenericDialogController(pParent, "cui/ui/zoomdialog.ui", "ZoomDialog")
+    : SfxDialogController(pParent, "cui/ui/zoomdialog.ui", "ZoomDialog")
     , m_rSet(rCoreSet)
     , m_bModified(false)
     , m_xOptimalBtn(m_xBuilder->weld_radio_button("optimal"))
diff --git a/cui/source/inc/passwdomdlg.hxx b/cui/source/inc/passwdomdlg.hxx
index 2d56f3b480ce..618ee1cd232a 100644
--- a/cui/source/inc/passwdomdlg.hxx
+++ b/cui/source/inc/passwdomdlg.hxx
@@ -19,11 +19,10 @@
 #ifndef INCLUDED_CUI_SOURCE_INC_PASSWDOMDLG_HXX
 #define INCLUDED_CUI_SOURCE_INC_PASSWDOMDLG_HXX
 
-#include <vcl/weld.hxx>
+#include <sfx2/basedlgs.hxx>
 #include <memory>
 
-
-class PasswordToOpenModifyDialog : public weld::GenericDialogController
+class PasswordToOpenModifyDialog : public SfxDialogController
 {
     std::unique_ptr<weld::Entry> m_xPasswdToOpenED;
     std::unique_ptr<weld::Entry> m_xReenterPasswdToOpenED;
diff --git a/cui/source/inc/postdlg.hxx b/cui/source/inc/postdlg.hxx
index 45e5c9ea62da..13ecf359c096 100644
--- a/cui/source/inc/postdlg.hxx
+++ b/cui/source/inc/postdlg.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_CUI_SOURCE_INC_POSTDLG_HXX
 #define INCLUDED_CUI_SOURCE_INC_POSTDLG_HXX
 
-#include <vcl/weld.hxx>
+#include <sfx2/basedlgs.hxx>
 
 // class SvxPostItDialog -------------------------------------------------
 /*
@@ -34,7 +34,7 @@
     <SvxPostItTextItem><SID_ATTR_POSTIT_TEXT>
 */
 
-class SvxPostItDialog : public weld::GenericDialogController
+class SvxPostItDialog : public SfxDialogController
 {
 public:
     SvxPostItDialog(weld::Window* pParent, const SfxItemSet& rCoreSet,
diff --git a/cui/source/inc/zoom.hxx b/cui/source/inc/zoom.hxx
index 7dd271f7b456..c87ff087767f 100644
--- a/cui/source/inc/zoom.hxx
+++ b/cui/source/inc/zoom.hxx
@@ -24,7 +24,7 @@
 #include <svx/zoom_def.hxx>
 #include <vcl/weld.hxx>
 
-class SvxZoomDialog : public weld::GenericDialogController
+class SvxZoomDialog : public SfxDialogController
 {
 private:
     const SfxItemSet&           m_rSet;