From fcdac9db2f94c92fa768dcfe5f92e85ce1c8de4d Mon Sep 17 00:00:00 2001
From: Vladimir Glazounov <vg@openoffice.org>
Date: Tue, 12 Feb 2008 16:25:58 +0000
Subject: INTEGRATION: CWS fwk84_SRC680 (1.143.66); FILE MERGED 2008/02/05
 15:26:12 cd 1.143.66.3: #153869# Use TemplateURL configuration to provide a
 registration URL with place holders 2008/02/01 13:12:21 cd 1.143.66.2:
 #153869# Control a instance uuid for every product version 2008/01/30
 15:53:13 cd 1.143.66.1: #153869# New property for instance uuid

---
 .../schema/org/openoffice/Office/Common.xcs        | 35 ++++++++++++++++++++--
 1 file changed, 32 insertions(+), 3 deletions(-)

(limited to 'officecfg')

diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 85c7c35d826b..ead09e6b6861 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -5,9 +5,9 @@
  *
  *  $RCSfile: Common.xcs,v $
  *
- *  $Revision: 1.143 $
+ *  $Revision: 1.144 $
  *
- *  last change: $Author: ihi $ $Date: 2007-11-26 16:25:01 $
+ *  last change: $Author: vg $ $Date: 2008-02-12 17:25:58 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -855,6 +855,17 @@ Dymamic border coloring means that when the mouse is hovered over a control, and
 				<value>false</value>
 			</prop>
 		</group>
+		<group oor:name="ProductVersionID">
+			<info>
+				<desc>Stores registration data which is related to a specific product version.</desc>
+			</info>
+			<prop oor:name="InstanceUUID" oor:type="xs:string">
+				<info>
+					<desc>An instance UUID associated with the product version ID.</desc>
+				</info>
+				<value/>
+			</prop>
+		</group>
 	</templates>
 	<component>
 		<group oor:name="InternalMSExport">
@@ -3311,9 +3322,16 @@ Dymamic border coloring means that when the mouse is hovered over a control, and
 					<author>FS</author>
 					<desc>Contains various settings regarding the product registration feature.</desc>
 				</info>
+				<prop oor:name="TemplateURL" oor:type="xs:string">
+					<info>
+						<desc>Contains a string specifying the URL with placeholders to be used for online registration.</desc>
+					</info>
+					<value/>
+					<!-- JB: Empty default inserted into empty property node. Remove if NIL was intended -->
+				</prop>
 				<prop oor:name="URL" oor:type="xs:string">
 					<info>
-						<desc>Contains a string specifying the URL to be used for online registration.</desc>
+						<desc>Contains a string specifying the real URL to be used for online registration.</desc>
 					</info>
 					<value/>
 					<!-- JB: Empty default inserted into empty property node. Remove if NIL was intended -->
@@ -3337,6 +3355,17 @@ Dymamic border coloring means that when the mouse is hovered over a control, and
 					</info>
 					<value>true</value>
 				</prop>
+				<prop oor:name="ProductVersionID" oor:type="xs:string">
+					<info>
+						<desc>Current product ID.</desc>
+					</info>
+				</prop>
+				<set oor:name="ProductVersions" oor:node-type="ProductVersionID">
+					<info>
+						<author>CD</author>
+						<desc>Specifies product specific IDs and associated instance UUIDs</desc>
+					</info>
+				</set>
 			</group>
 		</group>
 		<group oor:name="Java">
-- 
cgit