File tree Expand file tree Collapse file tree 1 file changed +4
-2
lines changed
layout/src/main/java/com/itextpdf/layout/margincollapse Expand file tree Collapse file tree 1 file changed +4
-2
lines changed Original file line number Diff line number Diff line change @@ -243,7 +243,9 @@ public void endMarginsCollapse(Rectangle layoutBox) {
243
243
} else {
244
244
ownCollapseAfter = new MarginsCollapse ();
245
245
}
246
- ownCollapseAfter .joinMargin (getModelBottomMargin (renderer ));
246
+ if (ownCollapseAfter != null ) {
247
+ ownCollapseAfter .joinMargin (getModelBottomMargin (renderer ));
248
+ }
247
249
collapseInfo .setOwnCollapseAfter (ownCollapseAfter );
248
250
249
251
if (collapseInfo .isSelfCollapsing ()) {
@@ -288,7 +290,7 @@ public void endMarginsCollapse(Rectangle layoutBox) {
288
290
}
289
291
290
292
private void updateCollapseBeforeIfPrevKidIsFirstAndSelfCollapsed (MarginsCollapse collapseAfter ) {
291
- if (prevChildMarginInfo .isSelfCollapsing () && prevChildMarginInfo .isIgnoreOwnMarginTop ()) {
293
+ if (prevChildMarginInfo .isSelfCollapsing () && prevChildMarginInfo .isIgnoreOwnMarginTop () && collapseAfter != null ) {
292
294
// prevChildMarginInfo.isIgnoreOwnMarginTop() is true only if it's the first kid and is adjoined to parent margin
293
295
collapseInfo .getCollapseBefore ().joinMargin (collapseAfter );
294
296
}
You can’t perform that action at this time.
0 commit comments