INTEGRATION: CWS dba24c (1.38.78); FILE MERGED

2007/10/29 10:57:55 fs 1.38.78.1: #i83097# additional setting specifying Java methods allowed to call from inside HSQL

1 files changed, 26 insertions, 2 deletions

diff --git a/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs b/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs
index e01ea53879c8..ea72821a8710 100644
--- a/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs
@@ -5,9 +5,9 @@
  *
  *  $RCSfile: DataAccess.xcs,v $
  *
- *  $Revision: 1.38 $
+ *  $Revision: 1.39 $
  *
- *  last change: $Author: rt $ $Date: 2007-07-24 11:55:08 $
+ *  last change: $Author: ihi $ $Date: 2007-11-21 15:11:51 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -263,6 +263,7 @@
 				<desc>Contains a list of descriptions for user defined drivers.</desc>
 			</info>
 		</set>
+
 		<group oor:name="AddressBook">
 			<info>
 				<desc>Specifies the data source that can be used as an AddressBook.</desc>
@@ -298,6 +299,7 @@
 				</info>
 			</set>
 		</group>
+
 		<group oor:name="Bibliography">
 			<info>
 				<author>OS</author>
@@ -350,10 +352,12 @@
 				</info>
 			</set>
 		</group>
+
 		<group oor:name="DriverSettings">
 			<info>
 				<desc>Specifies the driver settings that are used.</desc>
 			</info>
+
 			<group oor:name="com.sun.star.comp.sdbc.MozabDriver">
 				<info>
 					<desc>Specifies the driver settings for the mozilla database driver.</desc>
@@ -573,6 +577,7 @@
 					</prop>
 				</group>
 			</group>
+
 			<group oor:name="com.sun.star.comp.sdbc.evoab.OEvoabDriver">
 				<info>
 					<desc>Specifies the driver settings for the evolution database driver.</desc>
@@ -760,6 +765,7 @@
 					</prop>
 				</group>
 			</group>
+
             <group oor:name="com.sun.star.comp.sdbc.kab.Driver">
                 <info>
                     <desc>Specifies the driver settings for the mozilla database driver.</desc>
@@ -773,7 +779,25 @@
                     <value>false</value>
                 </prop>
             </group>
+
+            <group oor:name="com.sun.star.sdbcx.comp.hsqldb.Driver">
+                <info>
+                    <desc>Specifies settings for the driver accessing HSQL databases embedded into OpenOffice.org
+                          database documents (.odb)</desc>
+                </info>
+                <group oor:name="PermittedJavaMethods" oor:extensible="true">
+                    <info>
+                        <desc>HSQLDB features calling Java code directly from SQL statements. For security
+                              reasons, this is restricted to classes from the org.hsqldb.Library package,
+                              the java.lang.math package, plus any methods specified in this configuraton
+                              setting. If a method specification ends with .*, then all methods
+                              from the respectiv package are permitted.</desc>
+                    </info>
+                </group>
+            </group>
+
         </group>
+
 		<group oor:name="FormSearchOptions">
 			<info>
 				<desc>Specifies the options for searching in forms.</desc>