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/core/edit/eddel.cxx | |
| parent | 148905281d830dedb0e1a7bbe9142eaf40bd3cfb (diff) | |
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/core/edit/eddel.cxx')
| -rw-r--r-- | sw/source/core/edit/eddel.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/core/edit/eddel.cxx b/sw/source/core/edit/eddel.cxx index a5d7904ae8b5..9f90348dea00 100644 --- a/sw/source/core/edit/eddel.cxx +++ b/sw/source/core/edit/eddel.cxx @@ -102,7 +102,7 @@ long SwEditShell::Delete() { SET_CURR_SHELL( this ); long nRet = 0; - if( !HasReadonlySel() ) + if ( !HasReadonlySel() || CrsrInsideInputFld() ) { StartAllAction(); |