Kaydet (Commit) 36c905d8 authored tarafından Cédric Bosdonnat's avatar Cédric Bosdonnat

fdo#45908: Cleaning up the tabs too early can cause loops

üst b57f88ce
...@@ -1375,9 +1375,8 @@ SwLinePortion *SwTxtFormatter::NewPortion( SwTxtFormatInfo &rInf ) ...@@ -1375,9 +1375,8 @@ SwLinePortion *SwTxtFormatter::NewPortion( SwTxtFormatInfo &rInf )
} }
} }
// Wenn eine Portion erzeugt wird, obwohl eine RestPortion ansteht, // if a portion is created despite there being a pending RestPortion,
// dann haben wir es mit einem Feld zu tun, das sich aufgesplittet // then it is a field which has been split (e.g. because it contains a Tab)
// hat, weil z.B. ein Tab enthalten ist.
if( pPor && rInf.GetRest() ) if( pPor && rInf.GetRest() )
pPor->SetLen( 0 ); pPor->SetLen( 0 );
......
...@@ -82,10 +82,6 @@ sal_uInt16 SwLineInfo::NumberOfTabStops() const ...@@ -82,10 +82,6 @@ sal_uInt16 SwLineInfo::NumberOfTabStops() const
SwTabPortion *SwTxtFormatter::NewTabPortion( SwTxtFormatInfo &rInf, bool bAuto ) const SwTabPortion *SwTxtFormatter::NewTabPortion( SwTxtFormatInfo &rInf, bool bAuto ) const
{ {
SwTabPortion *pTabPor = 0; SwTabPortion *pTabPor = 0;
SwTabPortion *pLastTab = rInf.GetLastTab();
if( pLastTab && ( pLastTab->IsTabCntPortion() || pLastTab->IsTabDecimalPortion() ) )
if( pLastTab->PostFormat( rInf ) )
return 0;
xub_Unicode cFill = 0; xub_Unicode cFill = 0;
xub_Unicode cDec = 0; xub_Unicode cDec = 0;
......
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