Browse Source

FOP-2901: NoSuchElementException on empty table footer

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1872773 13f79535-47bb-0310-9956-ffa450edef68
tags/fop-2_5
Simon Steiner 4 years ago
parent
commit
fcfcda4775

+ 10
- 8
fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java View File

@@ -328,13 +328,15 @@ public class TableContentLayoutManager implements PercentBaseContext {
* 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 implements PercentBaseContext {
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

+ 67
- 0
fop/test/layoutengine/standard-testcases/table_empty_footer.xml View File

@@ -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>

Loading…
Cancel
Save