moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Bug 61882 - Some paths can create an XSSFColor instance with a null CTColor reference

Browse Source 
Protect against this in the future by introducing a factory method to create XSSFColor instances from a CTColor instance and the associated workbook style indexed color map.

If the CTColor instance is null, the factory returns null.  All callers already are prepared for a null instance, but many had their own null check on the CTColor object.  This centralizes that.

This also further forces the requirement for the indexed color map.  Any time a color is created, the workbook or styleTable is available in the same context, so passing this is extra parameter is trivial and allows XSSFColor to properly reference custom/themed indexed colors.

Did not remove any methods yet, only deprecated them.  Changed the signature to one internal test-only constructor.

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1817796 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Greg Woolsey 2017-12-11 17:30:04 +00:00
parent 185a66aed5
commit 11e60eb77e
23 changed files with 114 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/examples/src/org/apache/poi/xssf/usermodel/examples/CalendarDemo.java
View File

@ -140,7 +140,7 @@ public class CalendarDemo {
XSSFCellStyle style; XSSFCellStyle style;
XSSFFont titleFont = wb.createFont(); XSSFFont titleFont = wb.createFont();
titleFont.setFontHeightInPoints((short)48); titleFont.setFontHeightInPoints((short)48);
titleFont.setColor(new XSSFColor(new java.awt.Color(39, 51, 89))); titleFont.setColor(new XSSFColor(new java.awt.Color(39, 51, 89), wb.getStylesSource().getIndexedColors()));
style = wb.createCellStyle(); style = wb.createCellStyle();
style.setAlignment(HorizontalAlignment.CENTER); style.setAlignment(HorizontalAlignment.CENTER);
style.setVerticalAlignment(VerticalAlignment.CENTER); style.setVerticalAlignment(VerticalAlignment.CENTER);
@ -149,12 +149,12 @@ public class CalendarDemo {
XSSFFont monthFont = wb.createFont(); XSSFFont monthFont = wb.createFont();
monthFont.setFontHeightInPoints((short)12); monthFont.setFontHeightInPoints((short)12);
monthFont.setColor(new XSSFColor(new java.awt.Color(255, 255, 255))); monthFont.setColor(new XSSFColor(new java.awt.Color(255, 255, 255), wb.getStylesSource().getIndexedColors()));
monthFont.setBold(true); monthFont.setBold(true);
style = wb.createCellStyle(); style = wb.createCellStyle();
style.setAlignment(HorizontalAlignment.CENTER); style.setAlignment(HorizontalAlignment.CENTER);
style.setVerticalAlignment(VerticalAlignment.CENTER); style.setVerticalAlignment(VerticalAlignment.CENTER);
style.setFillForegroundColor(new XSSFColor(new java.awt.Color(39, 51, 89))); style.setFillForegroundColor(new XSSFColor(new java.awt.Color(39, 51, 89), wb.getStylesSource().getIndexedColors()));
style.setFillPattern(FillPatternType.SOLID_FOREGROUND); style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
style.setFont(monthFont); style.setFont(monthFont);
styles.put("month", style); styles.put("month", style);
@ -165,64 +165,64 @@ public class CalendarDemo {
style = wb.createCellStyle(); style = wb.createCellStyle();
style.setAlignment(HorizontalAlignment.LEFT); style.setAlignment(HorizontalAlignment.LEFT);
style.setVerticalAlignment(VerticalAlignment.TOP); style.setVerticalAlignment(VerticalAlignment.TOP);
style.setFillForegroundColor(new XSSFColor(new java.awt.Color(228, 232, 243))); style.setFillForegroundColor(new XSSFColor(new java.awt.Color(228, 232, 243), wb.getStylesSource().getIndexedColors()));
style.setFillPattern(FillPatternType.SOLID_FOREGROUND); style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
style.setBorderLeft(BorderStyle.THIN); style.setBorderLeft(BorderStyle.THIN);
style.setLeftBorderColor(new XSSFColor(new java.awt.Color(39, 51, 89))); style.setLeftBorderColor(new XSSFColor(new java.awt.Color(39, 51, 89), wb.getStylesSource().getIndexedColors()));
style.setBorderBottom(BorderStyle.THIN); style.setBorderBottom(BorderStyle.THIN);
style.setBottomBorderColor(new XSSFColor(new java.awt.Color(39, 51, 89))); style.setBottomBorderColor(new XSSFColor(new java.awt.Color(39, 51, 89), wb.getStylesSource().getIndexedColors()));
style.setFont(dayFont); style.setFont(dayFont);
styles.put("weekend_left", style); styles.put("weekend_left", style);
style = wb.createCellStyle(); style = wb.createCellStyle();
style.setAlignment(HorizontalAlignment.CENTER); style.setAlignment(HorizontalAlignment.CENTER);
style.setVerticalAlignment(VerticalAlignment.TOP); style.setVerticalAlignment(VerticalAlignment.TOP);
style.setFillForegroundColor(new XSSFColor(new java.awt.Color(228, 232, 243))); style.setFillForegroundColor(new XSSFColor(new java.awt.Color(228, 232, 243), wb.getStylesSource().getIndexedColors()));
style.setFillPattern(FillPatternType.SOLID_FOREGROUND); style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
style.setBorderRight(BorderStyle.THIN); style.setBorderRight(BorderStyle.THIN);
style.setRightBorderColor(new XSSFColor(new java.awt.Color(39, 51, 89))); style.setRightBorderColor(new XSSFColor(new java.awt.Color(39, 51, 89), wb.getStylesSource().getIndexedColors()));
style.setBorderBottom(BorderStyle.THIN); style.setBorderBottom(BorderStyle.THIN);
style.setBottomBorderColor(new XSSFColor(new java.awt.Color(39, 51, 89))); style.setBottomBorderColor(new XSSFColor(new java.awt.Color(39, 51, 89), wb.getStylesSource().getIndexedColors()));
styles.put("weekend_right", style); styles.put("weekend_right", style);
style = wb.createCellStyle(); style = wb.createCellStyle();
style.setAlignment(HorizontalAlignment.LEFT); style.setAlignment(HorizontalAlignment.LEFT);
style.setVerticalAlignment(VerticalAlignment.TOP); style.setVerticalAlignment(VerticalAlignment.TOP);
style.setBorderLeft(BorderStyle.THIN); style.setBorderLeft(BorderStyle.THIN);
style.setFillForegroundColor(new XSSFColor(new java.awt.Color(255, 255, 255))); style.setFillForegroundColor(new XSSFColor(new java.awt.Color(255, 255, 255), wb.getStylesSource().getIndexedColors()));
style.setFillPattern(FillPatternType.SOLID_FOREGROUND); style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
style.setLeftBorderColor(new XSSFColor(new java.awt.Color(39, 51, 89))); style.setLeftBorderColor(new XSSFColor(new java.awt.Color(39, 51, 89), wb.getStylesSource().getIndexedColors()));
style.setBorderBottom(BorderStyle.THIN); style.setBorderBottom(BorderStyle.THIN);
style.setBottomBorderColor(new XSSFColor(new java.awt.Color(39, 51, 89))); style.setBottomBorderColor(new XSSFColor(new java.awt.Color(39, 51, 89), wb.getStylesSource().getIndexedColors()));
style.setFont(dayFont); style.setFont(dayFont);
styles.put("workday_left", style); styles.put("workday_left", style);
style = wb.createCellStyle(); style = wb.createCellStyle();
style.setAlignment(HorizontalAlignment.CENTER); style.setAlignment(HorizontalAlignment.CENTER);
style.setVerticalAlignment(VerticalAlignment.TOP); style.setVerticalAlignment(VerticalAlignment.TOP);
style.setFillForegroundColor(new XSSFColor(new java.awt.Color(255, 255, 255))); style.setFillForegroundColor(new XSSFColor(new java.awt.Color(255, 255, 255), wb.getStylesSource().getIndexedColors()));
style.setFillPattern(FillPatternType.SOLID_FOREGROUND); style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
style.setBorderRight(BorderStyle.THIN); style.setBorderRight(BorderStyle.THIN);
style.setRightBorderColor(new XSSFColor(new java.awt.Color(39, 51, 89))); style.setRightBorderColor(new XSSFColor(new java.awt.Color(39, 51, 89), wb.getStylesSource().getIndexedColors()));
style.setBorderBottom(BorderStyle.THIN); style.setBorderBottom(BorderStyle.THIN);
style.setBottomBorderColor(new XSSFColor(new java.awt.Color(39, 51, 89))); style.setBottomBorderColor(new XSSFColor(new java.awt.Color(39, 51, 89), wb.getStylesSource().getIndexedColors()));
styles.put("workday_right", style); styles.put("workday_right", style);
style = wb.createCellStyle(); style = wb.createCellStyle();
style.setBorderLeft(BorderStyle.THIN); style.setBorderLeft(BorderStyle.THIN);
style.setFillForegroundColor(new XSSFColor(new java.awt.Color(234, 234, 234))); style.setFillForegroundColor(new XSSFColor(new java.awt.Color(234, 234, 234), wb.getStylesSource().getIndexedColors()));
style.setFillPattern(FillPatternType.SOLID_FOREGROUND); style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
style.setBorderBottom(BorderStyle.THIN); style.setBorderBottom(BorderStyle.THIN);
style.setBottomBorderColor(new XSSFColor(new java.awt.Color(39, 51, 89))); style.setBottomBorderColor(new XSSFColor(new java.awt.Color(39, 51, 89), wb.getStylesSource().getIndexedColors()));
styles.put("grey_left", style); styles.put("grey_left", style);
style = wb.createCellStyle(); style = wb.createCellStyle();
style.setFillForegroundColor(new XSSFColor(new java.awt.Color(234, 234, 234))); style.setFillForegroundColor(new XSSFColor(new java.awt.Color(234, 234, 234), wb.getStylesSource().getIndexedColors()));
style.setFillPattern(FillPatternType.SOLID_FOREGROUND); style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
style.setBorderRight(BorderStyle.THIN); style.setBorderRight(BorderStyle.THIN);
style.setRightBorderColor(new XSSFColor(new java.awt.Color(39, 51, 89))); style.setRightBorderColor(new XSSFColor(new java.awt.Color(39, 51, 89), wb.getStylesSource().getIndexedColors()));
style.setBorderBottom(BorderStyle.THIN); style.setBorderBottom(BorderStyle.THIN);
style.setBottomBorderColor(new XSSFColor(new java.awt.Color(39, 51, 89))); style.setBottomBorderColor(new XSSFColor(new java.awt.Color(39, 51, 89), wb.getStylesSource().getIndexedColors()));
styles.put("grey_right", style); styles.put("grey_right", style);
return styles; return styles;

6
src/examples/src/org/apache/poi/xssf/usermodel/examples/WorkingWithRichText.java
View File

@ -37,17 +37,17 @@ public class WorkingWithRichText {
XSSFFont font1 = wb.createFont(); XSSFFont font1 = wb.createFont();
font1.setBold(true); font1.setBold(true);
font1.setColor(new XSSFColor(new java.awt.Color(255, 0, 0))); font1.setColor(new XSSFColor(new java.awt.Color(255, 0, 0), wb.getStylesSource().getIndexedColors()));
rt.applyFont(0, 10, font1); rt.applyFont(0, 10, font1);
XSSFFont font2 = wb.createFont(); XSSFFont font2 = wb.createFont();
font2.setItalic(true); font2.setItalic(true);
font2.setUnderline(XSSFFont.U_DOUBLE); font2.setUnderline(XSSFFont.U_DOUBLE);
font2.setColor(new XSSFColor(new java.awt.Color(0, 255, 0))); font2.setColor(new XSSFColor(new java.awt.Color(0, 255, 0), wb.getStylesSource().getIndexedColors()));
rt.applyFont(10, 19, font2); rt.applyFont(10, 19, font2);
XSSFFont font3 = wb.createFont(); XSSFFont font3 = wb.createFont();
font3.setColor(new XSSFColor(new java.awt.Color(0, 0, 255))); font3.setColor(new XSSFColor(new java.awt.Color(0, 0, 255), wb.getStylesSource().getIndexedColors()));
rt.append(" Jumped over the lazy dog", font3); rt.append(" Jumped over the lazy dog", font3);
cell.setCellValue(rt); cell.setCellValue(rt);

2
src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFBorderFormatting.java
View File

@ -364,6 +364,6 @@ public class XSSFBorderFormatting implements BorderFormatting {
} }
private XSSFColor getColor(CTBorderPr pr) { private XSSFColor getColor(CTBorderPr pr) {
return pr == null ? null : new XSSFColor(pr.getColor(), _colorMap); return pr == null ? null : XSSFColor.from(pr.getColor(), _colorMap);
} }
} }

13
src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java
View File

@ -39,6 +39,7 @@ import org.apache.xmlbeans.XmlException;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTBorder; import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTBorder;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTBorderPr; import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTBorderPr;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCellAlignment; import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCellAlignment;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTColor;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTFill; import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTFill;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTFont; import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTFont;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTPatternFill; import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTPatternFill;
@ -755,7 +756,7 @@ public class XSSFCellStyle implements CellStyle {
*/ */
@Override @Override
public void setBottomBorderColor(short color) { public void setBottomBorderColor(short color) {
XSSFColor clr = new XSSFColor(); XSSFColor clr = XSSFColor.from(CTColor.Factory.newInstance(), _stylesSource.getIndexedColors());
clr.setIndexed(color); clr.setIndexed(color);
setBottomBorderColor(clr); setBottomBorderColor(clr);
} }
@ -865,7 +866,7 @@ public class XSSFCellStyle implements CellStyle {
*/ */
@Override @Override
public void setFillBackgroundColor(short bg) { public void setFillBackgroundColor(short bg) {
XSSFColor clr = new XSSFColor(); XSSFColor clr = XSSFColor.from(CTColor.Factory.newInstance(), _stylesSource.getIndexedColors());
clr.setIndexed(bg); clr.setIndexed(bg);
setFillBackgroundColor(clr); setFillBackgroundColor(clr);
} }
@ -900,7 +901,7 @@ public class XSSFCellStyle implements CellStyle {
*/ */
@Override @Override
public void setFillForegroundColor(short fg) { public void setFillForegroundColor(short fg) {
XSSFColor clr = new XSSFColor(); XSSFColor clr = XSSFColor.from(CTColor.Factory.newInstance(), _stylesSource.getIndexedColors());
clr.setIndexed(fg); clr.setIndexed(fg);
setFillForegroundColor(clr); setFillForegroundColor(clr);
} }
@ -1027,7 +1028,7 @@ public class XSSFCellStyle implements CellStyle {
*/ */
@Override @Override
public void setLeftBorderColor(short color) { public void setLeftBorderColor(short color) {
XSSFColor clr = new XSSFColor(); XSSFColor clr = XSSFColor.from(CTColor.Factory.newInstance(), _stylesSource.getIndexedColors());
clr.setIndexed(color); clr.setIndexed(color);
setLeftBorderColor(clr); setLeftBorderColor(clr);
} }
@ -1082,7 +1083,7 @@ public class XSSFCellStyle implements CellStyle {
*/ */
@Override @Override
public void setRightBorderColor(short color) { public void setRightBorderColor(short color) {
XSSFColor clr = new XSSFColor(); XSSFColor clr = XSSFColor.from(CTColor.Factory.newInstance(), _stylesSource.getIndexedColors());
clr.setIndexed(color); clr.setIndexed(color);
setRightBorderColor(clr); setRightBorderColor(clr);
} }
@ -1139,7 +1140,7 @@ public class XSSFCellStyle implements CellStyle {
*/ */
@Override @Override
public void setTopBorderColor(short color) { public void setTopBorderColor(short color) {
XSSFColor clr = new XSSFColor(); XSSFColor clr = XSSFColor.from(CTColor.Factory.newInstance(), _stylesSource.getIndexedColors());
clr.setIndexed(color); clr.setIndexed(color);
setTopBorderColor(clr); setTopBorderColor(clr);
} }

35
src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFColor.java
View File

@ -32,6 +32,15 @@ public class XSSFColor extends ExtendedColor {
private final CTColor ctColor; private final CTColor ctColor;
private final IndexedColorMap indexedColorMap; private final IndexedColorMap indexedColorMap;
/**
* @param color
* @param map
* @return null if color is null, new instance otherwise
*/
public static XSSFColor from(CTColor color, IndexedColorMap map) {
return color == null ? null : new XSSFColor(color, map);
}
/** /**
* Create an instance of XSSFColor from the supplied XML bean, with default color indexes * Create an instance of XSSFColor from the supplied XML bean, with default color indexes
* @param color The {@link CTColor} to use as color-value. * @param color The {@link CTColor} to use as color-value.
@ -47,7 +56,9 @@ public class XSSFColor extends ExtendedColor {
* Create an instance of XSSFColor from the supplied XML bean, with the given color indexes * Create an instance of XSSFColor from the supplied XML bean, with the given color indexes
* @param color The {@link CTColor} to use as color-value. * @param color The {@link CTColor} to use as color-value.
* @param map The IndexedColorMap to use instead of the default one * @param map The IndexedColorMap to use instead of the default one
* @deprecated 4.0.0 - use the factory {@link #from(CTColor, IndexedColorMap)} method instead to check for null CTColor instances. Make private eventually
*/ */
@Deprecated
public XSSFColor(CTColor color, IndexedColorMap map) { public XSSFColor(CTColor color, IndexedColorMap map) {
this.ctColor = color; this.ctColor = color;
this.indexedColorMap = map; this.indexedColorMap = map;
@ -56,17 +67,31 @@ public class XSSFColor extends ExtendedColor {
/** /**
* Create an new instance of XSSFColor, without knowledge of any custom indexed colors. * Create an new instance of XSSFColor, without knowledge of any custom indexed colors.
* This is OK for just transiently setting indexes, etc. but is discouraged in read/get uses * This is OK for just transiently setting indexes, etc. but is discouraged in read/get uses
* @deprecated as of 4.0.0, we want to have the indexed map, and all calling contexts have access to it.
* @see #XSSFColor(IndexedColorMap)
* @see #from(CTColor, IndexedColorMap)
*/ */
@Deprecated
@Removal(version="4.1")
public XSSFColor() { public XSSFColor() {
this(CTColor.Factory.newInstance(), null); this(CTColor.Factory.newInstance(), new DefaultIndexedColorMap());
} }
/** /**
* TEST ONLY - does not know about custom indexed colors * new color with the given indexed color map
* @param clr awt Color * @param colorMap
*/ */
public XSSFColor(java.awt.Color clr) { public XSSFColor(IndexedColorMap colorMap) {
this(); this(CTColor.Factory.newInstance(), colorMap);
}
/**
* TEST ONLY
* @param clr awt Color
* @param map
*/
public XSSFColor(java.awt.Color clr, IndexedColorMap map) {
this(map);
setColor(clr); setColor(clr);
} }

4
src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFColorScaleFormatting.java
View File

@ -56,7 +56,7 @@ public class XSSFColorScaleFormatting implements ColorScaleFormatting {
CTColor[] ctcols = _scale.getColorArray(); CTColor[] ctcols = _scale.getColorArray();
XSSFColor[] c = new XSSFColor[ctcols.length]; XSSFColor[] c = new XSSFColor[ctcols.length];
for (int i=0; i<ctcols.length; i++) { for (int i=0; i<ctcols.length; i++) {
c[i] = new XSSFColor(ctcols[i], _indexedColorMap); c[i] = XSSFColor.from(ctcols[i], _indexedColorMap);
} }
return c; return c;
} }
@ -89,7 +89,7 @@ public class XSSFColorScaleFormatting implements ColorScaleFormatting {
* @return color from scale * @return color from scale
*/ */
public XSSFColor createColor() { public XSSFColor createColor() {
return new XSSFColor(_scale.addNewColor(), _indexedColorMap); return XSSFColor.from(_scale.addNewColor(), _indexedColorMap);
} }
public XSSFConditionalFormattingThreshold createThreshold() { public XSSFConditionalFormattingThreshold createThreshold() {
return new XSSFConditionalFormattingThreshold(_scale.addNewCfvo()); return new XSSFConditionalFormattingThreshold(_scale.addNewCfvo());

2
src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCreationHelper.java
View File

@ -54,7 +54,7 @@ public class XSSFCreationHelper implements CreationHelper {
@Override @Override
public XSSFColor createExtendedColor() { public XSSFColor createExtendedColor() {
return new XSSFColor(CTColor.Factory.newInstance(), workbook.getStylesSource().getIndexedColors()); return XSSFColor.from(CTColor.Factory.newInstance(), workbook.getStylesSource().getIndexedColors());
} }
/** /**

2
src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDataBarFormatting.java
View File

@ -66,7 +66,7 @@ public class XSSFDataBarFormatting implements DataBarFormatting {
} }
public XSSFColor getColor() { public XSSFColor getColor() {
return new XSSFColor(_databar.getColor(), _colorMap); return XSSFColor.from(_databar.getColor(), _colorMap);
} }
public void setColor(Color color) { public void setColor(Color color) {
_databar.setColor( ((XSSFColor)color).getCTColor() ); _databar.setColor( ((XSSFColor)color).getCTColor() );

2
src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFont.java
View File

@ -157,7 +157,7 @@ public class XSSFFont implements Font {
public XSSFColor getXSSFColor() { public XSSFColor getXSSFColor() {
CTColor ctColor = _ctFont.sizeOfColorArray() == 0 ? null : _ctFont.getColorArray(0); CTColor ctColor = _ctFont.sizeOfColorArray() == 0 ? null : _ctFont.getColorArray(0);
if(ctColor != null) { if(ctColor != null) {
XSSFColor color = new XSSFColor(ctColor, _indexedColorMap); XSSFColor color = XSSFColor.from(ctColor, _indexedColorMap);
if(_themes != null) { if(_themes != null) {
_themes.inheritFromThemeAsRequired(color); _themes.inheritFromThemeAsRequired(color);
} }

2
src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFontFormatting.java
View File

@ -113,7 +113,7 @@ public class XSSFFontFormatting implements FontFormatting {
public XSSFColor getFontColor() { public XSSFColor getFontColor() {
if(_font.sizeOfColorArray() == 0) return null; if(_font.sizeOfColorArray() == 0) return null;
return new XSSFColor(_font.getColorArray(0), _colorMap); return XSSFColor.from(_font.getColorArray(0), _colorMap);
} }
@Override @Override

4
src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPatternFormatting.java
View File

@ -39,12 +39,12 @@ public class XSSFPatternFormatting implements PatternFormatting {
public XSSFColor getFillBackgroundColorColor() { public XSSFColor getFillBackgroundColorColor() {
if(!_fill.isSetPatternFill()) return null; if(!_fill.isSetPatternFill()) return null;
return new XSSFColor(_fill.getPatternFill().getBgColor(), _colorMap); return XSSFColor.from(_fill.getPatternFill().getBgColor(), _colorMap);
} }
public XSSFColor getFillForegroundColorColor() { public XSSFColor getFillForegroundColorColor() {
if(!_fill.isSetPatternFill() || ! _fill.getPatternFill().isSetFgColor()) if(!_fill.isSetPatternFill() || ! _fill.getPatternFill().isSetFgColor())
return null; return null;
return new XSSFColor(_fill.getPatternFill().getFgColor(), _colorMap); return XSSFColor.from(_fill.getPatternFill().getFgColor(), _colorMap);
} }
public short getFillPattern() { public short getFillPattern() {

2
src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
View File

@ -4022,7 +4022,7 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
if (!pr.isSetTabColor()) { if (!pr.isSetTabColor()) {
return null; return null;
} }
return new XSSFColor(pr.getTabColor(), getWorkbook().getStylesSource().getIndexedColors()); return XSSFColor.from(pr.getTabColor(), getWorkbook().getStylesSource().getIndexedColors());
} }
/** /**

2
src/ooxml/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellBorder.java
View File

@ -133,7 +133,7 @@ public class XSSFCellBorder {
CTBorderPr borderPr = getBorder(side); CTBorderPr borderPr = getBorder(side);
if(borderPr != null && borderPr.isSetColor()) { if(borderPr != null && borderPr.isSetColor()) {
XSSFColor clr = new XSSFColor(borderPr.getColor(), _indexedColorMap); XSSFColor clr = XSSFColor.from(borderPr.getColor(), _indexedColorMap);
if(_theme != null) { if(_theme != null) {
_theme.inheritFromThemeAsRequired(clr); _theme.inheritFromThemeAsRequired(clr);
} }

16
src/ooxml/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellFill.java
View File

@ -60,7 +60,7 @@ public final class XSSFCellFill {
if (ptrn == null) return null; if (ptrn == null) return null;
CTColor ctColor = ptrn.getBgColor(); CTColor ctColor = ptrn.getBgColor();
return ctColor == null ? null : new XSSFColor(ctColor, _indexedColorMap); return XSSFColor.from(ctColor, _indexedColorMap);
} }
/** /**
@ -81,7 +81,11 @@ public final class XSSFCellFill {
*/ */
public void setFillBackgroundColor(XSSFColor color) { public void setFillBackgroundColor(XSSFColor color) {
CTPatternFill ptrn = ensureCTPatternFill(); CTPatternFill ptrn = ensureCTPatternFill();
ptrn.setBgColor(color.getCTColor()); if (color == null) {
ptrn.unsetBgColor();
} else {
ptrn.setBgColor(color.getCTColor());
}
} }
/** /**
@ -94,7 +98,7 @@ public final class XSSFCellFill {
if (ptrn == null) return null; if (ptrn == null) return null;
CTColor ctColor = ptrn.getFgColor(); CTColor ctColor = ptrn.getFgColor();
return ctColor == null ? null : new XSSFColor(ctColor, _indexedColorMap); return XSSFColor.from(ctColor, _indexedColorMap);
} }
/** /**
@ -115,7 +119,11 @@ public final class XSSFCellFill {
*/ */
public void setFillForegroundColor(XSSFColor color) { public void setFillForegroundColor(XSSFColor color) {
CTPatternFill ptrn = ensureCTPatternFill(); CTPatternFill ptrn = ensureCTPatternFill();
ptrn.setFgColor(color.getCTColor()); if (color == null) {
ptrn.unsetFgColor();
} else {
ptrn.setFgColor(color.getCTColor());
}
} }
/** /**

4
src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
View File

@ -2921,7 +2921,7 @@ public final class TestXSSFBugs extends BaseTestBugzillaIssues {
XSSFWorkbook workbook = new XSSFWorkbook(); XSSFWorkbook workbook = new XSSFWorkbook();
XSSFCell cell = workbook.createSheet().createRow(0).createCell(0); XSSFCell cell = workbook.createSheet().createRow(0).createCell(0);
XSSFColor color = new XSSFColor(java.awt.Color.RED); XSSFColor color = new XSSFColor(java.awt.Color.RED, workbook.getStylesSource().getIndexedColors());
XSSFCellStyle style = workbook.createCellStyle(); XSSFCellStyle style = workbook.createCellStyle();
style.setFillForegroundColor(color); style.setFillForegroundColor(color);
style.setFillPattern(FillPatternType.SOLID_FOREGROUND); style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
@ -2941,7 +2941,7 @@ public final class TestXSSFBugs extends BaseTestBugzillaIssues {
XSSFWorkbook nwb = XSSFTestDataSamples.writeOutAndReadBack(workbook); XSSFWorkbook nwb = XSSFTestDataSamples.writeOutAndReadBack(workbook);
workbook.close(); workbook.close();
XSSFCell ncell = nwb.getSheetAt(0).getRow(0).getCell(0); XSSFCell ncell = nwb.getSheetAt(0).getRow(0).getCell(0);
XSSFColor ncolor = new XSSFColor(java.awt.Color.RED); XSSFColor ncolor = new XSSFColor(java.awt.Color.RED, workbook.getStylesSource().getIndexedColors());
// Now the cell is all black // Now the cell is all black
XSSFColor nactual = ncell.getCellStyle().getFillBackgroundColorColor(); XSSFColor nactual = ncell.getCellStyle().getFillBackgroundColorColor();

10
src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFCellStyle.java
View File

@ -359,7 +359,7 @@ public class TestXSSFCellStyle {
//setting XSSFColor //setting XSSFColor
num = stylesTable.getBorders().size(); num = stylesTable.getBorders().size();
clr = new XSSFColor(java.awt.Color.CYAN); clr = new XSSFColor(java.awt.Color.CYAN, stylesTable.getIndexedColors());
cellStyle.setBottomBorderColor(clr); cellStyle.setBottomBorderColor(clr);
assertEquals(clr.getCTColor().toString(), cellStyle.getBottomBorderXSSFColor().getCTColor().toString()); assertEquals(clr.getCTColor().toString(), cellStyle.getBottomBorderXSSFColor().getCTColor().toString());
byte[] rgb = cellStyle.getBottomBorderXSSFColor().getRGB(); byte[] rgb = cellStyle.getBottomBorderXSSFColor().getRGB();
@ -400,7 +400,7 @@ public class TestXSSFCellStyle {
//setting XSSFColor //setting XSSFColor
num = stylesTable.getBorders().size(); num = stylesTable.getBorders().size();
clr = new XSSFColor(java.awt.Color.CYAN); clr = new XSSFColor(java.awt.Color.CYAN, stylesTable.getIndexedColors());
cellStyle.setTopBorderColor(clr); cellStyle.setTopBorderColor(clr);
assertEquals(clr.getCTColor().toString(), cellStyle.getTopBorderXSSFColor().getCTColor().toString()); assertEquals(clr.getCTColor().toString(), cellStyle.getTopBorderXSSFColor().getCTColor().toString());
byte[] rgb = cellStyle.getTopBorderXSSFColor().getRGB(); byte[] rgb = cellStyle.getTopBorderXSSFColor().getRGB();
@ -441,7 +441,7 @@ public class TestXSSFCellStyle {
//setting XSSFColor //setting XSSFColor
num = stylesTable.getBorders().size(); num = stylesTable.getBorders().size();
clr = new XSSFColor(java.awt.Color.CYAN); clr = new XSSFColor(java.awt.Color.CYAN, stylesTable.getIndexedColors());
cellStyle.setLeftBorderColor(clr); cellStyle.setLeftBorderColor(clr);
assertEquals(clr.getCTColor().toString(), cellStyle.getLeftBorderXSSFColor().getCTColor().toString()); assertEquals(clr.getCTColor().toString(), cellStyle.getLeftBorderXSSFColor().getCTColor().toString());
byte[] rgb = cellStyle.getLeftBorderXSSFColor().getRGB(); byte[] rgb = cellStyle.getLeftBorderXSSFColor().getRGB();
@ -482,7 +482,7 @@ public class TestXSSFCellStyle {
//setting XSSFColor //setting XSSFColor
num = stylesTable.getBorders().size(); num = stylesTable.getBorders().size();
clr = new XSSFColor(java.awt.Color.CYAN); clr = new XSSFColor(java.awt.Color.CYAN, stylesTable.getIndexedColors());
cellStyle.setRightBorderColor(clr); cellStyle.setRightBorderColor(clr);
assertEquals(clr.getCTColor().toString(), cellStyle.getRightBorderXSSFColor().getCTColor().toString()); assertEquals(clr.getCTColor().toString(), cellStyle.getRightBorderXSSFColor().getCTColor().toString());
byte[] rgb = cellStyle.getRightBorderXSSFColor().getRGB(); byte[] rgb = cellStyle.getRightBorderXSSFColor().getRGB();
@ -523,7 +523,7 @@ public class TestXSSFCellStyle {
//setting XSSFColor //setting XSSFColor
num = stylesTable.getFills().size(); num = stylesTable.getFills().size();
clr = new XSSFColor(java.awt.Color.CYAN); clr = new XSSFColor(java.awt.Color.CYAN, stylesTable.getIndexedColors());
cellStyle.setFillBackgroundColor(clr); cellStyle.setFillBackgroundColor(clr);
assertEquals(clr.getCTColor().toString(), cellStyle.getFillBackgroundXSSFColor().getCTColor().toString()); assertEquals(clr.getCTColor().toString(), cellStyle.getFillBackgroundXSSFColor().getCTColor().toString());
byte[] rgb = cellStyle.getFillBackgroundXSSFColor().getRGB(); byte[] rgb = cellStyle.getFillBackgroundXSSFColor().getRGB();

4
src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFConditionalFormatting.java
View File

@ -70,7 +70,7 @@ public class TestXSSFConditionalFormatting extends BaseTestConditionalFormatting
@Test @Test
public void testFontFormattingColor() { public void testFontFormattingColor() {
Workbook wb = XSSFITestDataProvider.instance.createWorkbook(); XSSFWorkbook wb = XSSFITestDataProvider.instance.createWorkbook();
final Sheet sheet = wb.createSheet(); final Sheet sheet = wb.createSheet();
final SheetConditionalFormatting formatting = sheet.getSheetConditionalFormatting(); final SheetConditionalFormatting formatting = sheet.getSheetConditionalFormatting();
@ -101,7 +101,7 @@ public class TestXSSFConditionalFormatting extends BaseTestConditionalFormatting
assertEquals(-1, fontFmt.getFontColorIndex()); assertEquals(-1, fontFmt.getFontColorIndex());
//fontFmt.setFontColorIndex((short)11); //fontFmt.setFontColorIndex((short)11);
final ExtendedColor extendedColor = new XSSFColor(PEAK_ORANGE); final ExtendedColor extendedColor = new XSSFColor(PEAK_ORANGE, wb.getStylesSource().getIndexedColors());
fontFmt.setFontColor(extendedColor); fontFmt.setFontColor(extendedColor);
PatternFormatting patternFmt = formattingRule.createPatternFormatting(); PatternFormatting patternFmt = formattingRule.createPatternFormatting();

10
src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDrawing.java
View File

@ -223,7 +223,7 @@ public class TestXSSFDrawing {
XSSFRichTextString rt = new XSSFRichTextString("Test String"); XSSFRichTextString rt = new XSSFRichTextString("Test String");
XSSFFont font = wb.createFont(); XSSFFont font = wb.createFont();
font.setColor(new XSSFColor(new Color(0, 128, 128))); font.setColor(new XSSFColor(new Color(0, 128, 128), wb.getStylesSource().getIndexedColors()));
font.setItalic(true); font.setItalic(true);
font.setBold(true); font.setBold(true);
font.setUnderline(FontUnderline.SINGLE); font.setUnderline(FontUnderline.SINGLE);
@ -297,7 +297,7 @@ public class TestXSSFDrawing {
XSSFRichTextString rt = new XSSFRichTextString("Test String"); XSSFRichTextString rt = new XSSFRichTextString("Test String");
XSSFFont font = wb.createFont(); XSSFFont font = wb.createFont();
font.setColor(new XSSFColor(new Color(0, 128, 128))); font.setColor(new XSSFColor(new Color(0, 128, 128), wb.getStylesSource().getIndexedColors()));
font.setFontName("Arial"); font.setFontName("Arial");
rt.applyFont(font); rt.applyFont(font);
@ -328,7 +328,7 @@ public class TestXSSFDrawing {
XSSFRichTextString rt = new XSSFRichTextString("Test String"); XSSFRichTextString rt = new XSSFRichTextString("Test String");
XSSFFont font = wb.createFont(); XSSFFont font = wb.createFont();
font.setColor(new XSSFColor(new Color(0, 255, 255))); font.setColor(new XSSFColor(new Color(0, 255, 255), wb.getStylesSource().getIndexedColors()));
font.setFontName("Arial"); font.setFontName("Arial");
rt.applyFont(font); rt.applyFont(font);
@ -389,12 +389,12 @@ public class TestXSSFDrawing {
XSSFRichTextString rt = new XSSFRichTextString("Test Rich Text String"); XSSFRichTextString rt = new XSSFRichTextString("Test Rich Text String");
XSSFFont font = wb1.createFont(); XSSFFont font = wb1.createFont();
font.setColor(new XSSFColor(new Color(0, 255, 255))); font.setColor(new XSSFColor(new Color(0, 255, 255), wb1.getStylesSource().getIndexedColors()));
font.setFontName("Arial"); font.setFontName("Arial");
rt.applyFont(font); rt.applyFont(font);
XSSFFont midfont = wb1.createFont(); XSSFFont midfont = wb1.createFont();
midfont.setColor(new XSSFColor(new Color(0, 255, 0))); midfont.setColor(new XSSFColor(new Color(0, 255, 0), wb1.getStylesSource().getIndexedColors()));
rt.applyFont(5, 14, midfont); // set the text "Rich Text" to be green and the default font rt.applyFont(5, 14, midfont); // set the text "Rich Text" to be green and the default font
XSSFTextParagraph para = shape.addNewTextParagraph(rt); XSSFTextParagraph para = shape.addNewTextParagraph(rt);

2
src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFont.java
View File

@ -256,7 +256,7 @@ public final class TestXSSFFont extends BaseTestFont{
byte[] bytes = Integer.toHexString(0xF1F1F1).getBytes(LocaleUtil.CHARSET_1252); byte[] bytes = Integer.toHexString(0xF1F1F1).getBytes(LocaleUtil.CHARSET_1252);
color.setRgb(bytes); color.setRgb(bytes);
XSSFColor newColor=new XSSFColor(color, null); XSSFColor newColor=XSSFColor.from(color, null);
xssfFont.setColor(newColor); xssfFont.setColor(newColor);
assertEquals(ctFont.getColorArray(0).getRgb()[2],newColor.getRGB()[2]); assertEquals(ctFont.getColorArray(0).getRgb()[2],newColor.getRGB()[2]);

3
src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java
View File

@ -71,6 +71,7 @@ import org.junit.Test;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCalcPr; import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCalcPr;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCell; import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCell;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCol; import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCol;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTColor;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCols; import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCols;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTComments; import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTComments;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTIgnoredError; import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTIgnoredError;
@ -1924,7 +1925,7 @@ public final class TestXSSFSheet extends BaseTestXSheet {
assertEquals(expected, wb.getSheet("indexedRed").getTabColor()); assertEquals(expected, wb.getSheet("indexedRed").getTabColor());
// test regular-colored (non-indexed, ARGB) sheet // test regular-colored (non-indexed, ARGB) sheet
expected = new XSSFColor(); expected = XSSFColor.from(CTColor.Factory.newInstance(), wb.getStylesSource().getIndexedColors());
expected.setARGBHex("FF7F2700"); expected.setARGBHex("FF7F2700");
assertEquals(expected, wb.getSheet("customOrange").getTabColor()); assertEquals(expected, wb.getSheet("customOrange").getTabColor());
} }

2
src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSimpleShape.java
View File

@ -38,7 +38,7 @@ public class TestXSSFSimpleShape {
XSSFFont font = wb.createFont(); XSSFFont font = wb.createFont();
Color color = new Color(0, 255, 255); Color color = new Color(0, 255, 255);
font.setColor(new XSSFColor(color)); font.setColor(new XSSFColor(color, wb.getStylesSource().getIndexedColors()));
font.setFontName("Arial"); font.setFontName("Arial");
rt.applyFont(font); rt.applyFont(font);

2
src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFTextParagraph.java
View File

@ -37,7 +37,7 @@ public class TestXSSFTextParagraph {
XSSFFont font = wb.createFont(); XSSFFont font = wb.createFont();
Color color = new Color(0, 255, 255); Color color = new Color(0, 255, 255);
font.setColor(new XSSFColor(color)); font.setColor(new XSSFColor(color, wb.getStylesSource().getIndexedColors()));
font.setFontName("Arial"); font.setFontName("Arial");
rt.applyFont(font); rt.applyFont(font);

12
src/ooxml/testcases/org/apache/poi/xssf/usermodel/extensions/TestXSSFCellFill.java
View File

@ -20,12 +20,14 @@ package org.apache.poi.xssf.usermodel.extensions;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import java.io.IOException; import java.io.IOException;
import org.apache.poi.ss.usermodel.FillPatternType; import org.apache.poi.ss.usermodel.FillPatternType;
import org.apache.poi.xssf.XSSFTestDataSamples; import org.apache.poi.xssf.XSSFTestDataSamples;
import org.apache.poi.xssf.usermodel.XSSFCell; import org.apache.poi.xssf.usermodel.XSSFCell;
import org.apache.poi.xssf.usermodel.XSSFCellStyle;
import org.apache.poi.xssf.usermodel.XSSFColor; import org.apache.poi.xssf.usermodel.XSSFColor;
import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.junit.Test; import org.junit.Test;
@ -98,4 +100,14 @@ public class TestXSSFCellFill {
assertEquals(rgbWithTint[2],-80); assertEquals(rgbWithTint[2],-80);
wb.close(); wb.close();
} }
@Test
public void testFillWithoutColors() {
XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("FillWithoutColor.xlsx");
XSSFCell cellWithFill = wb.getSheetAt(0).getRow(5).getCell(1);
XSSFCellStyle style = cellWithFill.getCellStyle();
assertNotNull(style);
assertNull("had an empty background color", style.getFillBackgroundColorColor());
assertNull("had an empty background color", style.getFillBackgroundXSSFColor());
}
} }