summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2008-09-29 12:32:45 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2008-09-29 12:32:45 +0000
commitfbd3764c623d83884574cc1986b1e723843d9dea (patch)
treed1d73fb5d1fd1af2fa4e7f2994395fbfabcb59a1
parent9b81feb1b76d2389cf725cd05578e3ce4b62dbe5 (diff)
CWS-TOOLING: integrate CWS mav40_DEV300
-rw-r--r--framework/inc/services/autorecovery.hxx1
-rw-r--r--framework/source/services/autorecovery.cxx10
2 files changed, 7 insertions, 4 deletions
diff --git a/framework/inc/services/autorecovery.hxx b/framework/inc/services/autorecovery.hxx
index 533a60b23d..ab249fc5ba 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 1383e3556a..9aa997d501 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);