[Libreoffice-commits] .: configmgr/source

Stephan Bergmann sbergmann at kemper.freedesktop.org
Thu Jan 12 00:20:18 PST 2012


 configmgr/source/xcuparser.cxx |   10 ++++++++++
 1 file changed, 10 insertions(+)

New commits:
commit ab93e1b483d7af9bcac997e838e5a62a924e28c3
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Jan 12 09:15:19 2012 +0100

    Check for xcu <node> that should rather be <prop>.

diff --git a/configmgr/source/xcuparser.cxx b/configmgr/source/xcuparser.cxx
index 6ee5c82..2d65923 100644
--- a/configmgr/source/xcuparser.cxx
+++ b/configmgr/source/xcuparser.cxx
@@ -934,6 +934,16 @@ void XcuParser::handleGroupNode(
         state_.push(State(true)); // ignored
         return;
     }
+    Node::Kind kind = child->kind();
+    if (kind != Node::KIND_GROUP && kind != Node::KIND_SET) {
+        throw css::uno::RuntimeException(
+            (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bad <node> \"")) +
+             name +
+             rtl::OUString(
+                 RTL_CONSTASCII_USTRINGPARAM("\" of non group/set kind in ")) +
+             reader.getUrl()),
+            css::uno::Reference< css::uno::XInterface >());
+    }
     if (op != OPERATION_MODIFY && op != OPERATION_FUSE) {
         throw css::uno::RuntimeException(
             (rtl::OUString(


More information about the Libreoffice-commits mailing list