summaryrefslogtreecommitdiff
path: root/basegfx/source/inc/stringconversiontools.hxx
diff options
context:
space:
mode:
authorArmin Le Grand <alg@apache.org>2014-10-08 11:03:03 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-10-08 14:58:43 +0100
commite6bd33d4425bc568fbb40d5dd9137c72c82d411c (patch)
tree4d11796e9f4de24af777188c92b1df2dbcb7ea10 /basegfx/source/inc/stringconversiontools.hxx
parent6edebc078c527112e15c75f2666653e5f53dc171 (diff)
Resolves: #i125447# corrected some string to number conversion...
tools to correct svg:d imports (cherry picked from commit f077f99da3cb2903fa903dcf30e6cfd714fd009c) Conflicts: basegfx/source/inc/stringconversiontools.hxx basegfx/source/tools/stringconversiontools.cxx Change-Id: I7de1558682990f83e66fdded3d9d30e21e4f97fe
Diffstat (limited to 'basegfx/source/inc/stringconversiontools.hxx')
-rw-r--r--basegfx/source/inc/stringconversiontools.hxx10
1 files changed, 5 insertions, 5 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,