diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-07-24 16:35:33 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-07-24 16:36:55 +0200 |
| commit | 189bb791d248273758bd2b42e0ec216937fa22d9 (patch) | |
| tree | c5919fdc786c1dee4e822e64c1341cbe8303704a /odk | |
| parent | 7137605eefb6b4efe80c89c4468e33591b1e474f (diff) | |
fdo#66691: Revert fix for i#121577 Allow setting toolbar name in Addons.xcu
...which incompatibly changed Addons.xcs and breaks extensions (and LibreLogo,
which adds to Addons.xcu even though it is not an extension). See the mail
thread starting at
<http://lists.freedesktop.org/archives/libreoffice/2013-July/054612.html>
"[Libreoffice-commits] core.git: #i121577# Allow setting toolbar name in
Addons.xcu" for details.
This reverts commit 85f072ef33ef47b5e3e0bcd51acb5c4179cde2c2
"Resolves: #i121577# Allow setting toolbar name in Addons.xcu" plus follow-up
af572d9fbb744c9691abe465815d7927a9d11510 "Related: #i121577# Allow setting
toolbar name in Addons.xcu," f13f9b5cc5267a7a5606b1a89db91b6d7aef5f9c "various
.xcus are gone now," and 37d9921797a3ad3be8257fbfee11326549fcd987
"odk/examples/python/toolpanel/CalcWindowState.xcu is still in use," plus those
parts of f97ca6f65182efc6542c53ac5e973b3ff398a5d1 "Resolves: #i116455# Make
toolbar style settings persistent" that apparently belong to the fix for
i#121577 rather than i#116455.
Change-Id: Ib744566f3d8da7d9008d7dad8bec60f1bf32e743
Diffstat (limited to 'odk')
9 files changed, 363 insertions, 306 deletions
diff --git a/odk/Package_examples.mk b/odk/Package_examples.mk index 90c2dd7e1ea3..0c8a70540711 100644 --- a/odk/Package_examples.mk +++ b/odk/Package_examples.mk @@ -397,6 +397,7 @@ $(eval $(call gb_Package_add_files_with_dir,odk_examples,$(gb_Package_SDKDIRNAME cpp/DocumentLoader/test.odt \ cpp/complextoolbarcontrols/Addons.xcu \ cpp/complextoolbarcontrols/CalcListener.cxx \ + cpp/complextoolbarcontrols/CalcWindowState.xcu \ cpp/complextoolbarcontrols/Jobs.xcu \ cpp/complextoolbarcontrols/ListenerHelper.cxx \ cpp/complextoolbarcontrols/ListenerHelper.h \ @@ -409,6 +410,7 @@ $(eval $(call gb_Package_add_files_with_dir,odk_examples,$(gb_Package_SDKDIRNAME cpp/complextoolbarcontrols/MyProtocolHandler.h \ cpp/complextoolbarcontrols/ProtocolHandler.xcu \ cpp/complextoolbarcontrols/WriterListener.cxx \ + cpp/complextoolbarcontrols/WriterWindowState.xcu \ cpp/complextoolbarcontrols/exports.cxx \ cpp/complextoolbarcontrols/logo_big.png \ cpp/complextoolbarcontrols/logo_small.png \ diff --git a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Addons.xcu b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Addons.xcu index f8cf12b88429..a6a19855e7f9 100644 --- a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Addons.xcu +++ b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Addons.xcu @@ -136,46 +136,41 @@ </node> <node oor:name="OfficeToolBar"> <node oor:name="org.openoffice.Office.addon.example" oor:op="replace"> - <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 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> diff --git a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/Addons.xcu b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/Addons.xcu index 32ec0f096d89..5eefadb45fac 100644 --- a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/Addons.xcu +++ b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/Addons.xcu @@ -136,46 +136,41 @@ </node> <node oor:name="OfficeToolBar"> <node oor:name="org.openoffice.Office.addon.example" oor:op="replace"> - <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 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> diff --git a/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/Addons.xcu b/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/Addons.xcu index a31753d8004a..89136e9dc09a 100644 --- a/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/Addons.xcu +++ b/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/Addons.xcu @@ -17,63 +17,58 @@ * 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> - </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 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 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> + </node> </node> + </node> </oor:component-data> diff --git a/odk/examples/cpp/complextoolbarcontrols/Addons.xcu b/odk/examples/cpp/complextoolbarcontrols/Addons.xcu index e4edf15e4623..ce9aa26920fc 100644 --- a/odk/examples/cpp/complextoolbarcontrols/Addons.xcu +++ b/odk/examples/cpp/complextoolbarcontrols/Addons.xcu @@ -20,156 +20,151 @@ <node oor:name="AddonUI"> <node oor:name="OfficeToolBar"> <node oor:name="com.sun.star.comp.framework.addon.complextoolbarcontrols" oor:op="replace"> - <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 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> diff --git a/odk/examples/cpp/complextoolbarcontrols/CalcWindowState.xcu b/odk/examples/cpp/complextoolbarcontrols/CalcWindowState.xcu new file mode 100644 index 000000000000..4d9f71c2923a --- /dev/null +++ b/odk/examples/cpp/complextoolbarcontrols/CalcWindowState.xcu @@ -0,0 +1,38 @@ +<?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 0cc9f516d57c..a8f1a18386e1 100644 --- a/odk/examples/cpp/complextoolbarcontrols/Makefile +++ b/odk/examples/cpp/complextoolbarcontrols/Makefile @@ -104,6 +104,10 @@ $(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)>> $@ @@ -127,13 +131,13 @@ $(COMP_COMPONENTS) : @echo $(OSEP)/components$(CSEP) >> $@ # rule for component package file -$(COMP_PACKAGE) : $(SHAREDLIB_OUT)/$(COMP_IMPL_NAME) Addons.xcu ProtocolHandler.xcu $(COMP_UNOPKG_MANIFEST) $(COMP_COMPONENTS) +$(COMP_PACKAGE) : $(SHAREDLIB_OUT)/$(COMP_IMPL_NAME) Addons.xcu ProtocolHandler.xcu WriterWindowState.xcu CalcWindowState.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 logo_small.png logo_big.png + $(SDK_ZIP) -u $@ Addons.xcu ProtocolHandler.xcu WriterWindowState.xcu CalcWindowState.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 new file mode 100644 index 000000000000..e590f65458f4 --- /dev/null +++ b/odk/examples/cpp/complextoolbarcontrols/WriterWindowState.xcu @@ -0,0 +1,38 @@ +<?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 d35cc0e6e055..2ea6abdefeb5 100644 --- a/odk/examples/java/Inspector/Addons.xcu +++ b/odk/examples/java/Inspector/Addons.xcu @@ -20,24 +20,19 @@ <node oor:name="AddonUI"> <node oor:name="OfficeToolBar"> <node oor:name="org.openoffice.Office.addon.Inspector" oor:op="replace"> - <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 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> |