diff options
author | Caolán McNamara <caolanm@redhat.com> | 2018-10-03 15:13:36 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2018-10-03 21:03:43 +0200 |
commit | ca8558a28d1dc271cd2f10362e5e0f7d218149cb (patch) | |
tree | 73b624d66506093c66c858506016b9b44c6f659a /sw | |
parent | 349d0e679a4ee296c703145afe73e65efc5d2bff (diff) |
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>
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/ui/config/mailconfigpage.cxx | 8 | ||||
-rw-r--r-- | sw/source/ui/dbui/mmresultdialogs.cxx | 8 | ||||
-rw-r--r-- | sw/source/ui/dialog/ascfldlg.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/frmdlg/column.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/inc/mmresultdialogs.hxx | 4 | ||||
-rw-r--r-- | sw/source/ui/misc/linenum.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/misc/titlepage.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/table/convert.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/table/instable.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/table/tautofmt.cxx | 6 | ||||
-rw-r--r-- | sw/source/uibase/inc/ascfldlg.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/inc/column.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/inc/convert.hxx | 4 | ||||
-rw-r--r-- | sw/source/uibase/inc/instable.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/inc/linenum.hxx | 4 | ||||
-rw-r--r-- | sw/source/uibase/inc/tautofmt.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/inc/titlepage.hxx | 4 |
17 files changed, 29 insertions, 29 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)) 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; |