basctl/uiconfig/basicide/menubar/menubar.xml | 2 - chart2/uiconfig/menubar/menubar.xml | 2 - dbaccess/uiconfig/dbapp/menubar/menubar.xml | 2 - dbaccess/uiconfig/dbquery/menubar/menubar.xml | 2 - dbaccess/uiconfig/dbrelation/menubar/menubar.xml | 2 - dbaccess/uiconfig/dbtable/menubar/menubar.xml | 2 - dbaccess/uiconfig/dbtdata/menubar/menubar.xml | 2 - desktop/uiconfig/ui/extensionmanager.ui | 3 + extensions/uiconfig/sbibliography/menubar/menubar.xml | 2 - framework/uiconfig/startmodule/menubar/menubar.xml | 2 - icon-themes/breeze/links.txt | 4 ++ icon-themes/breeze_dark/links.txt | 4 ++ icon-themes/colibre/links.txt | 4 ++ icon-themes/colibre_dark/links.txt | 4 ++ icon-themes/karasa_jaga/links.txt | 2 + icon-themes/sifr/links.txt | 4 ++ icon-themes/sifr_dark/links.txt | 4 ++ icon-themes/sukapura/links.txt | 4 ++ icon-themes/sukapura_dark/links.txt | 4 ++ include/sfx2/sfxsids.hrc | 1 officecfg/registry/data/org/openoffice/Office/Accelerators.xcu | 4 +- officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 2 - reportdesign/uiconfig/dbreport/menubar/menubar.xml | 2 - sc/uiconfig/scalc/menubar/menubar.xml | 2 - sc/uiconfig/scalc/ui/notebookbar.ui | 2 - sc/uiconfig/scalc/ui/notebookbar_compact.ui | 4 +- sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui | 6 +-- sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui | 4 +- sd/uiconfig/sdraw/menubar/menubar.xml | 2 - sd/uiconfig/sdraw/ui/notebookbar.ui | 4 +- sd/uiconfig/sdraw/ui/notebookbar_compact.ui | 6 +-- sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui | 6 +-- sd/uiconfig/sdraw/ui/notebookbar_single.ui | 2 - sd/uiconfig/simpress/menubar/menubar.xml | 2 - sd/uiconfig/simpress/ui/notebookbar.ui | 2 - sd/uiconfig/simpress/ui/notebookbar_compact.ui | 6 +-- sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui | 6 +-- sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui | 4 +- sd/uiconfig/simpress/ui/notebookbar_single.ui | 2 - sfx2/sdi/appslots.sdi | 4 ++ sfx2/sdi/sfx.sdi | 17 ++++++++++ sfx2/source/appl/appserv.cxx | 16 +++++++++ starmath/uiconfig/smath/menubar/menubar.xml | 2 - sw/qa/uitest/writer_dialogs/openDialogs.py | 2 - sw/uiconfig/sglobal/menubar/menubar.xml | 2 - sw/uiconfig/sweb/menubar/menubar.xml | 2 - sw/uiconfig/swform/menubar/menubar.xml | 2 - sw/uiconfig/swreport/menubar/menubar.xml | 2 - sw/uiconfig/swriter/menubar/menubar.xml | 2 - sw/uiconfig/swriter/ui/notebookbar.ui | 2 - sw/uiconfig/swriter/ui/notebookbar_compact.ui | 6 +-- sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui | 6 +-- sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui | 2 - sw/uiconfig/swriter/ui/notebookbar_single.ui | 2 - sw/uiconfig/swxform/menubar/menubar.xml | 2 - 55 files changed, 134 insertions(+), 61 deletions(-)
New commits: commit b2c72c4acdc2d9755f48f36540d647605a9579a2 Author: Michael Weghorn <[email protected]> AuthorDate: Fri Nov 7 14:23:57 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Mon Nov 10 23:10:39 2025 +0100 tdf#169318 tdf#127201 extension mgr: Set dialog parent, make modal So far, the "Extensions" dialog didn't have a parent set, resulting in it not properly being shown on top of the application window, while still blocking it when the extension update dialog was started from the extensions dialog. Pass the dialog parent when creating it when handling the UNO command, which fixes this problem when the dialog is triggered via the UNO command, at least for the first run. Also use the service ctor instead of creating the service manually via the service name. A remaining problem is that the parent for the dialog in use is only set the first time the dialog is opened, which can be seen e.g. as follows: 1) start Writer 2) "Tools" -> "Extensions" -> Dialog opens modally on top of the Writer window as expected 3) create another Writer doc 4) close the first Writer window 5) "Tools" -> "Extensions" -> The dialog doesn't open modally on top of the Writer window and the problem described in tdf#169318 is still reproducible. Consistently setting the passed parent will have to be addressed separately in the dialog implementation itself. Running the dialog standalone via ./instdir/program/unopkg gui still behaves as before. Change-Id: Ieb7d7b564140b34ff5875d2e26a777b9932cfa2d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193585 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/desktop/uiconfig/ui/extensionmanager.ui b/desktop/uiconfig/ui/extensionmanager.ui index f099fc921533..7f318b61d8ff 100644 --- a/desktop/uiconfig/ui/extensionmanager.ui +++ b/desktop/uiconfig/ui/extensionmanager.ui @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.38.2 --> +<!-- Generated with glade 3.40.0 --> <interface domain="dkt"> <requires lib="gtk+" version="3.24"/> <object class="GtkDialog" id="ExtensionManagerDialog"> <property name="can-focus">False</property> <property name="border-width">6</property> <property name="title" translatable="yes" context="extensionmanager|ExtensionManagerDialog">Extensions</property> + <property name="modal">True</property> <property name="default-width">0</property> <property name="default-height">0</property> <property name="type-hint">dialog</property> diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 2ae403993fce..6eb6930adf11 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -20,6 +20,7 @@ #include <config_features.h> #include <config_wasm_strip.h> +#include <com/sun/star/deployment/ui/PackageManagerDialog.hpp> #include <com/sun/star/drawing/ModuleDispatcher.hpp> #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/frame/DispatchResultEvent.hpp> @@ -35,7 +36,6 @@ #include <com/sun/star/text/ModuleDispatcher.hpp> #include <com/sun/star/task/OfficeRestartManager.hpp> #include <com/sun/star/task/XInteractionHandler.hpp> -#include <com/sun/star/task/XJobExecutor.hpp> #include <com/sun/star/ui/dialogs/AddressBookSourcePilot.hpp> #include <com/sun/star/ui/UIElementType.hpp> #include <com/sun/star/ui/XUIElement.hpp> @@ -881,14 +881,15 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) case SID_EXTENSION_MANAGER: { - const Reference<XComponentContext>& xContext = comphelper::getProcessComponentContext(); - css::uno::Reference<css::uno::XInterface> xService - = xContext->getServiceManager()->createInstanceWithContext( - "com.sun.star.deployment.ui.PackageManagerDialog", xContext); - css::uno::Reference<css::task::XJobExecutor> xJobExecutor(xService, - css::uno::UNO_QUERY); - if (xJobExecutor.is()) - xJobExecutor->trigger(u""_ustr); + css::uno::Reference<css::awt::XWindow> xParent; + if (weld::Window* pWindow = rReq.GetFrameWeld()) + xParent = pWindow->GetXWindow(); + + Reference<ui::dialogs::XAsynchronousExecutableDialog> xDialog( + css::deployment::ui::PackageManagerDialog::create( + comphelper::getProcessComponentContext(), xParent, OUString())); + assert(xDialog.is()); + xDialog->startExecuteModal({}); bDone = true; break; } commit be04a19fa2b8357520e6d0297466e1909a3c3995 Author: Michael Weghorn <[email protected]> AuthorDate: Fri Nov 7 13:59:50 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Mon Nov 10 23:10:32 2025 +0100 tdf#169318 tdf#127201 extension mgr: Open via new UNO command Introduce a new UNO command, ".uno:ExtensionManager", which is used to open the "Extensions" dialog from the menu, notebookbar and using the keyboard shortcut (Ctrl+Alt+E) instead of specifying the service name "service:com.sun.star.deployment.ui.PackageManagerDialog" in their configuration directly. In a first step, handle the new UNO command in SfxApplication::MiscExec_Impl by creating an instance of the service by its name and executing the dialog using the css::task::XJobExecutor interface without any additional changes. This matches what the previous way of triggering the dialog would have done, i.e. no user-observable behavior is intended yet. This prepares for further changes in upcoming commits, in particular passing a parent for the dialog. As documented in icon-themes/README.md, make sure to have icons with the expected names, which is e.g. used in the "Tabbed Compact" UI variant of the Notebookbar. (Link to the already existing icons.) Change-Id: I4b381b5f0b7cddd9f0aa9abd9b88c1c4364ab824 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193580 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/basctl/uiconfig/basicide/menubar/menubar.xml b/basctl/uiconfig/basicide/menubar/menubar.xml index 80c19959a569..4ff93989fa84 100644 --- a/basctl/uiconfig/basicide/menubar/menubar.xml +++ b/basctl/uiconfig/basicide/menubar/menubar.xml @@ -148,7 +148,7 @@ <menu:menuseparator/> <menu:menuitem menu:id=".uno:MacroRecorder"/> <menu:menuitem menu:id=".uno:ScriptOrganizer"/> - <menu:menuitem menu:id="service:com.sun.star.deployment.ui.PackageManagerDialog"/> + <menu:menuitem menu:id=".uno:ExtensionManager"/> <menu:menuitem menu:id=".uno:ConfigureDialog"/> <menu:menuitem menu:id=".uno:OptionsTreeDialog"/> </menu:menupopup> diff --git a/chart2/uiconfig/menubar/menubar.xml b/chart2/uiconfig/menubar/menubar.xml index f612cefc404d..1c0304f6da6c 100644 --- a/chart2/uiconfig/menubar/menubar.xml +++ b/chart2/uiconfig/menubar/menubar.xml @@ -145,7 +145,7 @@ </menu:menupopup> </menu:menu> <menu:menuitem menu:id=".uno:OpenXMLFilterSettings"/> - <menu:menuitem menu:id="service:com.sun.star.deployment.ui.PackageManagerDialog" menu:style="text"/> + <menu:menuitem menu:id=".uno:ExtensionManager" menu:style="text"/> <menu:menuitem menu:id=".uno:ConfigureDialog" menu:style="text"/> <menu:menuitem menu:id=".uno:OptionsTreeDialog"/> </menu:menupopup> diff --git a/dbaccess/uiconfig/dbapp/menubar/menubar.xml b/dbaccess/uiconfig/dbapp/menubar/menubar.xml index cfa032fde89b..7ef526f54527 100644 --- a/dbaccess/uiconfig/dbapp/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbapp/menubar/menubar.xml @@ -132,7 +132,7 @@ </menu:menupopup> </menu:menu> <menu:menuitem menu:id=".uno:OpenXMLFilterSettings"/> - <menu:menuitem menu:id="service:com.sun.star.deployment.ui.PackageManagerDialog" menu:style="text"/> + <menu:menuitem menu:id=".uno:ExtensionManager" menu:style="text"/> <menu:menuitem menu:id=".uno:ConfigureDialog" menu:style="text"/> <menu:menuitem menu:id=".uno:OptionsTreeDialog"/> </menu:menupopup> diff --git a/dbaccess/uiconfig/dbquery/menubar/menubar.xml b/dbaccess/uiconfig/dbquery/menubar/menubar.xml index 8576bedd21b9..52f055cd28a5 100644 --- a/dbaccess/uiconfig/dbquery/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbquery/menubar/menubar.xml @@ -88,7 +88,7 @@ </menu:menupopup> </menu:menu> <menu:menuitem menu:id=".uno:OpenXMLFilterSettings"/> - <menu:menuitem menu:id="service:com.sun.star.deployment.ui.PackageManagerDialog" menu:style="text"/> + <menu:menuitem menu:id=".uno:ExtensionManager" menu:style="text"/> <menu:menuitem menu:id=".uno:ConfigureDialog" menu:style="text"/> <menu:menuitem menu:id=".uno:OptionsTreeDialog"/> </menu:menupopup> diff --git a/dbaccess/uiconfig/dbrelation/menubar/menubar.xml b/dbaccess/uiconfig/dbrelation/menubar/menubar.xml index c4f003a3c055..1de2991b3e48 100644 --- a/dbaccess/uiconfig/dbrelation/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbrelation/menubar/menubar.xml @@ -71,7 +71,7 @@ </menu:menupopup> </menu:menu> <menu:menuitem menu:id=".uno:OpenXMLFilterSettings"/> - <menu:menuitem menu:id="service:com.sun.star.deployment.ui.PackageManagerDialog" menu:style="text"/> + <menu:menuitem menu:id=".uno:ExtensionManager" menu:style="text"/> <menu:menuitem menu:id=".uno:ConfigureDialog" menu:style="text"/> <menu:menuitem menu:id=".uno:OptionsTreeDialog"/> </menu:menupopup> diff --git a/dbaccess/uiconfig/dbtable/menubar/menubar.xml b/dbaccess/uiconfig/dbtable/menubar/menubar.xml index 20642711bc03..0ee0275ff3f7 100644 --- a/dbaccess/uiconfig/dbtable/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbtable/menubar/menubar.xml @@ -71,7 +71,7 @@ </menu:menupopup> </menu:menu> <menu:menuitem menu:id=".uno:OpenXMLFilterSettings"/> - <menu:menuitem menu:id="service:com.sun.star.deployment.ui.PackageManagerDialog" menu:style="text"/> + <menu:menuitem menu:id=".uno:ExtensionManager" menu:style="text"/> <menu:menuitem menu:id=".uno:ConfigureDialog" menu:style="text"/> <menu:menuitem menu:id=".uno:OptionsTreeDialog"/> </menu:menupopup> diff --git a/dbaccess/uiconfig/dbtdata/menubar/menubar.xml b/dbaccess/uiconfig/dbtdata/menubar/menubar.xml index c9929b56011b..a00d50fbd511 100644 --- a/dbaccess/uiconfig/dbtdata/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbtdata/menubar/menubar.xml @@ -96,7 +96,7 @@ </menu:menupopup> </menu:menu> <menu:menuitem menu:id=".uno:OpenXMLFilterSettings"/> - <menu:menuitem menu:id="service:com.sun.star.deployment.ui.PackageManagerDialog" menu:style="text"/> + <menu:menuitem menu:id=".uno:ExtensionManager" menu:style="text"/> <menu:menuitem menu:id=".uno:ConfigureDialog" menu:style="text"/> <menu:menuitem menu:id=".uno:OptionsTreeDialog"/> </menu:menupopup> diff --git a/extensions/uiconfig/sbibliography/menubar/menubar.xml b/extensions/uiconfig/sbibliography/menubar/menubar.xml index 27b55e9770c1..ed8bb50951cd 100644 --- a/extensions/uiconfig/sbibliography/menubar/menubar.xml +++ b/extensions/uiconfig/sbibliography/menubar/menubar.xml @@ -44,7 +44,7 @@ </menu:menupopup> </menu:menu> <menu:menuitem menu:id=".uno:OpenXMLFilterSettings"/> - <menu:menuitem menu:id="service:com.sun.star.deployment.ui.PackageManagerDialog" menu:style="text"/> + <menu:menuitem menu:id=".uno:ExtensionManager" menu:style="text"/> <menu:menuitem menu:id=".uno:ConfigureDialog" menu:style="text"/> <menu:menuitem menu:id=".uno:OptionsTreeDialog"/> </menu:menupopup> diff --git a/framework/uiconfig/startmodule/menubar/menubar.xml b/framework/uiconfig/startmodule/menubar/menubar.xml index ead05db4e2c0..b7309cb05f0c 100644 --- a/framework/uiconfig/startmodule/menubar/menubar.xml +++ b/framework/uiconfig/startmodule/menubar/menubar.xml @@ -54,7 +54,7 @@ <menu:menuitem menu:id=".uno:MacroOrganizer?TabId:short=1"/> </menu:menupopup> </menu:menu> - <menu:menuitem menu:id="service:com.sun.star.deployment.ui.PackageManagerDialog" menu:style="text"/> + <menu:menuitem menu:id=".uno:ExtensionManager" menu:style="text"/> <menu:menuitem menu:id=".uno:ConfigureDialog" menu:style="text"/> <menu:menuitem menu:id=".uno:OptionsTreeDialog"/> </menu:menupopup> diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt index c4f6ed9f5393..e30be20e094f 100644 --- a/icon-themes/breeze/links.txt +++ b/icon-themes/breeze/links.txt @@ -2025,6 +2025,10 @@ cmd/sc_previousslide.png cmd/sc_prevrecord.png cmd/sc_slidesetup.png cmd/sc_pagesetup.png cmd/sc_nextslide.png cmd/sc_nextrecord.png +# extension manager +cmd/sc_extensionmanager.png cmd/sc_insertplugin.png +cmd/lc_extensionmanager.png cmd/lc_insertplugin.png + # dbaccess # ============================================== dbaccess/res/linked_text_table.png cmd/sc_dataimport.png diff --git a/icon-themes/breeze_dark/links.txt b/icon-themes/breeze_dark/links.txt index 9b49610ee75d..4b5855e2682e 100644 --- a/icon-themes/breeze_dark/links.txt +++ b/icon-themes/breeze_dark/links.txt @@ -2025,6 +2025,10 @@ cmd/sc_previousslide.png cmd/sc_prevrecord.png cmd/sc_slidesetup.png cmd/sc_pagesetup.png cmd/sc_nextslide.png cmd/sc_nextrecord.png +# extension manager +cmd/sc_extensionmanager.png cmd/sc_insertplugin.png +cmd/lc_extensionmanager.png cmd/lc_insertplugin.png + # dbaccess # ============================================== dbaccess/res/linked_text_table.png cmd/sc_dataimport.png diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt index 44f1b20d84a0..aad650fe6220 100644 --- a/icon-themes/colibre/links.txt +++ b/icon-themes/colibre/links.txt @@ -1900,6 +1900,10 @@ res/queries_32.png cmd/32/dbviewqueries.png res/reports_32.png cmd/32/dbviewreports.png res/tables_32.png cmd/32/dbviewtables.png +# extension manager +cmd/sc_extensionmanager.png cmd/sc_insertplugin.png +cmd/lc_extensionmanager.png cmd/lc_insertplugin.png + # desktop # ============================================== desktop/res/caution_16.png dbaccess/res/exwarning.png diff --git a/icon-themes/colibre_dark/links.txt b/icon-themes/colibre_dark/links.txt index 26db60b8a3d6..cf4e34b24fc1 100644 --- a/icon-themes/colibre_dark/links.txt +++ b/icon-themes/colibre_dark/links.txt @@ -1867,6 +1867,10 @@ cmd/sc_moveslideup.png cmd/sc_upsearch.png cmd/sc_nextslide.png cmd/sc_nextrecord.png cmd/sc_previousslide.png cmd/sc_prevrecord.png +# extension manager +cmd/sc_extensionmanager.png cmd/sc_insertplugin.png +cmd/lc_extensionmanager.png cmd/lc_insertplugin.png + # dbaccess # ============================================== dbaccess/res/all_left.png cmd/sc_firstrecord.png diff --git a/icon-themes/karasa_jaga/links.txt b/icon-themes/karasa_jaga/links.txt index fb0c469eae96..bca59a3ab726 100644 --- a/icon-themes/karasa_jaga/links.txt +++ b/icon-themes/karasa_jaga/links.txt @@ -797,6 +797,7 @@ cmd/lc_ellipsetoolbox.png cmd/lc_basicshapes.ellipse.png cmd/lc_exitsearch.png cmd/lc_closepreview.png cmd/lc_exportasgraphic.png cmd/lc_graphic.png cmd/lc_exportasmenu.png cmd/lc_exportto.png +cmd/lc_extensionmanager.png cmd/lc_addons.png cmd/lc_extrusionsurfacefloater.png cmd/lc_cube.png cmd/lc_extrusiontoggle.png cmd/lc_convertinto3d.png cmd/lc_fielddialog.png cmd/lc_fields.png @@ -1217,6 +1218,7 @@ cmd/sc_endnotedialog.png cmd/sc_footnotedialog.png cmd/sc_exitsearch.png cmd/sc_closepreview.png cmd/sc_exportasgraphic.png cmd/sc_graphic.png cmd/sc_exportasmenu.png cmd/sc_exportto.png +cmd/sc_extensionmanager.png cmd/sc_addons.png cmd/sc_extrusionsurfacefloater.png cmd/sc_cube.png cmd/sc_extrusiontoggle.png cmd/sc_convertinto3d.png cmd/sc_fielddialog.png cmd/sc_fields.png diff --git a/icon-themes/sifr/links.txt b/icon-themes/sifr/links.txt index a6bbdc0c6326..1dfbcac08be6 100644 --- a/icon-themes/sifr/links.txt +++ b/icon-themes/sifr/links.txt @@ -1465,6 +1465,10 @@ cmd/sc_sortdown.png cmd/sc_sortdescending.png cmd/sc_sortup.png cmd/sc_sortascending.png cmd/sc_tablesort.png cmd/sc_datasort.png +# extension manager +cmd/sc_extensionmanager.png cmd/sc_insertplugin.png +cmd/lc_extensionmanager.png cmd/lc_insertplugin.png + # Code cmd/32/sourceview.png cmd/32/managexmlsource.png diff --git a/icon-themes/sifr_dark/links.txt b/icon-themes/sifr_dark/links.txt index 85fd843a6b96..7df67381dec2 100644 --- a/icon-themes/sifr_dark/links.txt +++ b/icon-themes/sifr_dark/links.txt @@ -1464,6 +1464,10 @@ cmd/sc_sortdown.png cmd/sc_sortdescending.png cmd/sc_sortup.png cmd/sc_sortascending.png cmd/sc_tablesort.png cmd/sc_datasort.png +# extension manager +cmd/sc_extensionmanager.png cmd/sc_insertplugin.png +cmd/lc_extensionmanager.png cmd/lc_insertplugin.png + # Code cmd/32/sourceview.png cmd/32/managexmlsource.png diff --git a/icon-themes/sukapura/links.txt b/icon-themes/sukapura/links.txt index 89a1a2fd56f0..59be6c441e6e 100644 --- a/icon-themes/sukapura/links.txt +++ b/icon-themes/sukapura/links.txt @@ -26,6 +26,10 @@ cmd/lc_objectforwardone.png cmd/lc_forward.png cmd/sc_objectbackone.png cmd/sc_backward.png cmd/sc_objectforwardone.png cmd/sc_forward.png +# extension manager +cmd/sc_extensionmanager.png cmd/sc_insertplugin.png +cmd/lc_extensionmanager.png cmd/lc_insertplugin.png + # chart2 # ============================================== chart2/res/dataeditor_icon01.png cmd/sc_insertrowsafter.png diff --git a/icon-themes/sukapura_dark/links.txt b/icon-themes/sukapura_dark/links.txt index 6c1b1a65c295..12860a154b5f 100644 --- a/icon-themes/sukapura_dark/links.txt +++ b/icon-themes/sukapura_dark/links.txt @@ -26,6 +26,10 @@ cmd/lc_objectforwardone.png cmd/lc_forward.png cmd/sc_objectbackone.png cmd/sc_backward.png cmd/sc_objectforwardone.png cmd/sc_forward.png +# extension manager +cmd/sc_extensionmanager.png cmd/sc_insertplugin.png +cmd/lc_extensionmanager.png cmd/lc_insertplugin.png + # chart2 # ============================================== chart2/res/dataeditor_icon01.png cmd/sc_insertrowsafter.png diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc index 16dfaa129b7e..6077789da3ee 100644 --- a/include/sfx2/sfxsids.hrc +++ b/include/sfx2/sfxsids.hrc @@ -302,6 +302,7 @@ class SvxZoomItem; #define FN_INVERT_BACKGROUND (SID_SFX_START + 1749) #define SID_MACROMANAGER (SID_SFX_START + 1750) #define SID_EXPORTDIRECTORY TypedWhichId<SfxStringItem>(SID_SFX_START + 1751) +#define SID_EXTENSION_MANAGER TypedWhichId<SfxStringItem>(SID_SFX_START + 1752) // SID_SFX_free_END (SID_SFX_START + 3999) #define SID_OPEN_NEW_VIEW TypedWhichId<SfxBoolItem>(SID_SFX_START + 520) diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu index 199401558d59..feba2feb8c9c 100644 --- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu @@ -197,7 +197,7 @@ Ctrl+Shift+u aka U_SHIFT_MOD1 under GTK/IBUS is for unicode key input <node oor:name="E_MOD1_MOD2" oor:op="replace"> <prop oor:name="Command"> <value xml:lang="x-no-translate">L10N SHORTCUTS - NO TRANSLATE</value> - <value xml:lang="en-US">service:com.sun.star.deployment.ui.PackageManagerDialog</value> + <value xml:lang="en-US">.uno:ExtensionManager</value> <!-- tdf#119676 Turn off default shortcut for French --> <value xml:lang="fr"></value> </prop> @@ -206,7 +206,7 @@ Ctrl+Shift+u aka U_SHIFT_MOD1 under GTK/IBUS is for unicode key input <node oor:name="Q_SHIFT_MOD2" oor:op="replace"> <prop oor:name="Command"> <value xml:lang="x-no-translate">L10N SHORTCUTS - NO TRANSLATE</value> - <value xml:lang="fr">service:com.sun.star.deployment.ui.PackageManagerDialog</value> + <value xml:lang="fr">.uno:ExtensionManager</value> </prop> </node> <node oor:name="O_SHIFT_MOD1" oor:op="replace"> diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index 0ce4a0cb3972..3d158cff95db 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -6779,7 +6779,7 @@ bit 3 (0x8): #define UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8 <value xml:lang="en-US">Breakpoint Enabled/Disabled</value> </prop> </node> - <node oor:name="service:com.sun.star.deployment.ui.PackageManagerDialog" oor:op="replace"> + <node oor:name=".uno:ExtensionManager" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">~Extensions...</value> </prop> diff --git a/reportdesign/uiconfig/dbreport/menubar/menubar.xml b/reportdesign/uiconfig/dbreport/menubar/menubar.xml index 2f3ff9f29a77..2838f320815e 100644 --- a/reportdesign/uiconfig/dbreport/menubar/menubar.xml +++ b/reportdesign/uiconfig/dbreport/menubar/menubar.xml @@ -261,7 +261,7 @@ </menu:menupopup> </menu:menu> <menu:menuitem menu:id=".uno:OpenXMLFilterSettings"/> - <menu:menuitem menu:id="service:com.sun.star.deployment.ui.PackageManagerDialog"/> + <menu:menuitem menu:id=".uno:ExtensionManager"/> <menu:menuitem menu:id=".uno:ConfigureDialog"/> <menu:menuitem menu:id=".uno:OptionsTreeDialog"/> </menu:menupopup> diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml index 85fcc1a39d73..97b9a8b1ad43 100644 --- a/sc/uiconfig/scalc/menubar/menubar.xml +++ b/sc/uiconfig/scalc/menubar/menubar.xml @@ -738,7 +738,7 @@ <menu:menuitem menu:id=".uno:DevelopmentToolsDockingWindow"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:OpenXMLFilterSettings"/> - <menu:menuitem menu:id="service:com.sun.star.deployment.ui.PackageManagerDialog" menu:style="text"/> + <menu:menuitem menu:id=".uno:ExtensionManager" menu:style="text"/> <menu:menuitem menu:id=".uno:ConfigureDialog" menu:style="text"/> <menu:menuitem menu:id=".uno:OptionsTreeDialog"/> </menu:menupopup> diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui b/sc/uiconfig/scalc/ui/notebookbar.ui index 58e39d26bdfc..0f232c03363e 100644 --- a/sc/uiconfig/scalc/ui/notebookbar.ui +++ b/sc/uiconfig/scalc/ui/notebookbar.ui @@ -23,7 +23,7 @@ <object class="GtkMenuItem" id="Menu-Extension-PackageManagerDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">service:com.sun.star.deployment.ui.PackageManagerDialog</property> + <property name="action_name">.uno:ExtensionManager</property> </object> </child> </object> diff --git a/sc/uiconfig/scalc/ui/notebookbar_compact.ui b/sc/uiconfig/scalc/ui/notebookbar_compact.ui index 49504b1353b7..cc25e67776a2 100644 --- a/sc/uiconfig/scalc/ui/notebookbar_compact.ui +++ b/sc/uiconfig/scalc/ui/notebookbar_compact.ui @@ -23,7 +23,7 @@ <object class="GtkMenuItem" id="Menu-Extension-PackageManagerDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">service:com.sun.star.deployment.ui.PackageManagerDialog</property> + <property name="action_name">.uno:ExtensionManager</property> </object> </child> </object> @@ -15371,7 +15371,7 @@ <child> <object class="GtkToolButton" id="ExtensionMenu-ExtensionDialog"> <property name="visible">True</property> - <property name="action_name">service:com.sun.star.deployment.ui.PackageManagerDialog</property> + <property name="action_name">.uno:ExtensionManager</property> </object> <packing> <property name="expand">False</property> diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui index 938ce5779ffd..7dd91a8a6b5e 100644 --- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui +++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui @@ -81,7 +81,7 @@ <object class="GtkMenuItem" id="Menu-Extension-PackageManagerDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">service:com.sun.star.deployment.ui.PackageManagerDialog</property> + <property name="action_name">.uno:ExtensionManager</property> </object> </child> </object> @@ -1959,7 +1959,7 @@ <object class="GtkMenuItem" id="MenuSettings-Extensions"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">service:com.sun.star.deployment.ui.PackageManagerDialog</property> + <property name="action_name">.uno:ExtensionManager</property> </object> </child> <child> @@ -4841,7 +4841,7 @@ <child> <object class="GtkToolButton" id="Default-PackageManagerDialog"> <property name="visible">True</property> - <property name="action_name">service:com.sun.star.deployment.ui.PackageManagerDialog</property> + <property name="action_name">.uno:ExtensionManager</property> </object> <packing> <property name="expand">False</property> diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui index ebc57b89963e..66cbcdb21630 100644 --- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui +++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui @@ -2494,7 +2494,7 @@ <object class="GtkMenuItem" id="MenuSettings-Extensions"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">service:com.sun.star.deployment.ui.PackageManagerDialog</property> + <property name="action_name">.uno:ExtensionManager</property> </object> </child> <child> @@ -2911,7 +2911,7 @@ <object class="GtkMenuItem" id="MenuTools-PackageManagerDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">service:com.sun.star.deployment.ui.PackageManagerDialog</property> + <property name="action_name">.uno:ExtensionManager</property> </object> </child> <child> diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml index 366663e704c5..71a23dde641d 100644 --- a/sd/uiconfig/sdraw/menubar/menubar.xml +++ b/sd/uiconfig/sdraw/menubar/menubar.xml @@ -619,7 +619,7 @@ <menu:menuitem menu:id=".uno:DevelopmentToolsDockingWindow"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:OpenXMLFilterSettings"/> - <menu:menuitem menu:id="service:com.sun.star.deployment.ui.PackageManagerDialog" menu:style="text"/> + <menu:menuitem menu:id=".uno:ExtensionManager" menu:style="text"/> <menu:menuitem menu:id=".uno:ConfigureDialog" menu:style="text"/> <menu:menuitem menu:id=".uno:OptionsTreeDialog"/> </menu:menupopup> diff --git a/sd/uiconfig/sdraw/ui/notebookbar.ui b/sd/uiconfig/sdraw/ui/notebookbar.ui index c9cd5ad45611..80022b74edf1 100644 --- a/sd/uiconfig/sdraw/ui/notebookbar.ui +++ b/sd/uiconfig/sdraw/ui/notebookbar.ui @@ -102,7 +102,7 @@ <object class="GtkMenuItem" id="Menu-Extension-PackageManagerDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">service:com.sun.star.deployment.ui.PackageManagerDialog</property> + <property name="action_name">.uno:ExtensionManager</property> </object> </child> </object> @@ -2063,7 +2063,7 @@ <object class="GtkMenuItem" id="MenuTools-PackageManagerDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">service:com.sun.star.deployment.ui.PackageManagerDialog</property> + <property name="action_name">.uno:ExtensionManager</property> </object> </child> <child> diff --git a/sd/uiconfig/sdraw/ui/notebookbar_compact.ui b/sd/uiconfig/sdraw/ui/notebookbar_compact.ui index a3a9a992dbeb..1050185da7b6 100644 --- a/sd/uiconfig/sdraw/ui/notebookbar_compact.ui +++ b/sd/uiconfig/sdraw/ui/notebookbar_compact.ui @@ -102,7 +102,7 @@ <object class="GtkMenuItem" id="Menu-Extension-PackageManagerDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">service:com.sun.star.deployment.ui.PackageManagerDialog</property> + <property name="action_name">.uno:ExtensionManager</property> </object> </child> </object> @@ -2119,7 +2119,7 @@ <object class="GtkMenuItem" id="MenuTools-PackageManagerDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">service:com.sun.star.deployment.ui.PackageManagerDialog</property> + <property name="action_name">.uno:ExtensionManager</property> </object> </child> <child> @@ -19379,7 +19379,7 @@ <child> <object class="GtkToolButton" id="ExtensionMenu-ExtensionDialog"> <property name="visible">True</property> - <property name="action_name">service:com.sun.star.deployment.ui.PackageManagerDialog</property> + <property name="action_name">.uno:ExtensionManager</property> </object> <packing> <property name="expand">False</property> diff --git a/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui b/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui index b68d19548ad7..18a9cebb6c2e 100644 --- a/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui +++ b/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui @@ -81,7 +81,7 @@ <object class="GtkMenuItem" id="Menu-Extension-PackageManagerDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">service:com.sun.star.deployment.ui.PackageManagerDialog</property> + <property name="action_name">.uno:ExtensionManager</property> </object> </child> </object> @@ -2378,7 +2378,7 @@ <object class="GtkMenuItem" id="MenuSettings-Extensions"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">service:com.sun.star.deployment.ui.PackageManagerDialog</property> + <property name="action_name">.uno:ExtensionManager</property> </object> </child> <child> @@ -4303,7 +4303,7 @@ <child> <object class="GtkToolButton" id="Default-PackageManagerDialog"> <property name="visible">True</property> - <property name="action_name">service:com.sun.star.deployment.ui.PackageManagerDialog</property> + <property name="action_name">.uno:ExtensionManager</property> </object> <packing> <property name="expand">False</property> diff --git a/sd/uiconfig/sdraw/ui/notebookbar_single.ui b/sd/uiconfig/sdraw/ui/notebookbar_single.ui index eba6358eb5c0..b3ddef0e9ba4 100644 --- a/sd/uiconfig/sdraw/ui/notebookbar_single.ui +++ b/sd/uiconfig/sdraw/ui/notebookbar_single.ui @@ -23,7 +23,7 @@ <object class="GtkMenuItem" id="Menu-Extension-PackageManagerDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">service:com.sun.star.deployment.ui.PackageManagerDialog</property> + <property name="action_name">.uno:ExtensionManager</property> </object> </child> </object> diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml index 5d59b16e9498..08096057dda6 100644 --- a/sd/uiconfig/simpress/menubar/menubar.xml +++ b/sd/uiconfig/simpress/menubar/menubar.xml @@ -651,7 +651,7 @@ <menu:menuitem menu:id=".uno:DevelopmentToolsDockingWindow"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:OpenXMLFilterSettings"/> - <menu:menuitem menu:id="service:com.sun.star.deployment.ui.PackageManagerDialog" menu:style="text"/> + <menu:menuitem menu:id=".uno:ExtensionManager" menu:style="text"/> <menu:menuitem menu:id=".uno:ConfigureDialog" menu:style="text"/> <menu:menuitem menu:id=".uno:OptionsTreeDialog"/> </menu:menupopup> diff --git a/sd/uiconfig/simpress/ui/notebookbar.ui b/sd/uiconfig/simpress/ui/notebookbar.ui index 39190d273554..fe1d6a903a86 100644 --- a/sd/uiconfig/simpress/ui/notebookbar.ui +++ b/sd/uiconfig/simpress/ui/notebookbar.ui @@ -24,7 +24,7 @@ <object class="GtkMenuItem" id="Menu-Extension-PackageManagerDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">service:com.sun.star.deployment.ui.PackageManagerDialog</property> + <property name="action_name">.uno:ExtensionManager</property> </object> </child> </object> diff --git a/sd/uiconfig/simpress/ui/notebookbar_compact.ui b/sd/uiconfig/simpress/ui/notebookbar_compact.ui index fc89c1c42f80..6ef6ff4dde50 100644 --- a/sd/uiconfig/simpress/ui/notebookbar_compact.ui +++ b/sd/uiconfig/simpress/ui/notebookbar_compact.ui @@ -102,7 +102,7 @@ <object class="GtkMenuItem" id="Menu-Extension-PackageManagerDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">service:com.sun.star.deployment.ui.PackageManagerDialog</property> + <property name="action_name">.uno:ExtensionManager</property> </object> </child> </object> @@ -2426,7 +2426,7 @@ <object class="GtkMenuItem" id="MenuTools-PackageManagerDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">service:com.sun.star.deployment.ui.PackageManagerDialog</property> + <property name="action_name">.uno:ExtensionManager</property> </object> </child> <child> @@ -19062,7 +19062,7 @@ <child> <object class="GtkToolButton" id="ExtensionMenu-ExtensionDialog"> <property name="visible">True</property> - <property name="action_name">service:com.sun.star.deployment.ui.PackageManagerDialog</property> + <property name="action_name">.uno:ExtensionManager</property> </object> <packing> <property name="expand">False</property> diff --git a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui index 798f7b701cc8..e2d091a8fe54 100644 --- a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui +++ b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui @@ -81,7 +81,7 @@ <object class="GtkMenuItem" id="Menu-Extension-PackageManagerDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">service:com.sun.star.deployment.ui.PackageManagerDialog</property> + <property name="action_name">.uno:ExtensionManager</property> </object> </child> </object> @@ -2364,7 +2364,7 @@ <object class="GtkMenuItem" id="MenuSettings-Extensions"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">service:com.sun.star.deployment.ui.PackageManagerDialog</property> + <property name="action_name">.uno:ExtensionManager</property> </object> </child> <child> @@ -4362,7 +4362,7 @@ <child> <object class="GtkToolButton" id="Default-PackageManagerDialog"> <property name="visible">True</property> - <property name="action_name">service:com.sun.star.deployment.ui.PackageManagerDialog</property> + <property name="action_name">.uno:ExtensionManager</property> </object> <packing> <property name="expand">False</property> diff --git a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui index 97730155ccaf..5904d2c613b0 100644 --- a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui +++ b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui @@ -2223,7 +2223,7 @@ <object class="GtkMenuItem" id="ExtensionsD"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">service:com.sun.star.deployment.ui.PackageManagerDialog</property> + <property name="action_name">.uno:ExtensionManager</property> </object> </child> <child> @@ -2712,7 +2712,7 @@ <object class="GtkMenuItem" id="PackageManagerDialogD"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">service:com.sun.star.deployment.ui.PackageManagerDialog</property> + <property name="action_name">.uno:ExtensionManager</property> </object> </child> <child> diff --git a/sd/uiconfig/simpress/ui/notebookbar_single.ui b/sd/uiconfig/simpress/ui/notebookbar_single.ui index f031c0921e11..22c1f9f1f9da 100644 --- a/sd/uiconfig/simpress/ui/notebookbar_single.ui +++ b/sd/uiconfig/simpress/ui/notebookbar_single.ui @@ -23,7 +23,7 @@ <object class="GtkMenuItem" id="Menu-Extension-PackageManagerDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">service:com.sun.star.deployment.ui.PackageManagerDialog</property> + <property name="action_name">.uno:ExtensionManager</property> </object> </child> </object> diff --git a/sfx2/sdi/appslots.sdi b/sfx2/sdi/appslots.sdi index bb3b14046702..1c02d7bcf7aa 100644 --- a/sfx2/sdi/appslots.sdi +++ b/sfx2/sdi/appslots.sdi @@ -250,6 +250,10 @@ interface Application ExecMethod = MiscExec_Impl ; StateMethod = MiscState_Impl ; ] + SID_EXTENSION_MANAGER + [ + ExecMethod = MiscExec_Impl ; + ] } diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi index 567b06c2d367..bbe87138619f 100644 --- a/sfx2/sdi/sfx.sdi +++ b/sfx2/sdi/sfx.sdi @@ -134,6 +134,23 @@ SfxVoidItem About SID_ABOUT GroupId = SfxGroupId::Application; ] +SfxVoidItem ExtensionManager SID_EXTENSION_MANAGER +() +[ + AutoUpdate = FALSE, + FastCall = FALSE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + + AccelConfig = TRUE, + MenuConfig = TRUE, + ToolBoxConfig = TRUE, + GroupId = SfxGroupId::Application; +] + SfxVoidItem Activate SID_ACTIVATE () [ diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index d51c0cdb374e..2ae403993fce 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -35,6 +35,7 @@ #include <com/sun/star/text/ModuleDispatcher.hpp> #include <com/sun/star/task/OfficeRestartManager.hpp> #include <com/sun/star/task/XInteractionHandler.hpp> +#include <com/sun/star/task/XJobExecutor.hpp> #include <com/sun/star/ui/dialogs/AddressBookSourcePilot.hpp> #include <com/sun/star/ui/UIElementType.hpp> #include <com/sun/star/ui/XUIElement.hpp> @@ -878,6 +879,20 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) break; } + case SID_EXTENSION_MANAGER: + { + const Reference<XComponentContext>& xContext = comphelper::getProcessComponentContext(); + css::uno::Reference<css::uno::XInterface> xService + = xContext->getServiceManager()->createInstanceWithContext( + "com.sun.star.deployment.ui.PackageManagerDialog", xContext); + css::uno::Reference<css::task::XJobExecutor> xJobExecutor(xService, + css::uno::UNO_QUERY); + if (xJobExecutor.is()) + xJobExecutor->trigger(u""_ustr); + bDone = true; + break; + } + case SID_TEMPLATE_MANAGER: { SfxTemplateManagerDlg aDialog(rReq.GetFrameWeld()); diff --git a/starmath/uiconfig/smath/menubar/menubar.xml b/starmath/uiconfig/smath/menubar/menubar.xml index 7a62b08d0836..a1a0157f814c 100644 --- a/starmath/uiconfig/smath/menubar/menubar.xml +++ b/starmath/uiconfig/smath/menubar/menubar.xml @@ -141,7 +141,7 @@ </menu:menupopup> </menu:menu> <menu:menuitem menu:id=".uno:OpenXMLFilterSettings"/> - <menu:menuitem menu:id="service:com.sun.star.deployment.ui.PackageManagerDialog" menu:style="text"/> + <menu:menuitem menu:id=".uno:ExtensionManager" menu:style="text"/> <menu:menuitem menu:id=".uno:ConfigureDialog" menu:style="text"/> <menu:menuitem menu:id=".uno:OptionsTreeDialog"/> </menu:menupopup> diff --git a/sw/qa/uitest/writer_dialogs/openDialogs.py b/sw/qa/uitest/writer_dialogs/openDialogs.py index 651c3868de43..0ebd854a29c3 100644 --- a/sw/qa/uitest/writer_dialogs/openDialogs.py +++ b/sw/qa/uitest/writer_dialogs/openDialogs.py @@ -113,7 +113,7 @@ dialogs = [ {"command": ".uno:RunMacro", "closeButton": "cancel"}, {"command": ".uno:ScriptOrganizer", "closeButton": "close"}, {"command": ".uno:OpenXMLFilterSettings", "closeButton": "close"}, - {"command": "service:com.sun.star.deployment.ui.PackageManagerDialog", "closeButton": "close"}, + {"command": ".uno:ExtensionManager", "closeButton": "close"}, # {"command": ".uno:ConfigureDialog", "closeButton": "cancel"}, # tested in uitest/writer_tests/customizeDialog.py #{"command": ".uno:OptionsTreeDialog", "closeButton": "cancel"}, diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml index bb7847a42ad4..be8eeca4acec 100644 --- a/sw/uiconfig/sglobal/menubar/menubar.xml +++ b/sw/uiconfig/sglobal/menubar/menubar.xml @@ -774,7 +774,7 @@ <menu:menuitem menu:id=".uno:DevelopmentToolsDockingWindow"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:OpenXMLFilterSettings"/> - <menu:menuitem menu:id="service:com.sun.star.deployment.ui.PackageManagerDialog" menu:style="text"/> + <menu:menuitem menu:id=".uno:ExtensionManager" menu:style="text"/> <menu:menuitem menu:id=".uno:ConfigureDialog" menu:style="text"/> <menu:menuitem menu:id=".uno:OptionsTreeDialog"/> </menu:menupopup> diff --git a/sw/uiconfig/sweb/menubar/menubar.xml b/sw/uiconfig/sweb/menubar/menubar.xml index dda23a7d4f11..f2febf5e6127 100644 --- a/sw/uiconfig/sweb/menubar/menubar.xml +++ b/sw/uiconfig/sweb/menubar/menubar.xml @@ -636,7 +636,7 @@ </menu:menupopup> </menu:menu> <menu:menuitem menu:id=".uno:OpenXMLFilterSettings"/> - <menu:menuitem menu:id="service:com.sun.star.deployment.ui.PackageManagerDialog" menu:style="text"/> + <menu:menuitem menu:id=".uno:ExtensionManager" menu:style="text"/> <menu:menuitem menu:id=".uno:ConfigureDialog" menu:style="text"/> <menu:menuitem menu:id=".uno:OptionsTreeDialog"/> </menu:menupopup> diff --git a/sw/uiconfig/swform/menubar/menubar.xml b/sw/uiconfig/swform/menubar/menubar.xml index 7b840c782dee..b76599cb2678 100644 --- a/sw/uiconfig/swform/menubar/menubar.xml +++ b/sw/uiconfig/swform/menubar/menubar.xml @@ -716,7 +716,7 @@ </menu:menupopup> </menu:menu> <menu:menuitem menu:id=".uno:OpenXMLFilterSettings"/> - <menu:menuitem menu:id="service:com.sun.star.deployment.ui.PackageManagerDialog" menu:style="text"/> + <menu:menuitem menu:id=".uno:ExtensionManager" menu:style="text"/> <menu:menuitem menu:id=".uno:ConfigureDialog" menu:style="text"/> <menu:menuitem menu:id=".uno:OptionsTreeDialog"/> </menu:menupopup> diff --git a/sw/uiconfig/swreport/menubar/menubar.xml b/sw/uiconfig/swreport/menubar/menubar.xml index a4c61a82bef4..b5dcec6ece26 100644 --- a/sw/uiconfig/swreport/menubar/menubar.xml +++ b/sw/uiconfig/swreport/menubar/menubar.xml @@ -670,7 +670,7 @@ </menu:menupopup> </menu:menu> <menu:menuitem menu:id=".uno:OpenXMLFilterSettings"/> - <menu:menuitem menu:id="service:com.sun.star.deployment.ui.PackageManagerDialog" menu:style="text"/> + <menu:menuitem menu:id=".uno:ExtensionManager" menu:style="text"/> <menu:menuitem menu:id=".uno:ConfigureDialog" menu:style="text"/> <menu:menuitem menu:id=".uno:OptionsTreeDialog"/> </menu:menupopup> diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml index 4878ad6d9756..a0e0dd1b27a4 100644 --- a/sw/uiconfig/swriter/menubar/menubar.xml +++ b/sw/uiconfig/swriter/menubar/menubar.xml @@ -827,7 +827,7 @@ <menu:menuitem menu:id=".uno:DevelopmentToolsDockingWindow"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:OpenXMLFilterSettings"/> - <menu:menuitem menu:id="service:com.sun.star.deployment.ui.PackageManagerDialog" menu:style="text"/> + <menu:menuitem menu:id=".uno:ExtensionManager" menu:style="text"/> <menu:menuitem menu:id=".uno:ConfigureDialog" menu:style="text"/> <menu:menuitem menu:id=".uno:OptionsTreeDialog"/> </menu:menupopup> diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui b/sw/uiconfig/swriter/ui/notebookbar.ui index 7e25e24685fc..590450003eb7 100644 --- a/sw/uiconfig/swriter/ui/notebookbar.ui +++ b/sw/uiconfig/swriter/ui/notebookbar.ui @@ -24,7 +24,7 @@ <object class="GtkMenuItem" id="Menu-Extension-PackageManagerDialog"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="action-name">service:com.sun.star.deployment.ui.PackageManagerDialog</property> + <property name="action-name">.uno:ExtensionManager</property> </object> </child> </object> diff --git a/sw/uiconfig/swriter/ui/notebookbar_compact.ui b/sw/uiconfig/swriter/ui/notebookbar_compact.ui index 64b3e61dd802..a453a38d73c0 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_compact.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_compact.ui @@ -24,7 +24,7 @@ <object class="GtkMenuItem" id="Menu-Extension-PackageManagerDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">service:com.sun.star.deployment.ui.PackageManagerDialog</property> + <property name="action_name">.uno:ExtensionManager</property> </object> </child> </object> @@ -2342,7 +2342,7 @@ <object class="GtkMenuItem" id="PackageManagerDialogD"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">service:com.sun.star.deployment.ui.PackageManagerDialog</property> + <property name="action_name">.uno:ExtensionManager</property> </object> </child> <child> @@ -17333,7 +17333,7 @@ <child> <object class="GtkToolButton" id="ExtensionMenu-ExtensionDialog"> <property name="visible">True</property> - <property name="action_name">service:com.sun.star.deployment.ui.PackageManagerDialog</property> + <property name="action_name">.uno:ExtensionManager</property> </object> <packing> <property name="expand">False</property> diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui index 5587543e7e8a..8353a1fff96a 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui @@ -68,7 +68,7 @@ <object class="GtkMenuItem" id="Menu-Extension-PackageManagerDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">service:com.sun.star.deployment.ui.PackageManagerDialog</property> + <property name="action_name">.uno:ExtensionManager</property> </object> </child> </object> @@ -2937,7 +2937,7 @@ <object class="GtkMenuItem" id="MenuSettings-Extensions"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">service:com.sun.star.deployment.ui.PackageManagerDialog</property> + <property name="action_name">.uno:ExtensionManager</property> </object> </child> <child> @@ -5101,7 +5101,7 @@ <child> <object class="GtkToolButton" id="Default-PackageManagerDialog"> <property name="visible">True</property> - <property name="action_name">service:com.sun.star.deployment.ui.PackageManagerDialog</property> + <property name="action_name">.uno:ExtensionManager</property> </object> <packing> <property name="expand">False</property> diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui index 09ffeda00c11..07d5151d4316 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui @@ -3118,7 +3118,7 @@ <object class="GtkMenuItem" id="MenuSettings-Extensions"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">service:com.sun.star.deployment.ui.PackageManagerDialog</property> + <property name="action_name">.uno:ExtensionManager</property> </object> </child> <child> diff --git a/sw/uiconfig/swriter/ui/notebookbar_single.ui b/sw/uiconfig/swriter/ui/notebookbar_single.ui index 9607c62afaba..fba575c249fd 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_single.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_single.ui @@ -23,7 +23,7 @@ <object class="GtkMenuItem" id="Menu-Extension-PackageManagerDialog"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">service:com.sun.star.deployment.ui.PackageManagerDialog</property> + <property name="action_name">.uno:ExtensionManager</property> </object> </child> </object> diff --git a/sw/uiconfig/swxform/menubar/menubar.xml b/sw/uiconfig/swxform/menubar/menubar.xml index da4dbc7a4e92..6dd99347197d 100644 --- a/sw/uiconfig/swxform/menubar/menubar.xml +++ b/sw/uiconfig/swxform/menubar/menubar.xml @@ -762,7 +762,7 @@ </menu:menupopup> </menu:menu> <menu:menuitem menu:id=".uno:OpenXMLFilterSettings"/> - <menu:menuitem menu:id="service:com.sun.star.deployment.ui.PackageManagerDialog" menu:style="text"/> + <menu:menuitem menu:id=".uno:ExtensionManager" menu:style="text"/> <menu:menuitem menu:id=".uno:ConfigureDialog" menu:style="text"/> <menu:menuitem menu:id=".uno:OptionsTreeDialog"/> </menu:menupopup>
