core.git: include/vcl

Caolán McNamara (via logerrit) Fri, 11 Jul 2025 16:15:53 -0700

 include/vcl/tabs.hrc |   56 +++++++++++++++++++++++++--------------------------
 1 file changed, 28 insertions(+), 28 deletions(-)


New commits:
commit 3af3b87c79da47b52c39d8e38d68744c0bca3352
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Fri Jul 11 11:32:38 2025 +0100
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Sat Jul 12 01:15:27 2025 +0200

    use constexpr for TabData entries
    
    Change-Id: I02777999608137e41cdd4a3182d9884db830b12e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187746
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    Tested-by: Jenkins

diff --git a/include/vcl/tabs.hrc b/include/vcl/tabs.hrc
index 4af5f683f7f4..4575ef2c4692 100644
--- a/include/vcl/tabs.hrc
+++ b/include/vcl/tabs.hrc
@@ -29,35 +29,35 @@ struct TabData
 inline constexpr OUString RID_M = u"cmd/lc_"_ustr;
 inline constexpr OUString RID_L = u"cmd/32/"_ustr;
 
-const TabData RID_TAB_BORDER{ NC_("RID_TAB_BORDER", "Border"), 
"borderdialog.png" };
-const TabData RID_TAB_LINE{ NC_("RID_TAB_LINE", "Line"), "formatline.png" };
-const TabData RID_TAB_AREA{ NC_("RID_TAB_AREA", "Area"), "backgroundcolor.png" 
};
-const TabData RID_TAB_TRANSPARENCE{ NC_("RID_TAB_TRANSPARENCE", 
"Transparency"), "graftransparence.png" };
-const TabData RID_TAB_FONT{ NC_("RID_TAB_FONT", "Font"), "fontdialog.png" };
-const TabData RID_TAB_FONTEFFECTS{ NC_("RID_TAB_FONTEFFECTS", "Font Effects"), 
"color.png" };
-const TabData RID_TAB_ALIGNMENT{ NC_("RID_TAB_ALIGNMENT", "Alignment"), 
"alignblock.png" };
-const TabData RID_TAB_ASIANTYPO{ NC_("RID_TAB_ASIANTYPO", "Asian Typography"), 
"defaultcharstyle.png" };
-const TabData RID_TAB_POSITION{ NC_("RID_TAB_POSITION", "Position"), 
"fontwork.png" }; // font
-const TabData RID_TAB_HIGHLIGHTING{ NC_("RID_TAB_HIGHLIGHTING", 
"Highlighting"), "backcolor.png" };
-const TabData RID_TAB_COLORPALETTE{ NC_("RID_TAB_COLORPALETTE", "Color 
Palette"), "colorsettings.png" };
-const TabData RID_TAB_NUMBERS{ NC_("RID_TAB_NUMBERS", "Numbers"), 
"numberformatdecimal.png" };
-const TabData RID_TAB_INDENTS{ NC_("RID_TAB_INDENTS", "Indents &amp; 
Spacing"), "paraspaceincrease.png" };
-const TabData RID_TAB_TABS{ NC_("RID_TAB_TABS", "Tabs"), "hangingindent.png" };
+inline constexpr TabData RID_TAB_BORDER{ NC_("RID_TAB_BORDER", "Border"), 
u"borderdialog.png"_ustr };
+inline constexpr TabData RID_TAB_LINE{ NC_("RID_TAB_LINE", "Line"), 
u"formatline.png"_ustr };
+inline constexpr TabData RID_TAB_AREA{ NC_("RID_TAB_AREA", "Area"), 
u"backgroundcolor.png"_ustr };
+inline constexpr TabData RID_TAB_TRANSPARENCE{ NC_("RID_TAB_TRANSPARENCE", 
"Transparency"), u"graftransparence.png"_ustr };
+inline constexpr TabData RID_TAB_FONT{ NC_("RID_TAB_FONT", "Font"), 
u"fontdialog.png"_ustr };
+inline constexpr TabData RID_TAB_FONTEFFECTS{ NC_("RID_TAB_FONTEFFECTS", "Font 
Effects"), u"color.png"_ustr };
+inline constexpr TabData RID_TAB_ALIGNMENT{ NC_("RID_TAB_ALIGNMENT", 
"Alignment"), u"alignblock.png"_ustr };
+inline constexpr TabData RID_TAB_ASIANTYPO{ NC_("RID_TAB_ASIANTYPO", "Asian 
Typography"), u"defaultcharstyle.png"_ustr };
+inline constexpr TabData RID_TAB_POSITION{ NC_("RID_TAB_POSITION", 
"Position"), u"fontwork.png"_ustr }; // font
+inline constexpr TabData RID_TAB_HIGHLIGHTING{ NC_("RID_TAB_HIGHLIGHTING", 
"Highlighting"), u"backcolor.png"_ustr };
+inline constexpr TabData RID_TAB_COLORPALETTE{ NC_("RID_TAB_COLORPALETTE", 
"Color Palette"), u"colorsettings.png"_ustr };
+inline constexpr TabData RID_TAB_NUMBERS{ NC_("RID_TAB_NUMBERS", "Numbers"), 
u"numberformatdecimal.png"_ustr };
+inline constexpr TabData RID_TAB_INDENTS{ NC_("RID_TAB_INDENTS", "Indents 
&amp; Spacing"), u"paraspaceincrease.png"_ustr };
+inline constexpr TabData RID_TAB_TABS{ NC_("RID_TAB_TABS", "Tabs"), 
u"hangingindent.png"_ustr };
 
-const TabData RID_TAB_CHART_OPTIONS{ NC_("RID_TAB_CHART_OPTIONS", "Options"), 
"diagramtype.png" };
-const TabData RID_TAB_CHART_ERROR_X{ NC_("RID_TAB_CHART_ERROR_X", "X Error 
Bars"), "arrowshapes.png" };
-const TabData RID_TAB_CHART_ERROR_Y{ NC_("RID_TAB_CHART_ERROR_Y", "Y Error 
Bars"), "arrowshapes.up-down-arrow.png" };
-const TabData RID_TAB_CHART_TREND{ NC_("RID_TAB_CHART_TREND", "Type"), 
"bezierconvert.png" };
-const TabData RID_TAB_CHART_TABLE{ NC_("RID_TAB_CHART_TABLE", "Data Table"), 
"inserttable.png" };
-const TabData RID_TAB_CHART_LEGENDPOS{ NC_("RID_TAB_CHART_LEGENDPOS", 
"Position"), "arrowshapes.quad-arrow.png" };
-const TabData RID_TAB_CHART_DATALABEL{ NC_("RID_TAB_CHART_DATALABEL", "Data 
Labels"), "numberformatstandard.png" };
-const TabData RID_TAB_CHART_SCALE{ NC_("RID_TAB_CHART_SCALE", "Scale"), 
"diagramaxisxyz.png" };
-const TabData RID_TAB_CHART_POSITIONING{ NC_("RID_TAB_CHART_POSITIONING", 
"Positioning"), "grow.png" };
-const TabData RID_TAB_CHART_AXISLABEL{ NC_("RID_TAB_CHART_AXISLABEL", 
"Label"), "insertfixedtext.png" };
-const TabData RID_TAB_CHART_LAYOUT{ NC_("RID_TAB_CHART_LAYOUT", "Layout"), 
"cyramid.png" };
-const TabData RID_TAB_CHART_PERSPECTIVE{ NC_("RID_TAB_CHART_PERSPECTIVE", 
"Perspective"), "window3d.png" };
-const TabData RID_TAB_CHART_APPEARANCE{ NC_("RID_TAB_CHART_APPEARANCE", 
"Appearance"), "shell3d.png" };
-const TabData RID_TAB_CHART_ILLUMINATION{ NC_("RID_TAB_CHART_ILLUMINATION", 
"Illumination"), "grafluminance.png" };
+inline constexpr TabData RID_TAB_CHART_OPTIONS{ NC_("RID_TAB_CHART_OPTIONS", 
"Options"), u"diagramtype.png"_ustr };
+inline constexpr TabData RID_TAB_CHART_ERROR_X{ NC_("RID_TAB_CHART_ERROR_X", 
"X Error Bars"), u"arrowshapes.png"_ustr };
+inline constexpr TabData RID_TAB_CHART_ERROR_Y{ NC_("RID_TAB_CHART_ERROR_Y", 
"Y Error Bars"), u"arrowshapes.up-down-arrow.png"_ustr };
+inline constexpr TabData RID_TAB_CHART_TREND{ NC_("RID_TAB_CHART_TREND", 
"Type"), u"bezierconvert.png"_ustr };
+inline constexpr TabData RID_TAB_CHART_TABLE{ NC_("RID_TAB_CHART_TABLE", "Data 
Table"), u"inserttable.png"_ustr };
+inline constexpr TabData RID_TAB_CHART_LEGENDPOS{ 
NC_("RID_TAB_CHART_LEGENDPOS", "Position"), u"arrowshapes.quad-arrow.png"_ustr 
};
+inline constexpr TabData RID_TAB_CHART_DATALABEL{ 
NC_("RID_TAB_CHART_DATALABEL", "Data Labels"), u"numberformatstandard.png"_ustr 
};
+inline constexpr TabData RID_TAB_CHART_SCALE{ NC_("RID_TAB_CHART_SCALE", 
"Scale"), u"diagramaxisxyz.png"_ustr };
+inline constexpr TabData RID_TAB_CHART_POSITIONING{ 
NC_("RID_TAB_CHART_POSITIONING", "Positioning"), u"grow.png"_ustr };
+inline constexpr TabData RID_TAB_CHART_AXISLABEL{ 
NC_("RID_TAB_CHART_AXISLABEL", "Label"), u"insertfixedtext.png"_ustr };
+inline constexpr TabData RID_TAB_CHART_LAYOUT{ NC_("RID_TAB_CHART_LAYOUT", 
"Layout"), u"cyramid.png"_ustr };
+inline constexpr TabData RID_TAB_CHART_PERSPECTIVE{ 
NC_("RID_TAB_CHART_PERSPECTIVE", "Perspective"), u"window3d.png"_ustr };
+inline constexpr TabData RID_TAB_CHART_APPEARANCE{ 
NC_("RID_TAB_CHART_APPEARANCE", "Appearance"), u"shell3d.png"_ustr };
+inline constexpr TabData RID_TAB_CHART_ILLUMINATION{ 
NC_("RID_TAB_CHART_ILLUMINATION", "Illumination"), u"grafluminance.png"_ustr };
 
 static OUString TabResId(TranslateId aId)
 {

core.git: include/vcl

Reply via email to