Merge branch 'master' into feature/calc-key-binding-compat

5 files changed, 61 insertions, 2 deletions

diff --git a/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu b/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu
index d185b67fcc6e..f4c3c3f8c21d 100644
--- a/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu
@@ -153,6 +153,14 @@
     </node>
   </node>
   <node oor:name="RegisteredNames">
+    <node oor:name="EvolutionLocal" oor:op="replace">
+        <prop oor:name="Location" oor:type="xs:string">
+            <value>$(userurl)/database/evolocal.odb</value>
+        </prop>
+        <prop oor:name="Name" oor:type="xs:string">
+            <value>EvolutionLocal</value>
+        </prop>
+    </node>
     <node oor:name="org.openoffice.Bibliography" oor:op="replace">
         <prop oor:name="Location" oor:type="xs:string">
             <value>$(userurl)/database/biblio.odb</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index 251c9859e438..3c2584126a0b 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -1205,6 +1205,12 @@
                     <value xml:lang="en-US">~Remove Filter</value>
                 </prop>
             </node>
+                        <node oor:name=".uno:DataForm" oor:op="replace">
+                                <prop oor:name="Label" oor:type="xs:string">
+                                        <value xml:lang="de">D~atenForm...</value>
+                                        <value xml:lang="en-US">D~ataForm...</value>
+                                </prop>
+                        </node>
             <node oor:name=".uno:DataSubTotals" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
                     <value xml:lang="en-US">Sub~totals...</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/Writer.xcu b/officecfg/registry/data/org/openoffice/Office/Writer.xcu
index b318614ef789..bdc54ceb1ea1 100644
--- a/officecfg/registry/data/org/openoffice/Office/Writer.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Writer.xcu
@@ -40,6 +40,32 @@
     <prop oor:name="IsHideEmptyParagraphs" >
      <value>true</value>
     </prop>
+    <node oor:name="DataSource">
+      <prop oor:name="DataSourceName" oor:type="xs:string">
+        <value>EvolutionLocal</value>
+      </prop>
+      <prop oor:name="DataTableName" oor:type="xs:string">
+        <value>Personal</value>
+      </prop>
+    </node>
+    <node oor:name="AddressDataAssignments">
+      <node oor:name="_0" oor:op="replace">
+        <prop oor:name="DBColumnAssignments" oor:type="oor:string-list">
+          <value oor:separator=",">title,full_name,family_name,org,addr_line1,addr_line2,city,state,zip,country,home_phone,business_phone,email_1,</value>
+        </prop>
+        <node oor:name="DataSource">
+          <prop oor:name="DataCommandType" oor:type="xs:short">
+            <value>0</value>
+          </prop>
+          <prop oor:name="DataSourceName" oor:type="xs:string">
+            <value>EvolutionLocal</value>
+          </prop>
+          <prop oor:name="DataTableName" oor:type="xs:string">
+            <value>Personal</value>
+          </prop>
+        </node>
+      </node>
+    </node>
     <prop oor:name="EMailSupported">
      <value>true</value>
     </prop>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index efec26394481..fbec7abc0029 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -1402,7 +1402,7 @@
               <desc>Indicates whether VBA macros are imported without comments to be executable.</desc>
               <label>Executable code</label>
             </info>
-            <value>false</value>
+            <value>true</value>
           </prop>
           <prop oor:name="Save" oor:type="xs:boolean">
 						<!-- OldPath: Filter/MS_Office/Basic/Excel -->
diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
index d75708e9c1db..3c3c5dbde35b 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -2,7 +2,7 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -746,6 +746,17 @@
 		</group>
 	</templates>
 	<component>
+        <group oor:name="GlobalTemplateList">
+            <info>
+               <desc>Contains the most recently opened documents.</desc>
+            </info>
+            <prop oor:name="Paths" oor:type="oor:string-list">
+                <info>
+                    <desc>Lists the file global templates loaded when importing writer documents.</desc>
+                </info>
+                <value oor:separator=";"></value>
+            </prop>
+        </group>
         <group oor:name="MailMergeWizard">
             <info>
                 <desc>Settings of the mail merge wizard.</desc>
@@ -6021,6 +6032,14 @@
 						</info>
 						<value>true</value>
 					</prop>
+                    <prop oor:name="Executable" oor:type="xs:boolean">
+                        <info>
+                            <author>pflin</author>
+                            <desc>Indicates whether VBA macros are imported without comments to be executable.</desc>
+                             <label>Executable code</label>
+                         </info>
+                        <value>true</value>
+                    </prop>
 					<prop oor:name="Save" oor:type="xs:boolean">
 						<!-- OldPath: Filter/MS_Office/Basic/Word -->
 						<!-- OldLocation: soffice.cfg -->