diff options
| author | Noel Power <noel.power@novell.com> | 2010-10-13 10:51:50 +0100 |
|---|---|---|
| committer | Noel Power <noel.power@novell.com> | 2010-10-13 10:51:50 +0100 |
| commit | 6db6a43ddc5a66f41f109b7995fd83adb5d35411 (patch) | |
| tree | be01c36438a39fdebd43608355671d2e6d120108 /officecfg | |
| parent | 20658054d8bd6380b4b175b552ccc1480c49d01c (diff) | |
| parent | d1a9ad8f4dc25817cea279262286cdfb421fe891 (diff) | |
Merge branch 'vba' fix conflics, trailing ws & tab issues
also removed some old headers ( which I need to add new ones for )
Conflicts:
basic/source/classes/sbunoobj.cxx
basic/source/classes/sbxmod.cxx
xmloff/inc/xmlnmspe.hxx
xmloff/inc/xmloff/xmltoken.hxx
xmlscript/inc/xmlscript/xmldlg_imexp.hxx
Diffstat (limited to 'officecfg')
3 files changed, 27 insertions, 2 deletions
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/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs index 3a9cd0270bc2..ed6471d1b108 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 --> |