From fc83bdaf9ea53eb9181ea61717750d1b556dd4f1 Mon Sep 17 00:00:00 2001 From: Andreas Beeker Date: Wed, 16 Mar 2016 23:40:00 +0000 Subject: [PATCH] forgot another contains call ... git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1735349 13f79535-47bb-0310-9956-ffa450edef68 --- src/java/org/apache/poi/ss/format/CellNumberFormatter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/java/org/apache/poi/ss/format/CellNumberFormatter.java b/src/java/org/apache/poi/ss/format/CellNumberFormatter.java index 2097e6c909..230d245546 100644 --- a/src/java/org/apache/poi/ss/format/CellNumberFormatter.java +++ b/src/java/org/apache/poi/ss/format/CellNumberFormatter.java @@ -641,14 +641,14 @@ public class CellNumberFormatter extends CellFormatter { // New we check to see if we should remove the integer part boolean numNoZero = !hasChar('0', numeratorSpecials); boolean intNoZero = !hasChar('0', integerSpecials); - boolean intOnlyHash = integerSpecials.isEmpty() || (integerSpecials.size() == 1 && integerSpecials.contains('#')); + boolean intOnlyHash = integerSpecials.isEmpty() || (integerSpecials.size() == 1 && hasChar('#', integerSpecials)); boolean removeBecauseZero = fractional == 0 && (intOnlyHash || numNoZero); boolean removeBecauseFraction = fractional != 0 && intNoZero; if (value == 0 && (removeBecauseZero || removeBecauseFraction)) { Special start = lastSpecial(integerSpecials); - boolean hasPlaceHolder = integerSpecials.contains('?') || numeratorSpecials.contains('?'); + boolean hasPlaceHolder = hasChar('?', integerSpecials, numeratorSpecials); CellNumberStringMod sm = hasPlaceHolder ? replaceMod(start, true, numerator, false, ' ') : deleteMod(start, true, numerator, false); -- 2.39.5