diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2021-11-10 11:33:03 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2021-11-11 16:00:35 +0100 |
| commit | 4fc8c453da759b34e7460da6338a5c2d80e3d3c4 (patch) | |
| tree | 672c59d9b4f26d2a331a47c8ea2e5cfb6636bb97 /svtools | |
| parent | 8b98f44b9643bdd873919185a617f530c04203e1 (diff) | |
Handle UNO command aliases in ToolBoxes
This allows to use ".uno:InsertSlide" which is an alias for
".uno:InsertPage"
in the notebookbar.
Change-Id: Ia52488b65e308a62b686e77b38cba3675deece73
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124952
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125046
Tested-by: Jenkins
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/uno/toolboxcontroller.cxx | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx index a105bfb3b757..21e186baf2df 100644 --- a/svtools/source/uno/toolboxcontroller.cxx +++ b/svtools/source/uno/toolboxcontroller.cxx @@ -26,6 +26,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XLayoutManager.hpp> #include <com/sun/star/util/URLTransformer.hpp> +#include <vcl/commandinfoprovider.hxx> #include <vcl/svapp.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <vcl/toolbox.hxx> @@ -520,6 +521,30 @@ void ToolboxController::bindListener() catch ( Exception& ) { } + + // it may be a command alias + if (!xDispatch.is()) + { + try + { + auto aProperties = vcl::CommandInfoProvider::GetCommandProperties(listener.first, + vcl::CommandInfoProvider::GetModuleIdentifier(m_xFrame)); + OUString sRealCommand = vcl::CommandInfoProvider::GetRealCommandForCommand(aProperties); + + if (!sRealCommand.isEmpty()) + { + aTargetURL.Complete = sRealCommand; + if ( m_xUrlTransformer.is() ) + m_xUrlTransformer->parseStrict( aTargetURL ); + + xDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 ); + } + } + catch ( Exception& ) + { + } + } + listener.second = xDispatch; Listener aListener( aTargetURL, xDispatch ); |