diff options
Diffstat (limited to 'sw/source/ui')
-rw-r--r-- | sw/source/ui/chrdlg/break.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/dialog/swdlgfact.cxx | 26 | ||||
-rw-r--r-- | sw/source/ui/dialog/uiregionsw.cxx | 6 | ||||
-rw-r--r-- | sw/source/ui/envelp/envfmt.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/envelp/envprt.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/envelp/labprt.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/frmdlg/cption.cxx | 6 | ||||
-rw-r--r-- | sw/source/ui/misc/srtdlg.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/table/colwd.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/table/mergetbl.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/table/rowht.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/table/tautofmt.cxx | 4 |
12 files changed, 34 insertions, 34 deletions
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; |