[Libreoffice-commits] .: sw/source
Cédric Bosdonnat
cbosdo at kemper.freedesktop.org
Fri Feb 10 12:59:20 PST 2012
sw/source/core/text/itrform2.cxx | 5 ++---
sw/source/core/text/txttab.cxx | 4 ----
2 files changed, 2 insertions(+), 7 deletions(-)
New commits:
commit 36c905d8c2874f6f984d5fbbc07784ec20c43524
Author: Cédric Bosdonnat <cedric.bosdonnat.ooo at free.fr>
Date: Fri Feb 10 21:57:54 2012 +0100
fdo#45908: Cleaning up the tabs too early can cause loops
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index b46d5b8..f9163af 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 fceddca..8841e39 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;
More information about the Libreoffice-commits
mailing list