vgritsenko 2002/07/22 08:18:57
Modified:
src/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements
EPCell.java EPRowInfo.java Row.java Sheet.java
Added: lib/optional jakarta-poi-1.7.0-dev-20020624.jar
Removed: lib/optional jakarta-poi-1.6.0-dev-20020505.jar
Log:
Bug #10411
Submitted by: [EMAIL PROTECTED] (Andy Oliver)
Revision Changes Path
1.5 +1 -1
xml-cocoon2/src/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EPCell.java
Index: EPCell.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EPCell.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- EPCell.java 26 Apr 2002 14:09:22 -0000 1.4
+++ EPCell.java 22 Jul 2002 15:18:56 -0000 1.5
@@ -272,7 +272,7 @@
}
catch (NullPointerException ignored) {
}
- _cell = getSheet().getRow(( short ) getRow()).createCell(getColumn(),
+ _cell = getSheet().getRow(getRow()).createCell(getColumn(),
cellType);
1.2 +1 -1
xml-cocoon2/src/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EPRowInfo.java
Index: EPRowInfo.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EPRowInfo.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EPRowInfo.java 6 Mar 2002 16:58:02 -0000 1.1
+++ EPRowInfo.java 22 Jul 2002 15:18:57 -0000 1.2
@@ -322,6 +322,6 @@
{
throw new IOException("Illegal row value: " + row);
}
- getSheet().getRow(( short ) row).setHeight(getPoints());
+ getSheet().getRow(row).setHeight(getPoints());
}
} // end public class EPRowInfo
1.2 +0 -2
xml-cocoon2/src/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/Row.java
Index: Row.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/Row.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Row.java 6 Mar 2002 16:58:02 -0000 1.1
+++ Row.java 22 Jul 2002 15:18:57 -0000 1.2
@@ -133,9 +133,7 @@
Cell retval = new Cell(_row
.createCell(( short ) column, CellType
.convertCellType(cellType)), cellType);
-
retval.setStyle(_sheet.getCellStyleForRegion(_row.getRowNum(),
(short)column));
-
return retval;
}
1.3 +7 -8
xml-cocoon2/src/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/Sheet.java
Index: Sheet.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/Sheet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Sheet.java 6 Jun 2002 14:28:13 -0000 1.2
+++ Sheet.java 22 Jul 2002 15:18:57 -0000 1.3
@@ -255,20 +255,20 @@
* @exception IOException if rowNo is out of range
*/
- Row getRow(short rowNo)
+ Row getRow(int rowNo)
throws IOException
{
if (rowNo < 0)
{
throw new IOException("Illegal row number: " + rowNo);
}
- Short key = new Short(rowNo);
+ Short key = new Short((short)rowNo);
Object o = _rows.get(key);
Row rval = null;
if (o == null)
{
- rval = createRow(rowNo);
+ rval = createRow((int)rowNo);
_rows.put(key, rval);
}
else
@@ -319,9 +319,8 @@
* expect that then your code dies a horrible death.
* @return HSSFCellStyle
*/
- HSSFCellStyle getCellStyleForRegion(short row, short col) {
+ HSSFCellStyle getCellStyleForRegion(int row, short col) {
Iterator iregions = regions.keySet().iterator();
-
while (iregions.hasNext()) {
Region region = ((Region) iregions.next());
// if (col == 1)
@@ -336,9 +335,9 @@
}
- private Row createRow(final short rowNo)
+ private Row createRow(final int rowNo)
{
- return new Row(_sheet.createRow(rowNo), this);
+ return new Row(_sheet.createRow((int)rowNo), this);
}
private boolean isValidPoints(double points)
@@ -391,7 +390,7 @@
if (rownum > Short.MAX_VALUE)
{ rownum = Short.MAX_VALUE; }
- row = _sheet.createRow((short)rownum);
+ row = _sheet.createRow((int)rownum);
}
HSSFCell cell = row.getCell(colnum);
1.1 xml-cocoon2/lib/optional/jakarta-poi-1.7.0-dev-20020624.jar
<<Binary file>>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
