summaryrefslogtreecommitdiff
path: root/reportdesign/source/filter/xml/xmlCell.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-11-03 14:03:54 +0200
committerNoel Grandin <noel@peralex.com>2014-11-05 08:44:19 +0200
commit705c48d32eec0aa5180e60ca157daca4b154e4a3 (patch)
tree97f43496f4b429a2b8d03b1e71cb2a1c33142a15 /reportdesign/source/filter/xml/xmlCell.cxx
parentb7d8a58ff2698ffc6e22943f64aa97c5ea253bd9 (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/xmlCell.cxx')
-rw-r--r--reportdesign/source/filter/xml/xmlCell.cxx11
1 files changed, 5 insertions, 6 deletions
diff --git a/reportdesign/source/filter/xml/xmlCell.cxx b/reportdesign/source/filter/xml/xmlCell.cxx
index d7e7c8df4d41..a5f4a436ce7c 100644
--- a/reportdesign/source/filter/xml/xmlCell.cxx
+++ b/reportdesign/source/filter/xml/xmlCell.cxx
@@ -105,7 +105,7 @@ SvXMLImportContext* OXMLCell::CreateChildContext(
ORptFilter& rImport = GetOwnImport();
const SvXMLTokenMap& rTokenMap = rImport.GetCellElemTokenMap();
Reference<XMultiServiceFactory> xFactor(rImport.GetModel(),uno::UNO_QUERY);
- static const OUString s_sStringConcat(" & ");
+ static const char s_sStringConcat[] = " & ";
const sal_uInt16 nToken = rTokenMap.Get( _nPrefix, _rLocalName );
switch( nToken )
@@ -117,10 +117,10 @@ SvXMLImportContext* OXMLCell::CreateChildContext(
}
break;
case XML_TOK_PAGE_NUMBER:
- m_sText += s_sStringConcat + " PageNumber()";
+ m_sText += OUString(s_sStringConcat) + " PageNumber()";
break;
case XML_TOK_PAGE_COUNT:
- m_sText += s_sStringConcat + " PageCount()";
+ m_sText += OUString(s_sStringConcat) + " PageCount()";
break;
case XML_TOK_FORMATTED_TEXT:
{
@@ -257,11 +257,10 @@ void OXMLCell::Characters( const OUString& rChars )
{
if ( !rChars.isEmpty() )
{
- static const OUString s_Quote("\"");
+ static const char s_Quote[] = "\"";
if ( !m_sText.isEmpty() )
{
- static const OUString s_sStringConcat(" & ");
- m_sText += s_sStringConcat;
+ m_sText += " & ";
}
m_sText += s_Quote + rChars + s_Quote;