Apply patch from bug #51476 - Correct XSSF cell formatting in HTML export
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1144331 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
7f5bd44d98
commit
fa1e0a0b1d
@ -34,6 +34,7 @@
|
|||||||
|
|
||||||
<changes>
|
<changes>
|
||||||
<release version="3.8-beta4" date="2011-??-??">
|
<release version="3.8-beta4" date="2011-??-??">
|
||||||
|
<action dev="poi-developers" type="fix">51476 - Correct XSSF cell formatting in HTML export</action>
|
||||||
<action dev="poi-developers" type="add">51486 - XWPF support for adding new footnotes</action>
|
<action dev="poi-developers" type="add">51486 - XWPF support for adding new footnotes</action>
|
||||||
<action dev="poi-developers" type="fix">48065 - Problems with save output of HWPF (losing formatting)</action>
|
<action dev="poi-developers" type="fix">48065 - Problems with save output of HWPF (losing formatting)</action>
|
||||||
<action dev="poi-developers" type="fix">47563 - Exception when working with table</action>
|
<action dev="poi-developers" type="fix">47563 - Exception when working with table</action>
|
||||||
|
@ -58,7 +58,11 @@ public class XSSFHtmlHelper implements HtmlHelper {
|
|||||||
// support it will ignore the rgba specification and stick with the
|
// support it will ignore the rgba specification and stick with the
|
||||||
// solid color, which is declared first
|
// solid color, which is declared first
|
||||||
out.format(" %s: #%02x%02x%02x;%n", attr, rgb[0], rgb[1], rgb[2]);
|
out.format(" %s: #%02x%02x%02x;%n", attr, rgb[0], rgb[1], rgb[2]);
|
||||||
|
byte[] argb = color.getARgb();
|
||||||
|
if (argb == null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
out.format(" %s: rgba(0x%02x, 0x%02x, 0x%02x, 0x%02x);%n", attr,
|
out.format(" %s: rgba(0x%02x, 0x%02x, 0x%02x, 0x%02x);%n", attr,
|
||||||
rgb[0], rgb[1], rgb[2], rgb[3]);
|
argb[3], argb[0], argb[1], argb[2]);
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -212,7 +212,7 @@ public class CellFormat {
|
|||||||
case Cell.CELL_TYPE_BLANK:
|
case Cell.CELL_TYPE_BLANK:
|
||||||
return apply("");
|
return apply("");
|
||||||
case Cell.CELL_TYPE_BOOLEAN:
|
case Cell.CELL_TYPE_BOOLEAN:
|
||||||
return apply(c.getStringCellValue());
|
return apply(Boolean.toString(c.getBooleanCellValue()));
|
||||||
case Cell.CELL_TYPE_NUMERIC:
|
case Cell.CELL_TYPE_NUMERIC:
|
||||||
return apply(c.getNumericCellValue());
|
return apply(c.getNumericCellValue());
|
||||||
case Cell.CELL_TYPE_STRING:
|
case Cell.CELL_TYPE_STRING:
|
||||||
@ -254,7 +254,7 @@ public class CellFormat {
|
|||||||
case Cell.CELL_TYPE_BLANK:
|
case Cell.CELL_TYPE_BLANK:
|
||||||
return apply(label, "");
|
return apply(label, "");
|
||||||
case Cell.CELL_TYPE_BOOLEAN:
|
case Cell.CELL_TYPE_BOOLEAN:
|
||||||
return apply(label, c.getStringCellValue());
|
return apply(Boolean.toString(c.getBooleanCellValue()));
|
||||||
case Cell.CELL_TYPE_NUMERIC:
|
case Cell.CELL_TYPE_NUMERIC:
|
||||||
return apply(label, c.getNumericCellValue());
|
return apply(label, c.getNumericCellValue());
|
||||||
case Cell.CELL_TYPE_STRING:
|
case Cell.CELL_TYPE_STRING:
|
||||||
|
Loading…
Reference in New Issue
Block a user