diff options
| author | Oliver-Rainer Wittmann <orw@apache.org> | 2014-02-20 11:01:04 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-22 19:51:33 +0000 |
| commit | 961315f0838197e71e9bd49169afe673466e5eb8 (patch) | |
| tree | bd5075f2db9910f45821e5c1217ded37fd4bb7cb /sw/source/ui/shells | |
| parent | writerfilter: convert sprm:CF{Bold,BoldBi,Italic,ItalicBi} (diff) | |
| download | core-961315f0838197e71e9bd49169afe673466e5eb8.tar.gz core-961315f0838197e71e9bd49169afe673466e5eb8.zip | |
Resolves: #i124243# allow in-place editing of Input Fields...
in protected areas (e.g. protected sections)
(cherry picked from commit 1708b9bee77ab0e8762bbb6886b778b93428a2b0)
Conflicts:
sw/inc/pam.hxx
sw/source/core/crsr/crsrsh.cxx
sw/source/core/crsr/pam.cxx
sw/source/core/edit/edfcol.cxx
sw/source/core/edit/ednumber.cxx
sw/source/ui/docvw/edtwin.cxx
Change-Id: Iedcb31a824a9147bccb14314608749121c70d952
Diffstat (limited to 'sw/source/ui/shells')
| -rw-r--r-- | sw/source/ui/shells/basesh.cxx | 7 | ||||
| -rw-r--r-- | sw/source/ui/shells/textsh1.cxx | 10 |
2 files changed, 16 insertions, 1 deletions
diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx index c50b5944fa7e..75b25a3c39e0 100644 --- a/sw/source/ui/shells/basesh.cxx +++ b/sw/source/ui/shells/basesh.cxx @@ -1462,11 +1462,16 @@ void SwBaseShell::GetState( SfxItemSet &rSet ) rSet.Put(SfxBoolItem(nWhich, bDisable)); } break; + case FN_BACKSPACE: case SID_DELETE: - if (rSh.IsSelObjProtected( FLYPROTECT_CONTENT|FLYPROTECT_PARENT ) != 0) + if ( ( rSh.HasReadonlySel() && !rSh.CrsrInsideInputFld() ) + || rSh.IsSelObjProtected( FLYPROTECT_CONTENT|FLYPROTECT_PARENT ) != 0 ) + { rSet.DisableItem( nWhich ); + } break; + case SID_CONTOUR_DLG: { sal_Bool bParentCntProt = 0 != rSh.IsSelObjProtected(FLYPROTECT_CONTENT|FLYPROTECT_PARENT ); diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx index 59df37ecd9ab..20107080d00d 100644 --- a/sw/source/ui/shells/textsh1.cxx +++ b/sw/source/ui/shells/textsh1.cxx @@ -1568,6 +1568,16 @@ void SwTextShell::GetState( SfxItemSet &rSet ) } break; + + case FN_INSERT_BREAK: + if ( rSh.HasReadonlySel() + && !rSh.CrsrInsideInputFld() ) + { + rSet.DisableItem( nWhich ); + } + break; + + case FN_INSERT_BREAK_DLG: case FN_INSERT_COLUMN_BREAK: case FN_INSERT_PAGEBREAK: |