diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-08-10 12:57:52 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-08-15 15:07:37 +0000 |
| commit | 5aa736fa2590cc9dd8501f0f403924681ca09495 (patch) | |
| tree | da5e092eb5a082bd4adb2e8eaa2c76f919660010 | |
| parent | bf369b2c653297d722d41e56fd71425526a44a72 (diff) | |
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@gmail.com>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
(cherry picked from commit 7d8ab35f1f4a069d08b57652f79870fdcfc649af)
Reviewed-on: https://gerrit.libreoffice.org/5422
Reviewed-by: Eike Rathke <erack@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | sw/source/ui/envelp/labelcfg.cxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sw/source/ui/envelp/labelcfg.cxx b/sw/source/ui/envelp/labelcfg.cxx index dc815c7a5a5d..f24f44074131 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, |