diff options
| author | Noel Grandin <noel@peralex.com> | 2016-05-23 14:51:43 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-24 06:54:19 +0000 |
| commit | 6bda2bf6fe8afba0b47ad89033ea3dbf6dc8b797 (patch) | |
| tree | 7f52cca48b7229406580eb7d665527bd9df0b8d1 /configmgr | |
| parent | 111de438ea3e512a541281dc0716cc728ea8d152 (diff) | |
Convert XmlReader::Text to scoped enum
Change-Id: I4741b13fcf887a95b85886cb41f8236e128e81a2
Reviewed-on: https://gerrit.libreoffice.org/25364
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'configmgr')
| -rw-r--r-- | configmgr/source/valueparser.cxx | 6 | ||||
| -rw-r--r-- | configmgr/source/xcdparser.cxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/configmgr/source/valueparser.cxx b/configmgr/source/valueparser.cxx index f8d98dde2d76..e732e8df58e1 100644 --- a/configmgr/source/valueparser.cxx +++ b/configmgr/source/valueparser.cxx @@ -265,13 +265,13 @@ xmlreader::XmlReader::Text ValueParser::getTextMode() const { return (type_ == TYPE_STRING || type_ == TYPE_STRING_LIST || !separator_.isEmpty()) - ? xmlreader::XmlReader::TEXT_RAW - : xmlreader::XmlReader::TEXT_NORMALIZED; + ? xmlreader::XmlReader::Text::Raw + : xmlreader::XmlReader::Text::Normalized; default: break; } } - return xmlreader::XmlReader::TEXT_NONE; + return xmlreader::XmlReader::Text::NONE; } bool ValueParser::startElement( diff --git a/configmgr/source/xcdparser.cxx b/configmgr/source/xcdparser.cxx index 0bfe298fd08c..553087a38c4a 100644 --- a/configmgr/source/xcdparser.cxx +++ b/configmgr/source/xcdparser.cxx @@ -47,7 +47,7 @@ XcdParser::~XcdParser() {} xmlreader::XmlReader::Text XcdParser::getTextMode() { return nestedParser_.is() - ? nestedParser_->getTextMode() : xmlreader::XmlReader::TEXT_NONE; + ? nestedParser_->getTextMode() : xmlreader::XmlReader::Text::NONE; } bool XcdParser::startElement( |