replace createFromAscii with OUString literals in ScXMLEditAttributeMap

Change-Id: I7ab70713b2ee69eccedebeb09b8ea5879736a830
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167527
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Jenkins

3 files changed, 50 insertions, 53 deletions

diff --git a/sc/source/filter/xml/editattributemap.cxx b/sc/source/filter/xml/editattributemap.cxx
index 4b30edf1403d..93a341adaa7a 100644
--- a/sc/source/filter/xml/editattributemap.cxx
+++ b/sc/source/filter/xml/editattributemap.cxx
@@ -13,65 +13,63 @@
 #include <editeng/memberids.h>
 #include <xmloff/xmlnamespace.hxx>
 
-ScXMLEditAttributeMap::Entry const aEntries[] = {
+constexpr ScXMLEditAttributeMap::Entry aEntries[] {
 
-    { XML_NAMESPACE_FO, "color", "CharColor", EE_CHAR_COLOR, 0 },
-    { XML_NAMESPACE_STYLE, "font-charset", "CharFontCharSet", EE_CHAR_FONTINFO, MID_FONT_CHAR_SET },
-    { XML_NAMESPACE_STYLE, "font-charset-asian", "CharFontCharSetAsian", EE_CHAR_FONTINFO_CJK, MID_FONT_CHAR_SET },
-    { XML_NAMESPACE_STYLE, "font-charset-complex", "CharFontCharSetComplex", EE_CHAR_FONTINFO_CTL, MID_FONT_CHAR_SET },
-    { XML_NAMESPACE_FO, "font-family", "CharFontName", EE_CHAR_FONTINFO, MID_FONT_FAMILY_NAME },
-    { XML_NAMESPACE_STYLE, "font-family-asian", "CharFontNameAsian", EE_CHAR_FONTINFO_CJK, MID_FONT_FAMILY_NAME },
-    { XML_NAMESPACE_STYLE, "font-family-complex", "CharFontNameComplex", EE_CHAR_FONTINFO_CTL, MID_FONT_FAMILY_NAME },
-    { XML_NAMESPACE_STYLE, "font-family-generic", "CharFontFamily", EE_CHAR_FONTINFO, MID_FONT_FAMILY },
-    { XML_NAMESPACE_STYLE, "font-family-generic-asian", "CharFontFamilyAsian", EE_CHAR_FONTINFO_CJK, MID_FONT_FAMILY },
-    { XML_NAMESPACE_STYLE, "font-family-generic-complex", "CharFontFamilyComplex", EE_CHAR_FONTINFO_CTL, MID_FONT_FAMILY },
-    { XML_NAMESPACE_STYLE, "font-pitch", "CharFontPitch", EE_CHAR_FONTINFO, MID_FONT_PITCH },
-    { XML_NAMESPACE_STYLE, "font-pitch-asian", "CharFontPitchAsian", EE_CHAR_FONTINFO_CJK, MID_FONT_PITCH },
-    { XML_NAMESPACE_STYLE, "font-pitch-complex", "CharFontPitchComplex", EE_CHAR_FONTINFO_CTL, MID_FONT_PITCH },
-    { XML_NAMESPACE_FO, "font-size", "CharHeight", EE_CHAR_FONTHEIGHT, MID_FONTHEIGHT },
-    { XML_NAMESPACE_STYLE, "font-size-asian", "CharHeightAsian", EE_CHAR_FONTHEIGHT_CJK, MID_FONTHEIGHT },
-    { XML_NAMESPACE_STYLE, "font-size-complex", "CharHeightComplex", EE_CHAR_FONTHEIGHT_CTL, MID_FONTHEIGHT },
-    { XML_NAMESPACE_FO, "font-style", "CharPosture", EE_CHAR_ITALIC, MID_POSTURE },
-    { XML_NAMESPACE_STYLE, "font-style-asian", "CharPostureAsian", EE_CHAR_ITALIC_CJK, MID_POSTURE },
-    { XML_NAMESPACE_STYLE, "font-style-complex", "CharPostureComplex", EE_CHAR_ITALIC_CTL, MID_POSTURE },
-    { XML_NAMESPACE_STYLE, "font-style-name", "CharFontStyleName", EE_CHAR_FONTINFO, MID_FONT_STYLE_NAME },
-    { XML_NAMESPACE_STYLE, "font-style-name-asian", "CharFontStyleNameAsian", EE_CHAR_FONTINFO_CJK, MID_FONT_STYLE_NAME },
-    { XML_NAMESPACE_STYLE, "font-style-name-complex", "CharFontStyleNameComplex", EE_CHAR_FONTINFO_CTL, MID_FONT_STYLE_NAME },
-    { XML_NAMESPACE_FO, "font-weight", "CharWeight", EE_CHAR_WEIGHT, MID_WEIGHT },
-    { XML_NAMESPACE_STYLE, "font-weight-asian", "CharWeightAsian", EE_CHAR_WEIGHT_CJK, MID_WEIGHT },
-    { XML_NAMESPACE_STYLE, "font-weight-complex", "CharWeightComplex", EE_CHAR_WEIGHT_CTL, MID_WEIGHT },
-    { XML_NAMESPACE_STYLE, "text-overline-width", "CharOverline", EE_CHAR_OVERLINE, MID_TL_STYLE },
-    { XML_NAMESPACE_STYLE, "text-overline-color", "CharOverlineColor", EE_CHAR_OVERLINE, MID_TL_COLOR },
-    { XML_NAMESPACE_STYLE, "text-overline-color", "CharOverlineHasColor", EE_CHAR_OVERLINE, MID_TL_HASCOLOR },
-    { XML_NAMESPACE_STYLE, "text-underline-width", "CharUnderline", EE_CHAR_UNDERLINE, MID_TL_STYLE },
-    { XML_NAMESPACE_STYLE, "text-underline-color", "CharUnderlineColor", EE_CHAR_UNDERLINE, MID_TL_COLOR },
-    { XML_NAMESPACE_STYLE, "text-underline-color", "CharUnderlineHasColor", EE_CHAR_UNDERLINE, MID_TL_HASCOLOR },
-    { XML_NAMESPACE_STYLE, "text-line-through-mode", "CharWordMode", EE_CHAR_WLM, 0 },
-    { XML_NAMESPACE_STYLE, "text-line-through-type", "CharStrikeout", EE_CHAR_STRIKEOUT, MID_CROSS_OUT },
-    { XML_NAMESPACE_STYLE, "font-relief", "CharRelief", EE_CHAR_RELIEF, MID_RELIEF },
-    { XML_NAMESPACE_STYLE, "text-outline", "CharContoured", EE_CHAR_OUTLINE, 0 },
-    { XML_NAMESPACE_FO, "text-shadow", "CharShadowed", EE_CHAR_SHADOW, 0 },
-    { XML_NAMESPACE_FO, "letter-spacing", "CharKerning", EE_CHAR_KERNING, 0 },
-    { XML_NAMESPACE_STYLE, "letter-kerning", "CharAutoKerning", EE_CHAR_PAIRKERNING, 0 },
-    { XML_NAMESPACE_STYLE, "text-scale", "CharScaleWidth", EE_CHAR_FONTWIDTH, 0 },
-    { XML_NAMESPACE_STYLE, "text-position", "CharEscapement", EE_CHAR_ESCAPEMENT, MID_ESC },
-    { XML_NAMESPACE_STYLE, "text-position", "CharEscapementHeight", EE_CHAR_ESCAPEMENT, MID_ESC_HEIGHT },
-    { XML_NAMESPACE_STYLE, "text-emphasize", "CharEmphasis", EE_CHAR_EMPHASISMARK, MID_EMPHASIS },
+    { XML_NAMESPACE_FO, u"color"_ustr, u"CharColor"_ustr, EE_CHAR_COLOR, 0 },
+    { XML_NAMESPACE_STYLE, u"font-charset"_ustr, u"CharFontCharSet"_ustr, EE_CHAR_FONTINFO, MID_FONT_CHAR_SET },
+    { XML_NAMESPACE_STYLE, u"font-charset-asian"_ustr, u"CharFontCharSetAsian"_ustr, EE_CHAR_FONTINFO_CJK, MID_FONT_CHAR_SET },
+    { XML_NAMESPACE_STYLE, u"font-charset-complex"_ustr, u"CharFontCharSetComplex"_ustr, EE_CHAR_FONTINFO_CTL, MID_FONT_CHAR_SET },
+    { XML_NAMESPACE_FO, u"font-family"_ustr, u"CharFontName"_ustr, EE_CHAR_FONTINFO, MID_FONT_FAMILY_NAME },
+    { XML_NAMESPACE_STYLE, u"font-family-asian"_ustr, u"CharFontNameAsian"_ustr, EE_CHAR_FONTINFO_CJK, MID_FONT_FAMILY_NAME },
+    { XML_NAMESPACE_STYLE, u"font-family-complex"_ustr, u"CharFontNameComplex"_ustr, EE_CHAR_FONTINFO_CTL, MID_FONT_FAMILY_NAME },
+    { XML_NAMESPACE_STYLE, u"font-family-generic"_ustr, u"CharFontFamily"_ustr, EE_CHAR_FONTINFO, MID_FONT_FAMILY },
+    { XML_NAMESPACE_STYLE, u"font-family-generic-asian"_ustr, u"CharFontFamilyAsian"_ustr, EE_CHAR_FONTINFO_CJK, MID_FONT_FAMILY },
+    { XML_NAMESPACE_STYLE, u"font-family-generic-complex"_ustr, u"CharFontFamilyComplex"_ustr, EE_CHAR_FONTINFO_CTL, MID_FONT_FAMILY },
+    { XML_NAMESPACE_STYLE, u"font-pitch"_ustr, u"CharFontPitch"_ustr, EE_CHAR_FONTINFO, MID_FONT_PITCH },
+    { XML_NAMESPACE_STYLE, u"font-pitch-asian"_ustr, u"CharFontPitchAsian"_ustr, EE_CHAR_FONTINFO_CJK, MID_FONT_PITCH },
+    { XML_NAMESPACE_STYLE, u"font-pitch-complex"_ustr, u"CharFontPitchComplex"_ustr, EE_CHAR_FONTINFO_CTL, MID_FONT_PITCH },
+    { XML_NAMESPACE_FO, u"font-size"_ustr, u"CharHeight"_ustr, EE_CHAR_FONTHEIGHT, MID_FONTHEIGHT },
+    { XML_NAMESPACE_STYLE, u"font-size-asian"_ustr, u"CharHeightAsian"_ustr, EE_CHAR_FONTHEIGHT_CJK, MID_FONTHEIGHT },
+    { XML_NAMESPACE_STYLE, u"font-size-complex"_ustr, u"CharHeightComplex"_ustr, EE_CHAR_FONTHEIGHT_CTL, MID_FONTHEIGHT },
+    { XML_NAMESPACE_FO, u"font-style"_ustr, u"CharPosture"_ustr, EE_CHAR_ITALIC, MID_POSTURE },
+    { XML_NAMESPACE_STYLE, u"font-style-asian"_ustr, u"CharPostureAsian"_ustr, EE_CHAR_ITALIC_CJK, MID_POSTURE },
+    { XML_NAMESPACE_STYLE, u"font-style-complex"_ustr, u"CharPostureComplex"_ustr, EE_CHAR_ITALIC_CTL, MID_POSTURE },
+    { XML_NAMESPACE_STYLE, u"font-style-name"_ustr, u"CharFontStyleName"_ustr, EE_CHAR_FONTINFO, MID_FONT_STYLE_NAME },
+    { XML_NAMESPACE_STYLE, u"font-style-name-asian"_ustr, u"CharFontStyleNameAsian"_ustr, EE_CHAR_FONTINFO_CJK, MID_FONT_STYLE_NAME },
+    { XML_NAMESPACE_STYLE, u"font-style-name-complex"_ustr, u"CharFontStyleNameComplex"_ustr, EE_CHAR_FONTINFO_CTL, MID_FONT_STYLE_NAME },
+    { XML_NAMESPACE_FO, u"font-weight"_ustr, u"CharWeight"_ustr, EE_CHAR_WEIGHT, MID_WEIGHT },
+    { XML_NAMESPACE_STYLE, u"font-weight-asian"_ustr, u"CharWeightAsian"_ustr, EE_CHAR_WEIGHT_CJK, MID_WEIGHT },
+    { XML_NAMESPACE_STYLE, u"font-weight-complex"_ustr, u"CharWeightComplex"_ustr, EE_CHAR_WEIGHT_CTL, MID_WEIGHT },
+    { XML_NAMESPACE_STYLE, u"text-overline-width"_ustr, u"CharOverline"_ustr, EE_CHAR_OVERLINE, MID_TL_STYLE },
+    { XML_NAMESPACE_STYLE, u"text-overline-color"_ustr, u"CharOverlineColor"_ustr, EE_CHAR_OVERLINE, MID_TL_COLOR },
+    { XML_NAMESPACE_STYLE, u"text-overline-color"_ustr, u"CharOverlineHasColor"_ustr, EE_CHAR_OVERLINE, MID_TL_HASCOLOR },
+    { XML_NAMESPACE_STYLE, u"text-underline-width"_ustr, u"CharUnderline"_ustr, EE_CHAR_UNDERLINE, MID_TL_STYLE },
+    { XML_NAMESPACE_STYLE, u"text-underline-color"_ustr, u"CharUnderlineColor"_ustr, EE_CHAR_UNDERLINE, MID_TL_COLOR },
+    { XML_NAMESPACE_STYLE, u"text-underline-color"_ustr, u"CharUnderlineHasColor"_ustr, EE_CHAR_UNDERLINE, MID_TL_HASCOLOR },
+    { XML_NAMESPACE_STYLE, u"text-line-through-mode"_ustr, u"CharWordMode"_ustr, EE_CHAR_WLM, 0 },
+    { XML_NAMESPACE_STYLE, u"text-line-through-type"_ustr, u"CharStrikeout"_ustr, EE_CHAR_STRIKEOUT, MID_CROSS_OUT },
+    { XML_NAMESPACE_STYLE, u"font-relief"_ustr, u"CharRelief"_ustr, EE_CHAR_RELIEF, MID_RELIEF },
+    { XML_NAMESPACE_STYLE, u"text-outline"_ustr, u"CharContoured"_ustr, EE_CHAR_OUTLINE, 0 },
+    { XML_NAMESPACE_FO, u"text-shadow"_ustr, u"CharShadowed"_ustr, EE_CHAR_SHADOW, 0 },
+    { XML_NAMESPACE_FO, u"letter-spacing"_ustr, u"CharKerning"_ustr, EE_CHAR_KERNING, 0 },
+    { XML_NAMESPACE_STYLE, u"letter-kerning"_ustr, u"CharAutoKerning"_ustr, EE_CHAR_PAIRKERNING, 0 },
+    { XML_NAMESPACE_STYLE, u"text-scale"_ustr, u"CharScaleWidth"_ustr, EE_CHAR_FONTWIDTH, 0 },
+    { XML_NAMESPACE_STYLE, u"text-position"_ustr, u"CharEscapement"_ustr, EE_CHAR_ESCAPEMENT, MID_ESC },
+    { XML_NAMESPACE_STYLE, u"text-position"_ustr, u"CharEscapementHeight"_ustr, EE_CHAR_ESCAPEMENT, MID_ESC_HEIGHT },
+    { XML_NAMESPACE_STYLE, u"text-emphasize"_ustr, u"CharEmphasis"_ustr, EE_CHAR_EMPHASISMARK, MID_EMPHASIS },
     // The following 3 "country" entries are just placeholders for language,
     // country, script and rfc-language-tag, which all map to CharLocale,
     // EE_CHAR_LANGUAGE and MID_LANG_LOCALE and are handled individually.
-    { XML_NAMESPACE_FO, "country", "CharLocale", EE_CHAR_LANGUAGE, MID_LANG_LOCALE },
-    { XML_NAMESPACE_STYLE, "country-asian", "CharLocaleAsian", EE_CHAR_LANGUAGE_CJK, MID_LANG_LOCALE },
-    { XML_NAMESPACE_STYLE, "country-complex", "CharLocaleComplex", EE_CHAR_LANGUAGE_CTL, MID_LANG_LOCALE },
+    { XML_NAMESPACE_FO, u"country"_ustr, u"CharLocale"_ustr, EE_CHAR_LANGUAGE, MID_LANG_LOCALE },
+    { XML_NAMESPACE_STYLE, u"country-asian"_ustr, u"CharLocaleAsian"_ustr, EE_CHAR_LANGUAGE_CJK, MID_LANG_LOCALE },
+    { XML_NAMESPACE_STYLE, u"country-complex"_ustr, u"CharLocaleComplex"_ustr, EE_CHAR_LANGUAGE_CTL, MID_LANG_LOCALE },
 };
 
 ScXMLEditAttributeMap::ScXMLEditAttributeMap()
 {
     for (size_t i = 0; i < SAL_N_ELEMENTS(aEntries); ++i)
     {
-        maAPIEntries.emplace(
-                OUString::createFromAscii(aEntries[i].mpAPIName), &aEntries[i]);
-
+        maAPIEntries.emplace(aEntries[i].maAPIName, &aEntries[i]);
         maItemIDEntries.emplace(aEntries[i].mnItemID, &aEntries[i]);
     }
 }
diff --git a/sc/source/filter/xml/editattributemap.hxx b/sc/source/filter/xml/editattributemap.hxx
index 7139121910fb..a084e2ee2db3 100644
--- a/sc/source/filter/xml/editattributemap.hxx
+++ b/sc/source/filter/xml/editattributemap.hxx
@@ -23,8 +23,8 @@ public:
     struct Entry
     {
         sal_uInt16 nmXMLNS;
-        const char* mpXMLName;
-        const char* mpAPIName;
+        OUString maXMLName;
+        OUString maAPIName;
         sal_uInt16 mnItemID;
         sal_uInt8 mnFlag;
     };
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index 8f6f18f29796..aa14ff2da25f 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -976,8 +976,7 @@ const SvxFieldData* toXMLPropertyStates(
         if (!pEntry)
             continue;
 
-        sal_Int32 nIndex = xMapper->GetEntryIndex(
-            pEntry->nmXMLNS, OUString::createFromAscii(pEntry->mpXMLName), 0);
+        sal_Int32 nIndex = xMapper->GetEntryIndex(pEntry->nmXMLNS, pEntry->maXMLName, 0);
 
         if (nIndex == -1 || nIndex >= nEntryCount)
             continue;