summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2018-08-14 22:01:42 +0200
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2018-08-16 11:52:48 +0200
commit99762024dc5a2d5514c517c96c588949e30328b7 (patch)
tree16cfff0aa1f55fac8f8448ccc42c0d1da46b6020
parent90e473516b04fc0121b2e3a25aefa07ccb81307d (diff)
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@yahoo.fr> (cherry picked from commit d064ced9e9db3f924dd954b86c40f21addab1c68) Reviewed-on: https://gerrit.libreoffice.org/59040 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
-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 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