diff options
author | Tor Lillqvist <tml@collabora.com> | 2015-05-05 10:27:00 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2015-05-05 10:59:11 +0300 |
commit | 3363f828d63775a11073276dce927b9538b57be6 (patch) | |
tree | 66bfbffde18147a5d7188e4cf4dce0cd47112395 /basegfx/source/tools/stringconversiontools.cxx | |
parent | 259820af718fe15ea5080711f77918dad8f14fbb (diff) |
Drop misused lcl_ prefix
If used at all, lcl_ is supposed to be used for static functions truly local
to one source files. The functions here occur in several source files (well,
two, the one where they are defined and one other) so they are not "local" in
that sense. (But they could be local in the one file that uses them...) Also,
they are already in a basegfx::internal namespace.
While at it, drop the :: prefix eyesore from basegfx::internal, and align
parameter lists consistently.
Change-Id: I68b91075e0b1779ac0fa884d8f9e956f1ab7b308
Diffstat (limited to 'basegfx/source/tools/stringconversiontools.cxx')
-rw-r--r-- | basegfx/source/tools/stringconversiontools.cxx | 49 |
1 files changed, 25 insertions, 24 deletions
diff --git a/basegfx/source/tools/stringconversiontools.cxx b/basegfx/source/tools/stringconversiontools.cxx index 040c358337b2..4fcbbc77e9c2 100644 --- a/basegfx/source/tools/stringconversiontools.cxx +++ b/basegfx/source/tools/stringconversiontools.cxx @@ -24,9 +24,9 @@ namespace basegfx { namespace internal { - void lcl_skipSpaces(sal_Int32& io_rPos, - const OUString& rStr, - const sal_Int32 nLen) + void skipSpaces(sal_Int32& io_rPos, + const OUString& rStr, + const sal_Int32 nLen) { while( io_rPos < nLen && ' ' == rStr[io_rPos] ) @@ -35,9 +35,9 @@ namespace basegfx } } - void lcl_skipSpacesAndCommas(sal_Int32& io_rPos, - const OUString& rStr, - const sal_Int32 nLen) + void skipSpacesAndCommas(sal_Int32& io_rPos, + const OUString& rStr, + const sal_Int32 nLen) { while(io_rPos < nLen && (' ' == rStr[io_rPos] || ',' == rStr[io_rPos])) @@ -46,7 +46,9 @@ namespace basegfx } } - bool lcl_getDoubleChar(double& o_fRetval, sal_Int32& io_rPos, const OUString& rStr) + bool getDoubleChar(double& o_fRetval, + sal_Int32& io_rPos, + const OUString& rStr) { sal_Unicode aChar( rStr[io_rPos] ); OUStringBuffer sNumberString; @@ -120,23 +122,23 @@ namespace basegfx return false; } - bool lcl_importDoubleAndSpaces( double& o_fRetval, - sal_Int32& io_rPos, - const OUString& rStr, - const sal_Int32 nLen ) + bool importDoubleAndSpaces(double& o_fRetval, + sal_Int32& io_rPos, + const OUString& rStr, + const sal_Int32 nLen ) { - if( !lcl_getDoubleChar(o_fRetval, io_rPos, rStr) ) + if( !getDoubleChar(o_fRetval, io_rPos, rStr) ) return false; - lcl_skipSpacesAndCommas(io_rPos, rStr, nLen); + skipSpacesAndCommas(io_rPos, rStr, nLen); return true; } - bool lcl_importFlagAndSpaces(sal_Int32& o_nRetval, - sal_Int32& io_rPos, - const OUString& rStr, - const sal_Int32 nLen) + bool importFlagAndSpaces(sal_Int32& o_nRetval, + sal_Int32& io_rPos, + const OUString& rStr, + const sal_Int32 nLen) { sal_Unicode aChar( rStr[io_rPos] ); @@ -153,15 +155,15 @@ namespace basegfx else return false; - lcl_skipSpacesAndCommas(io_rPos, rStr, nLen); + skipSpacesAndCommas(io_rPos, rStr, nLen); return true; } - void lcl_putNumberCharWithSpace( OUStringBuffer& rStr, - double fValue, - double fOldValue, - bool bUseRelativeCoordinates ) + void putNumberCharWithSpace(OUStringBuffer& rStr, + double fValue, + double fOldValue, + bool bUseRelativeCoordinates ) { if( bUseRelativeCoordinates ) fValue -= fOldValue; @@ -169,7 +171,7 @@ namespace basegfx const sal_Int32 aLen( rStr.getLength() ); if(aLen) { - if( lcl_isOnNumberChar(rStr[aLen - 1], false, true) && + if( isOnNumberChar(rStr[aLen - 1], false, true) && fValue >= 0.0 ) { rStr.append( ' ' ); @@ -178,7 +180,6 @@ namespace basegfx rStr.append(fValue); } - } // namespace internal } |