commit 5372bbd0136ee8006f0641e1a6afee5c0e07e253
author Matúš Kukan <matus.kukan@gmail.com> Sat Aug 10 12:57:52 2013 +0200
committer Matúš Kukan <matus.kukan@gmail.com> Sat Aug 10 13:03:37 2013 +0200
tree 365105df52d06d384b5fc26dad2e4d8e2132732b
parent 90520bfe633e65acded019179af3e9930ed1e238

fdo#67799 read ending item also when assert is noop

Change-Id: I056212d0a01f7a647e846bbd1b605c04e1798a14

sw/source/ui/envelp/labelcfg.cxx

diff --git a/sw/source/ui/envelp/labelcfg.cxx b/sw/source/ui/envelp/labelcfg.cxx
index dc815c7..f24f440 100644
--- a/sw/source/ui/envelp/labelcfg.cxx
+++ b/sw/source/ui/envelp/labelcfg.cxx
@@ -33,14 +33,11 @@ using namespace ::com::sun::star::beans;

static inline void lcl_assertEndingItem(xmlreader::XmlReader& reader)
{
#if OSL_DEBUG_LEVEL > 0
    int nsId;
    xmlreader::Span name;
    assert(reader.nextItem(xmlreader::XmlReader::TEXT_NONE, &name, &nsId)
            == xmlreader::XmlReader::RESULT_END);
#else
    (void)reader;
#endif
    xmlreader::XmlReader::Result res;
    res = reader.nextItem(xmlreader::XmlReader::TEXT_NONE, &name, &nsId);
    assert(res == xmlreader::XmlReader::RESULT_END);
}

static inline OUString lcl_getValue(xmlreader::XmlReader& reader,