diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-01 09:26:27 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-02 08:00:10 +0000 |
| commit | 1461ebbbb5d47d90e31f0945a4878a68fbee5213 (patch) | |
| tree | 5af28d3cdaf4d5195ddf9e69727807ab8104a8e2 /sax | |
| parent | c0f9bdd3e644e3ebf690aff9eb1aeec4f16dbf27 (diff) | |
expand out ::sax::Converter::convertNumber to OUString::number
which results in much simpler code overall, there is no need to go via
an OUStringBuffer all the time
Change-Id: I69eba92c93f471fa9a45f97c29c56dcf3cd1ebf8
Reviewed-on: https://gerrit.libreoffice.org/33773
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sax')
| -rw-r--r-- | sax/qa/cppunit/test_converter.cxx | 14 | ||||
| -rw-r--r-- | sax/source/tools/converter.cxx | 10 |
2 files changed, 2 insertions, 22 deletions
diff --git a/sax/qa/cppunit/test_converter.cxx b/sax/qa/cppunit/test_converter.cxx index c8b813c47d22..6a1f087e143a 100644 --- a/sax/qa/cppunit/test_converter.cxx +++ b/sax/qa/cppunit/test_converter.cxx @@ -610,15 +610,6 @@ void doTestStringToNumber(sal_Int32 nValue, char const*const pis, sal_Int32 nMin CPPUNIT_ASSERT_EQUAL(nValue, nTemp); } -void doTestNumberToString(char const*const pis, sal_Int32 nValue) -{ - OUString const is(OUString::createFromAscii(pis)); - OUStringBuffer buf; - Converter::convertNumber(buf, nValue); - SAL_INFO("sax.cppunit","" << buf.toString()); - CPPUNIT_ASSERT_EQUAL(is, buf.makeStringAndClear()); -} - void ConverterTest::testNumber() { doTestStringToNumber(30, "30", 1, 40); @@ -626,11 +617,6 @@ void ConverterTest::testNumber() doTestStringToNumber(-30, "7", -100, -30); doTestStringToNumber(0, "-0", 0, 1); doTestStringToNumber(0, "666", -0, 0); - doTestNumberToString("333", 333); - doTestNumberToString("-1", -1); - doTestNumberToString("0", 0000); - doTestNumberToString("-1", -0001); - doTestNumberToString("0", -0); } void doTestEncodeBase64(char const*const pis, const uno::Sequence<sal_Int8>& aPass) diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx index 7f2069bba9a6..c3a77033e8f3 100644 --- a/sax/source/tools/converter.cxx +++ b/sax/source/tools/converter.cxx @@ -524,12 +524,6 @@ void Converter::convertColor( OUStringBuffer& rBuffer, sal_Int32 nColor ) rBuffer.append( sal_Unicode( aHexTab[ nCol & 0xf ] ) ); } -/** convert number to string */ -void Converter::convertNumber( OUStringBuffer& rBuffer, sal_Int32 nNumber ) -{ - rBuffer.append( nNumber ); -} - /** convert string to number with optional min and max values */ bool Converter::convertNumber( sal_Int32& rValue, const OUString& rString, @@ -651,7 +645,7 @@ void Converter::convertAngle(OUStringBuffer& rBuffer, sal_Int16 const nAngle) { #if 1 // wrong, but backward compatible with OOo/LO < 4.4 - ::sax::Converter::convertNumber(rBuffer, nAngle); + rBuffer.append(nAngle); #else // maybe in the future... (see other convertAngle) double fAngle(double(nAngle) / 10.0); @@ -2555,7 +2549,7 @@ bool Converter::convertAny(OUStringBuffer& rsValue, { rsType.append("integer"); bConverted = true; - ::sax::Converter::convertNumber(rsValue, nTempValue); + rsValue.append(nTempValue); } } break; |