[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 7598df03159c45eab011b15a47dc824676008f3d
Author:     Noel Grandin <noelgran...@gmail.com>
AuthorDate: Mon Oct 29 19:16:29 2018 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Oct 30 07:22:56 2018 +0100

    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.gran...@collabora.co.uk>

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:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits