Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SMesser-WhiteHawk wants to merge 2 commits into
base: master
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d93cc23
#246 Added better handling for default 'leading' value of a Paragraph.
Oct 16, 2017
651f094
Merge remote-tracking branch 'imagic/master'
SMesser-WhiteHawk May 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ....converter.pdf/src/main/java/fr/opensagres/poi/xwpf/converter/pdf/internal/PdfMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,6 +540,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();
Expand Down
9 changes: 9 additions & 0 deletions ...c/main/java/fr/opensagres/poi/xwpf/converter/pdf/internal/elements/StylableParagraph.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ public class StylableParagraph

private Color listItemFontColor;

private boolean defaultLeading = true;

public StylableParagraph( StylableDocument ownerDocument, IITextContainer parent )
{
super();
Expand Down Expand Up @@ -244,6 +246,7 @@ public void setLeading( float fixedLeading, float multipliedLeading )
{
super.setLeading( fixedLeading, multipliedLeading );
this.originMultipliedLeading = multipliedLeading;
this.defaultLeading = false;
}

@Override
Expand Down Expand Up @@ -276,4 +279,10 @@ public void adjustMultipliedLeading( Font font )
}
}

public void adjustLeading( Font font ){
if ( font != null ){
super.setLeading(font.getSize());
this.defaultLeading = false;
}
}
}