[Libreoffice-commits] core.git: svx/source

[Libreoffice Gerrit user]

 svx/source/dialog/docrecovery.cxx |   14 +++++++-------
 svx/source/inc/docrecovery.hxx    |    2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit eb34a6a93fcdebe545ab267d7cc7c5c72bab22c8
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Sep 10 09:33:08 2018 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Sep 10 11:02:23 2018 +0200

    clang-tidy bugprone-virtual-near-miss in RecoveryDialog
    
    warning: method 'svx::DocRecovery::RecoveryDialog::execute' has a
    similar name and the same signature as virtual method 'Dialog::Execute';
    did you mean to override it?
    
    Change-Id: I42eadd96069ff23c44fedc76d800161767313e77
    Reviewed-on: https://gerrit.libreoffice.org/60240
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index b3be3f22f2e5..9621a0c03fab 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -912,7 +912,7 @@ void RecoveryDialog::dispose()
     Dialog::dispose();
 }
 
-short RecoveryDialog::execute()
+short RecoveryDialog::Execute()
 {
     ::SolarMutexGuard aSolarLock;
 
@@ -937,7 +937,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 :
@@ -1143,11 +1143,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;
     }
 
@@ -1165,12 +1165,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 a3f15b15f9ed..0d9b81b0a208 100644
--- a/svx/source/inc/docrecovery.hxx
+++ b/svx/source/inc/docrecovery.hxx
@@ -521,7 +521,7 @@ class RecoveryDialog : public Dialog
         virtual void start() override;
         virtual void end() override;
 
-        short execute();
+        virtual short Execute() override;
 
     // helper
     private: