summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikhail Voitenko <mav@openoffice.org>2009-12-11 13:51:36 +0000
committerMikhail Voitenko <mav@openoffice.org>2009-12-11 13:51:36 +0000
commit621c3c25e55cabad3af9b8e94f2a2fc0dace076f (patch)
tree1be96040a0c4a8911b8f59cacc8e897e8474e76c
parent7d167021b32274fdcc628a42fd7f310e13b75f0b (diff)
#i107525# use the system file locking after storing process is over
-rw-r--r--sfx2/source/doc/docfile.cxx7
1 files changed, 7 insertions, 0 deletions
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 194d548236..b38c7daa08 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -1113,6 +1113,13 @@ sal_Bool SfxMedium::LockOrigFileOnDemand( sal_Bool bLoading, sal_Bool bNoUI )
// otherwise the document should be opened readonly
// if user cancel the loading the ERROR_ABORT is set
+ if ( pImp->m_bLocked && bLoading && ::utl::LocalFileHelper::IsLocalFile( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ) )
+ {
+ // if the document is already locked the system locking might be temporarely off after storing
+ // check whether the system file locking should be taken again
+ GetLockingStream_Impl();
+ }
+
sal_Bool bResult = pImp->m_bLocked;
if ( !bResult )