diff --git a/src/documentation/content/xdocs/status.xml b/src/documentation/content/xdocs/status.xml index 81a4a3bea..7fd203917 100644 --- a/src/documentation/content/xdocs/status.xml +++ b/src/documentation/content/xdocs/status.xml @@ -34,6 +34,7 @@ + 48325 - If a HSSF header or footer lacks left/right/centre information, assume it is a centre one 49966 - Correctly remove calcChain entries for XSSF cells that stop holding formulas 47582 - XSSFCellStyle support for creating a style in one workbook based on a style from a different one 49931 - Avoid concurrency problems when re-ordering multiple HSSF header records for a PageSettingsBlock diff --git a/src/java/org/apache/poi/hssf/usermodel/HeaderFooter.java b/src/java/org/apache/poi/hssf/usermodel/HeaderFooter.java index 4fd7c89cc..94a4e3b31 100644 --- a/src/java/org/apache/poi/hssf/usermodel/HeaderFooter.java +++ b/src/java/org/apache/poi/hssf/usermodel/HeaderFooter.java @@ -40,7 +40,13 @@ public abstract class HeaderFooter implements org.apache.poi.ss.usermodel.Header String _center = ""; String _right = ""; +outer: while (text.length() > 1) { + if (text.charAt(0) != '&') { + // Mimics the behaviour of Excel, which would put it in the center. + _center = text; + break; + } int pos = text.length(); switch (text.charAt(1)) { case 'L': @@ -74,7 +80,9 @@ public abstract class HeaderFooter implements org.apache.poi.ss.usermodel.Header text = text.substring(pos); break; default: - throw new IllegalStateException("bad text '" + getRawText() + "'."); + // Mimics the behaviour of Excel, which would put it in the center. + _center = text; + break outer; } } return new String[] { _left, _center, _right, }; diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java b/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java index b92a3d5f6..7c83d0b4a 100644 --- a/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java +++ b/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java @@ -1868,4 +1868,22 @@ if(1==2) { assertEquals(1, wb.getNumberOfSheets()); assertEquals("Foo", wb.getSheetAt(0).getRow(0).getCell(0).getRichStringCellValue().toString()); } + + /** + * Missing left/right/centre options on a footer + */ + public void test48325() throws Exception { + HSSFWorkbook wb = openSample("48325.xls"); + HSSFSheet sh = wb.getSheetAt(0); + HSSFFooter f = sh.getFooter(); + + // Will show as the centre, as that is what excel does + // with an invalid footer lacking left/right/centre details + assertEquals("Left text should be empty", "", f.getLeft()); + assertEquals("Right text should be empty", "", f.getRight()); + assertEquals( + "Center text should contain the illegal value", + "BlahBlah blah blah ", f.getCenter() + ); + } } diff --git a/test-data/spreadsheet/48325.xls b/test-data/spreadsheet/48325.xls new file mode 100644 index 000000000..8b8c926fa Binary files /dev/null and b/test-data/spreadsheet/48325.xls differ