From 38ef2cb092100d03fbef2c05a36526802d06ebaf Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Fri, 19 Nov 2021 08:45:09 +0200
Subject: [PATCH] loplugin:stringliteraldefine in i18npool

Change-Id: I8a56d5d6d201ac5ae65dc46ef4838a0e41af587e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125530
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 i18npool/CustomTarget_collator.mk             | 4 ++--
 i18npool/source/collator/collator_unicode.cxx | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/i18npool/CustomTarget_collator.mk b/i18npool/CustomTarget_collator.mk
index 4cf7b953573f..6f8f91f1f6f0 100644
--- a/i18npool/CustomTarget_collator.mk
+++ b/i18npool/CustomTarget_collator.mk
@@ -66,8 +66,8 @@ $(i18npool_CODIR)/lrl_include.hxx : $(SRCDIR)/i18npool/CustomTarget_collator.mk
 		$(SRCDIR)/i18npool/source/collator/data | $(i18npool_CODIR)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
 	$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),ECH)
-	echo '#define LOCAL_RULE_LANGS "$(sort $(foreach txt,$(i18npool_COTXTS), \
-		$(firstword $(subst _, ,$(txt)))))"' > $@
+	echo 'constexpr OUStringLiteral LOCAL_RULE_LANGS = u"$(sort $(foreach txt,$(i18npool_COTXTS), \
+		$(firstword $(subst _, ,$(txt)))))";' > $@
 	$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),ECH)
 
 # vim: set noet sw=4 ts=4:
diff --git a/i18npool/source/collator/collator_unicode.cxx b/i18npool/source/collator/collator_unicode.cxx
index fc99879759e8..8e54892efab4 100644
--- a/i18npool/source/collator/collator_unicode.cxx
+++ b/i18npool/source/collator/collator_unicode.cxx
@@ -20,10 +20,10 @@
 #include <config_locales.h>
 
 #include <sal/log.hxx>
+#include <rtl/ustrbuf.hxx>
 
 #include <lrl_include.hxx>
 
-#include <rtl/ustrbuf.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <i18nlangtag/languagetagicu.hxx>
 #include <collator_unicode.hxx>