diff options
| author | Jeremias Maerki <jeremias@apache.org> | 2011-06-21 09:44:42 +0000 |
|---|---|---|
| committer | Jeremias Maerki <jeremias@apache.org> | 2011-06-21 09:44:42 +0000 |
| commit | 1df8c0b1dbd25c96a90757fac3db1daf238991af (patch) | |
| tree | f0416777023b9b2649c9fc78c173527cadf65bb7 /src/java/org | |
| parent | 79b6690593ef89e6549a9803eea478ab8134802b (diff) | |
| download | xmlgraphics-fop-1df8c0b1dbd25c96a90757fac3db1daf238991af.tar.gz xmlgraphics-fop-1df8c0b1dbd25c96a90757fac3db1daf238991af.zip | |
Fixed regression introduced by SVN rev 1088079:
Endless loop with empty fo:inline.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1137921 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java/org')
| -rw-r--r-- | src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java index 5e696801d..db7d1edc8 100644 --- a/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java @@ -649,8 +649,8 @@ public class LineLayoutManager extends InlineStackingLayoutManager Paragraph lastPar = null; - InlineLevelLayoutManager curLM = (InlineLevelLayoutManager) getChildLM(); - while (curLM != null) { + InlineLevelLayoutManager curLM; + while ((curLM = (InlineLevelLayoutManager) getChildLM()) != null) { List inlineElements = curLM.getNextKnuthElements(inlineLC, effectiveAlignment); if (inlineElements == null || inlineElements.size() == 0) { /* curLM.getNextKnuthElements() returned null or an empty list; @@ -747,7 +747,6 @@ public class LineLayoutManager extends InlineStackingLayoutManager } } } // end of loop over returnedList - curLM = (InlineLevelLayoutManager) getChildLM(); } if (lastPar != null) { @@ -1149,6 +1148,7 @@ public class LineLayoutManager extends InlineStackingLayoutManager } /** {@inheritDoc} */ + @Override public List getChangedKnuthElements(List oldList, int alignment) { List<KnuthElement> returnList = new LinkedList<KnuthElement>(); for (int p = 0; p < knuthParagraphs.size(); p++) { @@ -1419,7 +1419,7 @@ public class LineLayoutManager extends InlineStackingLayoutManager private void addInlineArea(LayoutContext context, LineBreakPosition lbp, boolean isLastPosition) { - KnuthSequence seq = (KnuthSequence) knuthParagraphs.get(lbp.parIndex); + KnuthSequence seq = knuthParagraphs.get(lbp.parIndex); int startElementIndex = lbp.startIndex; int endElementIndex = lbp.getLeafPos(); |