fixed fetching names of user defined styles, see Bugzila 49751

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@987256 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yegor Kozlov 2010-08-19 18:08:54 +00:00
parent 74c34444a8
commit 424948b35a
4 changed files with 27 additions and 4 deletions

View File

@ -34,6 +34,7 @@
<changes> <changes>
<release version="3.7-beta3" date="2010-??-??"> <release version="3.7-beta3" date="2010-??-??">
<action dev="POI-DEVELOPERS" type="fix">49751 - fixed fetching names of user defined styles in HSSFCellStyle.getUserStyleName()</action>
<action dev="POI-DEVELOPERS" type="add">48900 - support for protecting a XSSF workbook</action> <action dev="POI-DEVELOPERS" type="add">48900 - support for protecting a XSSF workbook</action>
<action dev="POI-DEVELOPERS" type="fix">49725 - fixed FormulaParser to correctly process defined names with underscore</action> <action dev="POI-DEVELOPERS" type="fix">49725 - fixed FormulaParser to correctly process defined names with underscore</action>
<action dev="POI-DEVELOPERS" type="add">48526 - added implementation for RANDBETWEEN()</action> <action dev="POI-DEVELOPERS" type="add">48526 - added implementation for RANDBETWEEN()</action>

View File

@ -871,7 +871,7 @@ public final class InternalWorkbook {
continue; continue;
} }
if(!(r instanceof StyleRecord)) { if(!(r instanceof StyleRecord)) {
return null; continue;
} }
StyleRecord sr = (StyleRecord)r; StyleRecord sr = (StyleRecord)r;
if(sr.getXFIndex() == xfIndex) { if(sr.getXFIndex() == xfIndex) {

View File

@ -22,9 +22,7 @@ import java.io.File;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.util.Arrays; import java.util.*;
import java.util.Iterator;
import java.util.List;
import junit.framework.AssertionFailedError; import junit.framework.AssertionFailedError;
@ -1837,4 +1835,28 @@ if(1==2) {
assertEquals("Testing 2", wb.getCellStyleAt((short)22).getUserStyleName()); assertEquals("Testing 2", wb.getCellStyleAt((short)22).getUserStyleName());
assertEquals("Testing 3", wb.getCellStyleAt((short)23).getUserStyleName()); assertEquals("Testing 3", wb.getCellStyleAt((short)23).getUserStyleName());
} }
public void test49751() {
HSSFWorkbook wb = openSample("49751.xls");
short numCellStyles = wb.getNumCellStyles();
List<String> namedStyles = Arrays.asList(
"20% - Accent1", "20% - Accent2", "20% - Accent3", "20% - Accent4", "20% - Accent5",
"20% - Accent6", "40% - Accent1", "40% - Accent2", "40% - Accent3", "40% - Accent4",
"40% - Accent5", "40% - Accent6", "60% - Accent1", "60% - Accent2", "60% - Accent3",
"60% - Accent4", "60% - Accent5", "60% - Accent6", "Accent1", "Accent2", "Accent3",
"Accent4", "Accent5", "Accent6", "Bad", "Calculation", "Check Cell", "Explanatory Text",
"Good", "Heading 1", "Heading 2", "Heading 3", "Heading 4", "Input", "Linked Cell",
"Neutral", "Note", "Output", "Title", "Total", "Warning Text");
List<String> collecteddStyles = new ArrayList<String>();
for (short i = 0; i < numCellStyles; i++) {
HSSFCellStyle cellStyle = wb.getCellStyleAt(i);
String styleName = cellStyle.getUserStyleName();
if (styleName != null) {
collecteddStyles.add(styleName);
}
}
assertTrue(namedStyles.containsAll(collecteddStyles));
}
} }

Binary file not shown.