vcl/unx/gtk3/a11y/atktextattributes.cxx | 64 ++++++++++++++++----------------
1 file changed, 32 insertions(+), 32 deletions(-)
New commits:
commit 24b178cfb6b35789e69d80857e73e911abe338a3
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu May 9 11:48:34 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sun May 12 20:26:23 2024 +0200
createFromAscii -> OUString literals in attribute_set_map_to_property_values
Change-Id: I98f40cba9baf2a21d095af84a07cd794723cb75d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167552
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/vcl/unx/gtk3/a11y/atktextattributes.cxx
b/vcl/unx/gtk3/a11y/atktextattributes.cxx
index d34d0a3d9860..7f3e5a23ce1e 100644
--- a/vcl/unx/gtk3/a11y/atktextattributes.cxx
+++ b/vcl/unx/gtk3/a11y/atktextattributes.cxx
@@ -1306,42 +1306,42 @@ namespace {
struct AtkTextAttrMapping
{
- const char * name;
- TextPropertyValueFunc const toPropertyValue;
+ OUString name;
+ TextPropertyValueFunc toPropertyValue;
};
}
-const AtkTextAttrMapping g_TextAttrMap[] =
+constexpr AtkTextAttrMapping g_TextAttrMap[]
{
- { "", InvalidValue }, // ATK_TEXT_ATTR_INVALID = 0
- { "ParaLeftMargin", UnitString2CMM }, // ATK_TEXT_ATTR_LEFT_MARGIN
- { "ParaRightMargin", UnitString2CMM }, // ATK_TEXT_ATTR_RIGHT_MARGIN
- { "ParaFirstLineIndent", UnitString2CMM }, // ATK_TEXT_ATTR_INDENT
- { "CharHidden", String2Bool }, // ATK_TEXT_ATTR_INVISIBLE
- { "", InvalidValue }, // ATK_TEXT_ATTR_EDITABLE
- { "ParaTopMargin", UnitString2CMM }, //
ATK_TEXT_ATTR_PIXELS_ABOVE_LINES
- { "ParaBottomMargin", UnitString2CMM }, //
ATK_TEXT_ATTR_PIXELS_BELOW_LINES
- { "", InvalidValue }, //
ATK_TEXT_ATTR_PIXELS_INSIDE_WRAP
- { "", InvalidValue }, // ATK_TEXT_ATTR_BG_FULL_HEIGHT
- { "", InvalidValue }, // ATK_TEXT_ATTR_RISE
- { "CharUnderline", String2Underline }, // ATK_TEXT_ATTR_UNDERLINE
- { "CharStrikeout", String2Strikeout }, // ATK_TEXT_ATTR_STRIKETHROUGH
- { "CharHeight", String2Float }, // ATK_TEXT_ATTR_SIZE
- { "CharScaleWidth", String2Scale }, // ATK_TEXT_ATTR_SCALE
- { "CharWeight", String2Weight }, // ATK_TEXT_ATTR_WEIGHT
- { "CharLocale", String2Locale }, // ATK_TEXT_ATTR_LANGUAGE
- { "CharFontName", SetString }, // ATK_TEXT_ATTR_FAMILY_NAME
- { "CharBackColor", String2Color }, // ATK_TEXT_ATTR_BG_COLOR
- { "CharColor", String2Color }, // ATK_TEXT_ATTR_FG_COLOR
- { "", InvalidValue }, // ATK_TEXT_ATTR_BG_STIPPLE
- { "", InvalidValue }, // ATK_TEXT_ATTR_FG_STIPPLE
- { "", InvalidValue }, // ATK_TEXT_ATTR_WRAP_MODE
- { "", InvalidValue }, // ATK_TEXT_ATTR_DIRECTION
- { "ParaAdjust", Justification2Adjust }, // ATK_TEXT_ATTR_JUSTIFICATION
- { "", InvalidValue }, // ATK_TEXT_ATTR_STRETCH
- { "CharCaseMap", String2CaseMap }, // ATK_TEXT_ATTR_VARIANT
- { "CharPosture", Style2FontSlant } // ATK_TEXT_ATTR_STYLE
+ { u""_ustr, InvalidValue }, // ATK_TEXT_ATTR_INVALID
= 0
+ { u"ParaLeftMargin"_ustr, UnitString2CMM }, //
ATK_TEXT_ATTR_LEFT_MARGIN
+ { u"ParaRightMargin"_ustr, UnitString2CMM }, //
ATK_TEXT_ATTR_RIGHT_MARGIN
+ { u"ParaFirstLineIndent"_ustr, UnitString2CMM }, // ATK_TEXT_ATTR_INDENT
+ { u"CharHidden"_ustr, String2Bool }, //
ATK_TEXT_ATTR_INVISIBLE
+ { u""_ustr, InvalidValue }, // ATK_TEXT_ATTR_EDITABLE
+ { u"ParaTopMargin"_ustr, UnitString2CMM }, //
ATK_TEXT_ATTR_PIXELS_ABOVE_LINES
+ { u"ParaBottomMargin"_ustr, UnitString2CMM }, //
ATK_TEXT_ATTR_PIXELS_BELOW_LINES
+ { u""_ustr, InvalidValue }, //
ATK_TEXT_ATTR_PIXELS_INSIDE_WRAP
+ { u""_ustr, InvalidValue }, //
ATK_TEXT_ATTR_BG_FULL_HEIGHT
+ { u""_ustr, InvalidValue }, // ATK_TEXT_ATTR_RISE
+ { u"CharUnderline"_ustr, String2Underline }, //
ATK_TEXT_ATTR_UNDERLINE
+ { u"CharStrikeout"_ustr, String2Strikeout }, //
ATK_TEXT_ATTR_STRIKETHROUGH
+ { u"CharHeight"_ustr, String2Float }, // ATK_TEXT_ATTR_SIZE
+ { u"CharScaleWidth"_ustr, String2Scale }, // ATK_TEXT_ATTR_SCALE
+ { u"CharWeight"_ustr, String2Weight }, // ATK_TEXT_ATTR_WEIGHT
+ { u"CharLocale"_ustr, String2Locale }, // ATK_TEXT_ATTR_LANGUAGE
+ { u"CharFontName"_ustr, SetString }, //
ATK_TEXT_ATTR_FAMILY_NAME
+ { u"CharBackColor"_ustr, String2Color }, // ATK_TEXT_ATTR_BG_COLOR
+ { u"CharColor"_ustr, String2Color }, // ATK_TEXT_ATTR_FG_COLOR
+ { u""_ustr, InvalidValue }, //
ATK_TEXT_ATTR_BG_STIPPLE
+ { u""_ustr, InvalidValue }, //
ATK_TEXT_ATTR_FG_STIPPLE
+ { u""_ustr, InvalidValue }, //
ATK_TEXT_ATTR_WRAP_MODE
+ { u""_ustr, InvalidValue }, //
ATK_TEXT_ATTR_DIRECTION
+ { u"ParaAdjust"_ustr, Justification2Adjust }, //
ATK_TEXT_ATTR_JUSTIFICATION
+ { u""_ustr, InvalidValue }, // ATK_TEXT_ATTR_STRETCH
+ { u"CharCaseMap"_ustr, String2CaseMap }, // ATK_TEXT_ATTR_VARIANT
+ { u"CharPosture"_ustr, Style2FontSlant } // ATK_TEXT_ATTR_STYLE
};
/*****************************************************************************/
@@ -1368,7 +1368,7 @@ attribute_set_map_to_property_values(
if( ! g_TextAttrMap[text_attr].toPropertyValue(
pAttributeList[nIndex].Value, attribute->value) )
return false;
- pAttributeList[nIndex].Name = OUString::createFromAscii(
g_TextAttrMap[text_attr].name );
+ pAttributeList[nIndex].Name = g_TextAttrMap[text_attr].name;
pAttributeList[nIndex].State =
beans::PropertyState_DIRECT_VALUE;
++nIndex;
}
