diff options
| author | Andras Timar <andras.timar@collabora.com> | 2013-12-08 22:55:57 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2013-12-09 13:14:07 +0100 |
| commit | 95fb63a111b8ee3a5ecfed3d5cce84df58abf8a6 (patch) | |
| tree | 360e959445496bce9f81e871418f89ea8b5fb4ac | |
| parent | 622e80722683a2677388ccdf69fa888b7e6cbd8f (diff) | |
fdo#69027 check for state_.top().locked
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>: I wonder why I originally
introduced State::locked in addition to State:ignored in the first place, but
can't find a good reason for that now. So the patch looks ok, though it could be
further simplified to completely get rid of State::locked. Will do that in a
follow-up commit.
Change-Id: If07a07b21effbf42918408a0b60b2d18bdc8665c
| -rw-r--r-- | configmgr/source/xcuparser.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configmgr/source/xcuparser.cxx b/configmgr/source/xcuparser.cxx index e77025fb70b2..685cf0c63c50 100644 --- a/configmgr/source/xcuparser.cxx +++ b/configmgr/source/xcuparser.cxx @@ -92,7 +92,7 @@ bool XcuParser::startElement( reader.getUrl()), css::uno::Reference< css::uno::XInterface >()); } - } else if (state_.top().ignore) { + } else if (state_.top().ignore || state_.top().locked) { state_.push(State(false)); } else if (!state_.top().node.is()) { if (nsId == xmlreader::XmlReader::NAMESPACE_NONE && name.equals("item")) |