Author: ssteiner
Date: Tue Oct 12 13:51:54 2021
New Revision: 1894164
URL: http://svn.apache.org/viewvc?rev=1894164&view=rev
Log:
FOP-2943: NPE when inline character is a white space
Thanks to J Frank
Added:
xmlgraphics/fop/trunk/fop/test/layoutengine/standard-testcases/block-inline-empty-character.xml
(with props)
Modified:
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fo/FObj.java
Modified:
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fo/FObj.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fo/FObj.java?rev=1894164&r1=1894163&r2=1894164&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fo/FObj.java
(original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fo/FObj.java
Tue Oct 12 13:51:54 2021
@@ -314,7 +314,7 @@ public abstract class FObj extends FONod
}
if (child == lastChild) {
if (child.siblings != null) {
- lastChild = siblings[0];
+ lastChild = child.siblings[0];
} else {
lastChild = null;
}
Added:
xmlgraphics/fop/trunk/fop/test/layoutengine/standard-testcases/block-inline-empty-character.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop/test/layoutengine/standard-testcases/block-inline-empty-character.xml?rev=1894164&view=auto
==============================================================================
---
xmlgraphics/fop/trunk/fop/test/layoutengine/standard-testcases/block-inline-empty-character.xml
(added)
+++
xmlgraphics/fop/trunk/fop/test/layoutengine/standard-testcases/block-inline-empty-character.xml
Tue Oct 12 13:51:54 2021
@@ -0,0 +1,45 @@
+<?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 empty character inside inline.</p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format";>
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in"
page-height="5in"
+ margin="0.5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block><fo:inline>block1</fo:inline><fo:character character="
"/></fo:block>
+ <fo:block><fo:inline>block2</fo:inline><fo:character
character="2"/></fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="block1"
xpath="//flow/block[1]/lineArea[1]/inlineparent[1]/text[1]/word[1]" />
+ <eval expected="block2"
xpath="//flow/block[2]/lineArea[1]/inlineparent[1]/text[1]/word[1]" />
+ <eval expected="" xpath="//flow/block[2]/lineArea[1]/text[1]/space[1]" />
+ <eval expected="2" xpath="//flow/block[2]/lineArea[1]/text[1]" />
+ </checks>
+</testcase>
Propchange:
xmlgraphics/fop/trunk/fop/test/layoutengine/standard-testcases/block-inline-empty-character.xml
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscr...@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-h...@xmlgraphics.apache.org
