You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by ad...@apache.org on 2008/08/29 22:12:34 UTC
svn commit: r690382 - in /xmlgraphics/fop/trunk:
src/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java
status.xml
test/layoutengine/hyphenation-testcases/empty-inline_hyphenation_bug45667.xml
Author: adelmelle
Date: Fri Aug 29 13:12:34 2008
New Revision: 690382
URL: http://svn.apache.org/viewvc?rev=690382&view=rev
Log:
Bugzilla 45667: avoid NullPointerExceptions during hyphenation for empty inlines.
Added:
xmlgraphics/fop/trunk/test/layoutengine/hyphenation-testcases/empty-inline_hyphenation_bug45667.xml (with props)
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java
xmlgraphics/fop/trunk/status.xml
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java?rev=690382&r1=690381&r2=690382&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java Fri Aug 29 13:12:34 2008
@@ -334,7 +334,8 @@
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
Modified: xmlgraphics/fop/trunk/status.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/status.xml?rev=690382&r1=690381&r2=690382&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/status.xml (original)
+++ xmlgraphics/fop/trunk/status.xml Fri Aug 29 13:12:34 2008
@@ -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.
Added: xmlgraphics/fop/trunk/test/layoutengine/hyphenation-testcases/empty-inline_hyphenation_bug45667.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/hyphenation-testcases/empty-inline_hyphenation_bug45667.xml?rev=690382&view=auto
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/hyphenation-testcases/empty-inline_hyphenation_bug45667.xml (added)
+++ xmlgraphics/fop/trunk/test/layoutengine/hyphenation-testcases/empty-inline_hyphenation_bug45667.xml Fri Aug 29 13:12:34 2008
@@ -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>
Propchange: xmlgraphics/fop/trunk/test/layoutengine/hyphenation-testcases/empty-inline_hyphenation_bug45667.xml
------------------------------------------------------------------------------
svn:keywords = Id
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org