diff options
| -rw-r--r-- | svl/source/numbers/zformat.cxx | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index 191024238308..903fd9960200 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -2038,6 +2038,27 @@ void SvNumberformat::ImpGetOutputStandard(double& fNumber, OUString& rOutString) } } +namespace +{ + +template<typename T> +bool checkForAll0s(const T& rString, sal_Int32 nIdx=0) +{ + if (nIdx>=rString.getLength()) + return false; + + do + { + if (rString[nIdx]!='0') + return false; + } + while (++nIdx<rString.getLength()); + + return true; +} + +} + void SvNumberformat::ImpGetOutputStdToPrecision(double& rNumber, OUString& rOutString, sal_uInt16 nPrecision) const { // Make sure the precision doesn't go over the maximum allowable precision. @@ -2051,8 +2072,7 @@ void SvNumberformat::ImpGetOutputStdToPrecision(double& rNumber, OUString& rOutS rOutString = ::rtl::math::doubleToUString( rNumber, rtl_math_StringFormat_F, nPrecision /*2*/, GetFormatter().GetNumDecimalSep()[0], true ); - if (rOutString[0] == '-' && - comphelper::string::getTokenCount(rOutString, '0') == rOutString.getLength()) + if (rOutString[0] == '-' && checkForAll0s(rOutString, 1)) { rOutString = comphelper::string::stripStart(rOutString, '-'); // not -0 } @@ -4302,8 +4322,7 @@ bool SvNumberformat::ImpGetNumberOutput(double fNumber, } sStr.remove( nDecPos, 1 ); // Remove . } - if (bSign && (sStr.isEmpty() || - comphelper::string::getTokenCount(sStr.toString(), '0') == sStr.getLength()+1)) // Only 00000 + if (bSign && (sStr.isEmpty() || checkForAll0s(sStr))) // Only 00000 { bSign = false; // Not -0.00 } |