[Libreoffice-commits] core.git: desktop/test

[Stephan Bergmann]

 desktop/test/deployment/passive/Addons.xcu |   71 ++++++++++++++---------------
 1 file changed, 36 insertions(+), 35 deletions(-)

New commits:
commit ed5a8df72ac2d14aa2f5d1f87543fcfff9ad9d7d
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Nov 16 17:01:06 2016 +0100

    Demonstrate that (extension) .xcu can contain <item> with nested <node>s
    
    This sprang from an IRC conversation with uniscript about allowing .xcd in
    extensions, so that an extension with (localization) data for many packages
    would not need one .xcu file per package, but rather only a single file.  That
    is possible with a single .xcu file using the <item> syntax, as shown here.  (I
    had thought that originally only registrymodifications.xcu supported the <item>
    syntax, but can't find any traces of that; so looks like an extension with an
    .xcu file using <item> syntax should be supported by OOo and derivates "since
    ages".)
    
    Change-Id: I1101793e6b14ba9c1e7647edab76927d4d31a81c

diff --git a/desktop/test/deployment/passive/Addons.xcu b/desktop/test/deployment/passive/Addons.xcu
index 3ef3b62..efb3648 100644
--- a/desktop/test/deployment/passive/Addons.xcu
+++ b/desktop/test/deployment/passive/Addons.xcu
@@ -17,42 +17,43 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<o:component-data xmlns:o="http://openoffice.org/2001/registry"
-    o:package="org.openoffice.Office" o:name="Addons">
-  <node o:name="AddonUI">
-    <node o:name="OfficeMenuBar">
-      <node o:name="org.openoffice.test.desktop.deployment.passive"
-          o:op="replace">
-        <prop o:name="Title" xml:lang="en-US">
-          <value>passive</value>
-        </prop>
-        <node o:name="Submenu">
-          <node o:name="1" o:op="replace">
-            <prop o:name="URL">
-              <value>vnd.org.openoffice.test.desktop.deployment.passive_native:</value>
-            </prop>
-            <prop o:name="Title" xml:lang="en-US">
-              <value>native</value>
-            </prop>
-          </node>
-          <node o:name="2" o:op="replace">
-            <prop o:name="URL">
-              <value>vnd.org.openoffice.test.desktop.deployment.passive_java:</value>
-            </prop>
-            <prop o:name="Title" xml:lang="en-US">
-              <value>java</value>
-            </prop>
-          </node>
-          <node o:name="3" o:op="replace">
-            <prop o:name="URL">
-              <value>vnd.org.openoffice.test.desktop.deployment.passive_python:</value>
-            </prop>
-            <prop o:name="Title" xml:lang="en-US">
-              <value>python</value>
-            </prop>
+<o:items xmlns:o="http://openoffice.org/2001/registry">
+  <item o:path="/org.openoffice.Office.Addons">
+    <node o:name="AddonUI">
+      <node o:name="OfficeMenuBar">
+        <node o:name="org.openoffice.test.desktop.deployment.passive"
+            o:op="replace">
+          <prop o:name="Title" xml:lang="en-US">
+            <value>passive</value>
+          </prop>
+          <node o:name="Submenu">
+            <node o:name="1" o:op="replace">
+              <prop o:name="URL">
+                <value>vnd.org.openoffice.test.desktop.deployment.passive_native:</value>
+              </prop>
+              <prop o:name="Title" xml:lang="en-US">
+                <value>native</value>
+              </prop>
+            </node>
+            <node o:name="2" o:op="replace">
+              <prop o:name="URL">
+                <value>vnd.org.openoffice.test.desktop.deployment.passive_java:</value>
+              </prop>
+              <prop o:name="Title" xml:lang="en-US">
+                <value>java</value>
+              </prop>
+            </node>
+            <node o:name="3" o:op="replace">
+              <prop o:name="URL">
+                <value>vnd.org.openoffice.test.desktop.deployment.passive_python:</value>
+              </prop>
+              <prop o:name="Title" xml:lang="en-US">
+                <value>python</value>
+              </prop>
+            </node>
           </node>
         </node>
       </node>
     </node>
-  </node>
-</o:component-data>
+  </item>
+</o:items>