diff options
author | C?dric Bosdonnat <cedricbosdo@openoffice.org> | 2010-03-15 18:16:49 +0100 |
---|---|---|
committer | C?dric Bosdonnat <cedricbosdo@openoffice.org> | 2010-03-15 18:16:49 +0100 |
commit | 4f6ece30ea771e0fd970809bf0ceec837312d868 (patch) | |
tree | 73f250a08f4d0bda211527582f075cca294b47ce | |
parent | ccc3e6f8532e934a23a1a65b93616ff8219ba780 (diff) |
[cbosdo05] Fixed a usability problem introduced by cbosdo01
Removing the non-breaking space when the character typed immediately after the
punctuation mark if the last character typed isn't a blank.
-rw-r--r-- | sw/source/ui/docvw/edtwin.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx index d484af64aa..5d3510d9f4 100644 --- a/sw/source/ui/docvw/edtwin.cxx +++ b/sw/source/ui/docvw/edtwin.cxx @@ -2262,7 +2262,8 @@ KEYINPUT_CHECKTABLE_INSDEL: BOOL bIsAutoCorrectChar = SvxAutoCorrect::IsAutoCorrectChar( aCh ); - if( !aKeyEvent.GetRepeat() && pACorr && bIsAutoCorrectChar && + BOOL bRunNext = pACorr->HasRunNext(); + if( !aKeyEvent.GetRepeat() && pACorr && ( bIsAutoCorrectChar || bRunNext ) && pACfg->IsAutoFmtByInput() && (( pACorr->IsAutoCorrFlag( ChgWeightUnderl ) && ( '*' == aCh || '_' == aCh ) ) || @@ -2274,14 +2275,13 @@ KEYINPUT_CHECKTABLE_INSDEL: if( '\"' != aCh && '\'' != aCh ) // nur bei "*_" rufen! rSh.UpdateAttr(); } - else if( !aKeyEvent.GetRepeat() && pACorr && bIsAutoCorrectChar && + else if( !aKeyEvent.GetRepeat() && pACorr && ( bIsAutoCorrectChar || bRunNext ) && pACfg->IsAutoFmtByInput() && pACorr->IsAutoCorrFlag( CptlSttSntnc | CptlSttWrd | - ChgOrdinalNumber | + ChgOrdinalNumber | AddNonBrkSpace | ChgToEnEmDash | SetINetAttr | Autocorrect ) && - '\"' != aCh && '\'' != aCh && '*' != aCh && '_' != aCh && - !bIsNormalChar + '\"' != aCh && '\'' != aCh && '*' != aCh && '_' != aCh ) { FlushInBuffer(); |