[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sc/source

[Xisco Fauli]

 sc/source/ui/view/viewfunc.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 16fcf30fa53a55fdcd82826fd4d73bbd1b6bd883
Author: Xisco Fauli <xiscofauli at libreoffice.org>
Date:   Fri Jul 6 11:01:06 2018 +0200

    tdf#118547: Remove lock mark only if password is correct
    
    Change-Id: I9f5731dfaaf9b4cc67e600a8b1c01709e7c9ba99
    Reviewed-on: https://gerrit.libreoffice.org/57044
    Tested-by: Jenkins
    Reviewed-by: Eike Rathke <erack at redhat.com>
    (cherry picked from commit c3a732a11c320b98e31dad79f421d4d73f33a15b)
    Reviewed-on: https://gerrit.libreoffice.org/57056

diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index 306d020ec947..e7c8be1aa0d9 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -2557,10 +2557,11 @@ bool ScViewFunc::Unprotect( SCTAB nTab, const OUString& rPassword )
             pDocSh->GetUndoManager()->LeaveListAction();
     }
 
-    SetTabProtectionSymbol(nTab, false);
-
     if (bChanged)
+    {
+        SetTabProtectionSymbol(nTab, false);
         UpdateLayerLocks();     //! broadcast to all views
+    }
 
     return bChanged;
 }