diff options
author | sb <sb@openoffice.org> | 2011-01-03 13:09:08 +0100 |
---|---|---|
committer | sb <sb@openoffice.org> | 2011-01-03 13:09:08 +0100 |
commit | 4972a7ec9574cf24b8f665ff7ee0a86c3a981c63 (patch) | |
tree | 60795a0f4e01ff503ea527abc3d1097798f7fb29 /officecfg | |
parent | sb135: #i116121# framework::UIElement::operator= does not check for self-assi... (diff) | |
parent | #i10000# replace obsolete define (diff) | |
download | core-4972a7ec9574cf24b8f665ff7ee0a86c3a981c63.tar.gz core-4972a7ec9574cf24b8f665ff7ee0a86c3a981c63.zip |
sb135: merged in DEV300_m96
Diffstat (limited to 'officecfg')
-rwxr-xr-x | officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 108 | ||||
-rwxr-xr-x[-rw-r--r--] | officecfg/registry/schema/org/openoffice/Office/ExtensionManager.xcs | 70 | ||||
-rwxr-xr-x[-rw-r--r--] | officecfg/registry/schema/org/openoffice/Office/Jobs.xcs | 5 |
3 files changed, 106 insertions, 77 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index ed1c8d587762..46611715f998 100755 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -29,13 +29,13 @@ <oor:component-data oor:name="GenericCommands" oor:package="org.openoffice.Office.UI" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <node oor:name="UserInterface"> <node oor:name="Commands"> - <node oor:name=".uno:WebHtml" oor:op="replace"> + <node oor:name=".uno:WebHtml" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="de">Vorschau in Web-Browser</value> <value xml:lang="en-US">Preview in Web Browser</value> </prop> </node> - <node oor:name=".uno:NewPresentation" oor:op="replace"> + <node oor:name=".uno:NewPresentation" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">New Presentation</value> </prop> @@ -2117,9 +2117,9 @@ </prop> </node> <node oor:name=".uno:LanguageStatus" oor:op="replace"> - <prop oor:name="Label" oor:type="xs:string"> - <value xml:lang="en-US">Language Status</value> - </prop> + <prop oor:name="Label" oor:type="xs:string"> + <value xml:lang="en-US">Language Status</value> + </prop> </node> <node oor:name=".uno:ChooseControls" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> @@ -3006,7 +3006,7 @@ <value xml:lang="en-US">~Spelling and Grammar...</value> </prop> <prop oor:name="Properties" oor:type="xs:int"> - <value>1</value> + <value>1</value> </prop> </node> <node oor:name=".uno:SpellDialog" oor:op="replace"> @@ -3461,12 +3461,12 @@ <value>9</value> </prop> </node> - <node oor:name=".uno:TaskPane" oor:op="replace"> - <prop oor:name="Label" oor:type="xs:string"> - <value xml:lang="en-US">Task Pane</value> - </prop> - </node> - <node oor:name=".uno:RestoreEditingView" oor:op="replace"> + <node oor:name=".uno:TaskPane" oor:op="replace"> + <prop oor:name="Label" oor:type="xs:string"> + <value xml:lang="en-US">Task Pane</value> + </prop> + </node> + <node oor:name=".uno:RestoreEditingView" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Restore Editing View</value> </prop> @@ -3480,10 +3480,10 @@ <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Fit to Frame</value> </prop> - <prop oor:name="Properties" oor:type="xs:int"> - <value>8</value> - </prop> - </node> + <prop oor:name="Properties" oor:type="xs:int"> + <value>8</value> + </prop> + </node> <node oor:name=".uno:ImageMapDialog" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">ImageMap</value> @@ -3740,10 +3740,10 @@ <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Flash</value> </prop> - <prop oor:name="Properties" oor:type="xs:int"> - <value>8</value> - </prop> - </node> + <prop oor:name="Properties" oor:type="xs:int"> + <value>8</value> + </prop> + </node> <node oor:name=".uno:ToolsMacroEdit" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Edit Macros</value> @@ -4047,12 +4047,12 @@ </node> <node oor:name=".uno:RubyDialog" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> - <value xml:lang="en-US">As~ian phonetic guide...</value> + <value xml:lang="en-US">As~ian phonetic guide...</value> </prop> - <prop oor:name="Properties" oor:type="xs:int"> - <value>8</value> - </prop> - </node> + <prop oor:name="Properties" oor:type="xs:int"> + <value>8</value> + </prop> + </node> <node oor:name=".uno:InsertSymbol" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">S~pecial Character...</value> @@ -4149,10 +4149,10 @@ <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Status ~Bar</value> </prop> - <prop oor:name="Properties" oor:type="xs:int"> - <value>8</value> - </prop> - </node> + <prop oor:name="Properties" oor:type="xs:int"> + <value>8</value> + </prop> + </node> <node oor:name=".uno:MacroBarVisible" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Macro Toolbar On/Off</value> @@ -5121,16 +5121,16 @@ <value xml:lang="en-US">~Extension Manager...</value> </prop> </node> - <node oor:name=".uno:Signature" oor:op="replace"> - <prop oor:name="Label" oor:type="xs:string"> - <value xml:lang="en-US">Digital Signatu~res...</value> - </prop> - </node> - <node oor:name=".uno:MacroSignature" oor:op="replace"> - <prop oor:name="Label" oor:type="xs:string"> - <value xml:lang="en-US">Digital Signature...</value> - </prop> - </node> + <node oor:name=".uno:Signature" oor:op="replace"> + <prop oor:name="Label" oor:type="xs:string"> + <value xml:lang="en-US">Digital Signatu~res...</value> + </prop> + </node> + <node oor:name=".uno:MacroSignature" oor:op="replace"> + <prop oor:name="Label" oor:type="xs:string"> + <value xml:lang="en-US">Digital Signature...</value> + </prop> + </node> <node oor:name=".uno:CommonAlignLeft" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Left</value> @@ -5187,27 +5187,27 @@ <value xml:lang="en-US">Find</value> </prop> </node> --> - <node oor:name=".uno:DeleteAllNotes" oor:op="replace"> - <prop oor:name="Label" oor:type="xs:string"> - <value xml:lang="en-US">Delete All Comments</value> - </prop> - </node> - <node oor:name=".uno:DeleteAuthor" oor:op="replace"> - <prop oor:name="Label" oor:type="xs:string"> - <value xml:lang="en-US">Delete All Comments by This Author</value> - </prop> - </node> + <node oor:name=".uno:DeleteAllNotes" oor:op="replace"> + <prop oor:name="Label" oor:type="xs:string"> + <value xml:lang="en-US">Delete All Comments</value> + </prop> + </node> + <node oor:name=".uno:DeleteAuthor" oor:op="replace"> + <prop oor:name="Label" oor:type="xs:string"> + <value xml:lang="en-US">Delete All Comments by This Author</value> + </prop> + </node> <node oor:name=".uno:ReplyComment" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Reply Comment</value> </prop> </node> <node oor:name=".uno:DeleteComment" oor:op="replace"> - <prop oor:name="Label" oor:type="xs:string"> - <value xml:lang="en-US">Delete Comment</value> - </prop> - </node> - </node> + <prop oor:name="Label" oor:type="xs:string"> + <value xml:lang="en-US">Delete Comment</value> + </prop> + </node> + </node> <node oor:name="Popups"> <node oor:name=".uno:HelpMenu" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> diff --git a/officecfg/registry/schema/org/openoffice/Office/ExtensionManager.xcs b/officecfg/registry/schema/org/openoffice/Office/ExtensionManager.xcs index de26a3ae14eb..819290c3c283 100644..100755 --- a/officecfg/registry/schema/org/openoffice/Office/ExtensionManager.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/ExtensionManager.xcs @@ -26,28 +26,52 @@ * ************************************************************************ --> <!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="ExtensionManager" oor:package="org.openoffice.Office" xml:lang="en-US"> - <info> - <author>JL</author> - <desc >Contains information for the Extension Manager.</desc> - </info> - <component> - <group oor:name="ExtensionRepositories"> - <info> - <desc>Information about repositories for extensions. - </desc> - </info> - <prop oor:name="WebsiteLink" oor:type="xs:string"> - <info> - <desc>This links is used from the Extension Manager. A user can click on the &Download extensions...& - control so that a browser is opened which displayed the website to which directs this URL. - </desc> - </info> - <value></value> - </prop> - - </group> - </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="ExtensionManager" oor:package="org.openoffice.Office" xml:lang="en-US"> + <info> + <author>JL</author> + <desc>Contains information for the Extension Manager.</desc> + </info> + <templates> + <group oor:name="UpdateInfo"> + <info> + <desc>Holds the information about updates for extensions.</desc> + </info> + <prop oor:name="Version" oor:type="xs:string" oor:localized="false"> + <info> + <desc>The version of the extension</desc> + </info> + </prop> + </group> + </templates> + <component> + <group oor:name="ExtensionRepositories"> + <info> + <desc>Information about repositories for extensions.</desc> + </info> + <prop oor:name="WebsiteLink" oor:type="xs:string"> + <info> + <desc>This links is used from the Extension Manager. A user can click on the &Download extensions...& + control so that a browser is opened which displayed the website to which directs this URL. + </desc> + </info> + <value></value> + </prop> + </group> + <group oor:name="ExtensionUpdateData"> + <info> + <desc>Contains inforamtion about availabe or ignored updates for extensions."</desc> + </info> + <set oor:name="AvailableUpdates" oor:node-type="UpdateInfo"> + <info> + <desc>This set lists all known updates for extensions, which where not applied yet.</desc> + </info> + </set> + <set oor:name="IgnoredUpdates" oor:node-type="UpdateInfo"> + <info> + <desc>This set lists all updates for extensions which the user wanted to ignore.</desc> + </info> + </set> + </group> + </component> </oor:component-schema> diff --git a/officecfg/registry/schema/org/openoffice/Office/Jobs.xcs b/officecfg/registry/schema/org/openoffice/Office/Jobs.xcs index a9b4cdc70fd7..f5421c8a246f 100644..100755 --- a/officecfg/registry/schema/org/openoffice/Office/Jobs.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Jobs.xcs @@ -40,6 +40,11 @@ <desc>Must contain an UNO implementation(!) name of the implemented job component.</desc> </info> </prop> + <prop oor:name="Context" oor:type="xs:string"> + <info> + <desc>An property to define the context this event should be active in. It can be empty or a colon separated list of the supported application modules.</desc> + </info> + </prop> <group oor:name="Arguments" oor:extensible="true"> <info> <desc>Can be filled with any argument, which is under control of the job component.</desc> |