summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2016-10-15 00:26:09 +1000
committerMiklos Vajna <vmiklos@collabora.co.uk>2016-10-17 09:58:51 +0000
commit4af1ac3a9a773e4875712dd2f43f06a1a4edcc19 (patch)
treebc51865cd6fcf8541c748cac00343590ad88a0fb
parentaaa38fd34faab3108245f8fa8c13642919ff0c95 (diff)
tdf#92817: re-implement empty lockfile fix
As stated in original commit 8d411a4a1ef6844c00bc714f8b144d3729e4f4e8, An empty lock file doesn't have OOOUSERNAME and SYSUSERNAME. Change-Id: I17fc6d3375f411749fcbbe80535beb8ba53a0e71 Reviewed-on: https://gerrit.libreoffice.org/29836 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
-rw-r--r--sfx2/source/doc/docfile.cxx6
1 files changed, 2 insertions, 4 deletions
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 288632cfb185..f681bbfac815 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -830,10 +830,8 @@ sal_Int8 SfxMedium::ShowLockedDocumentDialog( const LockFileEntry& aData, bool b
{
sal_Int8 nResult = LOCK_UI_NOLOCK;
- if( aData[LockFileComponent::OOOUSERNAME] == aData[LockFileComponent::SYSUSERNAME] ||
- aData[LockFileComponent::OOOUSERNAME].isEmpty() ||
- aData[LockFileComponent::SYSUSERNAME].isEmpty()
- )
+ // tdf#92817: Simple check for empty lock file that needs to be deleted
+ if( aData[LockFileComponent::OOOUSERNAME].isEmpty() && aData[LockFileComponent::SYSUSERNAME].isEmpty() )
bOwnLock=true;
// show the interaction regarding the document opening