[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sw/source

[Matúš Kukan]

 sw/source/ui/envelp/labelcfg.cxx |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

New commits:
commit 7d8ab35f1f4a069d08b57652f79870fdcfc649af
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Sat Aug 10 12:57:52 2013 +0200

    fdo#67799 read ending item also when assert is noop
    
    Change-Id: I056212d0a01f7a647e846bbd1b605c04e1798a14
    Reviewed-on: https://gerrit.libreoffice.org/5336
    Tested-by: Norbert Thiebaud <nthiebaud at gmail.com>
    Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>

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,