diff options
author | Ariel Constenla-Haile <arielch@apache.org> | 2013-01-04 18:57:41 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-06-24 11:54:45 +0100 |
commit | af572d9fbb744c9691abe465815d7927a9d11510 (patch) | |
tree | 8d95cc5b1e817f5a9c16e552fd51ce74d2623a29 /odk/examples | |
parent | 85f072ef33ef47b5e3e0bcd51acb5c4179cde2c2 (diff) |
Related: #i121577# Allow setting toolbar name in Addons.xcu
(cherry picked from commit 96cd87ec89e5ebe9d174c90b0f2cab96b3772732)
Conflicts:
odk/examples/cpp/complextoolbarcontrols/CalcWindowState.xcu
odk/examples/cpp/complextoolbarcontrols/WriterWindowState.xcu
odk/examples/java/Inspector/Inspector.java
Change-Id: I6a0c1a657c6084df4efd8e150dc252155b32ba0b
Diffstat (limited to 'odk/examples')
8 files changed, 306 insertions, 361 deletions
diff --git a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Addons.xcu b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Addons.xcu index a6a19855e7f9..f8cf12b88429 100644 --- a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Addons.xcu +++ b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Addons.xcu @@ -136,41 +136,46 @@ </node> <node oor:name="OfficeToolBar"> <node oor:name="org.openoffice.Office.addon.example" oor:op="replace"> - <node oor:name="m1" oor:op="replace"> - <prop oor:name="URL" oor:type="xs:string"> - <value>org.openoffice.Office.addon.example:Function1</value> - </prop> - <prop oor:name="ImageIdentifier" oor:type="xs:string"> - <value/> - </prop> - <prop oor:name="Title" oor:type="xs:string"> - <value/> - <value xml:lang="en-US">Function 1</value> - </prop> - <prop oor:name="Target" oor:type="xs:string"> - <value>_self</value> - </prop> - <prop oor:name="Context" oor:type="xs:string"> - <value>com.sun.star.text.TextDocument</value> - </prop> - </node> - <node oor:name="m2" oor:op="replace"> - <prop oor:name="URL" oor:type="xs:string"> - <value>org.openoffice.Office.addon.example:Function2</value> - </prop> - <prop oor:name="ImageIdentifier" oor:type="xs:string"> - <value/> - </prop> - <prop oor:name="Title" oor:type="xs:string"> - <value/> - <value xml:lang="en-US">Function 2</value> - </prop> - <prop oor:name="Target" oor:type="xs:string"> - <value>_self</value> - </prop> - <prop oor:name="Context" oor:type="xs:string"> - <value>com.sun.star.text.TextDocument</value> - </prop> + <prop oor:name="Title" oor:type="xs:string"> + <value xml:lang="en-US">Cpp Addon Example</value> + </prop> + <node oor:name="ToolBarItems"> + <node oor:name="m1" oor:op="replace"> + <prop oor:name="URL" oor:type="xs:string"> + <value>org.openoffice.Office.addon.example:Function1</value> + </prop> + <prop oor:name="ImageIdentifier" oor:type="xs:string"> + <value/> + </prop> + <prop oor:name="Title" oor:type="xs:string"> + <value/> + <value xml:lang="en-US">Function 1</value> + </prop> + <prop oor:name="Target" oor:type="xs:string"> + <value>_self</value> + </prop> + <prop oor:name="Context" oor:type="xs:string"> + <value>com.sun.star.text.TextDocument</value> + </prop> + </node> + <node oor:name="m2" oor:op="replace"> + <prop oor:name="URL" oor:type="xs:string"> + <value>org.openoffice.Office.addon.example:Function2</value> + </prop> + <prop oor:name="ImageIdentifier" oor:type="xs:string"> + <value/> + </prop> + <prop oor:name="Title" oor:type="xs:string"> + <value/> + <value xml:lang="en-US">Function 2</value> + </prop> + <prop oor:name="Target" oor:type="xs:string"> + <value>_self</value> + </prop> + <prop oor:name="Context" oor:type="xs:string"> + <value>com.sun.star.text.TextDocument</value> + </prop> + </node> </node> </node> </node> diff --git a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/Addons.xcu b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/Addons.xcu index 5eefadb45fac..32ec0f096d89 100644 --- a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/Addons.xcu +++ b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/Addons.xcu @@ -136,41 +136,46 @@ </node> <node oor:name="OfficeToolBar"> <node oor:name="org.openoffice.Office.addon.example" oor:op="replace"> - <node oor:name="m1" oor:op="replace"> - <prop oor:name="URL" oor:type="xs:string"> - <value>org.openoffice.Office.addon.example:Function1</value> - </prop> - <prop oor:name="ImageIdentifier" oor:type="xs:string"> - <value/> - </prop> - <prop oor:name="Title" oor:type="xs:string"> - <value/> - <value xml:lang="en-US">Function 1</value> - </prop> - <prop oor:name="Target" oor:type="xs:string"> - <value>_self</value> - </prop> - <prop oor:name="Context" oor:type="xs:string"> - <value>com.sun.star.text.TextDocument</value> - </prop> - </node> - <node oor:name="m2" oor:op="replace"> - <prop oor:name="URL" oor:type="xs:string"> - <value>org.openoffice.Office.addon.example:Function2</value> - </prop> - <prop oor:name="ImageIdentifier" oor:type="xs:string"> - <value/> - </prop> - <prop oor:name="Title" oor:type="xs:string"> - <value/> - <value xml:lang="en-US">Function 2</value> - </prop> - <prop oor:name="Target" oor:type="xs:string"> - <value>_self</value> - </prop> - <prop oor:name="Context" oor:type="xs:string"> - <value>com.sun.star.text.TextDocument</value> - </prop> + <prop oor:name="Title" oor:type="xs:string"> + <value xml:lang="en-US">Java Addon Example</value> + </prop> + <node oor:name="ToolBarItems"> + <node oor:name="m1" oor:op="replace"> + <prop oor:name="URL" oor:type="xs:string"> + <value>org.openoffice.Office.addon.example:Function1</value> + </prop> + <prop oor:name="ImageIdentifier" oor:type="xs:string"> + <value/> + </prop> + <prop oor:name="Title" oor:type="xs:string"> + <value/> + <value xml:lang="en-US">Function 1</value> + </prop> + <prop oor:name="Target" oor:type="xs:string"> + <value>_self</value> + </prop> + <prop oor:name="Context" oor:type="xs:string"> + <value>com.sun.star.text.TextDocument</value> + </prop> + </node> + <node oor:name="m2" oor:op="replace"> + <prop oor:name="URL" oor:type="xs:string"> + <value>org.openoffice.Office.addon.example:Function2</value> + </prop> + <prop oor:name="ImageIdentifier" oor:type="xs:string"> + <value/> + </prop> + <prop oor:name="Title" oor:type="xs:string"> + <value/> + <value xml:lang="en-US">Function 2</value> + </prop> + <prop oor:name="Target" oor:type="xs:string"> + <value>_self</value> + </prop> + <prop oor:name="Context" oor:type="xs:string"> + <value>com.sun.star.text.TextDocument</value> + </prop> + </node> </node> </node> </node> diff --git a/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/Addons.xcu b/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/Addons.xcu index 89136e9dc09a..a31753d8004a 100644 --- a/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/Addons.xcu +++ b/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/Addons.xcu @@ -17,58 +17,63 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="Addons" oor:package="org.openoffice.Office"> - <node oor:name="AddonUI"> - <node oor:name="OfficeMenuBar"> - <node oor:name="com.foocorp.foo-ext:Menu" oor:op="replace"> - <prop oor:name="Title" oor:type="xs:string"> - <value/> - <value xml:lang="en">Foo E~xtension</value> - </prop> - <prop oor:name="Target" oor:type="xs:string"> - <value>_self</value> - </prop> - <prop oor:name="ImageIdentifier" oor:type="xs:string"> - <value/> - </prop> - <node oor:name="Submenu"> - <node oor:name="m1" oor:op="replace"> - <prop oor:name="URL" oor:type="xs:string"> - <value>vnd.sun.star.script:DialogWithHelp.Module1.main?language=Basic&location=application</value> - </prop> - <prop oor:name="ImageIdentifier" oor:type="xs:string"> - <value/> - </prop> - <prop oor:name="Target" oor:type="xs:string"> - <value>_self</value> - </prop> - <prop oor:name="Title" oor:type="xs:string"> - <value/> - <value xml:lang="en">Start Foo Dialog...</value> - </prop> - </node> - <node oor:name="m3" oor:op="replace"> - </node> + <node oor:name="AddonUI"> + <node oor:name="OfficeMenuBar"> + <node oor:name="com.foocorp.foo-ext:Menu" oor:op="replace"> + <prop oor:name="Title" oor:type="xs:string"> + <value/> + <value xml:lang="en">Foo E~xtension</value> + </prop> + <prop oor:name="Target" oor:type="xs:string"> + <value>_self</value> + </prop> + <prop oor:name="ImageIdentifier" oor:type="xs:string"> + <value/> + </prop> + <node oor:name="Submenu"> + <node oor:name="m1" oor:op="replace"> + <prop oor:name="URL" oor:type="xs:string"> + <value>vnd.sun.star.script:DialogWithHelp.Module1.main?language=Basic&location=application</value> + </prop> + <prop oor:name="ImageIdentifier" oor:type="xs:string"> + <value/> + </prop> + <prop oor:name="Target" oor:type="xs:string"> + <value>_self</value> + </prop> + <prop oor:name="Title" oor:type="xs:string"> + <value/> + <value xml:lang="en">Start Foo Dialog...</value> + </prop> + </node> + <node oor:name="m3" oor:op="replace"> + </node> + </node> + </node> </node> - </node> - </node> - <node oor:name="OfficeToolBar"> - <node oor:name="com.foocorp.foo-ext:ToolbarItem1" oor:op="replace"> - <node oor:name="m1" oor:op="replace"> - <prop oor:name="URL"> - <value>vnd.sun.star.script:DialogWithHelp.Module1.main?language=Basic&location=application</value> - </prop> - <prop oor:name="Title"> - <value xml:lang="en-US">Foo Toolbar Item</value> - <value xml:lang="de">Foo Toolbar Eintrag</value> - </prop> - <prop oor:name="Target" oor:type="xs:string"> - <value>_self</value> - </prop> - <prop oor:name="Context" oor:type="xs:string"> - <value>com.sun.star.text.TextDocument</value> - </prop> + <node oor:name="OfficeToolBar"> + <node oor:name="com.foocorp.foo-ext:ToolbarItem1" oor:op="replace"> + <prop oor:name="Title" oor:type="xs:string"> + <value xml:lang="en-US">Foo Toolbar</value> + </prop> + <node oor:name="ToolBarItems"> + <node oor:name="m1" oor:op="replace"> + <prop oor:name="URL"> + <value>vnd.sun.star.script:DialogWithHelp.Module1.main?language=Basic&location=application</value> + </prop> + <prop oor:name="Title"> + <value xml:lang="en-US">Foo Toolbar Item</value> + <value xml:lang="de">Foo Toolbar Eintrag</value> + </prop> + <prop oor:name="Target" oor:type="xs:string"> + <value>_self</value> + </prop> + <prop oor:name="Context" oor:type="xs:string"> + <value>com.sun.star.text.TextDocument</value> + </prop> + </node> + </node> + </node> </node> - </node> </node> - </node> </oor:component-data> diff --git a/odk/examples/cpp/complextoolbarcontrols/Addons.xcu b/odk/examples/cpp/complextoolbarcontrols/Addons.xcu index ce9aa26920fc..e4edf15e4623 100644 --- a/odk/examples/cpp/complextoolbarcontrols/Addons.xcu +++ b/odk/examples/cpp/complextoolbarcontrols/Addons.xcu @@ -20,151 +20,156 @@ <node oor:name="AddonUI"> <node oor:name="OfficeToolBar"> <node oor:name="com.sun.star.comp.framework.addon.complextoolbarcontrols" oor:op="replace"> - <node oor:name="m1" oor:op="replace"> - <prop oor:name="URL" oor:type="xs:string"> - <value>vnd.demo.complextoolbarcontrols.demoaddon:ImageButtonCmd</value> - </prop> - <prop oor:name="Title" oor:type="xs:string"> - <value xml:lang="en-US">Image Button</value> - </prop> - <prop oor:name="Target" oor:type="xs:string"> - <value>_self</value> - </prop> - <prop oor:name="Context" oor:type="xs:string"> - <value>com.sun.star.text.TextDocument,com.sun.star.sheet.SpreadsheetDocument</value> - </prop> - <prop oor:name="ControlType" oor:type="xs:string"> - <value>ImageButton</value> - </prop> - </node> - <node oor:name="m2" oor:op="replace"> - <prop oor:name="URL" oor:type="xs:string"> - <value>vnd.demo.complextoolbarcontrols.demoaddon:ComboboxCmd</value> - </prop> - <prop oor:name="Title" oor:type="xs:string"> - <value xml:lang="en-US">ComboBox</value> - </prop> - <prop oor:name="Target" oor:type="xs:string"> - <value>_self</value> - </prop> - <prop oor:name="Context" oor:type="xs:string"> - <value>com.sun.star.text.TextDocument,com.sun.star.sheet.SpreadsheetDocument</value> - </prop> - <prop oor:name="ControlType" oor:type="xs:string"> - <value>Combobox</value> - </prop> - <prop oor:name="Width" oor:type="xs:long"> - <value>200</value> - </prop> - </node> - <node oor:name="m3" oor:op="replace"> - <prop oor:name="URL" oor:type="xs:string"> - <value>private:separator</value> - </prop> - </node> - <node oor:name="m4" oor:op="replace"> - <prop oor:name="URL" oor:type="xs:string"> - <value>vnd.demo.complextoolbarcontrols.demoaddon:SpinfieldCmd</value> - </prop> - <prop oor:name="Title" oor:type="xs:string"> - <value xml:lang="en-US">Spinfield</value> - </prop> - <prop oor:name="Target" oor:type="xs:string"> - <value>_self</value> - </prop> - <prop oor:name="Context" oor:type="xs:string"> - <value>com.sun.star.text.TextDocument,com.sun.star.sheet.SpreadsheetDocument</value> - </prop> - <prop oor:name="ControlType" oor:type="xs:string"> - <value>Spinfield</value> - </prop> - <prop oor:name="Width" oor:type="xs:long"> - <value>70</value> - </prop> - </node> - <node oor:name="m5" oor:op="replace"> - <prop oor:name="URL" oor:type="xs:string"> - <value>private:separator</value> - </prop> - </node> - <node oor:name="m6" oor:op="replace"> - <prop oor:name="URL" oor:type="xs:string"> - <value>vnd.demo.complextoolbarcontrols.demoaddon:EditfieldCmd</value> - </prop> - <prop oor:name="Title" oor:type="xs:string"> - <value xml:lang="en-US">Editfield</value> - </prop> - <prop oor:name="Target" oor:type="xs:string"> - <value>_self</value> - </prop> - <prop oor:name="Context" oor:type="xs:string"> - <value>com.sun.star.text.TextDocument,com.sun.star.sheet.SpreadsheetDocument</value> - </prop> - <prop oor:name="ControlType" oor:type="xs:string"> - <value>Editfield</value> - </prop> - <prop oor:name="Width" oor:type="xs:long"> - <value>130</value> - </prop> - </node> - <node oor:name="m7" oor:op="replace"> - <prop oor:name="URL" oor:type="xs:string"> - <value>private:separator</value> - </prop> - </node> - <node oor:name="m8" oor:op="replace"> - <prop oor:name="URL" oor:type="xs:string"> - <value>vnd.demo.complextoolbarcontrols.demoaddon:DropdownboxCmd</value> - </prop> - <prop oor:name="Title" oor:type="xs:string"> - <value xml:lang="en-US">Dropdownbox</value> - </prop> - <prop oor:name="Target" oor:type="xs:string"> - <value>_self</value> - </prop> - <prop oor:name="Context" oor:type="xs:string"> - <value>com.sun.star.text.TextDocument,com.sun.star.sheet.SpreadsheetDocument</value> - </prop> - <prop oor:name="ControlType" oor:type="xs:string"> - <value>Dropdownbox</value> - </prop> - <prop oor:name="Width" oor:type="xs:long"> - <value>80</value> - </prop> - </node> - <node oor:name="m9" oor:op="replace"> - <prop oor:name="URL" oor:type="xs:string"> - <value>vnd.demo.complextoolbarcontrols.demoaddon:ToggleDropdownButtonCmd</value> - </prop> - <prop oor:name="Title" oor:type="xs:string"> - <value xml:lang="en-US">Toggle Dropdown Button</value> - </prop> - <prop oor:name="Target" oor:type="xs:string"> - <value>_self</value> - </prop> - <prop oor:name="Context" oor:type="xs:string"> - <value>com.sun.star.text.TextDocument,com.sun.star.sheet.SpreadsheetDocument</value> - </prop> - <prop oor:name="ControlType" oor:type="xs:string"> - <value>ToggleDropdownButton</value> - </prop> - </node> - <node oor:name="m10" oor:op="replace"> - <prop oor:name="URL" oor:type="xs:string"> - <value>vnd.demo.complextoolbarcontrols.demoaddon:DropdownButtonCmd</value> - </prop> - <prop oor:name="Title" oor:type="xs:string"> - <value xml:lang="en-US">Dropdown Button</value> - </prop> - <prop oor:name="Target" oor:type="xs:string"> - <value>_self</value> - </prop> - <prop oor:name="Context" oor:type="xs:string"> - <value>com.sun.star.text.TextDocument,com.sun.star.sheet.SpreadsheetDocument</value> - </prop> - <prop oor:name="ControlType" oor:type="xs:string"> - <value>DropdownButton</value> - </prop> + <prop oor:name="Title" oor:type="xs:string"> + <value xml:lang="en-US">Complex Toolbar Controls</value> + </prop> + <node oor:name="ToolBarItems"> + <node oor:name="m1" oor:op="replace"> + <prop oor:name="URL" oor:type="xs:string"> + <value>vnd.demo.complextoolbarcontrols.demoaddon:ImageButtonCmd</value> + </prop> + <prop oor:name="Title" oor:type="xs:string"> + <value xml:lang="en-US">Image Button</value> + </prop> + <prop oor:name="Target" oor:type="xs:string"> + <value>_self</value> + </prop> + <prop oor:name="Context" oor:type="xs:string"> + <value>com.sun.star.text.TextDocument,com.sun.star.sheet.SpreadsheetDocument</value> + </prop> + <prop oor:name="ControlType" oor:type="xs:string"> + <value>ImageButton</value> + </prop> + </node> + <node oor:name="m2" oor:op="replace"> + <prop oor:name="URL" oor:type="xs:string"> + <value>vnd.demo.complextoolbarcontrols.demoaddon:ComboboxCmd</value> + </prop> + <prop oor:name="Title" oor:type="xs:string"> + <value xml:lang="en-US">ComboBox</value> + </prop> + <prop oor:name="Target" oor:type="xs:string"> + <value>_self</value> + </prop> + <prop oor:name="Context" oor:type="xs:string"> + <value>com.sun.star.text.TextDocument,com.sun.star.sheet.SpreadsheetDocument</value> + </prop> + <prop oor:name="ControlType" oor:type="xs:string"> + <value>Combobox</value> + </prop> + <prop oor:name="Width" oor:type="xs:long"> + <value>200</value> + </prop> + </node> + <node oor:name="m3" oor:op="replace"> + <prop oor:name="URL" oor:type="xs:string"> + <value>private:separator</value> + </prop> + </node> + <node oor:name="m4" oor:op="replace"> + <prop oor:name="URL" oor:type="xs:string"> + <value>vnd.demo.complextoolbarcontrols.demoaddon:SpinfieldCmd</value> + </prop> + <prop oor:name="Title" oor:type="xs:string"> + <value xml:lang="en-US">Spinfield</value> + </prop> + <prop oor:name="Target" oor:type="xs:string"> + <value>_self</value> + </prop> + <prop oor:name="Context" oor:type="xs:string"> + <value>com.sun.star.text.TextDocument,com.sun.star.sheet.SpreadsheetDocument</value> + </prop> + <prop oor:name="ControlType" oor:type="xs:string"> + <value>Spinfield</value> + </prop> + <prop oor:name="Width" oor:type="xs:long"> + <value>70</value> + </prop> + </node> + <node oor:name="m5" oor:op="replace"> + <prop oor:name="URL" oor:type="xs:string"> + <value>private:separator</value> + </prop> + </node> + <node oor:name="m6" oor:op="replace"> + <prop oor:name="URL" oor:type="xs:string"> + <value>vnd.demo.complextoolbarcontrols.demoaddon:EditfieldCmd</value> + </prop> + <prop oor:name="Title" oor:type="xs:string"> + <value xml:lang="en-US">Editfield</value> + </prop> + <prop oor:name="Target" oor:type="xs:string"> + <value>_self</value> + </prop> + <prop oor:name="Context" oor:type="xs:string"> + <value>com.sun.star.text.TextDocument,com.sun.star.sheet.SpreadsheetDocument</value> + </prop> + <prop oor:name="ControlType" oor:type="xs:string"> + <value>Editfield</value> + </prop> + <prop oor:name="Width" oor:type="xs:long"> + <value>130</value> + </prop> + </node> + <node oor:name="m7" oor:op="replace"> + <prop oor:name="URL" oor:type="xs:string"> + <value>private:separator</value> + </prop> + </node> + <node oor:name="m8" oor:op="replace"> + <prop oor:name="URL" oor:type="xs:string"> + <value>vnd.demo.complextoolbarcontrols.demoaddon:DropdownboxCmd</value> + </prop> + <prop oor:name="Title" oor:type="xs:string"> + <value xml:lang="en-US">Dropdownbox</value> + </prop> + <prop oor:name="Target" oor:type="xs:string"> + <value>_self</value> + </prop> + <prop oor:name="Context" oor:type="xs:string"> + <value>com.sun.star.text.TextDocument,com.sun.star.sheet.SpreadsheetDocument</value> + </prop> + <prop oor:name="ControlType" oor:type="xs:string"> + <value>Dropdownbox</value> + </prop> + <prop oor:name="Width" oor:type="xs:long"> + <value>80</value> + </prop> + </node> + <node oor:name="m9" oor:op="replace"> + <prop oor:name="URL" oor:type="xs:string"> + <value>vnd.demo.complextoolbarcontrols.demoaddon:ToggleDropdownButtonCmd</value> + </prop> + <prop oor:name="Title" oor:type="xs:string"> + <value xml:lang="en-US">Toggle Dropdown Button</value> + </prop> + <prop oor:name="Target" oor:type="xs:string"> + <value>_self</value> + </prop> + <prop oor:name="Context" oor:type="xs:string"> + <value>com.sun.star.text.TextDocument,com.sun.star.sheet.SpreadsheetDocument</value> + </prop> + <prop oor:name="ControlType" oor:type="xs:string"> + <value>ToggleDropdownButton</value> + </prop> + </node> + <node oor:name="m10" oor:op="replace"> + <prop oor:name="URL" oor:type="xs:string"> + <value>vnd.demo.complextoolbarcontrols.demoaddon:DropdownButtonCmd</value> + </prop> + <prop oor:name="Title" oor:type="xs:string"> + <value xml:lang="en-US">Dropdown Button</value> + </prop> + <prop oor:name="Target" oor:type="xs:string"> + <value>_self</value> + </prop> + <prop oor:name="Context" oor:type="xs:string"> + <value>com.sun.star.text.TextDocument,com.sun.star.sheet.SpreadsheetDocument</value> + </prop> + <prop oor:name="ControlType" oor:type="xs:string"> + <value>DropdownButton</value> + </prop> + </node> </node> </node> </node> diff --git a/odk/examples/cpp/complextoolbarcontrols/CalcWindowState.xcu b/odk/examples/cpp/complextoolbarcontrols/CalcWindowState.xcu deleted file mode 100644 index 4d9f71c2923a..000000000000 --- a/odk/examples/cpp/complextoolbarcontrols/CalcWindowState.xcu +++ /dev/null @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . ---> -<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="CalcWindowState" oor:package="org.openoffice.Office.UI"> - <node oor:name="UIElements"> - <node oor:name="States"> - <node oor:name="private:resource/toolbar/addon_com.sun.star.comp.framework.addon.complextoolbarcontrols" oor:op="replace"> - <prop oor:name="ContextSensitive" oor:type="xs:boolean"> - <value>false</value> - </prop> - <prop oor:name="UIName" oor:type="xs:string"> - <value xml:lang="en-US">Complex Toolbar Controls</value> - </prop> - <prop oor:name="Visible" oor:type="xs:boolean"> - <value>true</value> - </prop> - <prop oor:name="Docked" oor:type="xs:boolean"> - <value>false</value> - </prop> - </node> - </node> - </node> -</oor:component-data>
\ No newline at end of file diff --git a/odk/examples/cpp/complextoolbarcontrols/Makefile b/odk/examples/cpp/complextoolbarcontrols/Makefile index a8f1a18386e1..0cc9f516d57c 100644 --- a/odk/examples/cpp/complextoolbarcontrols/Makefile +++ b/odk/examples/cpp/complextoolbarcontrols/Makefile @@ -104,10 +104,6 @@ $(OUT_COMP_GEN)/%/manifest.xml : @echo $(SQM) $(SQM)$(OSEP)manifest:file-entry manifest:media-type="$(QM)application/vnd.sun.star.configuration-data$(QM)" >> $@ @echo $(SQM) $(SQM)manifest:full-path="$(QM)Addons.xcu$(QM)"/$(CSEP) >> $@ @echo $(SQM) $(SQM)$(OSEP)manifest:file-entry manifest:media-type="$(QM)application/vnd.sun.star.configuration-data$(QM)" >> $@ - @echo $(SQM) $(SQM)manifest:full-path="$(QM)WriterWindowState.xcu$(QM)"/$(CSEP) >> $@ - @echo $(SQM) $(SQM)$(OSEP)manifest:file-entry manifest:meda-type="$(QM)application/vnd.sun.star.configuration-data$(QM)" >> $@ - @echo $(SQM) $(SQM)manifest:full-path="$(QM)CalcWindowState.xcu$(QM)"/$(CSEP) >> $@ - @echo $(SQM) $(SQM)$(OSEP)manifest:file-entry manifest:media-type="$(QM)application/vnd.sun.star.configuration-data$(QM)" >> $@ @echo $(SQM) $(SQM)manifest:full-path="$(QM)ProtocolHandler.xcu$(QM)"/$(CSEP) >> $@ @echo $(SQM) $(SQM)$(OSEP)manifest:file-entry manifest:media-type="$(QM)application/vnd.sun.star.uno-components;platform=$(UNOPKG_PLATFORM)$(QM)">> $@ @echo $(SQM) $(SQM)manifest:full-path="$(QM)$(COMP_NAME).components$(QM)"/$(CSEP)>> $@ @@ -131,13 +127,13 @@ $(COMP_COMPONENTS) : @echo $(OSEP)/components$(CSEP) >> $@ # rule for component package file -$(COMP_PACKAGE) : $(SHAREDLIB_OUT)/$(COMP_IMPL_NAME) Addons.xcu ProtocolHandler.xcu WriterWindowState.xcu CalcWindowState.xcu $(COMP_UNOPKG_MANIFEST) $(COMP_COMPONENTS) +$(COMP_PACKAGE) : $(SHAREDLIB_OUT)/$(COMP_IMPL_NAME) Addons.xcu ProtocolHandler.xcu $(COMP_UNOPKG_MANIFEST) $(COMP_COMPONENTS) -$(MKDIR) $(subst /,$(PS),$(@D)) && $(DEL) $(subst \\,\,$(subst /,$(PS),$@)) -$(MKDIR) $(subst /,$(PS),$(OUT_COMP_GEN)/$(UNOPKG_PLATFORM)) $(COPY) $(subst /,$(PS),$<) $(subst /,$(PS),$(OUT_COMP_GEN)/$(UNOPKG_PLATFORM)) cd $(subst /,$(PS),$(OUT_COMP_GEN)) && $(SDK_ZIP) -u ../../bin/$(@F) $(COMP_NAME).components cd $(subst /,$(PS),$(OUT_COMP_GEN)) && $(SDK_ZIP) -u ../../bin/$(@F) $(UNOPKG_PLATFORM)/$(<F) - $(SDK_ZIP) -u $@ Addons.xcu ProtocolHandler.xcu WriterWindowState.xcu CalcWindowState.xcu logo_small.png logo_big.png + $(SDK_ZIP) -u $@ Addons.xcu ProtocolHandler.xcu logo_small.png logo_big.png cd $(subst /,$(PS),$(OUT_COMP_GEN)/$(subst .$(UNOOXT_EXT),,$(@F))) && $(SDK_ZIP) -u ../../../bin/$(@F) META-INF/manifest.xml $(COMP_REGISTERFLAG) : $(COMP_PACKAGE) diff --git a/odk/examples/cpp/complextoolbarcontrols/WriterWindowState.xcu b/odk/examples/cpp/complextoolbarcontrols/WriterWindowState.xcu deleted file mode 100644 index e590f65458f4..000000000000 --- a/odk/examples/cpp/complextoolbarcontrols/WriterWindowState.xcu +++ /dev/null @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . ---> -<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="WriterWindowState" oor:package="org.openoffice.Office.UI"> - <node oor:name="UIElements"> - <node oor:name="States"> - <node oor:name="private:resource/toolbar/addon_com.sun.star.comp.framework.addon.complextoolbarcontrols" oor:op="replace"> - <prop oor:name="ContextSensitive" oor:type="xs:boolean"> - <value>false</value> - </prop> - <prop oor:name="UIName" oor:type="xs:string"> - <value xml:lang="en-US">Complex Toolbar Controls</value> - </prop> - <prop oor:name="Visible" oor:type="xs:boolean"> - <value>true</value> - </prop> - <prop oor:name="Docked" oor:type="xs:boolean"> - <value>false</value> - </prop> - </node> - </node> - </node> -</oor:component-data>
\ No newline at end of file diff --git a/odk/examples/java/Inspector/Addons.xcu b/odk/examples/java/Inspector/Addons.xcu index 2ea6abdefeb5..d35cc0e6e055 100644 --- a/odk/examples/java/Inspector/Addons.xcu +++ b/odk/examples/java/Inspector/Addons.xcu @@ -20,19 +20,24 @@ <node oor:name="AddonUI"> <node oor:name="OfficeToolBar"> <node oor:name="org.openoffice.Office.addon.Inspector" oor:op="replace"> - <node oor:name="toolBar_Inspector" oor:op="replace"> - <prop oor:name="URL" oor:type="xs:string"> - <value>org.openoffice.Office.addon.Inspector:inspect</value> - </prop> - <prop oor:name="Title" oor:type="xs:string"> - <value xml:lang="en-US">Object Inspector</value> - </prop> - <prop oor:name="Target" oor:type="xs:string"> - <value>_self</value> - </prop> - <prop oor:name="Context" oor:type="xs:string"> - <value></value> - </prop> + <prop oor:name="Title" oor:type="xs:string"> + <value xml:lang="en-US">Object Inspector</value> + </prop> + <node oor:name="ToolBarItems"> + <node oor:name="toolBar_Inspector" oor:op="replace"> + <prop oor:name="URL" oor:type="xs:string"> + <value>org.openoffice.Office.addon.Inspector:inspect</value> + </prop> + <prop oor:name="Title" oor:type="xs:string"> + <value xml:lang="en-US">Object Inspector</value> + </prop> + <prop oor:name="Target" oor:type="xs:string"> + <value>_self</value> + </prop> + <prop oor:name="Context" oor:type="xs:string"> + <value></value> + </prop> + </node> </node> </node> </node> |