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 | 0453ab6dd45bbdad0f4e91b25dc2a51f7b05a60a (patch) | |
| tree | bb3e0aff952cd3284b95d5393966f49532dac270 | |
| parent | 949029c7066d27cb58387a82598ad95774b33075 (diff) | |
| parent | 787c36414e0537fbf7efab3d98545b0171ee335a (diff) | |
CWS-TOOLING: integrate CWS sw33bf07
Notes
split repo tag: writer_ooo/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 c7527b372554..0ae80fb5306f 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 e2e59e17831e..7b5741316cbb 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 ) && |