Author: adelmelle
Date: Sat Jul 11 17:52:10 2015
New Revision: 1690396
URL: http://svn.apache.org/r1690396
Log:
Preliminary quick fix for FOP-2461
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java?rev=1690396&r1=1690395&r2=1690396&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
Sat Jul 11 17:52:10 2015
@@ -393,7 +393,8 @@ public class ListItemLayoutManager exten
int breakClass = EN_AUTO;
KnuthElement endEl = elementLists[0].size() > 0 ? (KnuthElement)
elementLists[0].get(end[0])
: null;
- Position originalLabelPosition = endEl != null ?
endEl.getPosition().getPosition() : null;
+ Position originalLabelPosition =
+ (endEl != null && endEl.getPosition() != null) ?
endEl.getPosition().getPosition() : null;
if (endEl instanceof KnuthPenalty) {
additionalPenaltyHeight = endEl.getWidth();
stepPenalty = endEl.getPenalty() == -KnuthElement.INFINITE ?
-KnuthElement.INFINITE : Math
@@ -402,7 +403,8 @@ public class ListItemLayoutManager exten
((KnuthPenalty) endEl).getBreakClass());
}
endEl = elementLists[1].size() > 0 ? (KnuthElement)
elementLists[1].get(end[1]) : null;
- Position originalBodyPosition = endEl != null ?
endEl.getPosition().getPosition() : null;
+ Position originalBodyPosition =
+ (endEl != null && endEl.getPosition() != null) ?
endEl.getPosition().getPosition() : null;
if (endEl instanceof KnuthPenalty) {
additionalPenaltyHeight = Math.max(
additionalPenaltyHeight, endEl.getWidth());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
