diff options
author | Caolán McNamara <caolanm@redhat.com> | 2018-10-23 10:38:03 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2018-10-24 11:55:01 +0200 |
commit | f8e06f7b77a6286d2c41bbc76f06a768c76cd87a (patch) | |
tree | 0aa5836b7dcdba477f0dfca47b24a5f9aa8bd952 /sw/source/uibase/inc | |
parent | b85ff98383942360901b8242cf77366782400426 (diff) |
weld AdvancedSettingsDialog
make run virtual and fold executes into it, so GenericUnoDialog
can call run on tabdialogs to do the right thing, and allows
Start_Impl to be private again
Change-Id: Ic457edfbdc7457f4c49d4e8ad679903f38ad9b42
Reviewed-on: https://gerrit.libreoffice.org/62227
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/uibase/inc')
-rw-r--r-- | sw/source/uibase/inc/DropDownFieldDialog.hxx | 4 | ||||
-rw-r--r-- | sw/source/uibase/inc/break.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/inc/inpdlg.hxx | 4 | ||||
-rw-r--r-- | sw/source/uibase/inc/insfnote.hxx | 4 | ||||
-rw-r--r-- | sw/source/uibase/inc/mergetbl.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/inc/multmrk.hxx | 4 | ||||
-rw-r--r-- | sw/source/uibase/inc/rowht.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/inc/splittbl.hxx | 4 | ||||
-rw-r--r-- | sw/source/uibase/inc/srtdlg.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/inc/tautofmt.hxx | 2 |
10 files changed, 15 insertions, 15 deletions
diff --git a/sw/source/uibase/inc/DropDownFieldDialog.hxx b/sw/source/uibase/inc/DropDownFieldDialog.hxx index 13f3946a4679..73b7d9fd15c1 100644 --- a/sw/source/uibase/inc/DropDownFieldDialog.hxx +++ b/sw/source/uibase/inc/DropDownFieldDialog.hxx @@ -51,9 +51,9 @@ public: virtual ~DropDownFieldDialog() override; bool PrevButtonPressed() const; bool NextButtonPressed() const; - short execute() + virtual short run() override { - short nRet = run(); + short nRet = GenericDialogController::run(); if (nRet == RET_OK) Apply(); return nRet; diff --git a/sw/source/uibase/inc/break.hxx b/sw/source/uibase/inc/break.hxx index 3b6966e6f534..096f13fbb0c7 100644 --- a/sw/source/uibase/inc/break.hxx +++ b/sw/source/uibase/inc/break.hxx @@ -57,7 +57,7 @@ class SwBreakDlg : public weld::GenericDialogController public: SwBreakDlg(weld::Window *pParent, SwWrtShell &rSh); - short execute(); + virtual short run() override; const OUString& GetTemplateName() const { return m_aTemplate; } sal_uInt16 GetKind() const { return nKind; } const ::boost::optional<sal_uInt16>& GetPageNumber() const { return oPgNum; } diff --git a/sw/source/uibase/inc/inpdlg.hxx b/sw/source/uibase/inc/inpdlg.hxx index 1263b0a1844b..b85e52663366 100644 --- a/sw/source/uibase/inc/inpdlg.hxx +++ b/sw/source/uibase/inc/inpdlg.hxx @@ -56,9 +56,9 @@ class SwFieldInputDlg : public weld::GenericDialogController public: SwFieldInputDlg(weld::Window *pParent, SwWrtShell &rSh, SwField* pField, bool bPrevButton, bool bNextButton); - short execute() + virtual short run() override { - short nRet = run(); + short nRet = GenericDialogController::run(); if (nRet == RET_OK) Apply(); return nRet; diff --git a/sw/source/uibase/inc/insfnote.hxx b/sw/source/uibase/inc/insfnote.hxx index 5d3daed7f1c3..ad0cb10515f8 100644 --- a/sw/source/uibase/inc/insfnote.hxx +++ b/sw/source/uibase/inc/insfnote.hxx @@ -71,9 +71,9 @@ public: return m_xNumberCharEdit->get_text(); return OUString(); } - short execute() + virtual short run() override { - short nRet = run(); + short nRet = GenericDialogController::run(); if (nRet == RET_OK) Apply(); return nRet; diff --git a/sw/source/uibase/inc/mergetbl.hxx b/sw/source/uibase/inc/mergetbl.hxx index 986ea3214c75..11ca8c726455 100644 --- a/sw/source/uibase/inc/mergetbl.hxx +++ b/sw/source/uibase/inc/mergetbl.hxx @@ -31,7 +31,7 @@ private: public: SwMergeTableDlg(weld::Window *pParent, bool& rWithPrev); - short execute(); + virtual short run() override; }; #endif diff --git a/sw/source/uibase/inc/multmrk.hxx b/sw/source/uibase/inc/multmrk.hxx index 0e7959433d01..0549d09b9ecf 100644 --- a/sw/source/uibase/inc/multmrk.hxx +++ b/sw/source/uibase/inc/multmrk.hxx @@ -38,9 +38,9 @@ class SwMultiTOXMarkDlg : public weld::GenericDialogController public: SwMultiTOXMarkDlg(weld::Window* pParent, SwTOXMgr &rTOXMgr); virtual ~SwMultiTOXMarkDlg() override; - short execute() + virtual short run() override { - short nRet = run(); + short nRet = GenericDialogController::run(); if (nRet == RET_OK) Apply(); return nRet; diff --git a/sw/source/uibase/inc/rowht.hxx b/sw/source/uibase/inc/rowht.hxx index afe10a0552ab..fdcb6438badb 100644 --- a/sw/source/uibase/inc/rowht.hxx +++ b/sw/source/uibase/inc/rowht.hxx @@ -38,7 +38,7 @@ private: public: SwTableHeightDlg(weld::Window *pParent, SwWrtShell &rS); - short execute(); + virtual short run() override; }; #endif diff --git a/sw/source/uibase/inc/splittbl.hxx b/sw/source/uibase/inc/splittbl.hxx index 8d32899d0f0a..ac75e72c691c 100644 --- a/sw/source/uibase/inc/splittbl.hxx +++ b/sw/source/uibase/inc/splittbl.hxx @@ -41,9 +41,9 @@ private: public: SwSplitTableDlg(weld::Window *pParent, SwWrtShell &rSh); - short execute() + virtual short run() override { - short nRet = m_xDialog->run(); + short nRet = GenericDialogController::run(); if (nRet == RET_OK) Apply(); return nRet; diff --git a/sw/source/uibase/inc/srtdlg.hxx b/sw/source/uibase/inc/srtdlg.hxx index ff32b8f0569f..99edf77dd081 100644 --- a/sw/source/uibase/inc/srtdlg.hxx +++ b/sw/source/uibase/inc/srtdlg.hxx @@ -81,7 +81,7 @@ class SwSortDlg : public weld::GenericDialogController public: SwSortDlg(weld::Window * pParent, SwWrtShell &rSh); - short execute(); + virtual short run() override; }; #endif diff --git a/sw/source/uibase/inc/tautofmt.hxx b/sw/source/uibase/inc/tautofmt.hxx index 77a8f694ea55..fdee21d9e3ab 100644 --- a/sw/source/uibase/inc/tautofmt.hxx +++ b/sw/source/uibase/inc/tautofmt.hxx @@ -79,7 +79,7 @@ public: SwAutoFormatDlg(weld::Window* pParent, SwWrtShell* pShell, bool bSetAutoFormat, const SwTableAutoFormat* pSelFormat); - short execute(); + virtual short run() override; SwTableAutoFormat* FillAutoFormatOfIndex() const; |