summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
Diffstat (limited to 'sc')
-rw-r--r--sc/source/ui/attrdlg/scdlgfact.cxx6
-rw-r--r--sc/source/ui/dbgui/pvfundlg.cxx4
-rw-r--r--sc/source/ui/docshell/docsh4.cxx2
-rw-r--r--sc/source/ui/docshell/impex.cxx2
-rw-r--r--sc/source/ui/inc/instbdlg.hxx2
-rw-r--r--sc/source/ui/inc/pvfundlg.hxx2
-rw-r--r--sc/source/ui/inc/warnbox.hxx2
-rw-r--r--sc/source/ui/miscdlgs/instbdlg.cxx4
-rw-r--r--sc/source/ui/miscdlgs/warnbox.cxx4
-rw-r--r--sc/source/ui/view/tabvwsh3.cxx6
-rw-r--r--sc/source/ui/view/viewfun3.cxx2
11 files changed, 18 insertions, 18 deletions
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx
index 677a5dd2f518..81896109b16b 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -137,7 +137,7 @@ short AbstractScInsertContentsDlg_Impl::Execute()
short AbstractScInsertTableDlg_Impl::Execute()
{
- return m_xDlg->execute();
+ return m_xDlg->run();
}
short AbstractScSelEntryDlg_Impl::Execute()
@@ -169,7 +169,7 @@ IMPL_ABSTDLG_BASE(AbstractScDPDateGroupDlg_Impl);
short AbstractScDPShowDetailDlg_Impl::Execute()
{
- return m_xDlg->execute();
+ return m_xDlg->run();
}
IMPL_ABSTDLG_BASE(AbstractScNewScenarioDlg_Impl);
@@ -691,7 +691,7 @@ bool AbstractScTextImportOptionsDlg_Impl::IsDateConversionSet() const
short ScAbstractTabController_Impl::Execute()
{
- return m_xDlg->execute();
+ return m_xDlg->run();
}
bool ScAbstractTabController_Impl::StartExecuteAsync(AsyncContext &rCtx)
diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx
index 42117af9ff63..93a7330571c1 100644
--- a/sc/source/ui/dbgui/pvfundlg.cxx
+++ b/sc/source/ui/dbgui/pvfundlg.cxx
@@ -850,9 +850,9 @@ ScDPShowDetailDlg::~ScDPShowDetailDlg()
{
}
-short ScDPShowDetailDlg::execute()
+short ScDPShowDetailDlg::run()
{
- return mxLbDims->n_children() ? m_xDialog->run() : static_cast<short>(RET_CANCEL);
+ return mxLbDims->n_children() ? GenericDialogController::run() : static_cast<short>(RET_CANCEL);
}
OUString ScDPShowDetailDlg::GetDimensionName() const
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index 90a24a9294fa..e29a9ccf172c 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -1286,7 +1286,7 @@ bool ScDocShell::ExecuteChangeProtectionDialog( bool bJustQueryIfProtected )
aDlg.SetEditHelpId( HID_CHG_PROTECT );
if ( !bProtected )
aDlg.ShowExtras(SfxShowExtras::CONFIRM);
- if (aDlg.execute() == RET_OK)
+ if (aDlg.run() == RET_OK)
aPassword = aDlg.GetPassword();
if (!aPassword.isEmpty())
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index 7adfa5030b11..a8e3b58130a1 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -1487,7 +1487,7 @@ bool ScImportExport::ExtText2Doc( SvStream& rStrm )
{
vcl::Window* pWin = ScDocShell::GetActiveDialogParent();
ScReplaceWarnBox aBox(pWin ? pWin->GetFrameWeld() : nullptr);
- if (aBox.execute() != RET_YES)
+ if (aBox.run() != RET_YES)
{
return false;
}
diff --git a/sc/source/ui/inc/instbdlg.hxx b/sc/source/ui/inc/instbdlg.hxx
index 8a80e7183035..60bb94db2827 100644
--- a/sc/source/ui/inc/instbdlg.hxx
+++ b/sc/source/ui/inc/instbdlg.hxx
@@ -37,7 +37,7 @@ public:
ScInsertTableDlg(weld::Window* pParent, ScViewData& rViewData, SCTAB nTabCount, bool bFromFile);
virtual ~ScInsertTableDlg() override;
- short execute(); // override to set parent dialog
+ virtual short run() override; // override to set parent dialog
bool GetTablesFromFile() const { return m_xBtnFromFile->get_active(); }
bool GetTablesAsLink() const { return m_xBtnLink->get_active(); }
diff --git a/sc/source/ui/inc/pvfundlg.hxx b/sc/source/ui/inc/pvfundlg.hxx
index 40ce2858ef67..18134d003cff 100644
--- a/sc/source/ui/inc/pvfundlg.hxx
+++ b/sc/source/ui/inc/pvfundlg.hxx
@@ -193,7 +193,7 @@ public:
css::sheet::DataPilotFieldOrientation nOrient);
virtual ~ScDPShowDetailDlg() override;
- short execute();
+ virtual short run() override;
/**
* @return String internal name of the selected field. Note that this may
diff --git a/sc/source/ui/inc/warnbox.hxx b/sc/source/ui/inc/warnbox.hxx
index 02fea50e181a..634f97e9e602 100644
--- a/sc/source/ui/inc/warnbox.hxx
+++ b/sc/source/ui/inc/warnbox.hxx
@@ -33,7 +33,7 @@ public:
/** Opens dialog if IsDialogEnabled() returns true.
@descr If after executing the dialog the checkbox "Do not show again" is set,
the method DisableDialog() will be called. */
- short execute();
+ virtual short run() override;
};
#endif
diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx
index a749c71be2be..854f5f41b171 100644
--- a/sc/source/ui/miscdlgs/instbdlg.cxx
+++ b/sc/source/ui/miscdlgs/instbdlg.cxx
@@ -116,12 +116,12 @@ void ScInsertTableDlg::Init_Impl( bool bFromFile )
}
}
-short ScInsertTableDlg::execute()
+short ScInsertTableDlg::run()
{
if (m_xBtnFromFile->get_active())
aBrowseTimer.Start();
- return m_xDialog->run();
+ return GenericDialogController::run();
}
void ScInsertTableDlg::SetNewTable_Impl()
diff --git a/sc/source/ui/miscdlgs/warnbox.cxx b/sc/source/ui/miscdlgs/warnbox.cxx
index acf8046f2c50..740fa0c3bd3c 100644
--- a/sc/source/ui/miscdlgs/warnbox.cxx
+++ b/sc/source/ui/miscdlgs/warnbox.cxx
@@ -33,12 +33,12 @@ ScReplaceWarnBox::ScReplaceWarnBox(weld::Window* pParent)
m_xDialog->set_default_response(RET_YES);
}
-short ScReplaceWarnBox::execute()
+short ScReplaceWarnBox::run()
{
short nRet = RET_YES;
if( SC_MOD()->GetInputOptions().GetReplaceCellsWarn() )
{
- nRet = m_xDialog->run();
+ nRet = MessageDialogController::run();
if (!m_xWarningOnBox->get_active())
{
ScModule* pScMod = SC_MOD();
diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx
index 0d9239f3a69e..451188a77acb 100644
--- a/sc/source/ui/view/tabvwsh3.cxx
+++ b/sc/source/ui/view/tabvwsh3.cxx
@@ -1055,7 +1055,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
aDlg.set_help_id(GetStaticInterface()->GetSlot(FID_PROTECT_DOC)->GetCommand());
aDlg.SetEditHelpId(HID_PASSWD_DOC);
- if (aDlg.execute() == RET_OK)
+ if (aDlg.run() == RET_OK)
aPassword = aDlg.GetPassword();
else
bCancel = true;
@@ -1079,7 +1079,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
aDlg.ShowExtras(SfxShowExtras::CONFIRM);
aDlg.SetConfirmHelpId(HID_PASSWD_DOC_CONFIRM);
- if (aDlg.execute() == RET_OK)
+ if (aDlg.run() == RET_OK)
{
OUString aPassword = aDlg.GetPassword();
Protect( TABLEID_DOC, aPassword );
@@ -1125,7 +1125,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
aDlg.set_help_id(GetStaticInterface()->GetSlot(FID_PROTECT_TABLE)->GetCommand());
aDlg.SetEditHelpId(HID_PASSWD_TABLE);
- if (aDlg.execute() == RET_OK)
+ if (aDlg.run() == RET_OK)
{
OUString aPassword = aDlg.GetPassword();
Unprotect(nTab, aPassword);
diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx
index 7d6411c82e3b..d412bbb29423 100644
--- a/sc/source/ui/view/viewfun3.cxx
+++ b/sc/source/ui/view/viewfun3.cxx
@@ -853,7 +853,7 @@ bool checkDestRangeForOverwrite(const ScRangeList& rDestRanges, const ScDocument
if (!bIsEmpty)
{
ScReplaceWarnBox aBox(pParentWnd);
- if (aBox.execute() != RET_YES)
+ if (aBox.run() != RET_YES)
{
// changing the configuration is within the ScReplaceWarnBox
return false;
generated by cgit (git 2.34.1) at 2024-07-17 16:16:10 +0000