diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-12-03 12:12:24 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-12-03 17:58:24 +0100 |
commit | 9b0202bf43133fd440fae62ccb4727dafb2da211 (patch) | |
tree | a0829601a140e382c649f73bdbdc5646777557e5 /include/xmloff | |
parent | 30f41d99af6cf84b5993d5c5c24fc49ef39bd756 (diff) |
loplugin:stringliteraldefine in xmloff
Change-Id: I9216c18d3ba4a4a528a49198fdfe547a66c06b6b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126284
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/xmloff')
-rw-r--r-- | include/xmloff/ProgressBarHelper.hxx | 8 | ||||
-rw-r--r-- | include/xmloff/families.hxx | 38 | ||||
-rw-r--r-- | include/xmloff/odffields.hxx | 37 | ||||
-rw-r--r-- | include/xmloff/xmlnumfe.hxx | 2 | ||||
-rw-r--r-- | include/xmloff/xmlnumfi.hxx | 2 |
5 files changed, 45 insertions, 42 deletions
diff --git a/include/xmloff/ProgressBarHelper.hxx b/include/xmloff/ProgressBarHelper.hxx index aa1b3585a3b0..7fe92ab9bb74 100644 --- a/include/xmloff/ProgressBarHelper.hxx +++ b/include/xmloff/ProgressBarHelper.hxx @@ -24,10 +24,10 @@ #include <xmloff/dllapi.h> #include <com/sun/star/task/XStatusIndicator.hpp> -#define XML_PROGRESSRANGE "ProgressRange" -#define XML_PROGRESSMAX "ProgressMax" -#define XML_PROGRESSCURRENT "ProgressCurrent" -#define XML_PROGRESSREPEAT "ProgressRepeat" +inline constexpr OUStringLiteral XML_PROGRESSRANGE = u"ProgressRange"; +inline constexpr OUStringLiteral XML_PROGRESSMAX = u"ProgressMax"; +inline constexpr OUStringLiteral XML_PROGRESSCURRENT = u"ProgressCurrent"; +inline constexpr OUStringLiteral XML_PROGRESSREPEAT = u"ProgressRepeat"; class XMLOFF_DLLPUBLIC ProgressBarHelper { diff --git a/include/xmloff/families.hxx b/include/xmloff/families.hxx index 58143393bc9d..05e355a3ce7d 100644 --- a/include/xmloff/families.hxx +++ b/include/xmloff/families.hxx @@ -23,26 +23,26 @@ used in the SvXMLAutoStylePoolP. */ -#define XML_STYLE_FAMILY_PAGE_MASTER_NAME "page-layout" -#define XML_STYLE_FAMILY_PAGE_MASTER_PREFIX "pm" -#define XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME "table" -#define XML_STYLE_FAMILY_TABLE_TABLE_STYLES_PREFIX "ta" -#define XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME "table-column" -#define XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_PREFIX "co" -#define XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME "table-row" -#define XML_STYLE_FAMILY_TABLE_ROW_STYLES_PREFIX "ro" -#define XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME "table-cell" -#define XML_STYLE_FAMILY_TABLE_CELL_STYLES_PREFIX "ce" -#define XML_STYLE_FAMILY_SD_GRAPHICS_NAME u"graphic" -#define XML_STYLE_FAMILY_SD_GRAPHICS_PREFIX "gr" -#define XML_STYLE_FAMILY_SD_PRESENTATION_NAME u"presentation" -#define XML_STYLE_FAMILY_SD_PRESENTATION_PREFIX "pr" +inline constexpr OUStringLiteral XML_STYLE_FAMILY_PAGE_MASTER_NAME = u"page-layout"; +inline constexpr OUStringLiteral XML_STYLE_FAMILY_PAGE_MASTER_PREFIX = u"pm"; +inline constexpr OUStringLiteral XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME = u"table"; +inline constexpr OUStringLiteral XML_STYLE_FAMILY_TABLE_TABLE_STYLES_PREFIX = u"ta"; +inline constexpr OUStringLiteral XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME = u"table-column"; +inline constexpr OUStringLiteral XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_PREFIX = u"co"; +inline constexpr OUStringLiteral XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME = u"table-row"; +inline constexpr OUStringLiteral XML_STYLE_FAMILY_TABLE_ROW_STYLES_PREFIX = u"ro"; +inline constexpr OUStringLiteral XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME = u"table-cell"; +inline constexpr OUStringLiteral XML_STYLE_FAMILY_TABLE_CELL_STYLES_PREFIX = u"ce"; +inline constexpr OUStringLiteral XML_STYLE_FAMILY_SD_GRAPHICS_NAME = u"graphic"; +inline constexpr OUStringLiteral XML_STYLE_FAMILY_SD_GRAPHICS_PREFIX = u"gr"; +inline constexpr OUStringLiteral XML_STYLE_FAMILY_SD_PRESENTATION_NAME = u"presentation"; +inline constexpr OUStringLiteral XML_STYLE_FAMILY_SD_PRESENTATION_PREFIX = u"pr"; #define XML_STYLE_FAMILY_SD_POOL_NAME u"default" -#define XML_STYLE_FAMILY_SD_DRAWINGPAGE_NAME u"drawing-page" -#define XML_STYLE_FAMILY_SD_DRAWINGPAGE_PREFIX "dp" -#define XML_STYLE_FAMILY_SCH_CHART_NAME u"chart" -#define XML_STYLE_FAMILY_SCH_CHART_PREFIX "ch" -#define XML_STYLE_FAMILY_CONTROL_PREFIX "ctrl" +inline constexpr OUStringLiteral XML_STYLE_FAMILY_SD_DRAWINGPAGE_NAME = u"drawing-page"; +inline constexpr OUStringLiteral XML_STYLE_FAMILY_SD_DRAWINGPAGE_PREFIX = u"dp"; +inline constexpr OUStringLiteral XML_STYLE_FAMILY_SCH_CHART_NAME = u"chart"; +inline constexpr OUStringLiteral XML_STYLE_FAMILY_SCH_CHART_PREFIX = u"ch"; +inline constexpr OUStringLiteral XML_STYLE_FAMILY_CONTROL_PREFIX = u"ctrl"; enum class XmlStyleFamily { diff --git a/include/xmloff/odffields.hxx b/include/xmloff/odffields.hxx index 89c2e6174335..8a0b103ba9b8 100644 --- a/include/xmloff/odffields.hxx +++ b/include/xmloff/odffields.hxx @@ -20,24 +20,27 @@ #ifndef INCLUDED_XMLOFF_ODFFIELDS_HXX #define INCLUDED_XMLOFF_ODFFIELDS_HXX -#define ODF_FORMTEXT "vnd.oasis.opendocument.field.FORMTEXT" +inline constexpr OUStringLiteral ODF_FORMTEXT = u"vnd.oasis.opendocument.field.FORMTEXT"; #define ODF_FORMFIELD_DEFAULT_LENGTH 5 -#define ODF_FORMCHECKBOX u"vnd.oasis.opendocument.field.FORMCHECKBOX" -#define ODF_FORMCHECKBOX_HELPTEXT "Checkbox_HelpText" -#define ODF_FORMCHECKBOX_NAME "Checkbox_Name" -#define ODF_FORMCHECKBOX_RESULT "Checkbox_Checked" +inline constexpr OUStringLiteral ODF_FORMCHECKBOX = u"vnd.oasis.opendocument.field.FORMCHECKBOX"; +inline constexpr OUStringLiteral ODF_FORMCHECKBOX_HELPTEXT = u"Checkbox_HelpText"; +inline constexpr OUStringLiteral ODF_FORMCHECKBOX_NAME = u"Checkbox_Name"; +inline constexpr OUStringLiteral ODF_FORMCHECKBOX_RESULT = u"Checkbox_Checked"; -#define ODF_FORMDROPDOWN u"vnd.oasis.opendocument.field.FORMDROPDOWN" -#define ODF_FORMDROPDOWN_LISTENTRY "Dropdown_ListEntry" -#define ODF_FORMDROPDOWN_RESULT "Dropdown_Selected" +inline constexpr OUStringLiteral ODF_FORMDROPDOWN = u"vnd.oasis.opendocument.field.FORMDROPDOWN"; +inline constexpr OUStringLiteral ODF_FORMDROPDOWN_LISTENTRY = u"Dropdown_ListEntry"; +inline constexpr OUStringLiteral ODF_FORMDROPDOWN_RESULT = u"Dropdown_Selected"; #define ODF_FORMDROPDOWN_ENTRY_COUNT_LIMIT 25 -#define ODF_FORMDATE "vnd.oasis.opendocument.field.FORMDATE" -#define ODF_FORMDATE_DATEFORMAT "DateField_DateFormat" // e.g. "MM.DD.YY" -#define ODF_FORMDATE_DATEFORMAT_LANGUAGE "DateField_DateFormat_Language" // e.g. "en-US", "hu-HU" -#define ODF_FORMDATE_CURRENTDATE "DateField_CurrentDate" // date string in a specific format -#define ODF_FORMDATE_CURRENTDATE_FORMAT u"YYYY-MM-DD" // Coming from MSO +inline constexpr OUStringLiteral ODF_FORMDATE = u"vnd.oasis.opendocument.field.FORMDATE"; +inline constexpr OUStringLiteral ODF_FORMDATE_DATEFORMAT + = u"DateField_DateFormat"; // e.g. "MM.DD.YY"; +inline constexpr OUStringLiteral ODF_FORMDATE_DATEFORMAT_LANGUAGE + = u"DateField_DateFormat_Language"; // e.g. "en-US", "hu-HU"; +inline constexpr OUStringLiteral ODF_FORMDATE_CURRENTDATE + = u"DateField_CurrentDate"; // date string in a specific format +inline constexpr OUStringLiteral ODF_FORMDATE_CURRENTDATE_FORMAT = u"YYYY-MM-DD"; // Coming from MSO #define ODF_FORMDATE_CURRENTDATE_LANGUAGE LANGUAGE_ENGLISH_US #define ODF_TOC "vnd.oasis.opendocument.field.TOC" @@ -46,10 +49,10 @@ #define ODF_PAGEREF "vnd.oasis.opendocument.field.PAGEREF" -#define ODF_UNHANDLED "vnd.oasis.opendocument.field.UNHANDLED" -#define ODF_OLE_PARAM "vnd.oasis.opendocument.field.ole" -#define ODF_ID_PARAM "vnd.oasis.opendocument.field.id" -#define ODF_CODE_PARAM "vnd.oasis.opendocument.field.code" +inline constexpr OUStringLiteral ODF_UNHANDLED = u"vnd.oasis.opendocument.field.UNHANDLED"; +inline constexpr OUStringLiteral ODF_OLE_PARAM = u"vnd.oasis.opendocument.field.ole"; +inline constexpr OUStringLiteral ODF_ID_PARAM = u"vnd.oasis.opendocument.field.id"; +inline constexpr OUStringLiteral ODF_CODE_PARAM = u"vnd.oasis.opendocument.field.code"; #endif // INCLUDED_XMLOFF_ODFFIELDS_HXX diff --git a/include/xmloff/xmlnumfe.hxx b/include/xmloff/xmlnumfe.hxx index 2949aed76679..38216a073107 100644 --- a/include/xmloff/xmlnumfe.hxx +++ b/include/xmloff/xmlnumfe.hxx @@ -32,7 +32,7 @@ namespace com::sun::star::lang { struct Locale; } namespace com::sun::star::uno { template <typename > class Reference; } namespace com::sun::star::util { class XNumberFormatsSupplier; } -#define XML_WRITTENNUMBERSTYLES "WrittenNumberStyles" +inline constexpr OUStringLiteral XML_WRITTENNUMBERSTYLES = u"WrittenNumberStyles"; class Color; class LocaleDataWrapper; diff --git a/include/xmloff/xmlnumfi.hxx b/include/xmloff/xmlnumfi.hxx index d45a1aaa83e2..9a18893df3c6 100644 --- a/include/xmloff/xmlnumfi.hxx +++ b/include/xmloff/xmlnumfi.hxx @@ -33,7 +33,7 @@ namespace com::sun::star::uno { class XComponentContext; } namespace com::sun::star::util { class XNumberFormatsSupplier; } namespace com::sun::star::xml::sax { class XAttributeList; } -#define XML_NUMBERSTYLES "NumberStyles" +inline constexpr OUStringLiteral XML_NUMBERSTYLES = u"NumberStyles"; enum class SvXMLStylesTokens { |