diff options
author | Noel Grandin <noel@peralex.com> | 2014-11-03 14:03:54 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-11-05 08:44:19 +0200 |
commit | 705c48d32eec0aa5180e60ca157daca4b154e4a3 (patch) | |
tree | 97f43496f4b429a2b8d03b1e71cb2a1c33142a15 /reportdesign/source/filter/xml/xmlExport.cxx | |
parent | b7d8a58ff2698ffc6e22943f64aa97c5ea253bd9 (diff) |
fdo#38835 strip out OUString globals
they are largely unnecessary these days, since our OUString infrastructure
gained optimised handling for static char constants.
Change-Id: I07f73484f82d0582252cb4324d4107c998432c37
Diffstat (limited to 'reportdesign/source/filter/xml/xmlExport.cxx')
-rw-r--r-- | reportdesign/source/filter/xml/xmlExport.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx index fd844617d6dc..b89d68715722 100644 --- a/reportdesign/source/filter/xml/xmlExport.cxx +++ b/reportdesign/source/filter/xml/xmlExport.cxx @@ -1010,8 +1010,8 @@ OUString ORptExport::convertFormula(const OUString& _sFormula) bool ORptExport::exportFormula(enum ::xmloff::token::XMLTokenEnum eName,const OUString& _sFormula) { const OUString sFieldData = convertFormula(_sFormula); - static const OUString s_sPageNumber("PageNumber()"); - static const OUString s_sPageCount("PageCount()"); + static const char s_sPageNumber[] = "PageNumber()"; + static const char s_sPageCount[] = "PageCount()"; sal_Int32 nPageNumberIndex = sFieldData.indexOf(s_sPageNumber); sal_Int32 nPageCountIndex = sFieldData.indexOf(s_sPageCount); bool bRet = nPageNumberIndex != -1 || nPageCountIndex != -1; @@ -1069,7 +1069,7 @@ bool ORptExport::exportGroup(const Reference<XReportDefinition>& _xReportDefinit OUString sExpression = sField; if ( !sExpression.isEmpty() ) { - static OUString s_sQuote("\"\""); + static const char s_sQuote[] = "\"\""; sal_Int32 nIndex = sExpression.indexOf('"'); while ( nIndex > -1 ) { @@ -1407,10 +1407,10 @@ void ORptExport::exportParagraph(const Reference< XReportControlModel >& _xRepor if ( Reference<XFormattedField>(_xReportElement,uno::UNO_QUERY).is() ) { OUString sFieldData = _xReportElement->getDataField(); - static const OUString s_sPageNumber("PageNumber()"); - static const OUString s_sPageCount("PageCount()"); - static const OUString s_sReportPrefix("rpt:"); - sFieldData = sFieldData.copy(s_sReportPrefix.getLength(),sFieldData.getLength() - s_sReportPrefix.getLength()); + static const char s_sPageNumber[] = "PageNumber()"; + static const char s_sPageCount[] = "PageCount()"; + static const char s_sReportPrefix[] = "rpt:"; + sFieldData = sFieldData.copy(strlen(s_sReportPrefix), sFieldData.getLength() - strlen(s_sReportPrefix)); sal_Int32 nPageNumberIndex = sFieldData.indexOf(s_sPageNumber); if ( nPageNumberIndex != -1 ) { @@ -1423,7 +1423,7 @@ void ORptExport::exportParagraph(const Reference< XReportControlModel >& _xRepor { if ( sToken == s_sPageNumber ) { - static const OUString s_sCurrent("current"); + static const char s_sCurrent[] = "current"; AddAttribute(XML_NAMESPACE_TEXT, XML_SELECT_PAGE, s_sCurrent ); SvXMLElementExport aPageNumber(*this,XML_NAMESPACE_TEXT, XML_PAGE_NUMBER, false, false); Characters(OUString("1")); |