fix FOP-1616

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

1 files changed, 7 insertions, 2 deletions

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 fdcda090d..9bc1437dd 100644
--- 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
@@ -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;