include/sfx2/templatedlg.hxx | 2 +- sfx2/source/doc/templatedlg.cxx | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-)
New commits: commit f04f2b366594d42b66bd603b5d08768c5ab5f69b Author: Michael Weghorn <[email protected]> AuthorDate: Tue Oct 7 02:05:54 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Tue Oct 7 08:27:37 2025 +0200 additions dialog: Set parent when run to install templates This is similar to previous commit Change-Id: I480f5275f13c0908372e1a38ef64daca7a27cbfb Author: Michael Weghorn <[email protected]> Date: Tue Oct 7 01:29:23 2025 +0200 additions dialog: Set proper parent when run from area tab page , but now covers the case where the dialog is run to install new dictionaries. Sample scenario: * start Writer * "File" -> "Templates" -> "Manage Templates" * press the "Manage" button and select the "Extensions" entry With this commit in place, the dialog now stays correctly modally on top of the dialog it was started from. Change-Id: Ie22fd979a869ab4b3c2864f849a5a4f9500fa656 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191994 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/include/sfx2/templatedlg.hxx b/include/sfx2/templatedlg.hxx index c8f2ddf19655..af69f47780bf 100644 --- a/include/sfx2/templatedlg.hxx +++ b/include/sfx2/templatedlg.hxx @@ -61,7 +61,7 @@ protected: DECL_DLLPRIVATE_LINK(OkClickHdl, weld::Button&, void); SAL_DLLPRIVATE void ImportActionHdl(); - SAL_DLLPRIVATE static void ExtensionsActionHdl(); + SAL_DLLPRIVATE void ExtensionsActionHdl(); DECL_DLLPRIVATE_LINK(TVItemStateHdl, const ThumbnailViewItem*, void); diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index c668a517d2f3..04e865c994af 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -16,6 +16,7 @@ #include <comphelper/propertyvalue.hxx> #include <comphelper/string.hxx> #include <comphelper/storagehelper.hxx> +#include <sfx2/AdditionsDialogHelper.hxx> #include <sfx2/app.hxx> #include <sfx2/docfac.hxx> #include <sfx2/docfilt.hxx> @@ -48,7 +49,6 @@ #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <com/sun/star/ui/dialogs/XFolderPicker2.hpp> #include <com/sun/star/task/InteractionHandler.hpp> -#include <comphelper/dispatchcommand.hxx> #include <sfx2/strings.hrc> #include <bitmaps.hlst> @@ -642,9 +642,7 @@ void SfxTemplateManagerDlg::ImportActionHdl() void SfxTemplateManagerDlg::ExtensionsActionHdl() { - uno::Sequence<beans::PropertyValue> aArgs{ comphelper::makePropertyValue( - u"AdditionsTag"_ustr, u"Templates"_ustr) }; - comphelper::dispatchCommand(u".uno:AdditionsDialog"_ustr, aArgs); + AdditionsDialogHelper::RunAdditionsDialog(getDialog(), u"Templates"_ustr); } IMPL_LINK_NOARG(SfxTemplateManagerDlg, OpenRegionHdl, void*, void)
