summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-10-03 15:13:36 +0100
committerBartosz Kosiorek <gang65@poczta.onet.pl>2018-11-06 19:24:26 +0100
commit20826019d8f77129853712c5fdf5134aff058171 (patch)
tree8ac9d3b9fde047884f20b205ab524a6fe7954c7f /sw/source
parent3c8ad17c769753af50ef14770661a6c1ffed226e (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> Reviewed-on: https://gerrit.libreoffice.org/61326 Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl>
Diffstat (limited to 'sw/source')
-rw-r--r--sw/source/ui/config/mailconfigpage.cxx4
-rw-r--r--sw/source/ui/dbui/mmresultdialogs.cxx8
-rw-r--r--sw/source/ui/dialog/ascfldlg.cxx2
-rw-r--r--sw/source/ui/inc/mmresultdialogs.hxx4
-rw-r--r--sw/source/ui/misc/linenum.cxx2
-rw-r--r--sw/source/ui/misc/titlepage.cxx2
-rw-r--r--sw/source/ui/table/convert.cxx2
-rw-r--r--sw/source/ui/table/instable.cxx2
-rw-r--r--sw/source/ui/table/tautofmt.cxx6
-rw-r--r--sw/source/uibase/inc/ascfldlg.hxx2
-rw-r--r--sw/source/uibase/inc/convert.hxx4
-rw-r--r--sw/source/uibase/inc/instable.hxx2
-rw-r--r--sw/source/uibase/inc/linenum.hxx4
-rw-r--r--sw/source/uibase/inc/tautofmt.hxx2
-rw-r--r--sw/source/uibase/inc/titlepage.hxx4
15 files changed, 25 insertions, 25 deletions
diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx
index 1038a54c6358..d9d0b231ee5d 100644
--- a/sw/source/ui/config/mailconfigpage.cxx
+++ b/sw/source/ui/config/mailconfigpage.cxx
@@ -73,7 +73,7 @@ public:
virtual void dispose() override;
};
-class SwAuthenticationSettingsDialog : public weld::GenericDialogController
+class SwAuthenticationSettingsDialog : public SfxDialogController
{
SwMailMergeConfigItem& m_rConfigItem;
@@ -393,7 +393,7 @@ SwMailConfigDlg::SwMailConfigDlg(vcl::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 0e2d1bf4d533..dba2a288d21e 100644
--- a/sw/source/ui/dbui/mmresultdialogs.cxx
+++ b/sw/source/ui/dbui/mmresultdialogs.cxx
@@ -190,14 +190,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"))
{
@@ -211,7 +211,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"))
@@ -243,7 +243,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_text("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 5c780926ae43..da8ad60e1dd4 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_text("charset")))
, m_xFontFT(m_xBuilder->weld_label("fontft"))
diff --git a/sw/source/ui/inc/mmresultdialogs.hxx b/sw/source/ui/inc/mmresultdialogs.hxx
index d391f34a50f9..621ce751c33e 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 281dd9dd0d77..84fa25d78d4e 100644
--- a/sw/source/ui/misc/linenum.cxx
+++ b/sw/source/ui/misc/linenum.cxx
@@ -63,7 +63,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 36034678463b..691640578734 100644
--- a/sw/source/ui/misc/titlepage.cxx
+++ b/sw/source/ui/misc/titlepage.cxx
@@ -150,7 +150,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")
, mpPageFormatDesc(nullptr)
, m_xUseExistingPagesRB(m_xBuilder->weld_radio_button("RB_USE_EXISTING_PAGES"))
, m_xPageCountNF(m_xBuilder->weld_spin_button("NF_PAGE_COUNT"))
diff --git a/sw/source/ui/table/convert.cxx b/sw/source/ui/table/convert.cxx
index 066ad5f51a99..0f797221ad9e 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 82dff402d7dd..fdc67e35bc76 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)
- : weld::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 4c716726aafb..2c5c1b194801 100644
--- a/sw/source/ui/table/tautofmt.cxx
+++ b/sw/source/ui/table/tautofmt.cxx
@@ -24,7 +24,7 @@
#include <shellres.hxx>
#include <tautofmt.hxx>
-class SwStringInputDlg : public weld::GenericDialogController
+class SwStringInputDlg : public SfxDialogController
{
private:
std::unique_ptr<weld::Label> m_xLabel;
@@ -33,7 +33,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"))
@@ -53,7 +53,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 81c75663fd6c..9af0f921f04b 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/convert.hxx b/sw/source/uibase/inc/convert.hxx
index 90d1cfebf715..21180a88e7cb 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 127fb10efb27..bb85752defa5 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 59f80d722f69..1b530c7ed60f 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 m_aStrTitle;
OUString m_aStrLabel;
diff --git a/sw/source/uibase/inc/titlepage.hxx b/sw/source/uibase/inc/titlepage.hxx
index 836d1d7dc0c5..6bb24a3fcc0c 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;