diff options
| author | Zolnai Tamás <zolnaitamas2000@gmail.com> | 2013-08-03 14:31:59 +0200 |
|---|---|---|
| committer | Zolnai Tamás <zolnaitamas2000@gmail.com> | 2013-08-04 14:45:50 +0200 |
| commit | 00515704d009d65e84404c0dc9bed7754df0f93e (patch) | |
| tree | 6595fafe3990fd1e55f95829c2e43ebb6ae0ac92 | |
| parent | 44f930dafb191523d8f319dc27ee3f1060e692cd (diff) | |
Revert "Use SwTxtInfo height and ascent for portions"
Not so easy
This reverts commit 318bbbfc9bad8c0e04306faade2dec956ff89d28.
| -rw-r--r-- | sw/source/core/text/itrform2.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx index 4c7f95867e13..56b002bcab0c 100644 --- a/sw/source/core/text/itrform2.cxx +++ b/sw/source/core/text/itrform2.cxx @@ -758,8 +758,10 @@ void SwTxtFormatter::CalcAscent( SwTxtFormatInfo &rInf, SwLinePortion *pPor ) { // Numbering + InterNetFlds can keep an own font, then their size is // independent from hard attribute values - pPor->Height( rInf.GetTxtHeight() ); - pPor->SetAscent( rInf.GetAscent() ); + SwFont* pFldFnt = ((SwFldPortion*)pPor)->pFnt; + SwFontSave aSave( rInf, pFldFnt ); + ((SwFldPortion*)pPor)->Height( pFldFnt->GetHeight( rInf.GetVsh(), *rInf.GetOut() ) ); + ((SwFldPortion*)pPor)->SetAscent( pFldFnt->GetAscent( rInf.GetVsh(), *rInf.GetOut() ) ); } // #i89179# // tab portion representing the list tab of a list label gets the @@ -808,7 +810,7 @@ void SwTxtFormatter::CalcAscent( SwTxtFormatInfo &rInf, SwLinePortion *pPor ) bChg = SeekAndChg( rInf ); } if( bChg || bFirstPor || !pPor->GetAscent() - || !pLast->InTxtGrp() ) + || !rInf.GetLast()->InTxtGrp() ) { pPor->SetAscent( rInf.GetAscent() ); pPor->Height( rInf.GetTxtHeight() ); |