From df18d5878c71d8d38a43dd04c0e907f9385addb4 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Thu, 16 May 2013 09:24:31 +0200
Subject: Some string literal clean up

Change-Id: I108882af13fa97fa094547ec4efb468f988f337d
---
 sw/source/ui/envelp/labelcfg.cxx | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

(limited to 'sw')

diff --git a/sw/source/ui/envelp/labelcfg.cxx b/sw/source/ui/envelp/labelcfg.cxx
index 6aaee0be304b..dc815c7a5a5d 100644
--- a/sw/source/ui/envelp/labelcfg.cxx
+++ b/sw/source/ui/envelp/labelcfg.cxx
@@ -87,19 +87,22 @@ SwLabelConfig::SwLabelConfig() :
     // fill m_aLabels and m_aManufacturers with the predefined labels
     res = reader.nextItem(
             xmlreader::XmlReader::TEXT_NONE, &name, &nsId);
-    assert(res == xmlreader::XmlReader::RESULT_BEGIN &&
-                name.equals(RTL_CONSTASCII_STRINGPARAM("manufacturers")));
+    assert(
+        res == xmlreader::XmlReader::RESULT_BEGIN
+        && name.equals("manufacturers"));
     res = reader.nextItem(
             xmlreader::XmlReader::TEXT_NONE, &name, &nsId);
     while (res != xmlreader::XmlReader::RESULT_END)
     {
         // Opening manufacturer
-        assert(res == xmlreader::XmlReader::RESULT_BEGIN &&
-                name.equals(RTL_CONSTASCII_STRINGPARAM("manufacturer")));
+        assert(
+            res == xmlreader::XmlReader::RESULT_BEGIN
+            && name.equals("manufacturer"));
         // Get the name
         reader.nextAttribute(&nsId, &name);
-        assert(nsId == xmlreader::XmlReader::NAMESPACE_NONE &&
-                name.equals(RTL_CONSTASCII_STRINGPARAM("name")));
+        assert(
+            nsId == xmlreader::XmlReader::NAMESPACE_NONE
+            && name.equals("name"));
         sManufacturer = reader.getAttributeValue(false).convertFromUtf8();
 
         for(;;) {
@@ -108,14 +111,13 @@ SwLabelConfig::SwLabelConfig() :
                     xmlreader::XmlReader::TEXT_NONE, &name, &nsId);
             if (res == xmlreader::XmlReader::RESULT_END)
                 break;
-            assert(res == xmlreader::XmlReader::RESULT_BEGIN &&
-                    name.equals(RTL_CONSTASCII_STRINGPARAM("label")));
+            assert(
+                res == xmlreader::XmlReader::RESULT_BEGIN
+                && name.equals("label"));
             // Get name value
-            sName = lcl_getValue(reader,
-                    xmlreader::Span(RTL_CONSTASCII_STRINGPARAM("name")));
+            sName = lcl_getValue(reader, xmlreader::Span("name"));
             // Get measure value
-            sMeasure = lcl_getValue(reader,
-                    xmlreader::Span(RTL_CONSTASCII_STRINGPARAM("measure")));
+            sMeasure = lcl_getValue(reader, xmlreader::Span("measure"));
             // Ending label mark
             lcl_assertEndingItem(reader);
             if ( m_aLabels.find( sManufacturer ) == m_aLabels.end() )
-- 
cgit v1.2.3