From a39947102bac8430b13b10b3f11c34b5ebf576b0 Mon Sep 17 00:00:00 2001
From: Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>
Date: Mon, 31 May 2021 10:36:09 +0900
Subject: tdf#142243 HUD - Use XCharacterClassification to convert case
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 sfx2/inc/commandpopup/CommandPopup.hxx | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'sfx2/inc/commandpopup')

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);
-- 
cgit