configmgr/source/xcsparser.cxx | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-)
New commits: commit 8ac9ef88ce9cf8a78748d420639eec0f23735e47 Author: Stephan Bergmann <[email protected]> AuthorDate: Sat Nov 25 14:54:27 2023 +0100 Commit: Stephan Bergmann <[email protected]> CommitDate: Sat Nov 25 23:10:06 2023 +0100 Simplify description/type parsing a bit ...it only pertains to property nodes Change-Id: I706e14118e3f8c33190821f9bcce81bd60d665e3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159953 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/configmgr/source/xcsparser.cxx b/configmgr/source/xcsparser.cxx index d4e35cc75c39..50d7b9fa4791 100644 --- a/configmgr/source/xcsparser.cxx +++ b/configmgr/source/xcsparser.cxx @@ -109,7 +109,7 @@ void merge( } XcsParser::XcsParser(int layer, Data & data): - valueParser_(layer), data_(data), state_(STATE_START), ignoring_(), bIsParsingInfo_(false), type_(TYPE_ERROR) + valueParser_(layer), data_(data), state_(STATE_START), ignoring_(), bIsParsingInfo_(false) {} XcsParser::~XcsParser() {} @@ -307,13 +307,17 @@ void XcsParser::endElement(xmlreader::XmlReader const & reader) { Element top(std::move(elements_.top())); elements_.pop(); if (top.node.is()) { - // Remove whitespace from description_ resulting from line breaks/indentation in xml files - OUString desc(description_.makeStringAndClear()); - desc = desc.trim(); - while (desc.indexOf(" ") != -1) - desc = desc.replaceAll(" ", " "); - top.node->setDescription(desc); - top.node->setType(type_); + if (top.node->kind() == Node::KIND_PROPERTY + || top.node->kind() == Node::KIND_LOCALIZED_PROPERTY) + { + // Remove whitespace from description_ resulting from line breaks/indentation in xml files + OUString desc(description_.makeStringAndClear()); + desc = desc.trim(); + while (desc.indexOf(" ") != -1) + desc = desc.replaceAll(" ", " "); + top.node->setDescription(desc); + top.node->setType(type_); + } if (elements_.empty()) { switch (state_) { case STATE_TEMPLATES: @@ -474,7 +478,7 @@ void XcsParser::handleNodeRef(xmlreader::XmlReader & reader) { void XcsParser::handleProp(xmlreader::XmlReader & reader) { bool hasName = false; OUString name; - valueParser_.type_ = TYPE_ERROR; + type_ = TYPE_ERROR; bool localized = false; bool nillable = true; for (;;) { @@ -489,9 +493,8 @@ void XcsParser::handleProp(xmlreader::XmlReader & reader) { } else if (attrNsId == ParseManager::NAMESPACE_OOR && attrLn == "type") { - valueParser_.type_ = xmldata::parseType( + type_ = xmldata::parseType( reader, reader.getAttributeValue(true)); - type_ = valueParser_.type_; } else if (attrNsId == ParseManager::NAMESPACE_OOR && attrLn == "localized") { @@ -506,10 +509,11 @@ void XcsParser::handleProp(xmlreader::XmlReader & reader) { throw css::uno::RuntimeException( "no prop name attribute in " + reader.getUrl()); } - if (valueParser_.type_ == TYPE_ERROR) { + if (type_ == TYPE_ERROR) { throw css::uno::RuntimeException( "no prop type attribute in " + reader.getUrl()); } + valueParser_.type_ = type_; elements_.push( Element( (localized
