opensagres#682 Fixed a bug in the previous solution.

imajic · Jul 4, 2024 · de938b7 · de938b7
1 parent c85aeae
commit de938b7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/...pdf/src/main/java/fr/opensagres/odfdom/converter/pdf/internal/stylable/StylableTable.java b/...pdf/src/main/java/fr/opensagres/odfdom/converter/pdf/internal/stylable/StylableTable.java
@@ -33,6 +33,7 @@
 import fr.opensagres.xdocreport.openpdf.extension.ExtendedPdfPTable;
 
 import java.util.Arrays;
+import java.util.stream.IntStream;
 
 public class StylableTable
     extends ExtendedPdfPTable
@@ -90,8 +91,8 @@ private void fitCellIntoSpansFromAbove(PdfPCell cell) {
         int colSpan = cell.getColspan();
 
         // skip all the cell places already spanned from above
-        while (spansFromAbove[spansFromAboveIdx] > 0){
-            if (spansFromAboveIdx < getNumberOfColumns()) {
+        do {
+            if (spansFromAboveIdx < getNumberOfColumns() && spansFromAbove[spansFromAboveIdx] > 0) {
                 spansFromAbove[spansFromAboveIdx]--;
                 spansFromAboveIdx++;
             }
@@ -101,6 +102,7 @@ private void fitCellIntoSpansFromAbove(PdfPCell cell) {
                 beginTableRow(currentRowStyle);
             }
         }
+        while (spansFromAbove[spansFromAboveIdx] > 0);
 
         for (int col = 0; col < colSpan; col++){
             if (spansFromAbove[spansFromAboveIdx] > 0){
@@ -114,7 +116,10 @@ private void fitCellIntoSpansFromAbove(PdfPCell cell) {
     }
 
     private boolean reachedEndOfRow(){
-        return spansFromAboveIdx == getNumberOfColumns();
+        return spansFromAboveIdx == getNumberOfColumns()
+            // we might reach end of row by not yet reaching getNumberOfColumns() with spansFromAboveIdx, but in that
+            // case all the remaining columns in the row have to be spanned from above
+            ||  IntStream.range(spansFromAboveIdx, getNumberOfColumns()).noneMatch(idx -> spansFromAbove[idx] == 0);
     }
 
     public void beginTableRow( Style currentRowStyle )

diff --git a/...onverter.pdf.openpdf/src/test/resources/org/odftoolkit/odfdom/converter/core/Issue682.odt b/...onverter.pdf.openpdf/src/test/resources/org/odftoolkit/odfdom/converter/core/Issue682.odt