Author: ssteiner
Date: Tue Jan 14 12:07:58 2020
New Revision: 1872773
URL: http://svn.apache.org/viewvc?rev=1872773&view=rev
Log:
FOP-2901: NoSuchElementException on empty table footer
Added:
xmlgraphics/fop/trunk/fop/test/layoutengine/standard-testcases/table_empty_footer.xml
(with props)
Modified:
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java
Modified:
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java?rev=1872773&r1=1872772&r2=1872773&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java
Tue Jan 14 12:07:58 2020
@@ -328,13 +328,15 @@ public class TableContentLayoutManager i
* represent the content. In such a case the break is simply disabled
by setting
* its penalty to infinite.
*/
- ListIterator elemIter = returnList.listIterator(returnList.size());
- ListElement elem = (ListElement) elemIter.previous();
- if (elem instanceof KnuthGlue) {
- BreakElement breakElement = (BreakElement) elemIter.previous();
- breakElement.setPenaltyValue(KnuthElement.INFINITE);
- } else {
- elemIter.remove();
+ if (!returnList.isEmpty()) {
+ ListIterator elemIter = returnList.listIterator(returnList.size());
+ ListElement elem = (ListElement) elemIter.previous();
+ if (elem instanceof KnuthGlue) {
+ BreakElement breakElement = (BreakElement) elemIter.previous();
+ breakElement.setPenaltyValue(KnuthElement.INFINITE);
+ } else {
+ elemIter.remove();
+ }
}
context.updateKeepWithPreviousPending(keepWithPrevious);
context.setBreakBefore(breakBefore);
@@ -483,7 +485,7 @@ public class TableContentLayoutManager i
tableLM.repeatAddAreasForSavedTableHeaderTableCellLayoutManagers();
atLeastOnce = true;
- if (footerElements != null) {
+ if (footerElements != null && !footerElements.isEmpty()) {
boolean ancestorTreatAsArtifact = layoutContext.treatAsArtifact();
layoutContext.setTreatAsArtifact(treatFooterAsArtifact);
//Positions for footers are simply added at the end
Added:
xmlgraphics/fop/trunk/fop/test/layoutengine/standard-testcases/table_empty_footer.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop/test/layoutengine/standard-testcases/table_empty_footer.xml?rev=1872773&view=auto
==============================================================================
---
xmlgraphics/fop/trunk/fop/test/layoutengine/standard-testcases/table_empty_footer.xml
(added)
+++
xmlgraphics/fop/trunk/fop/test/layoutengine/standard-testcases/table_empty_footer.xml
Tue Jan 14 12:07:58 2020
@@ -0,0 +1,67 @@
+<?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 basic tables.
+ </p>
+ </info>
+ <cfg>
+ <strict-validation>false</strict-validation>
+ </cfg>
+ <fo>
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format";>
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="simple" page-height="27.9cm"
page-width="21.6cm">
+ <fo:region-body />
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+
+ <fo:page-sequence master-reference="simple">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>
+ <fo:table border-collapse="separate" table-layout="fixed">
+ <fo:table-column column-width="2in" column-number="1"/>
+ <fo:table-header>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block>a</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-header>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block>b</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ <fo:table-footer/>
+ </fo:table>
+
+ </fo:block>
+
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
+ </fo>
+ <checks>
+ <eval expected="a" xpath="//word[1]"/>
+ </checks>
+</testcase>
Propchange:
xmlgraphics/fop/trunk/fop/test/layoutengine/standard-testcases/table_empty_footer.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
