diff options
Diffstat (limited to 'basegfx')
| -rw-r--r-- | basegfx/source/inc/stringconversiontools.hxx | 10 | ||||
| -rw-r--r-- | basegfx/source/tools/stringconversiontools.cxx | 32 |
2 files changed, 29 insertions, 13 deletions
diff --git a/basegfx/source/inc/stringconversiontools.hxx b/basegfx/source/inc/stringconversiontools.hxx index 834c0de0465f..d759bbb8385e 100644 --- a/basegfx/source/inc/stringconversiontools.hxx +++ b/basegfx/source/inc/stringconversiontools.hxx @@ -35,19 +35,19 @@ namespace basegfx const OUString& rStr, const sal_Int32 nLen); - inline bool lcl_isOnNumberChar(const sal_Unicode aChar, bool bSignAllowed = true) + inline bool lcl_isOnNumberChar(const sal_Unicode aChar, bool bSignAllowed = true, bool bDotAllowed = true) { const bool bPredicate( (sal_Unicode('0') <= aChar && sal_Unicode('9') >= aChar) || (bSignAllowed && sal_Unicode('+') == aChar) - || (bSignAllowed && sal_Unicode('-') == aChar) ); + || (bSignAllowed && sal_Unicode('-') == aChar) + || (bDotAllowed && sal_Unicode('.') == aChar)); return bPredicate; } - inline bool lcl_isOnNumberChar(const OUString& rStr, const sal_Int32 nPos, bool bSignAllowed = true) + inline bool lcl_isOnNumberChar(const OUString& rStr, const sal_Int32 nPos, bool bSignAllowed = true, bool bDotAllowed = true) { - return lcl_isOnNumberChar(rStr[nPos], - bSignAllowed); + return lcl_isOnNumberChar(rStr[nPos], bSignAllowed, bDotAllowed); } bool lcl_getDoubleChar(double& o_fRetval, diff --git a/basegfx/source/tools/stringconversiontools.cxx b/basegfx/source/tools/stringconversiontools.cxx index 211f8991d490..df37126a1854 100644 --- a/basegfx/source/tools/stringconversiontools.cxx +++ b/basegfx/source/tools/stringconversiontools.cxx @@ -46,35 +46,50 @@ namespace basegfx } } - bool lcl_getDoubleChar(double& o_fRetval, - sal_Int32& io_rPos, - const OUString& rStr) + bool lcl_getDoubleChar(double& o_fRetval, sal_Int32& io_rPos, const OUString& rStr) { sal_Unicode aChar( rStr[io_rPos] ); OUStringBuffer sNumberString; - bool separator_seen=false; + // sign if('+' == aChar || '-' == aChar) { sNumberString.append(rStr[io_rPos]); aChar = rStr[++io_rPos]; } - while(('0' <= aChar && '9' >= aChar) - || (!separator_seen && '.' == aChar)) + // numbers before point + while('0' <= aChar && '9' >= aChar) { - if ('.' == aChar) separator_seen = true; sNumberString.append(rStr[io_rPos]); io_rPos++; aChar = io_rPos < rStr.getLength() ? rStr[io_rPos] : 0; } + // point + if('.' == aChar) + { + sNumberString.append(rStr[io_rPos]); + io_rPos++; + aChar = io_rPos < rStr.getLength() ? rStr[io_rPos] : 0; + } + + // numbers after point + while ('0' <= aChar && '9' >= aChar) + { + sNumberString.append(rStr[io_rPos]); + io_rPos++; + aChar = io_rPos < rStr.getLength() ? rStr[io_rPos] : 0; + } + + // 'e' if('e' == aChar || 'E' == aChar) { sNumberString.append(rStr[io_rPos]); io_rPos++; aChar = io_rPos < rStr.getLength() ? rStr[io_rPos] : 0; + // sign for 'e' if('+' == aChar || '-' == aChar) { sNumberString.append(rStr[io_rPos]); @@ -82,6 +97,7 @@ namespace basegfx aChar = io_rPos < rStr.getLength() ? rStr[io_rPos] : 0; } + // number for 'e' while('0' <= aChar && '9' >= aChar) { sNumberString.append(rStr[io_rPos]); @@ -153,7 +169,7 @@ namespace basegfx const sal_Int32 aLen( rStr.getLength() ); if(aLen) { - if( lcl_isOnNumberChar(rStr[aLen - 1], false) && + if( lcl_isOnNumberChar(rStr[aLen - 1], false, true) && fValue >= 0.0 ) { rStr.append( ' ' ); |