jheight 2003/10/14 16:22:29
Modified: src/java/org/apache/poi/hssf/model Tag: REL_2_BRANCH
Workbook.java WorkbookRecordList.java
Log:
Branch. Dont forget to set the palette pos of the new palette record
Revision Changes Path
No revision
No revision
1.29.2.5 +1 -0 jakarta-poi/src/java/org/apache/poi/hssf/model/Workbook.java
Index: Workbook.java
===================================================================
RCS file: /home/cvs/jakarta-poi/src/java/org/apache/poi/hssf/model/Workbook.java,v
retrieving revision 1.29.2.4
retrieving revision 1.29.2.5
diff -u -r1.29.2.4 -r1.29.2.5
--- Workbook.java 14 Oct 2003 22:43:42 -0000 1.29.2.4
+++ Workbook.java 14 Oct 2003 23:22:29 -0000 1.29.2.5
@@ -2077,6 +2077,7 @@
palette = createPalette();
//Add the palette record after the bof which is always the first record
records.add(1, palette);
+ records.setPalettepos(1);
}
return palette;
}
1.3.2.2 +2 -2
jakarta-poi/src/java/org/apache/poi/hssf/model/WorkbookRecordList.java
Index: WorkbookRecordList.java
===================================================================
RCS file:
/home/cvs/jakarta-poi/src/java/org/apache/poi/hssf/model/WorkbookRecordList.java,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- WorkbookRecordList.java 14 Oct 2003 22:44:55 -0000 1.3.2.1
+++ WorkbookRecordList.java 14 Oct 2003 23:22:29 -0000 1.3.2.2
@@ -103,7 +103,7 @@
if (getBackuppos() >= pos) setBackuppos( backuppos + 1 );
if (getNamepos() >= pos) setNamepos(namepos+1);
if (getSupbookpos() >= pos) setSupbookpos(supbookpos+1);
- if (getPalettepos() >= pos) setPalettepos( palettepos + 1 );
+ if ((getPalettepos() != -1) && (getPalettepos() >= pos)) setPalettepos(
palettepos + 1 );
if (getExternsheetPos() >= pos) setExternsheetPos(getExternsheetPos() + 1);
}
@@ -128,7 +128,7 @@
if (getBackuppos() >= pos) setBackuppos( backuppos - 1 );
if (getNamepos() >= pos) setNamepos(getNamepos()-1);
if (getSupbookpos() >= pos) setSupbookpos(getSupbookpos()-1);
- if (getPalettepos() >= pos) setPalettepos( palettepos - 1 );
+ if ((getPalettepos() != -1) && (getPalettepos() >= pos)) setPalettepos(
palettepos - 1 );
if (getExternsheetPos() >= pos) setExternsheetPos( getExternsheetPos() -1);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
