diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2021-05-31 10:36:09 +0900 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2021-05-31 05:30:19 +0200 |
| commit | a39947102bac8430b13b10b3f11c34b5ebf576b0 (patch) | |
| tree | cc7e2431af918cb25d249ce5f3628fa924e34d09 /sfx2/inc | |
| parent | e718f0e703c0fb33a0b1b5efe7b13b02c25f3335 (diff) | |
tdf#142243 HUD - Use XCharacterClassification to convert case
This should use international case conversion, not just ascii one
that was used before.
Change-Id: Id01d3d0d30a846f02f97d081491b0de2c0d6ffef
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116419
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'sfx2/inc')
| -rw-r--r-- | sfx2/inc/commandpopup/CommandPopup.hxx | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/sfx2/inc/commandpopup/CommandPopup.hxx b/sfx2/inc/commandpopup/CommandPopup.hxx index 85208e37608e..5d1d74aff860 100644 --- a/sfx2/inc/commandpopup/CommandPopup.hxx +++ b/sfx2/inc/commandpopup/CommandPopup.hxx @@ -17,8 +17,11 @@ #include <vcl/weld.hxx> #include <vcl/window.hxx> -#include <com/sun/star/container/XIndexAccess.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/frame/XFrame.hpp> +#include <com/sun/star/container/XIndexAccess.hpp> +#include <com/sun/star/i18n/XCharacterClassification.hpp> +#include <com/sun/star/util/XURLTransformer.hpp> struct CurrentEntry final { @@ -36,6 +39,7 @@ struct MenuContent final { OUString m_aCommandURL; OUString m_aMenuLabel; + OUString m_aSearchableMenuLabel; OUString m_aFullLabelWithPath; OUString m_aTooltip; std::vector<MenuContent> m_aSubMenuContent; @@ -44,9 +48,14 @@ struct MenuContent final class MenuContentHandler final { private: + css::uno::Reference<css::uno::XComponentContext> m_xContext; css::uno::Reference<css::frame::XFrame> m_xFrame; + css::uno::Reference<css::i18n::XCharacterClassification> m_xCharacterClassification; + css::uno::Reference<css::util::XURLTransformer> m_xURLTransformer; + MenuContent m_aMenuContent; OUString m_sModuleLongName; + OUString toLower(OUString const& rString); public: MenuContentHandler(css::uno::Reference<css::frame::XFrame> const& xFrame); |