fix FOP-2624

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1860626 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/fop-core/src/main/java/org/apache/fop/render/rtf/RTFHandler.java b/fop-core/src/main/java/org/apache/fop/render/rtf/RTFHandler.java
index 36a201a8f543c12fd20e13a579b73cf3cbef7536..a4a63afc6b5b6b9ea38d474c21eaa8b251ebdb9c 100644 (file)
--- a/fop-core/src/main/java/org/apache/fop/render/rtf/RTFHandler.java
+++ b/fop-core/src/main/java/org/apache/fop/render/rtf/RTFHandler.java
@@ -437,8 +437,7 @@ public class RTFHandler extends FOEventHandler {
 
             RtfTableCell cellParent = (RtfTableCell)textrun.getParentOfClass(RtfTableCell.class);
             if (cellParent != null && par != null) {
-                int iDepth = cellParent.findChildren(textrun);
-                cellParent.setLastParagraph(par, iDepth);
+                cellParent.setLastParagraph(par);
             }
 
             int breakValue = toRtfBreakValue(bl.getBreakAfter());

diff --git a/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableCell.java b/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableCell.java
index 731800fdbaaa78b0e24ebe67f563d43cb12bb023..fdcda090d9a3ec27ad5e4d3ceac6d7708a53cdf5 100644 (file)
--- a/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableCell.java
+++ b/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableCell.java
@@ -48,7 +48,6 @@ public class RtfTableCell
     private boolean setRight;
     private int id;
     private RtfParagraphBreak lastBreak;
-    private int lastBreakDepth = Integer.MIN_VALUE;
 
     private static final String TABLE_CELL_PARAGRAPH = "cell";
     private static final String TABLE_CELL_NESTED_PARAGRAPH = "nestcell";
@@ -555,15 +554,10 @@ public class RtfTableCell
      * For nested tables it is not necessary.
      *
      * @param parBreak the paragraph break element
-     * @param breakDepth The depth is necessary for picking the correct break element.
-     * If it is deeper inside the whole cell it will be used, and if there is something on
-     * the same level (depth) it is also set because the method is called for all breaks
-     * in the correct order.
      */
-    public void setLastParagraph(RtfParagraphBreak parBreak, int breakDepth) {
-        if (parBreak != null && breakDepth >= lastBreakDepth) {
+    public void setLastParagraph(RtfParagraphBreak parBreak) {
+        if (parBreak != null) {
             lastBreak = parBreak;
-            lastBreakDepth = breakDepth;
         }
     }