diff options
35 files changed, 52 insertions, 52 deletions
diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx index d0066803c1c2..295d6f37fd28 100644 --- a/cui/source/dialogs/hyphen.cxx +++ b/cui/source/dialogs/hyphen.cxx @@ -405,7 +405,7 @@ SvxHyphenWordDialog::SvxHyphenWordDialog( weld::Window* pParent, uno::Reference< linguistic2::XHyphenator > const &xHyphen, SvxSpellWrapper* pWrapper) - : GenericDialogController(pParent, "cui/ui/hyphenate.ui", "HyphenateDialog") + : SfxDialogController(pParent, "cui/ui/hyphenate.ui", "HyphenateDialog") , m_pHyphWrapper(pWrapper) , m_aActWord(rWord) , m_nActLanguage(nLang) diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx index dbe433f8a4f1..f7b359bac237 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 a4d3bef88261..f02e8b1a79a8 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/hyphen.hxx b/cui/source/inc/hyphen.hxx index 5f5e72d4db17..fdf65cd4b201 100644 --- a/cui/source/inc/hyphen.hxx +++ b/cui/source/inc/hyphen.hxx @@ -29,7 +29,7 @@ class SvxSpellWrapper; -class SvxHyphenWordDialog : public weld::GenericDialogController +class SvxHyphenWordDialog : public SfxDialogController { OUString m_aLabel; SvxSpellWrapper *const m_pHyphWrapper; diff --git a/cui/source/inc/passwdomdlg.hxx b/cui/source/inc/passwdomdlg.hxx index 73e8bade074a..e49634026e93 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; diff --git a/include/sfx2/new.hxx b/include/sfx2/new.hxx index f5c30c23060f..0697414fa4ca 100644 --- a/include/sfx2/new.hxx +++ b/include/sfx2/new.hxx @@ -22,6 +22,7 @@ #include <memory> #include <sal/config.h> #include <sfx2/dllapi.h> +#include <sfx2/basedlgs.hxx> #include <sfx2/objsh.hxx> #include <vcl/idle.hxx> @@ -55,7 +56,7 @@ namespace o3tl #define RET_TEMPLATE_LOAD 100 -class SFX2_DLLPUBLIC SfxNewFileDialog : public weld::GenericDialogController +class SFX2_DLLPUBLIC SfxNewFileDialog : public SfxDialogController { private: Idle m_aPrevIdle; diff --git a/include/svx/passwd.hxx b/include/svx/passwd.hxx index 9f726b0d747c..7915453fb05d 100644 --- a/include/svx/passwd.hxx +++ b/include/svx/passwd.hxx @@ -19,10 +19,10 @@ #ifndef INCLUDED_SVX_PASSWD_HXX #define INCLUDED_SVX_PASSWD_HXX -#include <vcl/weld.hxx> +#include <sfx2/basedlgs.hxx> #include <svx/svxdllapi.h> -class SVX_DLLPUBLIC SvxPasswordDialog : public weld::GenericDialogController +class SVX_DLLPUBLIC SvxPasswordDialog : public SfxDialogController { private: OUString m_aOldPasswdErrStr; diff --git a/sd/source/ui/dlg/brkdlg.cxx b/sd/source/ui/dlg/brkdlg.cxx index 80e8fb8f6a8f..9dcefb6facf5 100644 --- a/sd/source/ui/dlg/brkdlg.cxx +++ b/sd/source/ui/dlg/brkdlg.cxx @@ -40,7 +40,7 @@ namespace sd { BreakDlg::BreakDlg(weld::Window* pWindow, DrawView* pDrView, DrawDocShell* pShell, sal_uLong nSumActionCount, sal_uLong nObjCount) - : GenericDialogController(pWindow, "modules/sdraw/ui/breakdialog.ui", "BreakDialog") + : SfxDialogController(pWindow, "modules/sdraw/ui/breakdialog.ui", "BreakDialog") , m_xFiObjInfo(m_xBuilder->weld_label("metafiles")) , m_xFiActInfo(m_xBuilder->weld_label("metaobjects")) , m_xFiInsInfo(m_xBuilder->weld_label("drawingobjects")) diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx index ea414a9bdf7b..d4bad13ad7e1 100644 --- a/sd/source/ui/dlg/copydlg.cxx +++ b/sd/source/ui/dlg/copydlg.cxx @@ -41,7 +41,7 @@ namespace sd { #define TOKEN ';' CopyDlg::CopyDlg(weld::Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View* pInView) - : GenericDialogController(pWindow, "modules/sdraw/ui/copydlg.ui", "DuplicateDialog") + : SfxDialogController(pWindow, "modules/sdraw/ui/copydlg.ui", "DuplicateDialog") , mrOutAttrs(rInAttrs) , maUIScale(pInView->GetDoc().GetUIScale()) , mpView(pInView) diff --git a/sd/source/ui/inc/BreakDlg.hxx b/sd/source/ui/inc/BreakDlg.hxx index 02d7a3081aed..21414b64f29e 100644 --- a/sd/source/ui/inc/BreakDlg.hxx +++ b/sd/source/ui/inc/BreakDlg.hxx @@ -20,10 +20,10 @@ #ifndef INCLUDED_SD_SOURCE_UI_INC_BREAKDLG_HXX #define INCLUDED_SD_SOURCE_UI_INC_BREAKDLG_HXX +#include <sfx2/basedlgs.hxx> #include <sfx2/progress.hxx> #include <svx/svdetc.hxx> #include <vcl/idle.hxx> -#include <vcl/weld.hxx> namespace sd { @@ -33,7 +33,7 @@ class DrawView; /** * dialog to break meta files */ -class BreakDlg : public weld::GenericDialogController +class BreakDlg : public SfxDialogController { public: BreakDlg(weld::Window* pWindow, DrawView* pDrView, DrawDocShell* pShell, diff --git a/sd/source/ui/inc/copydlg.hxx b/sd/source/ui/inc/copydlg.hxx index db0181efe2d4..dd6da82c8499 100644 --- a/sd/source/ui/inc/copydlg.hxx +++ b/sd/source/ui/inc/copydlg.hxx @@ -34,7 +34,7 @@ class View; /** * dialog to adjust screen */ -class CopyDlg : public weld::GenericDialogController +class CopyDlg : public SfxDialogController { public: CopyDlg(weld::Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View* pView); diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx index 5e903319bb05..c58401bb1a0d 100644 --- a/sfx2/source/dialog/versdlg.cxx +++ b/sfx2/source/dialog/versdlg.cxx @@ -450,7 +450,7 @@ IMPL_LINK( SfxVersionDialog, ButtonHdl_Impl, Button*, pButton, void ) } SfxViewVersionDialog_Impl::SfxViewVersionDialog_Impl(weld::Window *pParent, SfxVersionInfo& rInfo, bool bEdit) - : GenericDialogController(pParent, "sfx/ui/versioncommentdialog.ui", "VersionCommentDialog") + : SfxDialogController(pParent, "sfx/ui/versioncommentdialog.ui", "VersionCommentDialog") , m_rInfo(rInfo) , m_xDateTimeText(m_xBuilder->weld_label("timestamp")) , m_xSavedByText(m_xBuilder->weld_label("author")) diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx index b6a78c03bf7a..0c8f6d21513c 100644 --- a/sfx2/source/doc/new.cxx +++ b/sfx2/source/doc/new.cxx @@ -228,7 +228,7 @@ sal_uInt16 SfxNewFileDialog::GetSelectedTemplatePos() const } SfxNewFileDialog::SfxNewFileDialog(weld::Window *pParent, SfxNewFileDialogMode nFlags) - : GenericDialogController(pParent, "sfx/ui/loadtemplatedialog.ui", "LoadTemplateDialog") + : SfxDialogController(pParent, "sfx/ui/loadtemplatedialog.ui", "LoadTemplateDialog") , m_nFlags(nFlags) , m_xPreviewController(new SfxPreviewWin_Impl) , m_xRegionLb(m_xBuilder->weld_tree_view("categories")) diff --git a/sfx2/source/inc/versdlg.hxx b/sfx2/source/inc/versdlg.hxx index fa687f3c81f1..3f545c8b1dbb 100644 --- a/sfx2/source/inc/versdlg.hxx +++ b/sfx2/source/inc/versdlg.hxx @@ -71,7 +71,7 @@ public: bool IsSaveVersionOnClose() const { return m_bIsSaveVersionOnClose; } }; -class SfxViewVersionDialog_Impl : public weld::GenericDialogController +class SfxViewVersionDialog_Impl : public SfxDialogController { private: SfxVersionInfo& m_rInfo; diff --git a/svx/source/dialog/passwd.cxx b/svx/source/dialog/passwd.cxx index 331f9340e54e..cb7793c3de96 100644 --- a/svx/source/dialog/passwd.cxx +++ b/svx/source/dialog/passwd.cxx @@ -61,7 +61,7 @@ IMPL_LINK_NOARG(SvxPasswordDialog, EditModifyHdl, weld::Entry&, void) } SvxPasswordDialog::SvxPasswordDialog(weld::Window* pParent, bool bDisableOldPassword) - : GenericDialogController(pParent, "svx/ui/passwd.ui", "PasswordDialog") + : SfxDialogController(pParent, "svx/ui/passwd.ui", "PasswordDialog") , m_aOldPasswdErrStr(SvxResId(RID_SVXSTR_ERR_OLD_PASSWD)) , m_aRepeatPasswdErrStr(SvxResId(RID_SVXSTR_ERR_REPEAT_PASSWD )) , m_xOldFL(m_xBuilder->weld_label("oldpass")) 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)) diff --git a/sw/source/uibase/inc/ascfldlg.hxx b/sw/source/uibase/inc/ascfldlg.hxx index 43ee8452a18d..038d57098b85 100644 --- a/sw/source/uibase/inc/ascfldlg.hxx +++ b/sw/source/uibase/inc/ascfldlg.hxx @@ -30,7 +30,7 @@ class SwAsciiOptions; class SvStream; class SwDocShell; -class SwAsciiFilterDlg : public weld::GenericDialogController +class SwAsciiFilterDlg : public SfxDialogController { bool m_bSaveLineStatus; OUString m_sExtraData; diff --git a/sw/source/uibase/inc/column.hxx b/sw/source/uibase/inc/column.hxx index 1afcfb152b4f..7f6f4b0478af 100644 --- a/sw/source/uibase/inc/column.hxx +++ b/sw/source/uibase/inc/column.hxx @@ -42,7 +42,7 @@ class SwColMgr; class SwWrtShell; class SwColumnPage; -class SwColumnDlg : public weld::GenericDialogController +class SwColumnDlg : public SfxDialogController { SwWrtShell& m_rWrtShell; VclPtr<SwColumnPage> m_pTabPage; diff --git a/sw/source/uibase/inc/convert.hxx b/sw/source/uibase/inc/convert.hxx index 1c10ad388f47..d61f10b3abb7 100644 --- a/sw/source/uibase/inc/convert.hxx +++ b/sw/source/uibase/inc/convert.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_CONVERT_HXX #define INCLUDED_SW_SOURCE_UIBASE_INC_CONVERT_HXX -#include <vcl/weld.hxx> +#include <sfx2/basedlgs.hxx> class VclContainer; class SwTableAutoFormat; @@ -27,7 +27,7 @@ class SwView; class SwWrtShell; struct SwInsertTableOptions; -class SwConvertTableDlg : public weld::GenericDialogController +class SwConvertTableDlg : public SfxDialogController { std::unique_ptr<weld::RadioButton> m_xTabBtn; std::unique_ptr<weld::RadioButton> m_xSemiBtn; diff --git a/sw/source/uibase/inc/instable.hxx b/sw/source/uibase/inc/instable.hxx index 3f1872fef089..c0194403ab98 100644 --- a/sw/source/uibase/inc/instable.hxx +++ b/sw/source/uibase/inc/instable.hxx @@ -35,7 +35,7 @@ #include <tblafmt.hxx> #include <itabenum.hxx> -class SwInsTableDlg : public weld::GenericDialogController +class SwInsTableDlg : public SfxDialogController { TextFilter m_aTextFilter; diff --git a/sw/source/uibase/inc/linenum.hxx b/sw/source/uibase/inc/linenum.hxx index 9489201624a0..21f4d78864ca 100644 --- a/sw/source/uibase/inc/linenum.hxx +++ b/sw/source/uibase/inc/linenum.hxx @@ -19,13 +19,13 @@ #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_LINENUM_HXX #define INCLUDED_SW_SOURCE_UIBASE_INC_LINENUM_HXX -#include <vcl/weld.hxx> +#include <sfx2/basedlgs.hxx> #include "numberingtypelistbox.hxx" class SwView; class SwWrtShell; -class SwLineNumberingDlg : public weld::GenericDialogController +class SwLineNumberingDlg : public SfxDialogController { private: SwWrtShell* m_pSh; diff --git a/sw/source/uibase/inc/tautofmt.hxx b/sw/source/uibase/inc/tautofmt.hxx index 6b46283b80f0..77a8f694ea55 100644 --- a/sw/source/uibase/inc/tautofmt.hxx +++ b/sw/source/uibase/inc/tautofmt.hxx @@ -35,7 +35,7 @@ class SwWrtShell; enum AutoFormatLine { TOP_LINE, BOTTOM_LINE, LEFT_LINE, RIGHT_LINE }; -class SwAutoFormatDlg : public weld::GenericDialogController +class SwAutoFormatDlg : public SfxDialogController { OUString const m_aStrTitle; OUString const m_aStrLabel; diff --git a/sw/source/uibase/inc/titlepage.hxx b/sw/source/uibase/inc/titlepage.hxx index d39cf256d85f..062d500574f6 100644 --- a/sw/source/uibase/inc/titlepage.hxx +++ b/sw/source/uibase/inc/titlepage.hxx @@ -10,13 +10,13 @@ #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_TITLEPAGE_HXX #define INCLUDED_SW_SOURCE_UIBASE_INC_TITLEPAGE_HXX -#include <vcl/weld.hxx> +#include <sfx2/basedlgs.hxx> namespace vcl { class Window; } class SwWrtShell; class SwPageDesc; -class SwTitlePageDlg : public weld::GenericDialogController +class SwTitlePageDlg : public SfxDialogController { private: SwWrtShell *mpSh; |