diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-07-22 13:25:45 +0200 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-07-22 13:25:45 +0200 |
| commit | c1bf1dc2a21319f57e24f0ca48ddb94f128e12bd (patch) | |
| tree | dbc5694d1f410ebeca0a3cd1ee54b7ee87a14ba7 | |
| parent | fb91b7752c00aaadffd49026610ad663ff5337fe (diff) | |
| parent | 1645a756bad8a7dbc62a1dff7e8997034dfd998c (diff) | |
CWS-TOOLING: integrate CWS sw33bf07ooo/OOO330_m2
| -rw-r--r-- | sw/source/core/text/itrform2.cxx | 8 | ||||
| -rw-r--r-- | sw/source/ui/docvw/edtwin.cxx | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx index eb39c9edf2..310036452e 100644 --- a/sw/source/core/text/itrform2.cxx +++ b/sw/source/core/text/itrform2.cxx @@ -335,8 +335,14 @@ void SwTxtFormatter::InsertPortion( SwTxtFormatInfo &rInf, // bei dem LineLayout ist allerdings alles anders... if( pPor == pCurr ) { - if( pCurr->GetPortion() ) + if ( pCurr->GetPortion() ) + { pPor = pCurr->GetPortion(); + } + + // --> OD 2010-07-07 #i112181# + rInf.SetOtherThanFtnInside( rInf.IsOtherThanFtnInside() || !pPor->IsFtnPortion() ); + // <-- } else { diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx index 9945b90086..9ab1e772a2 100644 --- a/sw/source/ui/docvw/edtwin.cxx +++ b/sw/source/ui/docvw/edtwin.cxx @@ -2261,7 +2261,7 @@ KEYINPUT_CHECKTABLE_INSDEL: BOOL bIsAutoCorrectChar = SvxAutoCorrect::IsAutoCorrectChar( aCh ); - BOOL bRunNext = pACorr->HasRunNext(); + BOOL bRunNext = pACorr && pACorr->HasRunNext(); if( !aKeyEvent.GetRepeat() && pACorr && ( bIsAutoCorrectChar || bRunNext ) && pACfg->IsAutoFmtByInput() && (( pACorr->IsAutoCorrFlag( ChgWeightUnderl ) && |