Index: .classpath
===================================================================
RCS file: /home/cvspublic/jakarta-poi/.classpath,v
retrieving revision 1.3
diff -u -r1.3 .classpath
--- .classpath	1 Jan 2003 09:24:39 -0000	1.3
+++ .classpath	9 Jul 2003 17:37:39 -0000
@@ -3,8 +3,9 @@
     <classpathentry kind="src" path="src/testcases"/>
     <classpathentry kind="src" path="src/java"/>
     <classpathentry kind="src" path="src/examples/src"/>
-    <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
-    <classpathentry kind="lib" path="tools/cents/junit.cent/lib/junit-3.7.jar"/>
-    <classpathentry kind="lib" path="lib/core/commons-logging-1.0.jar"/>
+    <classpathentry kind="var" path="JRE_LIB" sourcepath="JRE_SRC"/>
+    <classpathentry kind="lib" path="C:/poi2/lib/commons-logging-1.0.1.jar"/>
+    <classpathentry kind="lib" path="C:/poi2/lib/log4j-1.2.8.jar"/>
+    <classpathentry kind="lib" path="C:/poi2/lib/junit-3.8.1.jar"/>
     <classpathentry kind="output" path="build"/>
 </classpath>
Index: build.xml
===================================================================
RCS file: /home/cvspublic/jakarta-poi/build.xml,v
retrieving revision 1.41
diff -u -r1.41 build.xml
--- build.xml	17 May 2003 05:43:08 -0000	1.41
+++ build.xml	9 Jul 2003 17:37:40 -0000
@@ -28,7 +28,7 @@
     Convert book.xml files to a sitemap.
 
  -->
-<project name="POI Build" default="compile" basedir=".">
+<project name="POI Build" default="jar" basedir=".">
 
     <description>
         The POI project Ant build.
Index: src/java/org/apache/poi/hssf/model/Sheet.java
===================================================================
RCS file: /home/cvspublic/jakarta-poi/src/java/org/apache/poi/hssf/model/Sheet.java,v
retrieving revision 1.34
diff -u -r1.34 Sheet.java
--- src/java/org/apache/poi/hssf/model/Sheet.java	27 Jun 2003 23:13:29 -0000	1.34
+++ src/java/org/apache/poi/hssf/model/Sheet.java	9 Jul 2003 17:37:41 -0000
@@ -249,15 +249,15 @@
             {
                 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;
             }
-            else if ( rec.getSid() == PrintSetupRecord.sid )
+            else if ( rec.getSid() == PrintSetupRecord.sid && bofEofNestingLevel == 1)
             {
                 retval.printSetup = (PrintSetupRecord) rec;
             }