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 /sw | |
| 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 'sw')
| -rw-r--r-- | sw/source/uibase/envelp/labelcfg.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/uibase/envelp/labelcfg.cxx b/sw/source/uibase/envelp/labelcfg.cxx index 72b22f2351dc..8cdd8813cdd8 100644 --- a/sw/source/uibase/envelp/labelcfg.cxx +++ b/sw/source/uibase/envelp/labelcfg.cxx @@ -38,7 +38,7 @@ static inline void lcl_assertEndingItem(xmlreader::XmlReader& reader) int nsId; xmlreader::Span name; xmlreader::XmlReader::Result res; - res = reader.nextItem(xmlreader::XmlReader::TEXT_NONE, &name, &nsId); + res = reader.nextItem(xmlreader::XmlReader::Text::NONE, &name, &nsId); assert(res == xmlreader::XmlReader::RESULT_END); (void) res; } @@ -49,9 +49,9 @@ static inline OUString lcl_getValue(xmlreader::XmlReader& reader, int nsId; xmlreader::Span name; xmlreader::XmlReader::Result res; - res = reader.nextItem(xmlreader::XmlReader::TEXT_NONE, &name, &nsId); + res = reader.nextItem(xmlreader::XmlReader::Text::NONE, &name, &nsId); assert(res == xmlreader::XmlReader::RESULT_BEGIN && name.equals(span)); - res = reader.nextItem(xmlreader::XmlReader::TEXT_RAW, &name, &nsId); + res = reader.nextItem(xmlreader::XmlReader::Text::Raw, &name, &nsId); assert(res == xmlreader::XmlReader::RESULT_TEXT); (void) res; (void) span; OUString sTmp = name.convertFromUtf8(); @@ -86,12 +86,12 @@ SwLabelConfig::SwLabelConfig() : // fill m_aLabels and m_aManufacturers with the predefined labels res = reader.nextItem( - xmlreader::XmlReader::TEXT_NONE, &name, &nsId); + xmlreader::XmlReader::Text::NONE, &name, &nsId); assert( res == xmlreader::XmlReader::RESULT_BEGIN && name.equals("manufacturers")); res = reader.nextItem( - xmlreader::XmlReader::TEXT_NONE, &name, &nsId); + xmlreader::XmlReader::Text::NONE, &name, &nsId); while (res != xmlreader::XmlReader::RESULT_END) { // Opening manufacturer @@ -108,7 +108,7 @@ SwLabelConfig::SwLabelConfig() : for(;;) { // Opening label or ending manufacturer res = reader.nextItem( - xmlreader::XmlReader::TEXT_NONE, &name, &nsId); + xmlreader::XmlReader::Text::NONE, &name, &nsId); if (res == xmlreader::XmlReader::RESULT_END) break; assert( @@ -127,10 +127,10 @@ SwLabelConfig::SwLabelConfig() : } // Get next manufacturer or end res = reader.nextItem( - xmlreader::XmlReader::TEXT_NONE, &name, &nsId); + xmlreader::XmlReader::Text::NONE, &name, &nsId); }; res = reader.nextItem( - xmlreader::XmlReader::TEXT_NONE, &name, &nsId); + xmlreader::XmlReader::Text::NONE, &name, &nsId); assert(res == xmlreader::XmlReader::RESULT_DONE); // add to m_aLabels and m_aManufacturers the custom labels |