[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - configmgr/source

[Andras Timar]

 configmgr/source/xcuparser.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4fb12553f5f273058156026300a715326ec3da2f
Author: Andras Timar <andras.timar at collabora.com>
Date:   Sun Dec 8 22:55:57 2013 +0100

    fdo#69027 check for state_.top().locked
    
    Signed-off-by: Stephan Bergmann <sbergman at 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

diff --git a/configmgr/source/xcuparser.cxx b/configmgr/source/xcuparser.cxx
index e77025f..685cf0c 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"))