You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by cb...@apache.org on 2020/01/07 16:00:07 UTC

svn commit: r1872447 - /xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableCell.java

Author: cbowditch
Date: Tue Jan  7 16:00:06 2020
New Revision: 1872447

URL: http://svn.apache.org/viewvc?rev=1872447&view=rev
Log:
fix FOP-1616

Modified:
    xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableCell.java

Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableCell.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableCell.java?rev=1872447&r1=1872446&r2=1872447&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableCell.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableCell.java Tue Jan  7 16:00:06 2020
@@ -234,8 +234,7 @@ public class RtfTableCell
             RtfTable tab = getRow().getTable();
 
             // Get the context of the current table in order to get the width of each column
-            ITableColumnsInfo tableColumnsInfo
-                = tab.getITableColumnsInfo();
+            ITableColumnsInfo tableColumnsInfo = tab.getITableColumnsInfo();
 
             tableColumnsInfo.selectFirstColumn();
 
@@ -256,6 +255,12 @@ public class RtfTableCell
 
                 i--;
             }
+
+            // check whether table right border should apply if this is really the last cell in the row
+            if (this.getRow().isHighestCell(this.id + nbMergedCells - 1)) {
+                writeAttributes(this.getRow().getTable().getBorderAttributes(), new String[]
+                        {ITableAttributes.CELL_BORDER_RIGHT});
+            }
         }
         final int xPos = offset + iCurrentWidth;
 



---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org