[Libreoffice-commits] .: 2 commits - configmgr/source test/user-template

[Stephan Bergmann]

 configmgr/source/xcuparser.cxx                    |    2 -
 test/user-template/user/registrymodifications.xcu |   40 +++++++++++++++++++---
 2 files changed, 36 insertions(+), 6 deletions(-)

New commits:
commit 3b317b52dce52b4302f40c8de75e3abf3d12afa2
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Oct 26 17:59:25 2011 +0200

    Fixed test/user-template/user/registrymodifications.xcu.
    
    Also added license header.

diff --git a/test/user-template/user/registrymodifications.xcu b/test/user-template/user/registrymodifications.xcu
index 7ac47c7..cdfda4a 100644
--- a/test/user-template/user/registrymodifications.xcu
+++ b/test/user-template/user/registrymodifications.xcu
@@ -1,7 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<oor:items xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <item oor:path="/org.openoffice.Office.Paths/Paths/org.openoffice.Office.Paths:NamedPath['UIConfig']/InternalPaths">
-    <node oor:name="$(userurl)/config/">
-    </node>
-  </item>
+<!--
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * Major Contributor(s):
+ * [ Copyright (C) 2011 Stephan Bergmann <sbergman at redhat.com> (initial
+ *   developer) ]
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+-->
+<oor:items xmlns:oor="http://openoffice.org/2001/registry">
+ <item oor:path="/org.openoffice.Office.Paths/Paths">
+  <node oor:name="UIConfig" oor:op="replace">
+   <node oor:name="InternalPaths">
+    <node oor:name="$(userurl)/config" oor:op="fuse"/>
+   </node>
+  </node>
+ </item>
 </oor:items>
commit 3f8072136f02041f8c4615130405771bd6959d59
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Oct 26 17:52:12 2011 +0200

    Handle removal of non-mandatory set members.

diff --git a/configmgr/source/xcuparser.cxx b/configmgr/source/xcuparser.cxx
index 3a81ea4..4746bcf 100644
--- a/configmgr/source/xcuparser.cxx
+++ b/configmgr/source/xcuparser.cxx
@@ -1109,7 +1109,7 @@ void XcuParser::handleSetNode(xmlreader::XmlReader & reader, SetNode * set) {
             bool known = i != set->getMembers().end();
             if (known && !state_.top().locked &&
                 finalizedLayer >= valueParser_.getLayer() &&
-                mandatoryLayer > valueParser_.getLayer())
+                (!mandatory || mandatoryLayer > valueParser_.getLayer()))
             {
                 set->getMembers().erase(i);
             }