Skip to content

C
core
Kaydet (Commit) 00515704 authored tarafından Zolnai Tamás's avatar Zolnai Tamás
Dosyalara gözat
Seçenekler

Revert "Use SwTxtInfo height and ascent for portions" 

Not so easy

This reverts commit 318bbbfc.
üst 44f930da
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 3 deletions
sw/source/core/text/itrform2.cxx
Dosyayı görüntüle @ 00515704
...@@ -758,8 +758,10 @@ void SwTxtFormatter::CalcAscent( SwTxtFormatInfo &rInf, SwLinePortion *pPor ) ...@@ -758,8 +758,10 @@ void SwTxtFormatter::CalcAscent( SwTxtFormatInfo &rInf, SwLinePortion *pPor )
{ {
// Numbering + InterNetFlds can keep an own font, then their size is // Numbering + InterNetFlds can keep an own font, then their size is
// independent from hard attribute values // independent from hard attribute values
pPor->Height( rInf.GetTxtHeight() ); SwFont* pFldFnt = ((SwFldPortion*)pPor)->pFnt;
pPor->SetAscent( rInf.GetAscent() ); SwFontSave aSave( rInf, pFldFnt );
((SwFldPortion*)pPor)->Height( pFldFnt->GetHeight( rInf.GetVsh(), *rInf.GetOut() ) );
((SwFldPortion*)pPor)->SetAscent( pFldFnt->GetAscent( rInf.GetVsh(), *rInf.GetOut() ) );
} }
// #i89179# // #i89179#
// tab portion representing the list tab of a list label gets the // tab portion representing the list tab of a list label gets the
...@@ -808,7 +810,7 @@ void SwTxtFormatter::CalcAscent( SwTxtFormatInfo &rInf, SwLinePortion *pPor ) ...@@ -808,7 +810,7 @@ void SwTxtFormatter::CalcAscent( SwTxtFormatInfo &rInf, SwLinePortion *pPor )
bChg = SeekAndChg( rInf ); bChg = SeekAndChg( rInf );
} }
if( bChg || bFirstPor || !pPor->GetAscent() if( bChg || bFirstPor || !pPor->GetAscent()
|| !pLast->InTxtGrp() ) || !rInf.GetLast()->InTxtGrp() )
{ {
pPor->SetAscent( rInf.GetAscent() ); pPor->SetAscent( rInf.GetAscent() );
pPor->Height( rInf.GetTxtHeight() ); pPor->Height( rInf.GetTxtHeight() );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment