diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-05-16 09:24:31 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-05-16 09:25:53 +0200 |
| commit | df18d5878c71d8d38a43dd04c0e907f9385addb4 (patch) | |
| tree | 72d8da1543c6835594f37b6d75cb194fc6f775b1 /sw/source | |
| parent | 09269acdb98854b1892aa539efec7d6a7875ad06 (diff) | |
Some string literal clean up
Change-Id: I108882af13fa97fa094547ec4efb468f988f337d
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/ui/envelp/labelcfg.cxx | 26 |
1 files changed, 14 insertions, 12 deletions
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() ) |