diff options
| author | Vladimir Glazunov <vg@openoffice.org> | 2010-02-16 18:29:26 +0100 |
|---|---|---|
| committer | Vladimir Glazunov <vg@openoffice.org> | 2010-02-16 18:29:26 +0100 |
| commit | b252e975820b8ca377f4727ef09c1e025861bbb6 (patch) | |
| tree | 021e785e998b6fe337a8c158c32c8fffe99506ce /sw/source/ui | |
| parent | 5764230f546cd20dd4e5787d2b9277812527b775 (diff) | |
| parent | 35bc17462a86b42345062708f7f1a57f3efd5779 (diff) | |
CWS-TOOLING: integrate CWS cbosdo01
Diffstat (limited to 'sw/source/ui')
| -rw-r--r-- | sw/source/ui/docvw/edtwin.cxx | 4 | ||||
| -rw-r--r-- | sw/source/ui/shells/textsh.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/utlui/utlui.src | 4 | ||||
| -rw-r--r-- | sw/source/ui/wrtsh/wrtsh1.cxx | 2 |
4 files changed, 8 insertions, 4 deletions
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx index 64e17e391f05..7042317fad17 100644 --- a/sw/source/ui/docvw/edtwin.cxx +++ b/sw/source/ui/docvw/edtwin.cxx @@ -2278,7 +2278,7 @@ KEYINPUT_CHECKTABLE_INSDEL: else if( !aKeyEvent.GetRepeat() && pACorr && bIsAutoCorrectChar && pACfg->IsAutoFmtByInput() && pACorr->IsAutoCorrFlag( CptlSttSntnc | CptlSttWrd | - ChgFractionSymbol | ChgOrdinalNumber | + ChgOrdinalNumber | ChgToEnEmDash | SetINetAttr | Autocorrect ) && '\"' != aCh && '\'' != aCh && '*' != aCh && '_' != aCh && @@ -2310,7 +2310,7 @@ KEYINPUT_CHECKTABLE_INSDEL: { if( pACorr && pACfg->IsAutoFmtByInput() && pACorr->IsAutoCorrFlag( CptlSttSntnc | CptlSttWrd | - ChgFractionSymbol | ChgOrdinalNumber | + ChgOrdinalNumber | ChgToEnEmDash | SetINetAttr | Autocorrect ) && !rSh.HasReadonlySel() ) diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx index 9367d9ba6d8a..f4d2e5dd305a 100644 --- a/sw/source/ui/shells/textsh.cxx +++ b/sw/source/ui/shells/textsh.cxx @@ -196,7 +196,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) SvxAutoCorrect* pACorr = pACfg->GetAutoCorrect(); if( pACorr && pACfg->IsAutoFmtByInput() && pACorr->IsAutoCorrFlag( CptlSttSntnc | CptlSttWrd | - ChgFractionSymbol | ChgOrdinalNumber | + AddNonBrkSpace | ChgOrdinalNumber | ChgToEnEmDash | SetINetAttr | Autocorrect )) rSh.AutoCorrect( *pACorr, cIns ); else diff --git a/sw/source/ui/utlui/utlui.src b/sw/source/ui/utlui/utlui.src index a67fe47aca4b..cc49d885d5eb 100644 --- a/sw/source/ui/utlui/utlui.src +++ b/sw/source/ui/utlui/utlui.src @@ -122,6 +122,10 @@ Resource RID_SHELLRES_AUTOFMTSTRS { Text [ en-US ] = "Combine paragraphs"; }; + String STR_AUTOFMTREDL_NON_BREAK_SPACE +1 + { + Text [ en-US ] = "Add non breaking space"; + }; }; diff --git a/sw/source/ui/wrtsh/wrtsh1.cxx b/sw/source/ui/wrtsh/wrtsh1.cxx index e444670b863a..a314b940c29c 100644 --- a/sw/source/ui/wrtsh/wrtsh1.cxx +++ b/sw/source/ui/wrtsh/wrtsh1.cxx @@ -159,7 +159,7 @@ SvxAutoCorrect* lcl_IsAutoCorr() { SvxAutoCorrect* pACorr = SvxAutoCorrCfg::Get()->GetAutoCorrect(); if( pACorr && !pACorr->IsAutoCorrFlag( CptlSttSntnc | CptlSttWrd | - ChgFractionSymbol | ChgOrdinalNumber | + AddNonBrkSpace | ChgOrdinalNumber | ChgToEnEmDash | SetINetAttr | Autocorrect )) pACorr = 0; return pACorr; |