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 /configmgr/source/xcdparser.cxx | |
parent | 09269acdb98854b1892aa539efec7d6a7875ad06 (diff) |
Some string literal clean up
Change-Id: I108882af13fa97fa094547ec4efb468f988f337d
Diffstat (limited to 'configmgr/source/xcdparser.cxx')
-rw-r--r-- | configmgr/source/xcdparser.cxx | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/configmgr/source/xcdparser.cxx b/configmgr/source/xcdparser.cxx index 4213f6cb3839..ebf14feda7f2 100644 --- a/configmgr/source/xcdparser.cxx +++ b/configmgr/source/xcdparser.cxx @@ -26,8 +26,6 @@ #include "com/sun/star/uno/Reference.hxx" #include "com/sun/star/uno/RuntimeException.hpp" #include "com/sun/star/uno/XInterface.hpp" -#include "rtl/string.h" -#include "rtl/ustring.h" #include "rtl/ustring.hxx" #include "xmlreader/span.hxx" #include "xmlreader/xmlreader.hxx" @@ -65,16 +63,14 @@ bool XcdParser::startElement( } switch (state_) { case STATE_START: - if (nsId == ParseManager::NAMESPACE_OOR && - name.equals(RTL_CONSTASCII_STRINGPARAM("data"))) - { + if (nsId == ParseManager::NAMESPACE_OOR && name.equals("data")) { state_ = STATE_DEPENDENCIES; return true; } break; case STATE_DEPENDENCIES: if (nsId == xmlreader::XmlReader::NAMESPACE_NONE && - name.equals(RTL_CONSTASCII_STRINGPARAM("dependency"))) + name.equals("dependency")) { if (dependencyFile_.isEmpty()) { dependencyOptional_ = false; @@ -87,13 +83,12 @@ bool XcdParser::startElement( } if (attrNsId == xmlreader::XmlReader::NAMESPACE_NONE && //TODO: _OOR - attrLn.equals(RTL_CONSTASCII_STRINGPARAM("file"))) + attrLn.equals("file")) { attrFile = reader.getAttributeValue(false); } else if ((attrNsId == xmlreader::XmlReader::NAMESPACE_NONE) && - attrLn.equals( - RTL_CONSTASCII_STRINGPARAM("optional"))) + attrLn.equals("optional")) { dependencyOptional_ = xmldata::parseBoolean( reader.getAttributeValue(true)); @@ -129,7 +124,7 @@ bool XcdParser::startElement( // fall through case STATE_COMPONENTS: if (nsId == ParseManager::NAMESPACE_OOR && - name.equals(RTL_CONSTASCII_STRINGPARAM("component-schema"))) + name.equals("component-schema")) { nestedParser_ = new XcsParser(layer_, data_); nesting_ = 1; @@ -137,7 +132,7 @@ bool XcdParser::startElement( reader, nsId, name, existingDependencies); } if (nsId == ParseManager::NAMESPACE_OOR && - name.equals(RTL_CONSTASCII_STRINGPARAM("component-data"))) + name.equals("component-data")) { nestedParser_ = new XcuParser(layer_ + 1, data_, 0, 0, 0); nesting_ = 1; |