sfx2/source/doc/docfile.cxx | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
New commits:
commit a6ea499e9e22055d421b08c2536b5cfe23f1b25a
Author: Mike Kaganski <mike.kagan...@collabora.com>
Date: Sat Oct 15 00:26:09 2016 +1000
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/29837
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
Reviewed-by: Eike Rathke <er...@redhat.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 288632c..f681bbf 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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
