#246: Added better handling for default 'leading' value of a Paragraph.

opensagres · May 25, 2024 · e90e7e9 · e90e7e9
1 parent 615d914
commit e90e7e9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/....converter.pdf/src/main/java/fr/opensagres/poi/xwpf/converter/pdf/internal/PdfMapper.java b/....converter.pdf/src/main/java/fr/opensagres/poi/xwpf/converter/pdf/internal/PdfMapper.java
@@ -550,6 +550,7 @@ protected void visitRun( XWPFRun docxRun, boolean pageNumber, String url, IIText
 
         StylableParagraph pdfParagraph = (StylableParagraph) pdfParagraphContainer;
         pdfParagraph.adjustMultipliedLeading( currentRunFontAscii );
+        pdfParagraph.adjustLeading(currentRunFontAscii);
 
         // addd symbol list item chunk if needed.
         String listItemText = pdfParagraph.getListItemText();

diff --git a/...c/main/java/fr/opensagres/poi/xwpf/converter/pdf/internal/elements/StylableParagraph.java b/...c/main/java/fr/opensagres/poi/xwpf/converter/pdf/internal/elements/StylableParagraph.java
@@ -63,19 +63,23 @@ public class StylableParagraph
 
     private Color listItemFontColor;
 
+    private boolean defaultLeading = true;
+
     public StylableParagraph( StylableDocument ownerDocument, IITextContainer parent )
     {
         super();
         this.ownerDocument = ownerDocument;
         this.parent = parent;
         this.originMultipliedLeading = null;
+        this.defaultLeading = false;
     }
 
     public StylableParagraph( StylableDocument ownerDocument, Paragraph title, IITextContainer parent )
     {
         super( title );
         this.ownerDocument = ownerDocument;
         this.parent = parent;
+        this.defaultLeading = false;
     }
 
     // FIXME check with Angelo the purpose of this method....
@@ -276,4 +280,11 @@ public void adjustMultipliedLeading( Font font )
         }
     }
 
+    public void adjustLeading( Font font ){
+        if ( font != null ){
+            super.setLeading(font.getSize());
+            this.defaultLeading = false;
+        }
+    }
+
 }