Author: vhennebert
Date: Mon Mar 15 18:36:21 2010
New Revision: 923380
URL: http://svn.apache.org/viewvc?rev=923380&view=rev
Log:
Bugfix: NPE when there is a forced break before a table occurring at an IPD
change
Added:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/flow_changing-ipd_break-before-table.xml
(with props)
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java?rev=923380&r1=923379&r2=923380&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
Mon Mar 15 18:36:21 2010
@@ -43,7 +43,9 @@ import org.apache.fop.layoutmgr.Conditio
import org.apache.fop.layoutmgr.KnuthElement;
import org.apache.fop.layoutmgr.KnuthGlue;
import org.apache.fop.layoutmgr.LayoutContext;
+import org.apache.fop.layoutmgr.LeafPosition;
import org.apache.fop.layoutmgr.ListElement;
+import org.apache.fop.layoutmgr.Position;
import org.apache.fop.layoutmgr.PositionIterator;
import org.apache.fop.layoutmgr.RelSide;
import org.apache.fop.layoutmgr.TraitSetter;
@@ -88,6 +90,8 @@ public class TableLayoutManager extends
/** See {...@link
TableLayoutManager#registerColumnBackgroundArea(TableColumn, Block, int)}. */
private List columnBackgroundAreas;
+ private Position auxiliaryPosition;
+
/**
* Temporary holder of column background informations for a table-cell's
area.
*
@@ -290,6 +294,20 @@ public class TableLayoutManager extends
return returnList;
}
+ /** {...@inheritdoc} */
+ public Position getAuxiliaryPosition() {
+ /*
+ * Redefined to return a LeafPosition instead of a NonLeafPosition. The
+ * SpaceResolver.SpaceHandlingBreakPosition constructors unwraps all
+ * NonLeafPositions, which can lead to a NPE when a break in a table
occurs at a
+ * page with different ipd.
+ */
+ if (auxiliaryPosition == null) {
+ auxiliaryPosition = new LeafPosition(this, 0);
+ }
+ return auxiliaryPosition;
+ }
+
/**
* Registers the given area, that will be used to render the part of
column background
* covered by a table-cell. If percentages are used to place the
background image, the
Added:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/flow_changing-ipd_break-before-table.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/flow_changing-ipd_break-before-table.xml?rev=923380&view=auto
==============================================================================
---
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/flow_changing-ipd_break-before-table.xml
(added)
+++
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/flow_changing-ipd_break-before-table.xml
Mon Mar 15 18:36:21 2010
@@ -0,0 +1,74 @@
+<?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>
+ Bugfix: NPE when a break-before was set on a table.
+ </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="120pt" page-width="170pt" margin="10pt">
+ <fo:region-body background-color="#F0F0F0"/>
+ </fo:simple-page-master>
+ <fo:simple-page-master master-name="wide"
+ page-height="120pt" page-width="220pt" 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">
+ <fo:flow flow-name="xsl-region-body" line-height="10pt"
font-size="8pt">
+ <fo:block>Before the table</fo:block>
+ <fo:table width="100%" table-layout="fixed">
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell border="1pt solid black">
+ <fo:block>Cell 1.1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell border="1pt solid black">
+ <fo:block break-before="page">Cell 1.2</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell border="1pt solid black">
+ <fo:block>Cell 2.1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell border="1pt solid black">
+ <fo:block>Cell 2.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="Before the table"
xpath="//pageViewport[1]//flow/block[1]//text"/>
+ <!-- Test does not really matter, just make sure document is processed
successfully -->
+ <eval expected="150000"
xpath="//pageViewport[2]//flow/block[1]/@ipd"/>
+ <eval expected="22000"
xpath="//pageViewport[2]//flow/block[1]/@bpd"/>
+ </checks>
+</testcase>
Propchange:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/flow_changing-ipd_break-before-table.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/flow_changing-ipd_break-before-table.xml
------------------------------------------------------------------------------
svn:keywords = Revision Id
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
