diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2018-10-29 19:16:29 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-10-30 07:22:56 +0100 |
| commit | 7598df03159c45eab011b15a47dc824676008f3d (patch) | |
| tree | c3de7cf143de245ff106892f857bc526d9be5998 /svx/source | |
| parent | d3db6ff43a531ecf1afc858a0a8832353d091644 (diff) | |
tdf#120097 Revert "clang-tidy bugprone-virtual-near-miss in RecoveryDialog"
This reverts commit eb34a6a93fcdebe545ab267d7cc7c5c72bab22c8.
Change-Id: Ife0cc2098ab49da97f73c65754b5d6a43bd0eece
Reviewed-on: https://gerrit.libreoffice.org/62519
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx/source')
| -rw-r--r-- | svx/source/dialog/docrecovery.cxx | 14 | ||||
| -rw-r--r-- | svx/source/inc/docrecovery.hxx | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index 899c7a9e9e59..68e2d115dbfd 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -913,7 +913,7 @@ void RecoveryDialog::dispose() Dialog::dispose(); } -short RecoveryDialog::Execute() +short RecoveryDialog::execute() { ::SolarMutexGuard aSolarLock; @@ -938,7 +938,7 @@ short RecoveryDialog::Execute() m_pCore->setUpdateListener(nullptr); m_eRecoveryState = RecoveryDialog::E_RECOVERY_CORE_DONE; - return Execute(); + return execute(); } case RecoveryDialog::E_RECOVERY_CORE_DONE : @@ -1017,7 +1017,7 @@ short RecoveryDialog::Execute() m_eRecoveryState = RecoveryDialog::E_RECOVERY_CANCELED_AFTERWARDS; else m_eRecoveryState = RecoveryDialog::E_RECOVERY_CANCELED_BEFORE; - return Execute(); + return execute(); } case RecoveryDialog::E_RECOVERY_CANCELED_BEFORE : @@ -1141,11 +1141,11 @@ IMPL_LINK_NOARG(RecoveryDialog, NextButtonHdl, Button*, void) { case RecoveryDialog::E_RECOVERY_PREPARED: m_eRecoveryState = RecoveryDialog::E_RECOVERY_IN_PROGRESS; - Execute(); + execute(); break; case RecoveryDialog::E_RECOVERY_CORE_DONE: m_eRecoveryState = RecoveryDialog::E_RECOVERY_DONE; - Execute(); + execute(); break; } @@ -1163,12 +1163,12 @@ IMPL_LINK_NOARG(RecoveryDialog, CancelButtonHdl, Button*, void) if (impl_askUserForWizardCancel(GetFrameWeld(), RID_SVXSTR_QUERY_EXIT_RECOVERY) != DLG_RET_CANCEL) { m_eRecoveryState = RecoveryDialog::E_RECOVERY_CANCELED; - Execute(); + execute(); } break; case RecoveryDialog::E_RECOVERY_CORE_DONE: m_eRecoveryState = RecoveryDialog::E_RECOVERY_CANCELED; - Execute(); + execute(); break; } diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx index d87afdb6ee27..f0caa6fcb448 100644 --- a/svx/source/inc/docrecovery.hxx +++ b/svx/source/inc/docrecovery.hxx @@ -522,7 +522,7 @@ class RecoveryDialog : public Dialog virtual void start() override; virtual void end() override; - virtual short Execute() override; + short execute(); // helper private: |