diff options
| -rw-r--r-- | src/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java | 3 | ||||
| -rw-r--r-- | status.xml | 4 | ||||
| -rw-r--r-- | test/layoutengine/hyphenation-testcases/empty-inline_hyphenation_bug45667.xml | 49 |
3 files changed, 55 insertions, 1 deletions
diff --git a/src/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java index a27fc6516..963b98b37 100644 --- a/src/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java @@ -334,7 +334,8 @@ public abstract class InlineStackingLayoutManager extends AbstractLayoutManager fromIndex = oldListIterator.previousIndex(); } else if (currLM == prevLM) { bSomethingChanged - = prevLM.applyChanges(oldList.subList(fromIndex, oldList.size())) + = (prevLM != null) + && prevLM.applyChanges(oldList.subList(fromIndex, oldList.size())) || bSomethingChanged; } else { bSomethingChanged diff --git a/status.xml b/status.xml index c5d699725..42d606538 100644 --- a/status.xml +++ b/status.xml @@ -53,6 +53,10 @@ <changes> <release version="FOP Trunk" date="TBD"> + <action context="Code" dev="AD" type="fix" fixes-bug="45667"> + Quick-fix to avoid a possible NullPointerException when using + empty inlines and hyphenation. + </action> <action context="Layout" dev="JM" type="add"> Added missing generation of areas for empty grid units in tables with collapsing border model. diff --git a/test/layoutengine/hyphenation-testcases/empty-inline_hyphenation_bug45667.xml b/test/layoutengine/hyphenation-testcases/empty-inline_hyphenation_bug45667.xml new file mode 100644 index 000000000..c66b10de9 --- /dev/null +++ b/test/layoutengine/hyphenation-testcases/empty-inline_hyphenation_bug45667.xml @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<!-- $Id$ --> +<testcase> + <info> + <p> + This test checks for Bugzilla 45667: NPE thrown by an empty inline + in combination with hyphenate="true". + </p> + </info> + <fo> + <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> + <fo:layout-master-set> + <fo:simple-page-master master-name="LetterPage" page-width="6in" + page-height="3in"> + <fo:region-body region-name="PageBody" margin="0.7in" + background-color="rgb(245,245,245)"/> + </fo:simple-page-master> + </fo:layout-master-set> + <fo:page-sequence master-reference="LetterPage" xml:lang="en-US" hyphenate="true"> + <fo:flow flow-name="PageBody"> + <fo:block font="12pt sans-serif"> + <!-- the following line caused a NullPointerException, + if hyphenate="true" --> + <fo:inline id="document.general.efficiently.dictionary"/> + <!-- the following line is working fine --> + Some <fo:inline font-weight="bold" color="red">inline text</fo:inline> formatting. + </fo:block> + </fo:flow> + </fo:page-sequence> + </fo:root> + </fo> + <checks /> <!-- only basic checks to see if no NPE occurred --> +</testcase> |