[Libreoffice-commits] core.git: sw/source
Michael Stahl (via logerrit)
logerrit at kemper.freedesktop.org
Thu Mar 26 15:58:06 UTC 2020
sw/source/core/crsr/pam.cxx | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 3fc68fdc6f4ef04091db2fd46499a10396c3a4f2
Author: Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Thu Mar 26 15:24:37 2020 +0100
Commit: Michael Stahl <michael.stahl at cib.de>
CommitDate: Thu Mar 26 16:57:26 2020 +0100
sw: PROTECT_FIELDS should not protect placeholder fields
The text placeholder field becomes totally nonfunctional, the other
placeholder fields allow inserting but are then not deleted; just ignore
protection for placeholder fields.
Change-Id: Ic478a32d616464bfe7f24fc851c1998b5e01a23b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91140
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl at cib.de>
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index f50b87b02bf3..59ed41a036b1 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -789,7 +789,9 @@ bool SwPaM::HasReadonlySel( bool bFormView ) const
{
break; // after selection
}
- if (pHint->Which() == RES_TXTATR_FIELD)
+ if (pHint->Which() == RES_TXTATR_FIELD
+ // placeholders don't work if you can't delete them
+ && pHint->GetFormatField().GetField()->GetTyp()->Which() != SwFieldIds::JumpEdit)
{
return true;
}
More information about the Libreoffice-commits
mailing list