sw/source/core/text/itrform2.cxx | 5 ++--- sw/source/core/text/txttab.cxx | 4 ---- 2 files changed, 2 insertions(+), 7 deletions(-)
New commits: commit 042e3727babc62913c753594412e7d7efbed43bf Author: Cédric Bosdonnat <cedric.bosdonnat....@free.fr> Date: Fri Feb 10 21:57:54 2012 +0100 fdo#45908: Cleaning up the tabs too early can cause loops Signed-off-by: Fridrich Štrba <fridrich.st...@bluewin.ch> diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx index 78dd1f1..c7a6cbe 100644 --- a/sw/source/core/text/itrform2.cxx +++ b/sw/source/core/text/itrform2.cxx @@ -1383,9 +1383,8 @@ SwLinePortion *SwTxtFormatter::NewPortion( SwTxtFormatInfo &rInf ) } } - // Wenn eine Portion erzeugt wird, obwohl eine RestPortion ansteht, - // dann haben wir es mit einem Feld zu tun, das sich aufgesplittet - // hat, weil z.B. ein Tab enthalten ist. + // if a portion is created despite there being a pending RestPortion, + // then it is a field which has been split (e.g. because it contains a Tab) if( pPor && rInf.GetRest() ) pPor->SetLen( 0 ); diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx index 5b77142..d3f4e8c 100644 --- a/sw/source/core/text/txttab.cxx +++ b/sw/source/core/text/txttab.cxx @@ -85,10 +85,6 @@ sal_uInt16 SwLineInfo::NumberOfTabStops() const SwTabPortion *SwTxtFormatter::NewTabPortion( SwTxtFormatInfo &rInf, bool bAuto ) const { 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 cDec = 0;
_______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits