summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCédric Bosdonnat <cedric.bosdonnat.ooo@free.fr>2012-02-10 21:57:54 +0100
committerFridrich Štrba <fridrich.strba@bluewin.ch>2012-02-14 12:38:39 +0100
commitefae3866d2f3ff23f403d81f58e719a69bf070e9 (patch)
tree790de792ef90bf07517fae63628c294f91e971ea
parent64c37949a4f07ceb03b9da85a5fae73251abbaf2 (diff)
fdo#45908: Cleaning up the tabs too early can cause loops
Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
-rw-r--r--sw/source/core/text/itrform2.cxx5
-rw-r--r--sw/source/core/text/txttab.cxx4
2 files changed, 2 insertions, 7 deletions
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index 54a78254e048..9bf93d2b5538 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -1375,9 +1375,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 fceddca6b007..8841e399fb04 100644
--- a/sw/source/core/text/txttab.cxx
+++ b/sw/source/core/text/txttab.cxx
@@ -82,10 +82,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;