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

[Libreoffice Gerrit user]

 sc/source/ui/view/viewfunc.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 99762024dc5a2d5514c517c96c588949e30328b7
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Tue Aug 14 22:01:42 2018 +0200
Commit:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Thu Aug 16 11:52:48 2018 +0200

    Related tdf#118547: Lock mark on protected sheet tab
    
    Fix opposite case, see https://bugs.documentfoundation.org/show_bug.cgi?id=118547#c10
    
    Change-Id: I2c4e55f8929b1979e71a4040dfac1ba7cff51aeb
    Reviewed-on: https://gerrit.libreoffice.org/59035
    Tested-by: Jenkins
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    (cherry picked from commit d064ced9e9db3f924dd954b86c40f21addab1c68)
    Reviewed-on: https://gerrit.libreoffice.org/59040
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index 0b5103924185..6533068bcd04 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -2539,7 +2539,11 @@ bool ScViewFunc::Unprotect( SCTAB nTab, const OUString& rPassword )
     bool bUndo (rDoc.IsUndoEnabled());
 
     if ( nTab == TABLEID_DOC || rMark.GetSelectCount() <= 1 )
+    {
         bChanged = rFunc.Unprotect( nTab, rPassword, false );
+        if (bChanged)
+            SetTabProtectionSymbol(nTab, false);
+    }
     else
     {
         //  modifying several tabs is handled here