Skip to content

Fix Excel's Accounting Format for zero part where 0 is randomly added at the end #888

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

Fix Excel's Accounting Format for zero part where 0 is randomly added at the end #888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions poi/src/main/java/org/apache/poi/ss/format/CellNumberFormatter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,10 +461,22 @@ public void formatValue(StringBuffer toAppendTo, Object valueObject) {
writeFraction(value, null, fractional, output, mods);
} else {
StringBuffer result = new StringBuffer();
try (Formatter f = new Formatter(result, locale)) {
f.format(locale, printfFmt, value);
} catch (IllegalFormatException e) {
throw new IllegalArgumentException("Format: " + printfFmt, e);

if (value == 0.0 && decimalPoint == null && !desc.contains("0")
&& specials.size() == calculateIntegerPartWidth()) {
// Excel's # with value 0 should output empty, not 0 as in Java.
// Excel's ? with value 0 should output space, not 0 as in Java.
for (Special s : specials) {
if (s.ch == '?') {
result.append(' ');
}
}
} else {
try (Formatter f = new Formatter(result, locale)) {
f.format(locale, printfFmt, value);
} catch (IllegalFormatException e) {
throw new IllegalArgumentException("Format: " + printfFmt, e);
}
}

if (numerator == null) {
Expand Down
10 changes: 6 additions & 4 deletions poi/src/test/java/org/apache/poi/ss/usermodel/TestDataFormatter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,13 +616,15 @@ void testFormatsWithPadding() {

assertEquals(" 0.10 ", dfUS.formatRawCellContents( 0.1, -1, "_-* #,##0.00_-;-* #,##0.00_-;_-* \"-\"??_-;_-@_-"));
assertEquals("- 0.10 ", dfUS.formatRawCellContents(-0.1, -1, "_-* #,##0.00_-;-* #,##0.00_-;_-* \"-\"??_-;_-@_-"));
// TODO Fix this, we are randomly adding a 0 at the end that shouldn't be there
//assertEquals(" - ", dfUS.formatRawCellContents(0.0, -1, "_-* #,##0.00_-;-* #,##0.00_-;_-* \"-\"??_-;_-@_-"));
// Repeating fill character `* ` doesn't really fill because we do not know the cell's width.
// We just repeat it 3 times.
assertEquals(" - ", dfUS.formatRawCellContents(0.0, -1, "_-* #,##0.00_-;-* #,##0.00_-;_-* \"-\"??_-;_-@_-"));

assertEquals(" $ 1.10 ", dfUS.formatRawCellContents( 1.1, -1, "_-$* #,##0.00_-;-$* #,##0.00_-;_-$* \"-\"??_-;_-@_-"));
assertEquals("-$ 1.10 ", dfUS.formatRawCellContents(-1.1, -1, "_-$* #,##0.00_-;-$* #,##0.00_-;_-$* \"-\"??_-;_-@_-"));
// TODO Fix this, we are randomly adding a 0 at the end that shouldn't be there
//assertEquals(" $ - ", dfUS.formatRawCellContents( 0.0, -1, "_-$* #,##0.00_-;-$* #,##0.00_-;_-$* \"-\"??_-;_-@_-"));
// Repeating fill character `* ` doesn't really fill because we do not know the cell's width.
// We just repeat it 3 times.
assertEquals(" $ - ", dfUS.formatRawCellContents( 0.0, -1, "_-$* #,##0.00_-;-$* #,##0.00_-;_-$* \"-\"??_-;_-@_-"));
}

@Test
Expand Down