summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2018-08-14 22:01:42 +0200
committerJulien Nabet <serval2412@yahoo.fr>2018-08-17 14:10:22 +0200
commitfb63a622cb843d2d0178bc26ff35d9b17deaee5a (patch)
tree4a0ef176f6fe7cd6222ae392d6c3953fd4005d17
parent1f7bbcfa7fc55437f11f0d8b93848d9c71f9b3cc (diff)
Related tdf#118547: Lock mark on protected sheet tab
Fix opposite case, see https://bugs.documentfoundation.org/show_bug.cgi?id=118547#c10 Reviewed-on: https://gerrit.libreoffice.org/59035 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr> (cherry picked from commit d064ced9e9db3f924dd954b86c40f21addab1c68) Change-Id: I2c4e55f8929b1979e71a4040dfac1ba7cff51aeb Reviewed-on: https://gerrit.libreoffice.org/59041 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins
-rw-r--r--sc/source/ui/view/viewfunc.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index 3f6e583c6f60..435a5a6f1ad5 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -2541,7 +2541,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 && nTab != TABLEID_DOC)
+ SetTabProtectionSymbol(nTab, false);
+ }
else
{
// modifying several tabs is handled here