diff options
author | Matúš Kukan <matus.kukan@collabora.com> | 2014-10-03 11:16:39 +0200 |
---|---|---|
committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-10-23 13:24:28 +0200 |
commit | f39d69f6b5bc6dad1112e9465e12395d9439effb (patch) | |
tree | 3d95f927c680e343e32ef43febcab8f7e49969be | |
parent | c0c45cad415b2d091c632f3c2bc15103597db1f9 (diff) |
Remove few pointless OUString::number() and one method
Change-Id: I3e9a302a7513eebfeff07402f71fc3dde22e4cc2
-rw-r--r-- | include/sax/fshelper.hxx | 1 | ||||
-rw-r--r-- | oox/source/core/xmlfilterbase.cxx | 7 | ||||
-rw-r--r-- | sax/source/tools/fshelper.cxx | 15 |
3 files changed, 9 insertions, 14 deletions
diff --git a/include/sax/fshelper.hxx b/include/sax/fshelper.hxx index 1f3b1b894747..50248ce28ce6 100644 --- a/include/sax/fshelper.hxx +++ b/include/sax/fshelper.hxx @@ -124,7 +124,6 @@ public: FastSerializerHelper* write(const char* value); FastSerializerHelper* write(const OUString& value); - FastSerializerHelper* write(const OString& value); FastSerializerHelper* write(sal_Int32 value); FastSerializerHelper* write(sal_Int64 value); FastSerializerHelper* write(double value); diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx index 9516b82ff6e8..d5c3a2453a78 100644 --- a/oox/source/core/xmlfilterbase.cxx +++ b/oox/source/core/xmlfilterbase.cxx @@ -524,7 +524,7 @@ static void writeElement( FSHelperPtr pDoc, sal_Int32 nXmlElement, const sal_Int32 nValue ) { pDoc->startElement( nXmlElement, FSEND ); - pDoc->write( OUString::number( nValue ) ); + pDoc->write( nValue ); pDoc->endElement( nXmlElement ); } @@ -677,7 +677,7 @@ writeAppProperties( XmlFilterBase& rSelf, Reference< XDocumentProperties > xProp { sal_Int32 nValue = 0; if (it->second >>= nValue) - writeElement(pAppProps, XML_Paragraphs, OUString::number(nValue)); + writeElement(pAppProps, XML_Paragraphs, nValue); } uno::Reference<beans::XPropertyAccess> xUserDefinedProperties(xProperties->getUserDefinedProperties(), uno::UNO_QUERY); @@ -719,10 +719,9 @@ writeCustomProperties( XmlFilterBase& rSelf, Reference< XDocumentProperties > xP OString aName = OUStringToOString( aprop[n].Name, RTL_TEXTENCODING_ASCII_US ); // pid starts from 2 not from 1 as MS supports pid from 2 - OString pid = OUStringToOString( OUString::number(n + 2), RTL_TEXTENCODING_ASCII_US ); pAppProps->startElement( XML_property , XML_fmtid, "{D5CDD505-2E9C-101B-9397-08002B2CF9AE}", - XML_pid, pid, + XML_pid, OString::number(n + 2), XML_name, aName, FSEND); diff --git a/sax/source/tools/fshelper.cxx b/sax/source/tools/fshelper.cxx index 55be646f748d..e0ed75186629 100644 --- a/sax/source/tools/fshelper.cxx +++ b/sax/source/tools/fshelper.cxx @@ -112,25 +112,22 @@ FastSerializerHelper* FastSerializerHelper::write(const OUString& value) return this; } -FastSerializerHelper* FastSerializerHelper::write(const OString& value) -{ - mpSerializer->write(value); - return this; -} - FastSerializerHelper* FastSerializerHelper::write(sal_Int32 value) { - return write(OString::number(value)); + mpSerializer->write(OString::number(value)); + return this; } FastSerializerHelper* FastSerializerHelper::write(sal_Int64 value) { - return write(OString::number(value)); + mpSerializer->write(OString::number(value)); + return this; } FastSerializerHelper* FastSerializerHelper::write(double value) { - return write(OString::number(value)); + mpSerializer->write(OString::number(value)); + return this; } FastSerializerHelper* FastSerializerHelper::writeEscaped(const char* value) |