diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2013-01-10 16:21:55 +0100 |
|---|---|---|
| committer | Noel Power <noel.power@suse.com> | 2013-01-11 11:02:04 +0000 |
| commit | 5a0dc1d1fdeac4b06b39ea616374d3f81b6be8a9 (patch) | |
| tree | 03dac1aca0c62160d66630ef4b807cae4c872c58 | |
| parent | cdd0555aefa0a01d0d90fed8640811c5601f314e (diff) | |
fdo#57938 SwPaM::HasReadonlySel: commented text ranges are not read-only
(cherry picked from commit fd0da52d371ca13d66be3b04d89f9d9cf73baddd)
Change-Id: I8191ed6383c4c636be67b8d42654dbba0a5c8b6f
Reviewed-on: https://gerrit.libreoffice.org/1629
Reviewed-by: Noel Power <noel.power@suse.com>
Tested-by: Noel Power <noel.power@suse.com>
| -rw-r--r-- | sw/source/core/crsr/pam.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx index baf62ad58ba3..6d7f07a7b5e9 100644 --- a/sw/source/core/crsr/pam.cxx +++ b/sw/source/core/crsr/pam.cxx @@ -685,6 +685,7 @@ sal_Bool SwPaM::HasReadonlySel( bool bFormView ) const sw::mark::IMark* pA = NULL; sw::mark::IMark* pB = NULL; bool bUnhandledMark = false; + bool bCommentrangeMark = false; if ( pDoc ) { const IDocumentMarkAccess* pMarksAccess = pDoc->getIDocumentMarkAccess( ); @@ -693,7 +694,11 @@ sal_Bool SwPaM::HasReadonlySel( bool bFormView ) const sw::mark::IFieldmark* pFieldmark = pMarksAccess->getFieldmarkFor( *GetPoint() ); if ( pFieldmark ) + { bUnhandledMark = pFieldmark->GetFieldname( ) == ODF_UNHANDLED; + if (!bUnhandledMark) + bCommentrangeMark = pFieldmark->GetFieldname() == ODF_COMMENTRANGE; + } } if (!bRet) @@ -701,7 +706,8 @@ sal_Bool SwPaM::HasReadonlySel( bool bFormView ) const // Unhandled fieldmarks case shouldn't be edited manually to avoid breaking anything if ( ( pA == pB ) && bUnhandledMark ) bRet = sal_True; - else + // Allow editing of commented ranges. + else if (!((pA == pB) && bCommentrangeMark)) { // Form protection case bool bAtStartA = pA != NULL && pA->GetMarkStart() == *GetPoint(); |