Kaydet (Commit) 7598df03 authored tarafından Noel Grandin's avatar Noel Grandin Kaydeden (comit) Noel Grandin

tdf#120097 Revert "clang-tidy bugprone-virtual-near-miss in RecoveryDialog"

This reverts commit eb34a6a9.

Change-Id: Ife0cc2098ab49da97f73c65754b5d6a43bd0eece
Reviewed-on: https://gerrit.libreoffice.org/62519
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst d3db6ff4
...@@ -913,7 +913,7 @@ void RecoveryDialog::dispose() ...@@ -913,7 +913,7 @@ void RecoveryDialog::dispose()
Dialog::dispose(); Dialog::dispose();
} }
short RecoveryDialog::Execute() short RecoveryDialog::execute()
{ {
::SolarMutexGuard aSolarLock; ::SolarMutexGuard aSolarLock;
...@@ -938,7 +938,7 @@ short RecoveryDialog::Execute() ...@@ -938,7 +938,7 @@ short RecoveryDialog::Execute()
m_pCore->setUpdateListener(nullptr); m_pCore->setUpdateListener(nullptr);
m_eRecoveryState = RecoveryDialog::E_RECOVERY_CORE_DONE; m_eRecoveryState = RecoveryDialog::E_RECOVERY_CORE_DONE;
return Execute(); return execute();
} }
case RecoveryDialog::E_RECOVERY_CORE_DONE : case RecoveryDialog::E_RECOVERY_CORE_DONE :
...@@ -1017,7 +1017,7 @@ short RecoveryDialog::Execute() ...@@ -1017,7 +1017,7 @@ short RecoveryDialog::Execute()
m_eRecoveryState = RecoveryDialog::E_RECOVERY_CANCELED_AFTERWARDS; m_eRecoveryState = RecoveryDialog::E_RECOVERY_CANCELED_AFTERWARDS;
else else
m_eRecoveryState = RecoveryDialog::E_RECOVERY_CANCELED_BEFORE; m_eRecoveryState = RecoveryDialog::E_RECOVERY_CANCELED_BEFORE;
return Execute(); return execute();
} }
case RecoveryDialog::E_RECOVERY_CANCELED_BEFORE : case RecoveryDialog::E_RECOVERY_CANCELED_BEFORE :
...@@ -1141,11 +1141,11 @@ IMPL_LINK_NOARG(RecoveryDialog, NextButtonHdl, Button*, void) ...@@ -1141,11 +1141,11 @@ IMPL_LINK_NOARG(RecoveryDialog, NextButtonHdl, Button*, void)
{ {
case RecoveryDialog::E_RECOVERY_PREPARED: case RecoveryDialog::E_RECOVERY_PREPARED:
m_eRecoveryState = RecoveryDialog::E_RECOVERY_IN_PROGRESS; m_eRecoveryState = RecoveryDialog::E_RECOVERY_IN_PROGRESS;
Execute(); execute();
break; break;
case RecoveryDialog::E_RECOVERY_CORE_DONE: case RecoveryDialog::E_RECOVERY_CORE_DONE:
m_eRecoveryState = RecoveryDialog::E_RECOVERY_DONE; m_eRecoveryState = RecoveryDialog::E_RECOVERY_DONE;
Execute(); execute();
break; break;
} }
...@@ -1163,12 +1163,12 @@ IMPL_LINK_NOARG(RecoveryDialog, CancelButtonHdl, Button*, void) ...@@ -1163,12 +1163,12 @@ IMPL_LINK_NOARG(RecoveryDialog, CancelButtonHdl, Button*, void)
if (impl_askUserForWizardCancel(GetFrameWeld(), RID_SVXSTR_QUERY_EXIT_RECOVERY) != DLG_RET_CANCEL) if (impl_askUserForWizardCancel(GetFrameWeld(), RID_SVXSTR_QUERY_EXIT_RECOVERY) != DLG_RET_CANCEL)
{ {
m_eRecoveryState = RecoveryDialog::E_RECOVERY_CANCELED; m_eRecoveryState = RecoveryDialog::E_RECOVERY_CANCELED;
Execute(); execute();
} }
break; break;
case RecoveryDialog::E_RECOVERY_CORE_DONE: case RecoveryDialog::E_RECOVERY_CORE_DONE:
m_eRecoveryState = RecoveryDialog::E_RECOVERY_CANCELED; m_eRecoveryState = RecoveryDialog::E_RECOVERY_CANCELED;
Execute(); execute();
break; break;
} }
......
...@@ -522,7 +522,7 @@ class RecoveryDialog : public Dialog ...@@ -522,7 +522,7 @@ class RecoveryDialog : public Dialog
virtual void start() override; virtual void start() override;
virtual void end() override; virtual void end() override;
virtual short Execute() override; short execute();
// helper // helper
private: private:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment