diff options
Diffstat (limited to 'sw')
25 files changed, 53 insertions, 53 deletions
diff --git a/sw/inc/colwd.hxx b/sw/inc/colwd.hxx index 379f4584c922..4feacc6c4e99 100644 --- a/sw/inc/colwd.hxx +++ b/sw/inc/colwd.hxx @@ -37,7 +37,7 @@ private: public: SwTableWidthDlg(weld::Window *pParent, SwTableFUNC &rFnc); - short execute(); + virtual short run() override; }; #endif diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx index 9afdb75a9118..c50fecf559fc 100644 --- a/sw/source/ui/chrdlg/break.cxx +++ b/sw/source/ui/chrdlg/break.cxx @@ -35,9 +35,9 @@ #include <strings.hrc> #include <SwStyleNameMapper.hxx> -short SwBreakDlg::execute() +short SwBreakDlg::run() { - short nRet = m_xDialog->run(); + short nRet = GenericDialogController::run(); if (nRet == RET_OK) { nKind = 0; diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx index 371c7e0be8e0..ed9cc2b47001 100644 --- a/sw/source/ui/dialog/swdlgfact.cxx +++ b/sw/source/ui/dialog/swdlgfact.cxx @@ -105,27 +105,27 @@ IMPL_ABSTDLG_BASE(VclAbstractDialog_Impl); short AbstractSplitTableDialog_Impl::Execute() { - return m_xDlg->execute(); + return m_xDlg->run(); } short AbstractSwBreakDlg_Impl::Execute() { - return m_xDlg->execute(); + return m_xDlg->run(); } short AbstractSwTableWidthDlg_Impl::Execute() { - return m_xDlg->execute(); + return m_xDlg->run(); } short AbstractSwTableHeightDlg_Impl::Execute() { - return m_xDlg->execute(); + return m_xDlg->run(); } short AbstractSwMergeTableDlg_Impl::Execute() { - return m_xDlg->execute(); + return m_xDlg->run(); } short AbstractGenericDialog_Impl::Execute() @@ -140,17 +140,17 @@ bool AbstractGenericDialog_Impl::StartExecuteAsync(AsyncContext &rCtx) short AbstractSwSortDlg_Impl::Execute() { - return m_xDlg->execute(); + return m_xDlg->run(); } short AbstractMultiTOXMarkDlg_Impl::Execute() { - return m_xDlg->execute(); + return m_xDlg->run(); } short AbstractTabController_Impl::Execute() { - return m_xDlg->execute(); + return m_xDlg->run(); } IMPL_ABSTDLG_BASE(AbstractTabDialog_Impl); @@ -164,12 +164,12 @@ IMPL_ABSTDLG_BASE(AbstractSwInsertDBColAutoPilot_Impl); short AbstractDropDownFieldDialog_Impl::Execute() { - return m_xDlg->execute(); + return m_xDlg->run(); } short AbstractSwLabDlg_Impl::Execute() { - return m_xDlg->execute(); + return m_xDlg->run(); } short AbstractSwSelGlossaryDlg_Impl::Execute() @@ -179,7 +179,7 @@ short AbstractSwSelGlossaryDlg_Impl::Execute() short AbstractSwAutoFormatDlg_Impl::Execute() { - return m_xDlg->execute(); + return m_xDlg->run(); } IMPL_ABSTDLG_BASE(AbstractSwFieldDlg_Impl); @@ -194,12 +194,12 @@ IMPL_ABSTDLG_BASE(AbstractGlossaryDlg_Impl); short AbstractFieldInputDlg_Impl::Execute() { - return m_xDlg->execute(); + return m_xDlg->run(); } short AbstractInsFootNoteDlg_Impl::Execute() { - return m_xDlg->execute(); + return m_xDlg->run(); } short AbstractInsTableDlg_Impl::Execute() diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index a08d180c859f..433986cb4026 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -409,7 +409,7 @@ bool SwEditRegionDlg::CheckPasswd(CheckBox* pBox) { SfxPasswordDialog aPasswdDlg(GetFrameWeld()); bRet = false; - if (aPasswdDlg.execute()) + if (aPasswdDlg.run()) { const OUString sNewPasswd(aPasswdDlg.GetPassword()); css::uno::Sequence <sal_Int8 > aNewPasswd; @@ -1264,7 +1264,7 @@ IMPL_LINK( SwEditRegionDlg, ChangePasswdHdl, Button *, pBox, void ) { SfxPasswordDialog aPasswdDlg(GetFrameWeld()); aPasswdDlg.ShowExtras(SfxShowExtras::CONFIRM); - if (RET_OK == aPasswdDlg.execute()) + if (RET_OK == aPasswdDlg.run()) { const OUString sNewPasswd(aPasswdDlg.GetPassword()); if (aPasswdDlg.GetConfirm() == sNewPasswd) @@ -1701,7 +1701,7 @@ IMPL_LINK( SwInsertSectionTabPage, ChangePasswdHdl, Button *, pButton, void ) { SfxPasswordDialog aPasswdDlg(GetFrameWeld()); aPasswdDlg.ShowExtras(SfxShowExtras::CONFIRM); - if (RET_OK == aPasswdDlg.execute()) + if (RET_OK == aPasswdDlg.run()) { const OUString sNewPasswd(aPasswdDlg.GetPassword()); if (aPasswdDlg.GetConfirm() == sNewPasswd) diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx index d18b62b97dd3..82c177e0cd42 100644 --- a/sw/source/ui/envelp/envfmt.cxx +++ b/sw/source/ui/envelp/envfmt.cxx @@ -292,7 +292,7 @@ void SwEnvFormatPage::Edit(const OString& rIdent, bool bSender) const OUString sFormatStr = pColl->GetName(); SwParaDlg aDlg(GetDialogFrameWeld(), pSh->GetView(), aTmpSet, DLG_ENVELOP, &sFormatStr); - if (aDlg.execute() == RET_OK) + if (aDlg.run() == RET_OK) { // maybe relocate defaults const SfxPoolItem* pItem = nullptr; diff --git a/sw/source/ui/envelp/envprt.cxx b/sw/source/ui/envelp/envprt.cxx index 74860a832ff4..f046a910d69d 100644 --- a/sw/source/ui/envelp/envprt.cxx +++ b/sw/source/ui/envelp/envprt.cxx @@ -120,7 +120,7 @@ IMPL_LINK(SwEnvPrtPage, ButtonHdl, weld::Button&, rBtn, void) { PrinterSetupDialog aDlg(GetDialogFrameWeld()); aDlg.SetPrinter(m_xPrt); - aDlg.execute(); + aDlg.run(); rBtn.grab_focus(); m_xPrinterInfo->set_label(m_xPrt->GetName()); } diff --git a/sw/source/ui/envelp/labprt.cxx b/sw/source/ui/envelp/labprt.cxx index 872f31d7f070..337ae9614e8e 100644 --- a/sw/source/ui/envelp/labprt.cxx +++ b/sw/source/ui/envelp/labprt.cxx @@ -76,7 +76,7 @@ IMPL_LINK( SwLabPrtPage, CountHdl, weld::Button&, rButton, void ) PrinterSetupDialog aDlg(GetFrameWeld()); aDlg.SetPrinter(pPrinter); - aDlg.execute(); + aDlg.run(); rButton.grab_focus(); m_xPrinterInfo->set_label(pPrinter->GetName()); return; diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx index d5ce4e3f3a0b..2b96b74ad99b 100644 --- a/sw/source/ui/frmdlg/cption.cxx +++ b/sw/source/ui/frmdlg/cption.cxx @@ -77,9 +77,9 @@ public: void SetCharacterStyle(const OUString& rStyle); OUString GetCharacterStyle() const; - short execute() + virtual short run() override { - int nRet = run(); + int nRet = GenericDialogController::run(); if (nRet == RET_OK) Apply(); return nRet; @@ -297,7 +297,7 @@ IMPL_LINK_NOARG( SwCaptionDialog, OptionHdl, Button*, void ) aDlg.SetApplyBorderAndShadow(bCopyAttributes); aDlg.SetCharacterStyle( sCharacterStyle ); aDlg.SetOrderNumberingFirst( bOrderNumberingFirst ); - aDlg.execute(); + aDlg.run(); bCopyAttributes = aDlg.IsApplyBorderAndShadow(); sCharacterStyle = aDlg.GetCharacterStyle(); //#i61007# order of captions diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx index 2f2ba79a4c4c..f9736984fb5f 100644 --- a/sw/source/ui/misc/srtdlg.cxx +++ b/sw/source/ui/misc/srtdlg.cxx @@ -226,9 +226,9 @@ sal_Unicode SwSortDlg::GetDelimChar() const return cRet; } -short SwSortDlg::execute() +short SwSortDlg::run() { - short nRet = run(); + short nRet = GenericDialogController::run(); if (nRet == RET_OK) Apply(); return nRet; diff --git a/sw/source/ui/table/colwd.cxx b/sw/source/ui/table/colwd.cxx index d572563cbe4a..a6b0f349bb35 100644 --- a/sw/source/ui/table/colwd.cxx +++ b/sw/source/ui/table/colwd.cxx @@ -68,9 +68,9 @@ void SwTableWidthDlg::Apply() static_cast<sal_uInt16>(m_xWidthMF->denormalize(m_xWidthMF->get_value(FUNIT_TWIP)))); } -short SwTableWidthDlg::execute() +short SwTableWidthDlg::run() { - short nRet = run(); + short nRet = GenericDialogController::run(); if (nRet == RET_OK) Apply(); return nRet; diff --git a/sw/source/ui/table/mergetbl.cxx b/sw/source/ui/table/mergetbl.cxx index fa51a3b60aa3..bb45020e9783 100644 --- a/sw/source/ui/table/mergetbl.cxx +++ b/sw/source/ui/table/mergetbl.cxx @@ -33,9 +33,9 @@ void SwMergeTableDlg::Apply() m_rMergePrev = m_xMergePrevRB->get_active(); } -short SwMergeTableDlg::execute() +short SwMergeTableDlg::run() { - int nRet = run(); + int nRet = GenericDialogController::run(); if (nRet == RET_OK) Apply(); return nRet; diff --git a/sw/source/ui/table/rowht.cxx b/sw/source/ui/table/rowht.cxx index e8b725b806cd..53c35373cc8f 100644 --- a/sw/source/ui/table/rowht.cxx +++ b/sw/source/ui/table/rowht.cxx @@ -70,9 +70,9 @@ SwTableHeightDlg::SwTableHeightDlg(weld::Window *pParent, SwWrtShell &rS) } } -short SwTableHeightDlg::execute() +short SwTableHeightDlg::run() { - short nRet = run(); + short nRet = GenericDialogController::run(); if (nRet == RET_OK) Apply(); return nRet; diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx index a395be977d54..503553fc6ead 100644 --- a/sw/source/ui/table/tautofmt.cxx +++ b/sw/source/ui/table/tautofmt.cxx @@ -395,9 +395,9 @@ IMPL_LINK_NOARG(SwAutoFormatDlg, SelFormatHdl, weld::TreeView&, void) m_xBtnRename->set_sensitive(bBtnEnable); } -short SwAutoFormatDlg::execute() +short SwAutoFormatDlg::run() { - short nRet = m_xDialog->run(); + short nRet = SfxDialogController::run(); if (nRet == RET_OK && m_bSetAutoFormat) m_pShell->SetTableStyle((*m_xTableTable)[m_nIndex]); return nRet; diff --git a/sw/source/uibase/dbui/mailmergehelper.cxx b/sw/source/uibase/dbui/mailmergehelper.cxx index 20f040ab03be..f249a8c04e2f 100644 --- a/sw/source/uibase/dbui/mailmergehelper.cxx +++ b/sw/source/uibase/dbui/mailmergehelper.cxx @@ -944,7 +944,7 @@ OUString SwAuthenticator::getPassword( ) { SfxPasswordDialog aPasswdDlg(m_pParentWindow); aPasswdDlg.SetMinLen(0); - if (RET_OK == aPasswdDlg.execute()) + if (RET_OK == aPasswdDlg.run()) m_aPassword = aPasswdDlg.GetPassword(); } return m_aPassword; 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; diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx index 66c76633d14b..15964603fedd 100644 --- a/sw/source/uibase/uiview/view2.cxx +++ b/sw/source/uibase/uiview/view2.cxx @@ -563,7 +563,7 @@ void SwView::Execute(SfxRequest &rReq) SfxPasswordDialog aPasswdDlg(GetFrameWeld()); aPasswdDlg.SetMinLen(1); //#i69751# the result of Execute() can be ignored - (void)aPasswdDlg.execute(); + (void)aPasswdDlg.run(); OUString sNewPasswd(aPasswdDlg.GetPassword()); Sequence <sal_Int8> aNewPasswd = rIDRA.GetRedlinePassword(); SvPasswordHelper::GetHashPassword( aNewPasswd, sNewPasswd ); @@ -604,7 +604,7 @@ void SwView::Execute(SfxRequest &rReq) aPasswdDlg.SetMinLen(1); if (!aPasswd.getLength()) aPasswdDlg.ShowExtras(SfxShowExtras::CONFIRM); - if (aPasswdDlg.execute()) + if (aPasswdDlg.run()) { RedlineFlags nOn = RedlineFlags::On; OUString sNewPasswd(aPasswdDlg.GetPassword()); |