diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2013-01-14 10:55:55 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-01-14 14:39:33 +0100 |
| commit | 50b6dc0099ff61050b82a2e37e70d643151e7ce7 (patch) | |
| tree | 491fa1ca7a77a3bf298ba2ab91801942efe4752d | |
| parent | a6f5e5238ca4536eff6c52cf10e52bd116723d72 (diff) | |
fdo#57938 SwPaM::HasReadonlySel allow editing before commented text ranges
Change-Id: I229602e7783c76e7fc57b78a408f90c1f6a8cda5
| -rw-r--r-- | sw/source/core/crsr/pam.cxx | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx index 8000052414e8..5fbf4bcbfdb7 100644 --- a/sw/source/core/crsr/pam.cxx +++ b/sw/source/core/crsr/pam.cxx @@ -700,6 +700,13 @@ sal_Bool SwPaM::HasReadonlySel( bool bFormView ) const if (!bUnhandledMark) bCommentrangeMark = pFieldmark->GetFieldname() == ODF_COMMENTRANGE; } + // Allow editing selection right before a commented range. + if (!bCommentrangeMark && GetMark()) + { + pFieldmark = pMarksAccess->getFieldmarkFor(*GetMark()); + if (pFieldmark) + bCommentrangeMark = pFieldmark->GetFieldname() == ODF_COMMENTRANGE; + } } if (!bRet) @@ -708,7 +715,7 @@ sal_Bool SwPaM::HasReadonlySel( bool bFormView ) const if ( ( pA == pB ) && bUnhandledMark ) bRet = sal_True; // Allow editing of commented ranges. - else if (!((pA == pB) && bCommentrangeMark)) + else if (!bCommentrangeMark) { // Form protection case bool bAtStartA = pA != NULL && pA->GetMarkStart() == *GetPoint(); |