diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-09-29 12:32:45 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-09-29 12:32:45 +0000 |
| commit | 8015f1d71db86b090932e8444c7eb381d27904c1 (patch) | |
| tree | 6ffb31978acbf6e100cb48da19512894ba9d3744 /framework | |
| parent | 00b3aa66248169c36eb3a2bda588099497a07513 (diff) | |
CWS-TOOLING: integrate CWS mav40_DEV300
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/inc/services/autorecovery.hxx | 1 | ||||
| -rw-r--r-- | framework/source/services/autorecovery.cxx | 10 |
2 files changed, 7 insertions, 4 deletions
diff --git a/framework/inc/services/autorecovery.hxx b/framework/inc/services/autorecovery.hxx index fd8494fe2c8c..8f6c62a2f39e 100644 --- a/framework/inc/services/autorecovery.hxx +++ b/framework/inc/services/autorecovery.hxx @@ -747,6 +747,7 @@ class AutoRecovery : public css::lang::XTypeProvider @threadsafe */ AutoRecovery::ETimerType implts_saveDocs( sal_Bool bAllowUserIdleLoop, + sal_Bool bRemoveLockFiles, const DispatchParams* pParams = 0); //--------------------------------------- diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index b4e86820572d..b63ae9cecf8a 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -1592,7 +1592,7 @@ IMPL_LINK(AutoRecovery, implts_timerExpired, void*, EMPTYARG) // The called method returns an info, if and how this // timer must be restarted. sal_Bool bAllowUserIdleLoop = sal_True; - AutoRecovery::ETimerType eSuggestedTimer = implts_saveDocs(bAllowUserIdleLoop); + AutoRecovery::ETimerType eSuggestedTimer = implts_saveDocs(bAllowUserIdleLoop, sal_False); // If timer isnt used for "short callbacks" (means polling // for special states) ... reset the handle state of all @@ -2100,6 +2100,7 @@ sal_Bool lc_checkIfSaveForbiddenByArguments(AutoRecovery::TDocumentInfo& rInfo) //----------------------------------------------- AutoRecovery::ETimerType AutoRecovery::implts_saveDocs( sal_Bool bAllowUserIdleLoop, + sal_Bool bRemoveLockFiles, const DispatchParams* pParams ) { // SAFE -> ---------------------------------- @@ -2153,7 +2154,8 @@ AutoRecovery::ETimerType AutoRecovery::implts_saveDocs( sal_Bool bAl AutoRecovery::TDocumentInfo aInfo = *pIt; // WORKAROUND... Since the documents are not closed the lock file must be removed explicitly - lc_removeLockFile( aInfo ); + if ( bRemoveLockFiles ) + lc_removeLockFile( aInfo ); // WORKAROUND ... see comment of this method if (lc_checkIfSaveForbiddenByArguments(aInfo)) @@ -2914,7 +2916,7 @@ void AutoRecovery::implts_doEmergencySave(const DispatchParams& aParams) AutoRecovery::ETimerType eSuggestedTimer = AutoRecovery::E_DONT_START_TIMER; do { - eSuggestedTimer = implts_saveDocs(bAllowUserIdleLoop, &aParams); + eSuggestedTimer = implts_saveDocs(bAllowUserIdleLoop, sal_True, &aParams); } while(eSuggestedTimer == AutoRecovery::E_CALL_ME_BACK); @@ -2981,7 +2983,7 @@ void AutoRecovery::implts_doSessionSave(const DispatchParams& aParams) AutoRecovery::ETimerType eSuggestedTimer = AutoRecovery::E_DONT_START_TIMER; do { - eSuggestedTimer = implts_saveDocs(bAllowUserIdleLoop, &aParams); + eSuggestedTimer = implts_saveDocs(bAllowUserIdleLoop, sal_True, &aParams); } while(eSuggestedTimer == AutoRecovery::E_CALL_ME_BACK); |