Mirrors/fop
1
0
Fork 0
mirror of https://github.com/apache/xmlgraphics-fop.git synced 2024-09-14 00:01:49 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bugfix: a table immediately following a break where changing IPD occurs was causing a NPE (or some content to be swallowed if it's not a table)

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@826739 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Vincent Hennebert 2009-10-19 18:02:36 +00:00
parent 37b65497ae
commit 7ed63c2e01
2 changed files with 82 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/java/org/apache/fop/layoutmgr/AbstractBreaker.java
View File

@ -383,12 +383,12 @@ public abstract class AbstractBreaker {
if (containsNonRestartableLM(positionAtBreak)) {
firstElements = new LinkedList();
boolean boxFound = false;
Iterator iter = effectiveList.listIterator(++positionIndex);
Iterator iter = effectiveList.listIterator(positionIndex + 1);
Position position = null;
while (iter.hasNext()
&& (position == null || containsNonRestartableLM(position))) {
KnuthElement element = (KnuthElement) iter.next();
positionIndex++;
KnuthElement element = (KnuthElement) iter.next();
position = element.getPosition();
if (element.isBox()) {
boxFound = true;

80
test/layoutengine/standard-testcases/flow_changing-ipd_table-after-break.xml Normal file
View File

@ -0,0 +1,80 @@
<?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 that a table immediately following a changing IPD break is handled properly.
</p>
</info>
<fo>
<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:layout-master-set>
<fo:simple-page-master master-name="narrow"
page-height="220pt" page-width="320pt" margin="10pt">
<fo:region-body background-color="#F0F0F0"/>
</fo:simple-page-master>
<fo:simple-page-master master-name="wide"
page-height="220pt" page-width="420pt" margin="10pt">
<fo:region-body background-color="#F0F0F0"/>
</fo:simple-page-master>
<fo:page-sequence-master master-name="pages">
<fo:single-page-master-reference master-reference="narrow"/>
<fo:repeatable-page-master-reference master-reference="wide"/>
</fo:page-sequence-master>
</fo:layout-master-set>
<fo:page-sequence master-reference="pages" font-size="8pt" line-height="10pt">
<fo:flow flow-name="xsl-region-body" text-align="justify">
<fo:block space-after="180pt">Before the table</fo:block>
<fo:table table-layout="fixed" width="100%" id="table">
<fo:table-body>
<fo:table-row>
<fo:table-cell>
<fo:block>
<fo:block id="before_break">Block before the page break.</fo:block>
<fo:block id="after_break">Block after the page break.</fo:block>
</fo:block>
</fo:table-cell>
</fo:table-row>
</fo:table-body>
</fo:table>
<fo:table table-layout="fixed" width="100%">
<fo:table-body>
<fo:table-row>
<fo:table-cell>
<fo:block>After the table 1</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
<fo:table-cell>
<fo:block>After the table 2</fo:block>
</fo:table-cell>
</fo:table-row>
</fo:table-body>
</fo:table>
</fo:flow>
</fo:page-sequence>
</fo:root>
</fo>
<checks>
<eval expected="Block before the page break." xpath="//pageViewport[1]//flow/block[2]//text"/>
<eval expected="Block after the page break." xpath="//pageViewport[2]//flow/block[1]//text"/>
<eval expected="After the table 1" xpath="//pageViewport[2]//flow/block[2]/block[1]//text"/>
<eval expected="After the table 2" xpath="//pageViewport[2]//flow/block[2]/block[2]//text"/>
</checks>
</testcase>