|
Michael Simacek |
f06e69 |
From 933f4f76b3af4bd8dc109dc375db84c44ea167f9 Mon Sep 17 00:00:00 2001
|
|
Michael Simacek |
6b693c |
From: Michael Simacek <msimacek@redhat.com>
|
|
Michael Simacek |
6b693c |
Date: Fri, 7 Aug 2015 13:03:32 +0200
|
|
Michael Simacek |
f06e69 |
Subject: [PATCH 5/6] NPE-FOP-2461
|
|
Michael Simacek |
6b693c |
|
|
Michael Simacek |
6b693c |
---
|
|
Michael Simacek |
6b693c |
src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java | 6 ++++--
|
|
Michael Simacek |
6b693c |
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
Michael Simacek |
6b693c |
|
|
Michael Simacek |
6b693c |
diff --git a/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java b/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
|
|
Michael Simacek |
6b693c |
index 9ba1bce..b42c635 100644
|
|
Michael Simacek |
6b693c |
--- a/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
|
|
Michael Simacek |
6b693c |
+++ b/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
|
|
Michael Simacek |
6b693c |
@@ -393,7 +393,8 @@ public class ListItemLayoutManager extends SpacedBorderedPaddedBlockLayoutManage
|
|
Michael Simacek |
6b693c |
int breakClass = EN_AUTO;
|
|
Michael Simacek |
6b693c |
KnuthElement endEl = elementLists[0].size() > 0 ? (KnuthElement) elementLists[0].get(end[0])
|
|
Michael Simacek |
6b693c |
: null;
|
|
Michael Simacek |
6b693c |
- Position originalLabelPosition = endEl != null ? endEl.getPosition().getPosition() : null;
|
|
Michael Simacek |
6b693c |
+ Position originalLabelPosition =
|
|
Michael Simacek |
6b693c |
+ (endEl != null && endEl.getPosition() != null) ? endEl.getPosition().getPosition() : null;
|
|
Michael Simacek |
6b693c |
if (endEl instanceof KnuthPenalty) {
|
|
Michael Simacek |
6b693c |
additionalPenaltyHeight = endEl.getWidth();
|
|
Michael Simacek |
6b693c |
stepPenalty = endEl.getPenalty() == -KnuthElement.INFINITE ? -KnuthElement.INFINITE : Math
|
|
Michael Simacek |
6b693c |
@@ -402,7 +403,8 @@ public class ListItemLayoutManager extends SpacedBorderedPaddedBlockLayoutManage
|
|
Michael Simacek |
6b693c |
((KnuthPenalty) endEl).getBreakClass());
|
|
Michael Simacek |
6b693c |
}
|
|
Michael Simacek |
6b693c |
endEl = elementLists[1].size() > 0 ? (KnuthElement) elementLists[1].get(end[1]) : null;
|
|
Michael Simacek |
6b693c |
- Position originalBodyPosition = endEl != null ? endEl.getPosition().getPosition() : null;
|
|
Michael Simacek |
6b693c |
+ Position originalBodyPosition =
|
|
Michael Simacek |
6b693c |
+ (endEl != null && endEl.getPosition() != null) ? endEl.getPosition().getPosition() : null;
|
|
Michael Simacek |
6b693c |
if (endEl instanceof KnuthPenalty) {
|
|
Michael Simacek |
6b693c |
additionalPenaltyHeight = Math.max(
|
|
Michael Simacek |
6b693c |
additionalPenaltyHeight, endEl.getWidth());
|
|
Michael Simacek |
6b693c |
--
|
|
Michael Simacek |
f06e69 |
2.9.3
|
|
Michael Simacek |
6b693c |
|