slaubach 2003/07/24 11:42:46
Modified: src/java/org/apache/poi/hssf/model Tag: REL_2_BRANCH
Sheet.java
Added: src/testcases/org/apache/poi/hssf/data Tag: REL_2_BRANCH
EmbeddedChartHeaderTest.xls
src/testcases/org/apache/poi/hssf/usermodel Tag:
REL_2_BRANCH TestHSSFHeaderFooter.java
Log:
Applied the pertinent patch for bug #21439 by Paul Pound to get the header/footer
from the sheet and not a chart.
Revision Changes Path
No revision
No revision
1.31.2.3 +2 -2 jakarta-poi/src/java/org/apache/poi/hssf/model/Sheet.java
Index: Sheet.java
===================================================================
RCS file: /home/cvs/jakarta-poi/src/java/org/apache/poi/hssf/model/Sheet.java,v
retrieving revision 1.31.2.2
retrieving revision 1.31.2.3
diff -u -r1.31.2.2 -r1.31.2.3
--- Sheet.java 27 Jun 2003 23:21:17 -0000 1.31.2.2
+++ Sheet.java 24 Jul 2003 18:42:45 -0000 1.31.2.3
@@ -249,11 +249,11 @@
{
retval.printGridlines = (PrintGridlinesRecord) rec;
}
- else if ( rec.getSid() == HeaderRecord.sid )
+ else if ( rec.getSid() == HeaderRecord.sid && bofEofNestingLevel == 1)
{
retval.header = (HeaderRecord) rec;
}
- else if ( rec.getSid() == FooterRecord.sid )
+ else if ( rec.getSid() == FooterRecord.sid && bofEofNestingLevel == 1)
{
retval.footer = (FooterRecord) rec;
}
No revision
No revision
1.1.2.1 +0 -0
jakarta-poi/src/testcases/org/apache/poi/hssf/data/EmbeddedChartHeaderTest.xls
<<Binary file>>
No revision
No revision
1.1.2.1 +0 -0
jakarta-poi/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFHeaderFooter.java
Index: TestHSSFHeaderFooter.java
===================================================================
RCS file:
/home/cvs/jakarta-poi/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFHeaderFooter.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
