Kaydet (Commit) 2a7fe9b0 authored tarafından Andrea Gelmini's avatar Andrea Gelmini Kaydeden (comit) Julien Nabet

Fix E_SUCCEDED -> E_SUCCEEDED

It passed "make check" on Linux.

Change-Id: I96b34c818f6d4170c110ecd1fb93af79c3279e57
Reviewed-on: https://gerrit.libreoffice.org/61028
Tested-by: Jenkins
Reviewed-by: 's avatarJulien Nabet <serval2412@yahoo.fr>
üst 84deb155
...@@ -1401,7 +1401,7 @@ framework/source/services/autorecovery.cxx:188 ...@@ -1401,7 +1401,7 @@ framework/source/services/autorecovery.cxx:188
framework/source/services/autorecovery.cxx:196 framework/source/services/autorecovery.cxx:196
enum (anonymous namespace)::AutoRecovery::EDocStates E_TRY_SAVE enum (anonymous namespace)::AutoRecovery::EDocStates E_TRY_SAVE
framework/source/services/autorecovery.cxx:207 framework/source/services/autorecovery.cxx:207
enum (anonymous namespace)::AutoRecovery::EDocStates E_SUCCEDED enum (anonymous namespace)::AutoRecovery::EDocStates E_SUCCEEDED
framework/source/services/autorecovery.cxx:218 framework/source/services/autorecovery.cxx:218
enum (anonymous namespace)::AutoRecovery::EFailureSafeResult E_COPIED enum (anonymous namespace)::AutoRecovery::EFailureSafeResult E_COPIED
framework/source/services/autorecovery.cxx:219 framework/source/services/autorecovery.cxx:219
......
...@@ -208,7 +208,7 @@ public: ...@@ -208,7 +208,7 @@ public:
/// the Auto/Emergency saved document is not really up-to-date (some changes can be missing) /// the Auto/Emergency saved document is not really up-to-date (some changes can be missing)
E_INCOMPLETE = 128, E_INCOMPLETE = 128,
/// the Auto/Emergency saved document was processed successfully /// the Auto/Emergency saved document was processed successfully
E_SUCCEDED = 512 E_SUCCEEDED = 512
}; };
/** @short indicates the results of a FAILURE_SAFE operation /** @short indicates the results of a FAILURE_SAFE operation
...@@ -3103,7 +3103,7 @@ void AutoRecovery::implts_saveOneDoc(const OUString& ...@@ -3103,7 +3103,7 @@ void AutoRecovery::implts_saveOneDoc(const OUString&
// ... you know the reason: to know it on recovery time if next line crash .-) // ... you know the reason: to know it on recovery time if next line crash .-)
rInfo.DocumentState &= ~AutoRecovery::E_TRY_SAVE; rInfo.DocumentState &= ~AutoRecovery::E_TRY_SAVE;
rInfo.DocumentState |= AutoRecovery::E_HANDLED; rInfo.DocumentState |= AutoRecovery::E_HANDLED;
rInfo.DocumentState |= AutoRecovery::E_SUCCEDED; rInfo.DocumentState |= AutoRecovery::E_SUCCEEDED;
} }
else else
{ {
...@@ -3145,7 +3145,7 @@ AutoRecovery::ETimerType AutoRecovery::implts_openDocs(const DispatchParams& aPa ...@@ -3145,7 +3145,7 @@ AutoRecovery::ETimerType AutoRecovery::implts_openDocs(const DispatchParams& aPa
for (auto & info : m_lDocCache) for (auto & info : m_lDocCache)
{ {
// Such documents are already loaded by the last loop. // Such documents are already loaded by the last loop.
// Don't check E_SUCCEDED here! It may be the final state of an AutoSave // Don't check E_SUCCEEDED here! It may be the final state of an AutoSave
// operation before!!! // operation before!!!
if ((info.DocumentState & AutoRecovery::E_HANDLED) == AutoRecovery::E_HANDLED) if ((info.DocumentState & AutoRecovery::E_HANDLED) == AutoRecovery::E_HANDLED)
continue; continue;
...@@ -3296,7 +3296,7 @@ AutoRecovery::ETimerType AutoRecovery::implts_openDocs(const DispatchParams& aPa ...@@ -3296,7 +3296,7 @@ AutoRecovery::ETimerType AutoRecovery::implts_openDocs(const DispatchParams& aPa
info.DocumentState &= ~AutoRecovery::E_TRY_LOAD_BACKUP; info.DocumentState &= ~AutoRecovery::E_TRY_LOAD_BACKUP;
info.DocumentState &= ~AutoRecovery::E_TRY_LOAD_ORIGINAL; info.DocumentState &= ~AutoRecovery::E_TRY_LOAD_ORIGINAL;
info.DocumentState |= AutoRecovery::E_HANDLED; info.DocumentState |= AutoRecovery::E_HANDLED;
info.DocumentState |= AutoRecovery::E_SUCCEDED; info.DocumentState |= AutoRecovery::E_SUCCEEDED;
implts_flushConfigItem(info); implts_flushConfigItem(info);
implts_informListener(eJob, implts_informListener(eJob,
......
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