desktop/source/deployment/gui/dp_gui_service.cxx | 2 +- desktop/source/deployment/gui/dp_gui_theextmgr.cxx | 6 +++--- desktop/source/deployment/gui/dp_gui_theextmgr.hxx | 8 +++----- 3 files changed, 7 insertions(+), 9 deletions(-)
New commits: commit f379e1c62b6303189d1223d2b6233cf3bf1072d0 Author: Michael Weghorn <[email protected]> AuthorDate: Mon Feb 23 18:27:53 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Tue Feb 24 23:50:35 2026 +0100 tdf#170805 extension mgr: Use more specific weld::Dialog Return and use the more specific weld::Dialog subclass in TheExtensionManager::getDialog instead of just weld::Window. Change-Id: I931864f8117af87386761f0838b4f3970d9d8c62 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200150 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx index 9530f8ba3b99..b8a03667e91f 100644 --- a/desktop/source/deployment/gui/dp_gui_service.cxx +++ b/desktop/source/deployment/gui/dp_gui_service.cxx @@ -183,7 +183,7 @@ void ServiceImpl::setDialogTitle( OUString const & title ) if ( dp_gui::TheExtensionManager::s_ExtMgr.is() ) { const SolarMutexGuard guard; - if (weld::Window* pDialog = dp_gui::TheExtensionManager::s_ExtMgr->getDialog()) + if (weld::Dialog* pDialog = dp_gui::TheExtensionManager::s_ExtMgr->getDialog()) pDialog->set_title(title); } } diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx index 091d37a3180a..711019d48fb6 100644 --- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx +++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx @@ -149,7 +149,7 @@ void TheExtensionManager::SetText( const OUString &rTitle ) { const SolarMutexGuard guard; - if (weld::Window* pDialog = getDialog()) + if (weld::Dialog* pDialog = getDialog()) pDialog->set_title( rTitle ); } @@ -158,7 +158,7 @@ void TheExtensionManager::ToTop() { const SolarMutexGuard guard; - if (weld::Window* pDialog = getDialog()) + if (weld::Dialog* pDialog = getDialog()) pDialog->present(); } @@ -197,7 +197,7 @@ sal_Int16 TheExtensionManager::execute() bool TheExtensionManager::isVisible() { - weld::Window* pDialog = getDialog(); + weld::Dialog* pDialog = getDialog(); return pDialog && pDialog->get_visible(); } diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx index 7e133e78501d..0b1b50070e21 100644 --- a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx +++ b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx @@ -68,7 +68,7 @@ public: bool isModified() const { return m_bModified; } void clearModified() { m_bModified = false; } - weld::Window* getDialog() + weld::Dialog* getDialog() { if (DialogHelper* pHelper = getDialogHelper()) return pHelper->getDialog(); commit deaa7aca41ca19c571270c9434b0def9cc52e3fe Author: Michael Weghorn <[email protected]> AuthorDate: Mon Feb 23 18:26:19 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Tue Feb 24 23:50:28 2026 +0100 ext mgr: Reuse TheExtensionManager::getDialogHelper ... to simplify/deduplicate TheExtensionManager::getDialog a bit. Change-Id: I65c3380ee1fe8574a128e4670e57b16edf9974cb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200149 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx index 8e85372344df..7e133e78501d 100644 --- a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx +++ b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx @@ -70,10 +70,8 @@ public: weld::Window* getDialog() { - if (m_xExtMgrDialog) - return m_xExtMgrDialog->getDialog(); - if (m_xUpdReqDialog) - return m_xUpdReqDialog->getDialog(); + if (DialogHelper* pHelper = getDialogHelper()) + return pHelper->getDialog(); return nullptr; } DialogHelper* getDialogHelper()
