opensagres#246 Added better handling for default 'leading' value of a…

… Paragraph.
imajic · Oct 16, 2017 · d93cc23 · d93cc23
1 parent 06f0770
commit d93cc23
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
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
@@ -287,7 +287,6 @@ protected IITextContainer startVisitParagraph(XWPFParagraph docxParagraph,
 							.getMultipleLeading());
 				}
 			}
-
 		}
 
 		// text-align
@@ -488,6 +487,7 @@ protected void visitRun(XWPFRun docxRun, boolean pageNumber, String url,
 
 		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,6 +63,8 @@ public class StylableParagraph
 
     private Color listItemFontColor;
 
+    private boolean defaultLeading = true;
+
     public StylableParagraph( StylableDocument ownerDocument, IITextContainer parent )
     {
         super();
@@ -244,6 +246,7 @@ public void setLeading( float fixedLeading, float multipliedLeading )
     {
         super.setLeading( fixedLeading, multipliedLeading );
         this.originMultipliedLeading = multipliedLeading;
+        this.defaultLeading = false;
     }
 
     @Override
@@ -276,4 +279,10 @@ public void adjustMultipliedLeading( Font font )
         }
     }
 
+    public void adjustLeading( Font font ){
+        if ( font != null ){
+            super.setLeading(font.getSize());
+            this.defaultLeading = false;
+        }
+    }
 }