Bugfix: Fixed an NPE that was thrown when a table was used inside a footnote-body.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@386015 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java b/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
index c8ba02f92a47bbbeba14c5ce711e8a9f2b93b1e3..b94b2623c5891fe08662b44c0f9eb13010bc0bfd 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
@@ -242,6 +242,7 @@ public class PageSequenceLayoutManager extends AbstractLayoutManager {
                         // element represents a line with footnote citations
                         bFootnotesPresent = true;
                         LayoutContext footnoteContext = new LayoutContext(context);
+                        footnoteContext.setStackLimit(context.getStackLimit());
                         footnoteContext.setRefIPD(getCurrentPV()
                                 .getRegionReference(Constants.FO_REGION_BODY).getIPD());
                         LinkedList footnoteBodyLMs = ((KnuthBlockBox) element).getFootnoteBodyLMs();

diff --git a/status.xml b/status.xml
index 0596f50c5407e3d9284ff3ee93b08b67826b749e..57909491655a58e2f53bcbb6cad31fb65a98d91b 100644 (file)
--- a/status.xml
+++ b/status.xml
@@ -27,6 +27,9 @@
 
   <changes>
     <release version="FOP Trunk">
+      <action context="Code" dev="JM" type="fix">
+        Bugfix: Fixed an NPE that was thrown when a table was used inside a footnote-body.
+      </action>
       <action context="Code" dev="JM" type="fix">
         Bugfix: Fixed a problem with certain TrueType fonts which are missing the "PCLT"
         table, where a baseline-shift="sub" had no effect due to a missing x-height value.

diff --git a/test/layoutengine/standard-testcases/table_in_footnote.xml b/test/layoutengine/standard-testcases/table_in_footnote.xml
new file mode 100644 (file)
index 0000000..0c187e4
--- /dev/null
+++ b/test/layoutengine/standard-testcases/table_in_footnote.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2006 The Apache Software Foundation
+
+  Licensed 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 is a regression check for an NPE that occured when a table is placed in a footnote-body.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="normal" page-width="5in" page-height="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 font-size="14pt" line-height="17pt">
+          A table within a 
+          <fo:footnote>
+            <fo:inline>footnote</fo:inline>
+            <fo:footnote-body>
+              <fo:block>
+                <fo:table table-layout="fixed">
+                  <fo:table-column column-width="100pt"/>
+                  <fo:table-body>
+                    <fo:table-row>
+                      <fo:table-cell>
+                        <fo:block>
+                          One cell shouldn't be too hard to render.
+                        </fo:block>
+                      </fo:table-cell>
+                    </fo:table-row>
+                  </fo:table-body>
+                </fo:table>
+              </fo:block>
+            </fo:footnote-body>
+          </fo:footnote>
+          shouldn't be a problem.
+        </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="1" xpath="count(//pageViewport)"/>
+    <eval expected="1" xpath="count(//footnote/block)"/>
+  </checks>
+</testcase>