diff options
Diffstat (limited to 'officecfg')
23 files changed, 773 insertions, 339 deletions
diff --git a/officecfg/prj/build.lst b/officecfg/prj/build.lst index dba837c643..04d2cfd87a 100644 --- a/officecfg/prj/build.lst +++ b/officecfg/prj/build.lst @@ -1,5 +1,4 @@ oc officecfg : l10n soltools solenv LIBXSLT:libxslt NULL -oc officecfg usr30073 - none NULL oc officecfg usr1 - all oc_mkout NULL oc officecfg\registry\schema nmake - all oc_reg_schema NULL oc officecfg\registry nmake - all oc_reg NULL diff --git a/officecfg/registry/component-update.dtd b/officecfg/registry/component-update.dtd index 51623f40ba..81acc5e35e 100644 --- a/officecfg/registry/component-update.dtd +++ b/officecfg/registry/component-update.dtd @@ -113,7 +113,8 @@ <!ELEMENT oor:items (item*)> <!ATTLIST oor:items> -<!ELEMENT item ((prop | node)*)> +<!ELEMENT item ((node | prop | value)*)> <!ATTLIST item oor:path CDATA #REQUIRED> - <!-- the absolute path representation of a set or group node --> + <!-- the absolute path representation of a localized property or a group + or set node --> diff --git a/officecfg/registry/data/org/openoffice/Interaction.xcu b/officecfg/registry/data/org/openoffice/Interaction.xcu new file mode 100644 index 0000000000..4269378c36 --- /dev/null +++ b/officecfg/registry/data/org/openoffice/Interaction.xcu @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--*********************************************************************** + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************ --> +<!DOCTYPE oor:component-data SYSTEM "../../../component-update.dtd"> +<oor:component-data oor:name="Interaction" oor:package="org.openoffice" xmlns:oor="http://openoffice.org/2001/registry" xmlns:install="http://openoffice.org/2004/installation" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <node oor:name="InteractionHandlers"> + <!-- The interaction handler for SQLExceptions (and derived exceptions), implemented in the Base module. + --> + <node oor:name="org.openoffice.Office.Base.DatabaseInteractions" oor:op="replace"> + <node oor:name="HandledRequestTypes"> + <node oor:name="com.sun.star.sdbc.SQLException" oor:op="replace"> + <prop oor:name="Propagation" oor:type="xs:string"> + <value>named-and-derived</value> + </prop> + </node> + <node oor:name="com.sun.star.sdb.ParametersRequest" oor:op="replace"> + <prop oor:name="Propagation" oor:type="xs:string"> + <value>named-and-derived</value> + </prop> + </node> + <node oor:name="com.sun.star.sdb.DocumentSaveRequest" oor:op="replace"> + <prop oor:name="Propagation" oor:type="xs:string"> + <value>named-and-derived</value> + </prop> + </node> + </node> + <prop oor:name="ServiceName" oor:type="xs:string"> + <value>com.sun.star.comp.dbaccess.DatabaseInteractionHandler</value> + </prop> + </node> + </node> +</oor:component-data> diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu index 18b0658cc0..c197b77231 100644..100755 --- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu @@ -394,6 +394,7 @@ <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> <value xml:lang="de">.uno:AlignBlock</value> <value xml:lang="en-US">.uno:Bold</value> + <value xml:lang="es">.uno:SearchDialog</value> </prop> </node> <node oor:name="B_SHIFT_MOD1" oor:op="replace"> @@ -459,6 +460,7 @@ <node oor:name="E_MOD1" oor:op="replace"> <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> <value xml:lang="en-US">.uno:AlignHorizontalCenter</value> + <value xml:lang="es">.uno:SelectAll</value> </prop> </node> <node oor:name="F11" oor:op="replace"> @@ -828,6 +830,7 @@ <node oor:name="U_MOD1" oor:op="replace"> <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> <value xml:lang="en-US">.uno:Underline</value> + <value xml:lang="es">.uno:AddDirect</value> </prop> </node> <node oor:name="U_SHIFT_MOD1" oor:op="replace"> @@ -988,6 +991,7 @@ <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> <value xml:lang="de">.uno:JustifyPara</value> <value xml:lang="en-US">.uno:Bold</value> + <value xml:lang="es">.uno:SearchDialog</value> </prop> </node> <node oor:name="B_SHIFT_MOD1" oor:op="replace"> @@ -1023,6 +1027,7 @@ <node oor:name="E_MOD1" oor:op="replace"> <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> <value xml:lang="en-US">.uno:CenterPara</value> + <value xml:lang="es">.uno:SelectAll</value> </prop> </node> <node oor:name="F11" oor:op="replace"> @@ -1228,6 +1233,7 @@ <node oor:name="U_MOD1" oor:op="replace"> <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> <value xml:lang="en-US">.uno:Underline</value> + <value xml:lang="es">.uno:AddDirect</value> </prop> </node> <node oor:name="U_SHIFT_MOD1" oor:op="replace"> @@ -1336,6 +1342,7 @@ <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> <value xml:lang="de">.uno:JustifyPara</value> <value xml:lang="en-US">.uno:Bold</value> + <value xml:lang="es">.uno:SearchDialog</value> </prop> </node> <node oor:name="B_SHIFT_MOD1" oor:op="replace"> @@ -1421,6 +1428,7 @@ <node oor:name="E_MOD1" oor:op="replace"> <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> <value xml:lang="en-US">.uno:CenterPara</value> + <value xml:lang="es">.uno:SelectAll</value> </prop> </node> <node oor:name="F10_MOD1" oor:op="replace"> @@ -1835,6 +1843,7 @@ <node oor:name="U_MOD1" oor:op="replace"> <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> <value xml:lang="en-US">.uno:Underline</value> + <value xml:lang="es">.uno:AddDirect</value> </prop> </node> <node oor:name="U_SHIFT_MOD1" oor:op="replace"> @@ -1869,6 +1878,12 @@ </node> </node> <node oor:name="com.sun.star.presentation.PresentationDocument" oor:op="replace"> + <node oor:name="N_MOD1_MOD2" oor:op="replace"> + <prop oor:name="Command"> + <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> + <value xml:lang="en-US">.uno:InsertAnnotation</value> + </prop> + </node> <node oor:name="PAGEDOWN_MOD1_MOD2" oor:op="replace"> <prop oor:name="Command"> <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> @@ -1925,6 +1940,7 @@ <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> <value xml:lang="de">.uno:JustifyPara</value> <value xml:lang="en-US">.uno:Bold</value> + <value xml:lang="es">.uno:SearchDialog</value> </prop> </node> <node oor:name="B_SHIFT_MOD1" oor:op="replace"> @@ -1965,6 +1981,7 @@ <node oor:name="E_MOD1" oor:op="replace"> <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> <value xml:lang="en-US">.uno:CenterPara</value> + <value xml:lang="es">.uno:SelectAll</value> </prop> </node> <node oor:name="F11" oor:op="replace"> @@ -2195,6 +2212,7 @@ <node oor:name="U_MOD1" oor:op="replace"> <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> <value xml:lang="en-US">.uno:Underline</value> + <value xml:lang="es">.uno:AddDirect</value> </prop> </node> <node oor:name="U_SHIFT_MOD1" oor:op="replace"> @@ -2355,6 +2373,7 @@ <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> <value xml:lang="de">.uno:JustifyPara</value> <value xml:lang="en-US">.uno:Bold</value> + <value xml:lang="es">.uno:SearchDialog</value> </prop> </node> <node oor:name="B_SHIFT_MOD1" oor:op="replace"> @@ -2440,6 +2459,7 @@ <node oor:name="E_MOD1" oor:op="replace"> <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> <value xml:lang="en-US">.uno:CenterPara</value> + <value xml:lang="es">.uno:SelectAll</value> </prop> </node> <node oor:name="F10_MOD1" oor:op="replace"> @@ -2854,6 +2874,7 @@ <node oor:name="U_MOD1" oor:op="replace"> <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> <value xml:lang="en-US">.uno:Underline</value> + <value xml:lang="es">.uno:AddDirect</value> </prop> </node> <node oor:name="U_SHIFT_MOD1" oor:op="replace"> @@ -2967,6 +2988,7 @@ <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> <value xml:lang="de">.uno:JustifyPara</value> <value xml:lang="en-US">.uno:Bold</value> + <value xml:lang="es">.uno:SearchDialog</value> </prop> </node> <node oor:name="B_SHIFT_MOD1" oor:op="replace"> @@ -3057,6 +3079,7 @@ <node oor:name="E_MOD1" oor:op="replace"> <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> <value xml:lang="en-US">.uno:CenterPara</value> + <value xml:lang="es">.uno:SelectAll</value> </prop> </node> <node oor:name="F10_MOD1" oor:op="replace"> @@ -3491,6 +3514,7 @@ <node oor:name="U_MOD1" oor:op="replace"> <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> <value xml:lang="en-US">.uno:Underline</value> + <value xml:lang="es">.uno:AddDirect</value> </prop> </node> <node oor:name="U_SHIFT_MOD1" oor:op="replace"> @@ -3589,6 +3613,7 @@ <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> <value xml:lang="de">.uno:JustifyPara</value> <value xml:lang="en-US">.uno:Bold</value> + <value xml:lang="es">.uno:SearchDialog</value> </prop> </node> <node oor:name="B_SHIFT_MOD1" oor:op="replace"> @@ -3674,6 +3699,7 @@ <node oor:name="E_MOD1" oor:op="replace"> <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> <value xml:lang="en-US">.uno:CenterPara</value> + <value xml:lang="es">.uno:SelectAll</value> </prop> </node> <node oor:name="F10_MOD1" oor:op="replace"> @@ -4088,6 +4114,7 @@ <node oor:name="U_MOD1" oor:op="replace"> <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> <value xml:lang="en-US">.uno:Underline</value> + <value xml:lang="es">.uno:AddDirect</value> </prop> </node> <node oor:name="U_SHIFT_MOD1" oor:op="replace"> @@ -4191,6 +4218,7 @@ <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> <value xml:lang="de">.uno:JustifyPara</value> <value xml:lang="en-US">.uno:Bold</value> + <value xml:lang="es">.uno:SearchDialog</value> </prop> </node> <node oor:name="B_SHIFT_MOD1" oor:op="replace"> @@ -4248,7 +4276,7 @@ <value xml:lang="en-US">.uno:ParaRightToLeft</value> </prop> </node> - <node oor:name="END" oor:op="replace"> + <node oor:name="END" oor:op="replace"> <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> <value xml:lang="en-US">.uno:GoToEndOfLine</value> </prop> @@ -4276,6 +4304,7 @@ <node oor:name="E_MOD1" oor:op="replace"> <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> <value xml:lang="en-US">.uno:CenterPara</value> + <value xml:lang="es">.uno:SelectAll</value> </prop> </node> <node oor:name="F10_MOD1" oor:op="replace"> @@ -4690,6 +4719,7 @@ <node oor:name="U_MOD1" oor:op="replace"> <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> <value xml:lang="en-US">.uno:Underline</value> + <value xml:lang="es">.uno:AddDirect</value> </prop> </node> <node oor:name="U_SHIFT_MOD1" oor:op="replace"> @@ -4798,6 +4828,7 @@ <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> <value xml:lang="de">.uno:JustifyPara</value> <value xml:lang="en-US">.uno:Bold</value> + <value xml:lang="es">.uno:SearchDialog</value> </prop> </node> <node oor:name="B_SHIFT_MOD1" oor:op="replace"> @@ -4883,6 +4914,7 @@ <node oor:name="E_MOD1" oor:op="replace"> <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> <value xml:lang="en-US">.uno:CenterPara</value> + <value xml:lang="es">.uno:SelectAll</value> </prop> </node> <node oor:name="F10_MOD1" oor:op="replace"> @@ -5297,6 +5329,7 @@ <node oor:name="U_MOD1" oor:op="replace"> <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> <value xml:lang="en-US">.uno:Underline</value> + <value xml:lang="es">.uno:AddDirect</value> </prop> </node> <node oor:name="U_SHIFT_MOD1" oor:op="replace"> @@ -5499,7 +5532,13 @@ </node> </node> <node oor:name="com.sun.star.drawing.DrawingDocument" oor:op="replace"> - <node oor:name="BACKSPACE_MOD2" oor:op="replace"> + <node oor:name="N_MOD1_MOD2" oor:op="replace"> + <prop oor:name="Command"> + <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> + <value xml:lang="en-US">.uno:InsertAnnotation</value> + </prop> + </node> + <node oor:name="BACKSPACE_MOD2" oor:op="replace"> <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> <value xml:lang="en-US">.uno:Undo</value> </prop> @@ -5529,7 +5568,19 @@ <value xml:lang="en-US">.uno:Paste</value> </prop> </node> - <node oor:name="OPEN" oor:op="replace"> + <node oor:name="K_MOD1" oor:op="replace"> + <prop oor:name="Command"> + <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> + <value xml:lang="es">.uno:Italic</value> + </prop> + </node> + <node oor:name="N_MOD1" oor:op="replace"> + <prop oor:name="Command"> + <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> + <value xml:lang="es">.uno:Bold</value> + </prop> + </node> + <node oor:name="OPEN" oor:op="replace"> <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> <value xml:lang="en-US">.uno:Open</value> </prop> @@ -5603,7 +5654,19 @@ <value xml:lang="en-US">.uno:Paste</value> </prop> </node> - <node oor:name="OPEN" oor:op="replace"> + <node oor:name="K_MOD1" oor:op="replace"> + <prop oor:name="Command"> + <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> + <value xml:lang="es">.uno:Italic</value> + </prop> + </node> + <node oor:name="N_MOD1" oor:op="replace"> + <prop oor:name="Command"> + <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> + <value xml:lang="es">.uno:Bold</value> + </prop> + </node> + <node oor:name="OPEN" oor:op="replace"> <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> <value xml:lang="en-US">.uno:Open</value> </prop> @@ -5613,6 +5676,20 @@ <value xml:lang="en-US">.uno:Paste</value> </prop> </node> + <node oor:name="S_MOD1" oor:op="replace"> + <prop oor:name="Command"> + <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> + <value xml:lang="es">.uno:Underline</value> + </prop> + </node> + <node oor:name="T_MOD1" oor:op="replace"> + <prop oor:name="Command"> + <value xml:lang="x-no-translate" install:module="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> + <value xml:lang="de" install:module="unxwnt">.uno:SubScript</value> + <value xml:lang="es" install:module="unxwnt">.uno:AlignHorizontalCenter</value> + <value xml:lang="en-US" install:module="macosx">.uno:DesignerDialog</value> + </prop> + </node> <node oor:name="UNDO" oor:op="replace"> <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> <value xml:lang="en-US">.uno:Undo</value> diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu b/officecfg/registry/data/org/openoffice/Office/Common.xcu index 0fd3f03949..bb3c7795a4 100644 --- a/officecfg/registry/data/org/openoffice/Office/Common.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu @@ -134,6 +134,9 @@ <prop oor:name="TemplateRepositoryURL" oor:type="xs:string"> <value>${STARTCENTER_TEMPLREP_URL}</value> </prop> + <prop oor:name="StartCenterLayoutStyle" oor:type="xs:int" install:module="brand"> + <value>${STARTCENTER_LAYOUT_STYLE}</value> + </prop> </node> <node oor:name="Registration"> <prop oor:name="TemplateURL"> diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ChartCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ChartCommands.xcu index d69c481fa7..6619f83e8e 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/ChartCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/ChartCommands.xcu @@ -529,7 +529,7 @@ <value xml:lang="en-US">Select Chart Element</value> </prop> <prop oor:name="Properties" oor:type="xs:int"> - <value>1</value> + <value>0</value> </prop> </node> diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ChartWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ChartWindowState.xcu index 2397810ed2..3d3c89ab15 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/ChartWindowState.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/ChartWindowState.xcu @@ -73,6 +73,90 @@ <value>true</value> </prop> </node> + <node oor:name="private:resource/toolbar/basicshapes" oor:op="replace"> + <prop oor:name="Docked" oor:type="xs:boolean"> + <value>false</value> + </prop> + <prop oor:name="UIName" oor:type="xs:string"> + <value xml:lang="en-US">Basic Shapes</value> + </prop> + <prop oor:name="Visible" oor:type="xs:boolean"> + <value>false</value> + </prop> + <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean"> + <value>true</value> + </prop> + </node> + <node oor:name="private:resource/toolbar/symbolshapes" oor:op="replace"> + <prop oor:name="Docked" oor:type="xs:boolean"> + <value>false</value> + </prop> + <prop oor:name="UIName" oor:type="xs:string"> + <value xml:lang="en-US">Symbol Shapes</value> + </prop> + <prop oor:name="Visible" oor:type="xs:boolean"> + <value>false</value> + </prop> + <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean"> + <value>true</value> + </prop> + </node> + <node oor:name="private:resource/toolbar/arrowshapes" oor:op="replace"> + <prop oor:name="Docked" oor:type="xs:boolean"> + <value>false</value> + </prop> + <prop oor:name="UIName" oor:type="xs:string"> + <value xml:lang="en-US">Block Arrows</value> + </prop> + <prop oor:name="Visible" oor:type="xs:boolean"> + <value>false</value> + </prop> + <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean"> + <value>true</value> + </prop> + </node> + <node oor:name="private:resource/toolbar/flowchartshapes" oor:op="replace"> + <prop oor:name="Docked" oor:type="xs:boolean"> + <value>false</value> + </prop> + <prop oor:name="UIName" oor:type="xs:string"> + <value xml:lang="en-US">Flowchart</value> + </prop> + <prop oor:name="Visible" oor:type="xs:boolean"> + <value>false</value> + </prop> + <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean"> + <value>true</value> + </prop> + </node> + <node oor:name="private:resource/toolbar/calloutshapes" oor:op="replace"> + <prop oor:name="Docked" oor:type="xs:boolean"> + <value>false</value> + </prop> + <prop oor:name="UIName" oor:type="xs:string"> + <value xml:lang="en-US">Callouts</value> + </prop> + <prop oor:name="Visible" oor:type="xs:boolean"> + <value>false</value> + </prop> + <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean"> + <value>true</value> + </prop> + </node> + <node oor:name="private:resource/toolbar/starshapes" oor:op="replace"> + <prop oor:name="Docked" oor:type="xs:boolean"> + <value>false</value> + </prop> + <prop oor:name="UIName" oor:type="xs:string"> + <value xml:lang="en-US">Stars and Banners</value> + </prop> + <prop oor:name="Visible" oor:type="xs:boolean"> + <value>false</value> + </prop> + <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean"> + <value>true</value> + </prop> + </node> </node> </node> </oor:component-data> diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu index d57d1b3b4d..38bfc08b2e 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu @@ -229,7 +229,7 @@ <value>com.sun.star.comp.chart.ElementSelectorToolbarController</value> </prop> </node> - <node oor:name="c4" oor:op="replace"> + <node oor:name="com.sun.star.chart2.BasicShapesToolbarController" oor:op="replace"> <prop oor:name="Command"> <value>.uno:BasicShapes</value> </prop> @@ -237,10 +237,10 @@ <value>com.sun.star.chart2.ChartDocument</value> </prop> <prop oor:name="Controller"> - <value>com.sun.star.chart2.comp.ShapeToolbarController</value> + <value>com.sun.star.comp.chart2.ShapeToolbarController</value> </prop> </node> - <node oor:name="c5" oor:op="replace"> + <node oor:name="com.sun.star.chart2.SymbolShapesToolbarController" oor:op="replace"> <prop oor:name="Command"> <value>.uno:SymbolShapes</value> </prop> @@ -248,10 +248,10 @@ <value>com.sun.star.chart2.ChartDocument</value> </prop> <prop oor:name="Controller"> - <value>com.sun.star.chart2.comp.ShapeToolbarController</value> + <value>com.sun.star.comp.chart2.ShapeToolbarController</value> </prop> </node> - <node oor:name="c6" oor:op="replace"> + <node oor:name="com.sun.star.chart2.ArrowShapesToolbarController" oor:op="replace"> <prop oor:name="Command"> <value>.uno:ArrowShapes</value> </prop> @@ -259,10 +259,10 @@ <value>com.sun.star.chart2.ChartDocument</value> </prop> <prop oor:name="Controller"> - <value>com.sun.star.chart2.comp.ShapeToolbarController</value> + <value>com.sun.star.comp.chart2.ShapeToolbarController</value> </prop> </node> - <node oor:name="c7" oor:op="replace"> + <node oor:name="com.sun.star.chart2.FlowChartShapesToolbarController" oor:op="replace"> <prop oor:name="Command"> <value>.uno:FlowChartShapes</value> </prop> @@ -270,10 +270,10 @@ <value>com.sun.star.chart2.ChartDocument</value> </prop> <prop oor:name="Controller"> - <value>com.sun.star.chart2.comp.ShapeToolbarController</value> + <value>com.sun.star.comp.chart2.ShapeToolbarController</value> </prop> </node> - <node oor:name="c8" oor:op="replace"> + <node oor:name="com.sun.star.chart2.CalloutShapesToolbarController" oor:op="replace"> <prop oor:name="Command"> <value>.uno:CalloutShapes</value> </prop> @@ -281,10 +281,10 @@ <value>com.sun.star.chart2.ChartDocument</value> </prop> <prop oor:name="Controller"> - <value>com.sun.star.chart2.comp.ShapeToolbarController</value> + <value>com.sun.star.comp.chart2.ShapeToolbarController</value> </prop> </node> - <node oor:name="c9" oor:op="replace"> + <node oor:name="com.sun.star.chart2.StarShapesToolbarController" oor:op="replace"> <prop oor:name="Command"> <value>.uno:StarShapes</value> </prop> @@ -292,7 +292,7 @@ <value>com.sun.star.chart2.ChartDocument</value> </prop> <prop oor:name="Controller"> - <value>com.sun.star.chart2.comp.ShapeToolbarController</value> + <value>com.sun.star.comp.chart2.ShapeToolbarController</value> </prop> </node> </node> diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu index 385617f693..4a316a7c32 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu @@ -705,7 +705,21 @@ <prop oor:name="ContextSensitive" oor:type="xs:boolean"> <value>true</value> </prop> - </node> - </node> + </node> + <node oor:name="private:resource/toolbar/optimizetablebar" oor:op="replace"> + <prop oor:name="Docked" oor:type="xs:boolean"> + <value>false</value> + </prop> + <prop oor:name="Visible" oor:type="xs:boolean"> + <value>false</value> + </prop> + <prop oor:name="UIName" oor:type="xs:string"> + <value xml:lang="en-US">Optimize</value> + </prop> + <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean"> + <value>true</value> + </prop> + </node> + </node> </node> </oor:component-data> diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu index 735fcd0204..f887055161 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu @@ -129,9 +129,6 @@ <prop oor:name="DockingArea" oor:type="xs:int"> <value>0</value> </prop> - <prop oor:name="Style" oor:type="xs:int"> - <value>2</value> - </prop> <prop oor:name="Visible" oor:type="xs:boolean"> <value>true</value> </prop> @@ -803,7 +800,21 @@ <prop oor:name="ContextSensitive" oor:type="xs:boolean"> <value>true</value> </prop> - </node> - </node> + </node> + <node oor:name="private:resource/toolbar/optimizetablebar" oor:op="replace"> + <prop oor:name="Docked" oor:type="xs:boolean"> + <value>false</value> + </prop> + <prop oor:name="Visible" oor:type="xs:boolean"> + <value>false</value> + </prop> + <prop oor:name="UIName" oor:type="xs:string"> + <value xml:lang="en-US">Optimize</value> + </prop> + <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean"> + <value>true</value> + </prop> + </node> + </node> </node> </oor:component-data> diff --git a/officecfg/registry/data/org/openoffice/Office/Writer.xcu b/officecfg/registry/data/org/openoffice/Office/Writer.xcu index d19e9e5d78..8add2a0aa1 100644 --- a/officecfg/registry/data/org/openoffice/Office/Writer.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Writer.xcu @@ -40,7 +40,7 @@ <prop oor:name="IsHideEmptyParagraphs" > <value>true</value> </prop> - <prop oor:name="EMailSupported" install:module="javamail"> + <prop oor:name="EMailSupported"> <value>true</value> </prop> </node> diff --git a/officecfg/registry/data/org/openoffice/Office/makefile.mk b/officecfg/registry/data/org/openoffice/Office/makefile.mk index 5cd876f75b..e65b03371d 100644 --- a/officecfg/registry/data/org/openoffice/Office/makefile.mk +++ b/officecfg/registry/data/org/openoffice/Office/makefile.mk @@ -88,7 +88,6 @@ MODULEFILES= \ Paths-unxwnt.xcu \ Paths-unixdesktop.xcu \ Writer-cjk.xcu \ - Writer-javamail.xcu \ Impress-ogltrans.xcu \ Embedding-calc.xcu \ Embedding-chart.xcu \ diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu b/officecfg/registry/data/org/openoffice/Setup.xcu index 15f98d5f7c..5afb19f394 100644..100755 --- a/officecfg/registry/data/org/openoffice/Setup.xcu +++ b/officecfg/registry/data/org/openoffice/Setup.xcu @@ -594,7 +594,7 @@ <value>GenericCategories</value> </prop> <prop oor:name="ooSetupFactoryUIName"> - <value>Table Data View</value> + <value xml:lang="en-US">Base: Table Data View</value> </prop> </node> <node oor:name="com.sun.star.frame.Bibliography" oor:op="replace"> @@ -616,7 +616,7 @@ <value >GenericCategories</value> </prop> <prop oor:name="ooSetupFactoryUIName"> - <value >Bibliography</value> + <value xml:lang="en-US">Bibliography</value> </prop> </node> <node oor:name="com.sun.star.script.BasicIDE" oor:op="replace"> @@ -750,174 +750,180 @@ <value>true</value> </prop> </node> - <node oor:name="Migration"> - <prop oor:name="SupportedVersions"> - <value oor:separator=",">OpenOffice.org 2=openoffice.org2,StarOffice 8=staroffice8,StarSuite 8=starsuite8</value> + <node oor:name="Migration"> + <node oor:name="SupportedVersions"> + <node oor:name="OpenOffice.org2+StarOffice8+StarSuite8" oor:op="replace"> + <prop oor:name="Priority"> + <value>10</value> </prop> - <node oor:name="MigrationSteps"> - <node oor:name="Datasources" oor:op="replace"> - <prop oor:name="IncludedFiles"> - <value>.*/database/biblio/biblio\.dbf</value> - </prop> - <prop oor:name="ExcludedFiles"> - </prop> - <prop oor:name="IncludedNodes"> - <value>org.openoffice.Office.DataAccess</value> - </prop> - <prop oor:name="ExcludedNodes"> - <value> - org.openoffice.Office.DataAccess/Bibliography - org.openoffice.Office.DataAccess/ConnectionPool - org.openoffice.Office.DataAccess/DataSources - org.openoffice.Office.DataAccess/DriverManager - </value> - </prop> - </node> - <node oor:name="Deployment" oor:op="replace"> - <prop oor:name="MigrationService"> - <value>com.sun.star.migration.Extensions</value> - </prop> - </node> - <node oor:name="Inet" oor:op="replace"> - <prop oor:name="IncludedNodes"> - <value>org.openoffice.Inet - </value> - </prop> - </node> - <node oor:name="Basic" oor:op="replace"> - <prop oor:name="MigrationService"> - <value>com.sun.star.migration.Basic</value> - </prop> - </node> - <node oor:name="UserProfile" oor:op="replace"> - <prop oor:name="IncludedNodes"> - <value>org.openoffice.UserProfile</value> - </prop> - </node> - <node oor:name="Common" oor:op="replace"> - <prop oor:name="IncludedFiles"> - <value> - .*/autotext/.* - .*/autocorr/.* - .*/config/.*\.so[bcdegh] - .*/config/soffice.cfg/modules/.*/toolbar/custom.*\.xml - .*/config/soffice.cfg/modules/.*/images/.* - .*/gallery/.* - .*/template/.* - </value> - </prop> - <prop oor:name="IncludedNodes"> - <value> - org.openoffice.Office.Compatibility - org.openoffice.Office.Custom - org.openoffice.Office.Embedding - org.openoffice.Office.Events - org.openoffice.Office.ExtendedColorScheme - org.openoffice.Office.Common/Accessibility - org.openoffice.Office.Common/Accessibility/AutoDetectSystemHC - org.openoffice.Office.Common/AsianLayout - org.openoffice.Office.Common/AutoCorrect - org.openoffice.Office.Common/Cache - org.openoffice.Office.Common/DateFormat - org.openoffice.Office.Common/ExternalMailer/Program - org.openoffice.Office.Common/Filter - org.openoffice.Office.Common/Font - org.openoffice.Office.Common/Forms - org.openoffice.Office.Common/Gallery - org.openoffice.Office.Common/Help - org.openoffice.Office.Common/History - org.openoffice.Office.Common/I18N - org.openoffice.Office.Common/InternalMSExport - org.openoffice.Office.Common/Load - org.openoffice.Office.Common/Misc/FormControlPilotsEnabled - org.openoffice.Office.Common/Misc/PluginsEnabled - org.openoffice.Office.Common/Misc/SymbolSet - org.openoffice.Office.Common/Misc/UseSystemFileDialog - org.openoffice.Office.Common/Misc/UseSystemPrintDialog - org.openoffice.Office.Common/Misc/SymbolStyle - org.openoffice.Office.Common/Passwords - org.openoffice.Office.Common/Print/PrintingModifiesDocument - org.openoffice.Office.Common/Print/Warning - org.openoffice.Office.Common/Vectorize - org.openoffice.Office.Common/Save - org.openoffice.Office.Common/SearchOptions - org.openoffice.Office.Common/Undo - org.openoffice.Office.Common/View/Dialog/Dialog/MiddleMouseButton - org.openoffice.Office.Common/View/Dialog/MousePositioning - org.openoffice.Office.Common/View/Localization - org.openoffice.Office.Common/View/Menu - org.openoffice.Office.Common/_3D_Engine - </value> - </prop> - <prop oor:name="ExcludedNodes"> - <value> - org.openoffice.Office.Common/_3D_Engine/OpenGL - org.openoffice.Office.Common/Help/Registration - </value> - </prop> - </node> - <node oor:name="Calc" oor:op="replace"> - <prop oor:name="IncludedNodes"> - <value>org.openoffice.Office.Calc</value> - </prop> - </node> - <node oor:name="Chart" oor:op="replace"> - <prop oor:name="IncludedNodes"> - <value>org.openoffice.Office.Chart</value> - </prop> - </node> - <node oor:name="Draw" oor:op="replace"> - <prop oor:name="IncludedNodes"> - <value>org.openoffice.Office.Draw</value> - </prop> - </node> - <node oor:name="Impress" oor:op="replace"> - <prop oor:name="IncludedNodes"> - <value>org.openoffice.Office.Impress</value> - </prop> - </node> - <node oor:name="Labels" oor:op="replace"> - <prop oor:name="IncludedNodes"> - <value>org.openoffice.Office.Labels</value> - </prop> - </node> - <node oor:name="Linguistic" oor:op="replace"> - <prop oor:name="MigrationService"> - <value>com.sun.star.migration.Wordbooks</value> - </prop> - <prop oor:name="IncludedNodes"> - <value>org.openoffice.Office.Linguistic</value> - </prop> - <prop oor:name="ExcludedNodes"> - <value>org.openoffice.Office.Linguistic/ServiceManager</value> - </prop> - </node> - <node oor:name="Math" oor:op="replace"> - <prop oor:name="IncludedNodes"> - <value>org.openoffice.Office.Math</value> - </prop> - </node> - <node oor:name="Security" oor:op="replace"> - <prop oor:name="IncludedNodes"> - <value>org.openoffice.Office.Security</value> - </prop> - </node> - <node oor:name="UI" oor:op="replace"> - <prop oor:name="IncludedNodes"> - <value>org.openoffice.Office.UI/ColorScheme</value> - </prop> - </node> - <node oor:name="Writer" oor:op="replace"> - <prop oor:name="IncludedNodes"> - <value> - org.openoffice.Office.Writer - org.openoffice.Office.WriterWeb - </value> - </prop> - <prop oor:name="ExcludedNodes"> - <value>org.openoffice.Office.Writer/Wizard</value> + <prop oor:name="VersionIdentifiers"> + <value oor:separator=",">OpenOffice.org 2=openoffice.org2,StarOffice 8=staroffice8,StarSuite 8=starsuite8</value> </prop> + <node oor:name="MigrationSteps"> + <node oor:name="Datasources" oor:op="replace"> + <prop oor:name="IncludedFiles"> + <value>.*/database/biblio/biblio\.dbf</value> + </prop> + <prop oor:name="ExcludedFiles"> + </prop> + <prop oor:name="IncludedNodes"> + <value>/org.openoffice.Office.DataAccess</value> + </prop> + <prop oor:name="ExcludedNodes"> + <value> + <it>/org.openoffice.Office.DataAccess/Bibliography</it> + <it>/org.openoffice.Office.DataAccess/ConnectionPool</it> + <it>/org.openoffice.Office.DataAccess/DataSources</it> + <it>/org.openoffice.Office.DataAccess/DriverManager</it> + </value> + </prop> + </node> + <node oor:name="Deployment" oor:op="replace"> + <prop oor:name="MigrationService"> + <value>com.sun.star.migration.Extensions</value> + </prop> + </node> + <node oor:name="Inet" oor:op="replace"> + <prop oor:name="IncludedNodes"> + <value>/org.openoffice.Inet</value> + </prop> + </node> + <node oor:name="Basic" oor:op="replace"> + <prop oor:name="MigrationService"> + <value>com.sun.star.migration.Basic</value> + </prop> + </node> + <node oor:name="UserProfile" oor:op="replace"> + <prop oor:name="IncludedNodes"> + <value>/org.openoffice.UserProfile</value> + </prop> + </node> + <node oor:name="Common" oor:op="replace"> + <prop oor:name="IncludedFiles"> + <value> + .*/autotext/.* + .*/autocorr/.* + .*/config/.*\.so[bcdegh] + .*/config/soffice.cfg/modules/.*/toolbar/custom.*\.xml + .*/config/soffice.cfg/modules/.*/images/.* + .*/gallery/.* + .*/template/.* + </value> + </prop> + <prop oor:name="IncludedNodes"> + <value> + <it>/org.openoffice.Office.Compatibility</it> + <it>/org.openoffice.Office.Custom</it> + <it>/org.openoffice.Office.Embedding</it> + <it>/org.openoffice.Office.Events</it> + <it>/org.openoffice.Office.ExtendedColorScheme</it> + <it>/org.openoffice.Office.Common/Accessibility</it> + <it>/org.openoffice.Office.Common/Accessibility/AutoDetectSystemHC</it> + <it>/org.openoffice.Office.Common/AsianLayout</it> + <it>/org.openoffice.Office.Common/AutoCorrect</it> + <it>/org.openoffice.Office.Common/Cache</it> + <it>/org.openoffice.Office.Common/DateFormat</it> + <it>/org.openoffice.Office.Common/ExternalMailer/Program</it> + <it>/org.openoffice.Office.Common/Filter</it> + <it>/org.openoffice.Office.Common/Font</it> + <it>/org.openoffice.Office.Common/Forms</it> + <it>/org.openoffice.Office.Common/Gallery</it> + <it>/org.openoffice.Office.Common/Help</it> + <it>/org.openoffice.Office.Common/History</it> + <it>/org.openoffice.Office.Common/I18N</it> + <it>/org.openoffice.Office.Common/InternalMSExport</it> + <it>/org.openoffice.Office.Common/Load</it> + <it>/org.openoffice.Office.Common/Misc/FormControlPilotsEnabled</it> + <it>/org.openoffice.Office.Common/Misc/PluginsEnabled</it> + <it>/org.openoffice.Office.Common/Misc/SymbolSet</it> + <it>/org.openoffice.Office.Common/Misc/UseSystemFileDialog</it> + <it>/org.openoffice.Office.Common/Misc/UseSystemPrintDialog</it> + <it>/org.openoffice.Office.Common/Misc/SymbolStyle</it> + <it>/org.openoffice.Office.Common/Passwords</it> + <it>/org.openoffice.Office.Common/Print/PrintingModifiesDocument</it> + <it>/org.openoffice.Office.Common/Print/Warning</it> + <it>/org.openoffice.Office.Common/Vectorize</it> + <it>/org.openoffice.Office.Common/Save</it> + <it>/org.openoffice.Office.Common/SearchOptions</it> + <it>/org.openoffice.Office.Common/Undo</it> + <it>/org.openoffice.Office.Common/View/Dialog/Dialog/MiddleMouseButton</it> + <it>/org.openoffice.Office.Common/View/Dialog/MousePositioning</it> + <it>/org.openoffice.Office.Common/View/Localization</it> + <it>/org.openoffice.Office.Common/View/Menu</it> + <it>/org.openoffice.Office.Common/_3D_Engine</it> + </value> + </prop> + <prop oor:name="ExcludedNodes"> + <value> + <it>/org.openoffice.Office.Common/_3D_Engine/OpenGL</it> + <it>/org.openoffice.Office.Common/Help/Registration</it> + </value> + </prop> + </node> + <node oor:name="Calc" oor:op="replace"> + <prop oor:name="IncludedNodes"> + <value>/org.openoffice.Office.Calc</value> + </prop> + </node> + <node oor:name="Chart" oor:op="replace"> + <prop oor:name="IncludedNodes"> + <value>/org.openoffice.Office.Chart</value> + </prop> + </node> + <node oor:name="Draw" oor:op="replace"> + <prop oor:name="IncludedNodes"> + <value>/org.openoffice.Office.Draw</value> + </prop> + </node> + <node oor:name="Impress" oor:op="replace"> + <prop oor:name="IncludedNodes"> + <value>/org.openoffice.Office.Impress</value> + </prop> + </node> + <node oor:name="Labels" oor:op="replace"> + <prop oor:name="IncludedNodes"> + <value>/org.openoffice.Office.Labels</value> + </prop> + </node> + <node oor:name="Linguistic" oor:op="replace"> + <prop oor:name="MigrationService"> + <value>com.sun.star.migration.Wordbooks</value> + </prop> + <prop oor:name="IncludedNodes"> + <value>/org.openoffice.Office.Linguistic</value> + </prop> + <prop oor:name="ExcludedNodes"> + <value>/org.openoffice.Office.Linguistic/ServiceManager</value> + </prop> + </node> + <node oor:name="Math" oor:op="replace"> + <prop oor:name="IncludedNodes"> + <value>/org.openoffice.Office.Math</value> + </prop> + </node> + <node oor:name="Security" oor:op="replace"> + <prop oor:name="IncludedNodes"> + <value>/org.openoffice.Office.Security</value> + </prop> + </node> + <node oor:name="UI" oor:op="replace"> + <prop oor:name="IncludedNodes"> + <value>/org.openoffice.Office.UI/ColorScheme</value> + </prop> + </node> + <node oor:name="Writer" oor:op="replace"> + <prop oor:name="IncludedNodes"> + <value> + <it>/org.openoffice.Office.Writer</it> + <it>/org.openoffice.Office.WriterWeb</it> + </value> + </prop> + <prop oor:name="ExcludedNodes"> + <value>/org.openoffice.Office.Writer/Wizard</value> + </prop> </node> </node> + </node> + </node> </node> </oor:component-data> diff --git a/officecfg/registry/data/org/openoffice/makefile.mk b/officecfg/registry/data/org/openoffice/makefile.mk index 4e69cfecf1..b51285af50 100644..100755 --- a/officecfg/registry/data/org/openoffice/makefile.mk +++ b/officecfg/registry/data/org/openoffice/makefile.mk @@ -41,7 +41,8 @@ XCUFILES= \ System.xcu \ VCL.xcu \ FirstStartWizard.xcu \ - UserProfile.xcu + UserProfile.xcu \ + Interaction.xcu MODULEFILES= \ Inet-macosx.xcu \ diff --git a/officecfg/registry/schema/org/openoffice/Interaction.xcs b/officecfg/registry/schema/org/openoffice/Interaction.xcs new file mode 100644 index 0000000000..e39d44da7f --- /dev/null +++ b/officecfg/registry/schema/org/openoffice/Interaction.xcs @@ -0,0 +1,86 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--*********************************************************************** + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************ --> +<!DOCTYPE oor:component-schema SYSTEM "../../../component-schema.dtd"> +<oor:component-schema xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:name="Interaction" oor:package="org.openoffice" xml:lang="en-US"> + <info> + <author>Frank Schönheit</author> + <desc>contains configuration related to the interaction system of OpenOffice.org.</desc> + </info> + <templates> + <group oor:name="RequestTypeResponsibility"> + <info> + <desc>describes the responsibility for a single interaction request type.</desc> + </info> + <prop oor:name="Propagation" oor:type="xs:string"> + <info> + <desc>describes how the responsibility for this particular request type propagates through the + type hierarchy.</desc> + </info> + <constraints> + <enumeration oor:value="named-only"> + <info> + <desc>specifies that the interaction handler is responsible only for this particular type.</desc> + </info> + </enumeration> + <enumeration oor:value="named-and-derived"> + <info> + <desc> + specifies that the interaction handler is responsible not only for this particular type, + but also for all derived types. + </desc> + </info> + </enumeration> + </constraints> + </prop> + </group> + <group oor:name="InteractionHandlerImplementation"> + <info> + <desc>contains information about a concrete interaction handler implementation.</desc> + </info> + <set oor:name="HandledRequestTypes" oor:node-type="RequestTypeResponsibility"> + <info> + <desc>specifies the types which the interaction handler implementation is responsible for. The node names + of this set are interpreted as names in the UNO type system, this way specifying the request types + which should be delegated to the given interaction handler.</desc> + </info> + </set> + <prop oor:name="ServiceName" oor:type="xs:string"> + <info> + <desc>contains the name to be used to create an instance of the interaction handler implementation.</desc> + </info> + </prop> + </group> + </templates> + <component> + <set oor:name="InteractionHandlers" oor:node-type="InteractionHandlerImplementation"> + <info> + <desc>collects information about registered interaction handlers.</desc> + </info> + </set> + </component> +</oor:component-schema> diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs index 6daeaf69a8..ffe5388caf 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs @@ -782,13 +782,13 @@ <desc>MAX</desc> </info> </enumeration> - <enumeration oor:value="5"> + <enumeration oor:value="6"> <info> <desc>IF</desc> </info> </enumeration> </constraints> - <value>224 226 222 223 5</value> + <value>224 226 222 223 6</value> </prop> <prop oor:name="AutoInput" oor:type="xs:boolean"> <!-- OldPath: Calc/Input --> @@ -1016,6 +1016,97 @@ <value>NULL</value> </prop> </group> + <group oor:name="Dialogs"> + <info> + <desc>Contains the dialogs settings.</desc> + </info> + <group oor:name="CSVImport"> + <info> + <desc>Contains setting for Text CSV Import</desc> + </info> + <prop oor:name="MergeDelimiters" oor:type="xs:boolean"> + <info> + <author>muthusuba</author> + <desc>Merge Delimiter check box status</desc> + <label>MergeDelimiters</label> + </info> + <value>false</value> + </prop> + <prop oor:name="QuotedFieldAsText" oor:type="xs:boolean"> + <info> + <author>kyoshida</author> + <desc>If true, quoted field is always imported as text + with no exception.</desc> + <label>QuotedFieldAsText</label> + </info> + <value>true</value> + </prop> + <prop oor:name="DetectSpecialNumbers" oor:type="xs:boolean"> + <info> + <author>kyoshida</author> + <desc>If true, Calc tries to detect special number format, such as date and scientific notation.</desc> + <label>DetectSpecialNumbers</label> + </info> + <value>false</value> + </prop> + <prop oor:name="Language" oor:type="xs:int"> + <info> + <author>kyoshida</author> + <desc>Language to use for CSV import. This determines how the numbers are parsed.</desc> + <label>Language</label> + </info> + <value>0</value> + </prop> + <prop oor:name="Separators" oor:type="xs:string"> + <info> + <author>muthusuba</author> + <desc>List of Separators - as a String</desc> + <label>Separators</label> + </info> + <value>; </value> + </prop> + <prop oor:name="TextSeparators" oor:type="xs:string"> + <info> + <author>muthusuba</author> + <desc>Text Separators</desc> + <label>TextSeparators</label> + </info> + <value>"</value> + </prop> + <prop oor:name="FixedWidth" oor:type="xs:boolean"> + <info> + <author>muthusuba</author> + <desc>Fixed width</desc> + <label>FixedWidth</label> + </info> + <value>false</value> + </prop> + <prop oor:name="FromRow" oor:type="xs:int"> + <info> + <author>muthusuba</author> + <desc>From Row</desc> + <label>FromRow</label> + </info> + <value>1</value> + </prop> + <prop oor:name="CharSet" oor:type="xs:int"> + <info> + <author>muthusuba</author> + <desc>Char Set</desc> + <label>CharSet</label> + </info> + <value>-1</value> + </prop> + <prop oor:name="FixedWidthList" oor:type="xs:string"> + <info> + <author>muthusuba</author> + <desc>Fixed Width List of separators</desc> + <label>FixedWidthList</label> + </info> + <value></value> + </prop> + </group> + </group> <group oor:name="Calculate"> <info> <desc>Contains settings that affect cell calculation.</desc> diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index a0e17004f5..cb19bb01e1 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -2238,17 +2238,6 @@ </info> <value>true</value> </prop> - <prop oor:name="DocumentWindows" oor:type="xs:boolean"> - <!-- OldPath: General/Restore --> - <!-- OldLocation: soffice.cfg --> - <!-- UIHints: Tools Options - General Save - [Section] Restore editing view - Open windows--> - <info> - <author>MBA</author> - <desc>Specifies whether all currently open windows of a document should be saved. If true the view properties for all open document views of that document are saved.</desc> - <label>Open windows</label> - </info> - <value>false</value> - </prop> <prop oor:name="PrettyPrinting" oor:type="xs:boolean"> <!-- UIHints: Tools Options - General Save - optimize XML file size--> <!--the UI setting is inverse to this setting--> @@ -3562,6 +3551,12 @@ </info> <value/> </prop> + <prop oor:name="StartCenterLayoutStyle" oor:type="xs:int"> + <info> + <desc>Contains a number deciding the layout style of the start center</desc> + </info> + <value>0</value> + </prop> </group> <group oor:name="Registration"> <info> @@ -5343,6 +5338,13 @@ </info> <value>true</value> </prop> + <prop oor:name="EmbedStandardFonts" oor:type="xs:boolean"> + <info> + <author>pl</author> + <desc>Specifies whether to embed the 14 standard PDF fonts or not.</desc> + </info> + <value>false</value> + </prop> <prop oor:name="FormsType" oor:type="xs:int"> <info> <desc>Specifies the submitted format of a PDF form.</desc> diff --git a/officecfg/registry/schema/org/openoffice/Office/Recovery.xcs b/officecfg/registry/schema/org/openoffice/Office/Recovery.xcs index 6f6c661e8f..f424180c76 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Recovery.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Recovery.xcs @@ -28,54 +28,59 @@ <!DOCTYPE oor:component-schema SYSTEM "../../../../component-schema.dtd"> <oor:component-schema xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:name="Recovery" oor:package="org.openoffice.Office" xml:lang="en-US"> <info> - <desc>TODO</desc> + <desc> </desc> </info> <templates> <group oor:name="RecoveryEntry"> <info> - <desc>TODO</desc> + <desc> </desc> </info> <prop oor:name="TempURL" oor:type="xs:string"> <info> - <desc>TODO</desc> + <desc> </desc> </info> </prop> <prop oor:name="OriginalURL" oor:type="xs:string"> <info> - <desc>TODO</desc> + <desc> </desc> </info> </prop> <prop oor:name="TemplateURL" oor:type="xs:string"> <info> - <desc>TODO</desc> + <desc> </desc> </info> </prop> <prop oor:name="Module" oor:type="xs:string"> <info> - <desc>TODO</desc> + <desc> </desc> </info> </prop> <prop oor:name="DocumentState" oor:type="xs:int"> <info> - <desc>TODO</desc> + <desc> </desc> </info> </prop> <prop oor:name="Filter" oor:type="xs:string"> <info> - <desc>TODO</desc> + <desc> </desc> </info> </prop> <prop oor:name="Title" oor:type="xs:string"> <info> - <desc>TODO</desc> + <desc> </desc> </info> </prop> - </group> + <prop oor:name="ViewNames" oor:type="oor:string-list"> + <info> + <desc> </desc> + </info> + </prop> + </group> </templates> <component> <set oor:name="RecoveryList" oor:node-type="RecoveryEntry"> <info> - <desc>TODO</desc> + <desc> </desc> </info> </set> <group oor:name="SessionShutdown"> @@ -93,7 +98,7 @@ </group> <group oor:name="RecoveryInfo"> <info> - <desc>TODO</desc> + <desc> </desc> </info> <prop oor:name="Enabled" oor:type="xs:boolean"> <info> @@ -103,13 +108,13 @@ </prop> <prop oor:name="Crashed" oor:type="xs:boolean"> <info> - <desc>TODO</desc> + <desc> </desc> </info> <value>false</value> </prop> <prop oor:name="SessionData" oor:type="xs:boolean"> <info> - <desc>TODO</desc> + <desc> </desc> </info> <value>false</value> </prop> @@ -127,17 +132,17 @@ </group> <group oor:name="AutoSave"> <info> - <desc>TODO</desc> + <desc> </desc> </info> <prop oor:name="Enabled" oor:type="xs:boolean"> <info> - <desc>TODO</desc> + <desc> </desc> </info> <value>true</value> </prop> <prop oor:name="TimeIntervall" oor:type="xs:int"> <info> - <desc>TODO</desc> + <desc> </desc> </info> <value>15</value> </prop> diff --git a/officecfg/registry/schema/org/openoffice/Setup.xcs b/officecfg/registry/schema/org/openoffice/Setup.xcs index 9e5551bda1..a3d5ba6e5d 100644 --- a/officecfg/registry/schema/org/openoffice/Setup.xcs +++ b/officecfg/registry/schema/org/openoffice/Setup.xcs @@ -34,61 +34,81 @@ <templates> <group oor:name="InstalledLocale"> <info> - <author>JB</author> + <author>JB</author> <desc>Describes a language pack that is installed to provide a localized office UI.</desc> </info> <prop oor:name="Origin" oor:type="xs:string"> - <info> - <author>JB</author> - <desc>Identifies the organization, group or person that provided this language pack.</desc> - </info> + <info> + <author>JB</author> + <desc>Identifies the organization, group or person that provided this language pack.</desc> + </info> </prop> </group> - <group oor:name="MigrationStep"> + <group oor:name="MigrationStep"> + <info> + <desc>Describes one step of migration</desc> + </info> + <prop oor:name="MigrationService" oor:type="xs:string"> + <info> + <desc>an optional uno service that is called after files and nodes have been copied in order to perform custom migration actions. The service needs to support XInitializable and XJob interfaces according do http://specs.openoffice.org/appwide/migration/spec_migration.sxw</desc> + </info> + </prop> + <prop oor:name="IncludedFiles" oor:type="oor:string-list"> + <info> + <desc>a list of wildcards relative to the old userdata origin that are to be copied</desc> + </info> + </prop> + <prop oor:name="ExcludedFiles" oor:type="oor:string-list"> + <info> + <desc>a list of wildcards relative to the old userdata origin that are to be copied</desc> + </info> + </prop> + <prop oor:name="IncludedNodes" oor:type="oor:string-list"> + <info> + <desc>a list of configuration node paths that are to be moved from the old user layer to the new user layer</desc> + </info> + </prop> + <prop oor:name="ExcludedNodes" oor:type="oor:string-list"> + <info> + <desc>a list of configuration node paths that are not to be moved from the old user layer to the new user layer</desc> + </info> + </prop> + <prop oor:name="IncludedExtensions" oor:type="oor:string-list"> + <info> + <desc>a list of extension identifiers that are to be copied from the old user layer to the new user layer</desc> + </info> + </prop> + <prop oor:name="ExcludedExtensions" oor:type="oor:string-list"> + <info> + <desc>a list of extension identifiers that are not to be copied from the old user layer to the new user layer</desc> + </info> + </prop> + </group> + <group oor:name="MigrateVersion"> + <info> + <desc>Describes migration steps specific for certain version(s)</desc> + </info> + <prop oor:name="VersionIdentifiers" oor:type="oor:string-list"> + <info> + <desc>version identifiers, that are supported for migration</desc> + </info> + <value/> + </prop> + <prop oor:name="Priority" oor:type="xs:int"> + <info> + <desc>Contains the priority value to specify which migration should be prefered. Higher values are prefered.</desc> + </info> + <value/> + </prop> + <set oor:name="MigrationSteps" oor:node-type="MigrationStep"> + <info> + <desc>Contains necessary migration steps for specific versions</desc> + </info> + </set> + </group> + <group oor:name="Factory"> <info> - <author>LO</author> - <desc>Describes one step of migration</desc> - </info> - <prop oor:name="MigrationService" oor:type="xs:string"> - <info> - <author>LO</author> - <desc>an optional uno service that is called after files and nodes have been copied in order to perform custom migration actions. The service needs to support XInitializable and XJob interfaces according do http://specs.openoffice.org/appwide/migration/spec_migration.sxw</desc> - </info> - </prop> - <prop oor:name="ServiceConfigComponents" oor:type="oor:string-list"> - <info> - <author>LO</author> - <desc>a list of config components that are to be passed to service</desc> - </info> - </prop> - <prop oor:name="IncludedFiles" oor:type="oor:string-list"> - <info> - <author>LO</author> - <desc>a list of wildcards relative to the old userdata origin that are to be copied</desc> - </info> - </prop> - <prop oor:name="ExcludedFiles" oor:type="oor:string-list"> - <info> - <author>LO</author> - <desc>a list of wildcards relative to the old userdata origin that are to be copied</desc> - </info> - </prop> - <prop oor:name="IncludedNodes" oor:type="oor:string-list"> - <info> - <author>LO</author> - <desc>a list of configuration node paths that are to be moved from the old user layer to the new user layer</desc> - </info> - </prop> - <prop oor:name="ExcludedNodes" oor:type="oor:string-list"> - <info> - <author>LO</author> - <desc>a list of configuration node paths that are not to be moved from the old user layer to the new user layer</desc> - </info> - </prop> - </group> - <group oor:name="Factory"> - <info> - <author>AS</author> + <author>AS</author> <desc>Describes an application module (a document factory, such as Writer).</desc> </info> <prop oor:name="ooSetupFactoryActualFilter" oor:type="xs:string"> @@ -416,30 +436,21 @@ </info> <prop oor:name="TransferUserSettingsOnce" oor:type="xs:boolean" oor:nillable="false"> <info> - <deprecated>This feature is not supported any more since OOo 2.0</deprecated> + <deprecated>This feature is not supported any more since OOo 2.0</deprecated> <author>JB</author> - <desc>Deprecated</desc> - </info> - </prop> - </group> - <group oor:name="Migration"> - <info> - <author>LO</author> - <desc>Contains settings that control configuration data access.</desc> - </info> - <set oor:name="MigrationSteps" oor:node-type="MigrationStep"> - <info> - <author>LO</author> - <desc>The enumeration of migration steps that are to be applied on first start</desc> - </info> - </set> - <prop oor:name="SupportedVersions" oor:type="oor:string-list"> - <info> - <author>LO</author> - <desc>version identifiers, that are supported for migration</desc> + <desc>Deprecated</desc> </info> - <value/> </prop> </group> - </component> + <group oor:name="Migration"> + <info> + <desc>Contains settings that control the migration process for certain versions.</desc> + </info> + <set oor:name="SupportedVersions" oor:node-type="MigrateVersion"> + <info> + <desc>Define migration steps for supported versions</desc> + </info> + </set> + </group> + </component> </oor:component-schema> diff --git a/officecfg/registry/schema/org/openoffice/makefile.mk b/officecfg/registry/schema/org/openoffice/makefile.mk index 98cbdb4b21..f928e447f4 100644 --- a/officecfg/registry/schema/org/openoffice/makefile.mk +++ b/officecfg/registry/schema/org/openoffice/makefile.mk @@ -42,7 +42,8 @@ XCSFILES= \ System.xcs \ UserProfile.xcs \ VCL.xcs \ - FirstStartWizard.xcs + FirstStartWizard.xcs \ + Interaction.xcs .INCLUDE : target.mk diff --git a/officecfg/registry/schema/org/openoffice/ucb/InteractionHandler.xcs b/officecfg/registry/schema/org/openoffice/ucb/InteractionHandler.xcs index 8775baa91d..ea6de5b80a 100644 --- a/officecfg/registry/schema/org/openoffice/ucb/InteractionHandler.xcs +++ b/officecfg/registry/schema/org/openoffice/ucb/InteractionHandler.xcs @@ -26,39 +26,28 @@ * ************************************************************************ --> <!DOCTYPE oor:component-schema SYSTEM "../../../../component-schema.dtd"> -<oor:component-schema xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:name="InteractionHandler" oor:package="org.openoffice.ucb" xml:lang="en-US"> <info> - <author>TKR</author> - <desc >Contains components and templates used for InteractionHandler configuration related data. </desc> - </info> - <templates> - <group oor:name="InteractionHandlerData"> - <info> - <desc>Contains the Service name of the custom InteractionHandler. The listed InteractionHandlers will be called after the "build-in" InteractionHandler sequently.</desc> - </info> - <prop oor:name="ServiceName" oor:type="xs:string"> - <info> - <desc>Specifies the name of the UNO service to be used to instantiate the InteractionHandler. The type should be com.sun.star.task.XInteractionHandler.</desc> - </info> - </prop> - </group> - </templates> - <component> - <set oor:name="InteractionHandlers" oor:node-type="InteractionHandlerData"> - <info> - <desc>Contains a root entry for InteractionHandler configurations.</desc> - </info> - </set> - </component> +<oor:component-schema xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:name="InteractionHandler" oor:package="org.openoffice.ucb" xml:lang="en-US"> + <info> + <author>TKR</author> + <desc>Deprecated. Use org.openoffice.Interaction instead.</desc> + </info> + <templates> + <group oor:name="InteractionHandlerData"> + <info> + <desc>Deprecated. Use org.openoffice.Interaction instead.</desc> + </info> + <prop oor:name="ServiceName" oor:type="xs:string"> + <info> + <desc>Deprecated. Use org.openoffice.Interaction instead.</desc> + </info> + </prop> + </group> + </templates> + <component> + <set oor:name="InteractionHandlers" oor:node-type="InteractionHandlerData"> + <info> + <desc>Deprecated. Use org.openoffice.Interaction instead.</desc> + </info> + </set> + </component> </oor:component-schema> - - - - - - - - - - - - diff --git a/officecfg/util/alllang.xsl b/officecfg/util/alllang.xsl index 339c6685fa..dafb45c85c 100644 --- a/officecfg/util/alllang.xsl +++ b/officecfg/util/alllang.xsl @@ -100,7 +100,7 @@ <xsl:if test="@xml:lang=$locale and not(@install:module)"> <xsl:copy> <xsl:apply-templates select = "@*" mode="locale"/> - <xsl:value-of select="."/> + <xsl:copy-of select="node()"/> </xsl:copy> </xsl:if> </xsl:template> @@ -275,7 +275,7 @@ <xsl:otherwise> <xsl:copy> <xsl:apply-templates select = "@*"/> - <xsl:value-of select="."/> + <xsl:copy-of select="node()"/> </xsl:copy> </xsl:otherwise> </xsl:choose> @@ -285,7 +285,7 @@ <xsl:if test="@xml:lang=$fallback-locale and not(@install:module)"> <xsl:copy> <xsl:apply-templates select = "@*"/> - <xsl:value-of select="."/> + <xsl:copy-of select="node()"/> </xsl:copy> </xsl:if> </xsl:template> diff --git a/officecfg/util/makefile.mk b/officecfg/util/makefile.mk index d6c6ddf16f..332ac90fe2 100644 --- a/officecfg/util/makefile.mk +++ b/officecfg/util/makefile.mk @@ -41,9 +41,7 @@ $(MISC)$/$(TARGET)_delzip : $(BIN)$/registry_{$(alllangiso)}.zip : $(MISC)$/$(TARGET)_delzip cd $(MISC)$/registry$/res$/$(@:b:s/registry_//) && zip -ru ..$/..$/..$/..$/bin$/registry_$(@:b:s/registry_//).zip org/* -.IF "$(USE_SHELL)"!="4nt" $(PERL) -w $(SOLARENV)$/bin$/cleanzip.pl $@ -.ENDIF # "$(USE_SHELL)"!="4nt" ALLTAR: \ $(MISC)$/$(TARGET)_delzip \ |