Attachment #34389 for bug #56525

View | Details | Raw Unified | Return to bug 56525
Collapse All | Expand All

Lines 959-965 Link Here

(-)src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java (-1 / +4 lines)
959	@Override	959	@Override
960	public CellStyle getColumnStyle(int column) {	960	public CellStyle getColumnStyle(int column) {
961	int idx = columnHelper.getColDefaultStyle(column);	961	int idx = columnHelper.getColDefaultStyle(column);
962	return getWorkbook().getCellStyleAt((short)(idx == -1 ? 0 : idx));	962	if (idx == -1) {
		963	return null;
		964	}
		965	return getWorkbook().getCellStyleAt(idx);
963	}	966	}
964		967
965	/**	968	/**





        CellStyle blueStyle = wb.createCellStyle();
        blueStyle.setFillForegroundColor(IndexedColors.AQUA.getIndex());
        blueStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND);
        assertEquals(1, blueStyle.getIndex());

        CellStyle pinkStyle = wb.createCellStyle();
        pinkStyle.setFillForegroundColor(IndexedColors.PINK.getIndex());
        pinkStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND);
        assertEquals(2, pinkStyle.getIndex());

        // Starts empty

        assertEquals(1, s.getCTWorksheet().sizeOfColsArray());
        assertEquals(0, cols.sizeOfColArray());

        assertNull(s.getColumnStyle(0));
        assertNull(s.getColumnStyle(2));
        assertNull(s.getColumnStyle(3));


        // Apply the styles


        // Check
        assertEquals(pinkStyle, s.getColumnStyle(0));
        assertNull(s.getColumnStyle(2));
        assertEquals(blueStyle, s.getColumnStyle(3));

        assertEquals(1, s.getCTWorksheet().sizeOfColsArray());

        pinkStyle = wbBack.getCellStyleAt(pinkStyle.getIndex());

        assertEquals(pinkStyle, s.getColumnStyle(0));
        assertNull(s.getColumnStyle(2));
        assertEquals(blueStyle, s.getColumnStyle(3));
        wbBack.close();
    }

Return to bug 56525

Lines 1109-1120 Link Here

(-)src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java (-7 / +7 lines)
1109		1109
1110	CellStyle blueStyle = wb.createCellStyle();	1110	CellStyle blueStyle = wb.createCellStyle();
1111	blueStyle.setFillForegroundColor(IndexedColors.AQUA.getIndex());	1111	blueStyle.setFillForegroundColor(IndexedColors.AQUA.getIndex());
1112	blueStyle.setFillPattern(CellStyle.SOLID_FOREGROUND);	1112	blueStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND);
1113	assertEquals(1, blueStyle.getIndex());	1113	assertEquals(1, blueStyle.getIndex());
1114		1114
1115	CellStyle pinkStyle = wb.createCellStyle();	1115	CellStyle pinkStyle = wb.createCellStyle();
1116	pinkStyle.setFillForegroundColor(IndexedColors.PINK.getIndex());	1116	pinkStyle.setFillForegroundColor(IndexedColors.PINK.getIndex());
1117	pinkStyle.setFillPattern(CellStyle.SOLID_FOREGROUND);	1117	pinkStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND);
1118	assertEquals(2, pinkStyle.getIndex());	1118	assertEquals(2, pinkStyle.getIndex());
1119		1119
1120	// Starts empty	1120	// Starts empty
Lines 1134-1142 Link Here
1134	assertEquals(1, s.getCTWorksheet().sizeOfColsArray());	1134	assertEquals(1, s.getCTWorksheet().sizeOfColsArray());
1135	assertEquals(0, cols.sizeOfColArray());	1135	assertEquals(0, cols.sizeOfColArray());
1136		1136
1137	assertEquals(defaultStyle, s.getColumnStyle(0));	1137	assertNull(s.getColumnStyle(0));
1138	assertEquals(defaultStyle, s.getColumnStyle(2));	1138	assertNull(s.getColumnStyle(2));
1139	assertEquals(defaultStyle, s.getColumnStyle(3));	1139	assertNull(s.getColumnStyle(3));
1140		1140
1141		1141
1142	// Apply the styles	1142	// Apply the styles
Lines 1145-1151 Link Here
1145		1145
1146	// Check	1146	// Check
1147	assertEquals(pinkStyle, s.getColumnStyle(0));	1147	assertEquals(pinkStyle, s.getColumnStyle(0));
1148	assertEquals(defaultStyle, s.getColumnStyle(2));	1148	assertNull(s.getColumnStyle(2));
1149	assertEquals(blueStyle, s.getColumnStyle(3));	1149	assertEquals(blueStyle, s.getColumnStyle(3));
1150		1150
1151	assertEquals(1, s.getCTWorksheet().sizeOfColsArray());	1151	assertEquals(1, s.getCTWorksheet().sizeOfColsArray());
Lines 1169-1175 Link Here
1169	pinkStyle = wbBack.getCellStyleAt(pinkStyle.getIndex());	1169	pinkStyle = wbBack.getCellStyleAt(pinkStyle.getIndex());
1170		1170
1171	assertEquals(pinkStyle, s.getColumnStyle(0));	1171	assertEquals(pinkStyle, s.getColumnStyle(0));
1172	assertEquals(defaultStyle, s.getColumnStyle(2));	1172	assertNull(s.getColumnStyle(2));
1173	assertEquals(blueStyle, s.getColumnStyle(3));	1173	assertEquals(blueStyle, s.getColumnStyle(3));
1174	wbBack.close();	1174	wbBack.close();
1175	}	1175	}