Bugzilla #53596: When PDF accessibility is enabled, the structure tree must contain information about the number of columns or rows spanned by a table cell.

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

1 files changed, 8 insertions, 5 deletions

diff --git a/src/java/org/apache/fop/accessibility/fo/StructureTreeEventTrigger.java b/src/java/org/apache/fop/accessibility/fo/StructureTreeEventTrigger.java
index 51f7f2bed..7e3ed0591 100644
--- a/src/java/org/apache/fop/accessibility/fo/StructureTreeEventTrigger.java
+++ b/src/java/org/apache/fop/accessibility/fo/StructureTreeEventTrigger.java
@@ -221,14 +221,17 @@ class StructureTreeEventTrigger extends FOEventHandler {
     @Override
     public void startCell(TableCell tc) {
         AttributesImpl attributes = new AttributesImpl();
-        int colSpan = tc.getNumberColumnsSpanned();
-        if (colSpan > 1) {
-            addNoNamespaceAttribute(attributes, "number-columns-spanned",
-                    Integer.toString(colSpan));
-        }
+        addSpanAttribute(attributes, "number-columns-spanned", tc.getNumberColumnsSpanned());
+        addSpanAttribute(attributes, "number-rows-spanned", tc.getNumberRowsSpanned());
         startElement(tc, attributes);
     }
 
+    private void addSpanAttribute(AttributesImpl attributes, String attributeName, int span) {
+        if (span > 1) {
+            addNoNamespaceAttribute(attributes, attributeName, Integer.toString(span));
+        }
+    }
+
     @Override
     public void endCell(TableCell tc) {
         endElement(tc);