From 8e6ec5ebcc523a189238a90fd9237872d67085f9 Mon Sep 17 00:00:00 2001 From: Noel Date: Fri, 18 Dec 2020 08:57:20 +0200 Subject: use more string_view in IsXMLToken Change-Id: Ib84e2e7db4b4e6e2486dd024d60057d9d42ff4b0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107932 Tested-by: Jenkins Reviewed-by: Noel Grandin --- include/xmloff/families.hxx | 10 +++++----- include/xmloff/xmlstyle.hxx | 2 +- include/xmloff/xmltoken.hxx | 2 +- include/xmloff/xmluconv.hxx | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'include/xmloff') diff --git a/include/xmloff/families.hxx b/include/xmloff/families.hxx index 253472220168..58143393bc9d 100644 --- a/include/xmloff/families.hxx +++ b/include/xmloff/families.hxx @@ -33,14 +33,14 @@ #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 "graphic" +#define XML_STYLE_FAMILY_SD_GRAPHICS_NAME u"graphic" #define XML_STYLE_FAMILY_SD_GRAPHICS_PREFIX "gr" -#define XML_STYLE_FAMILY_SD_PRESENTATION_NAME "presentation" +#define XML_STYLE_FAMILY_SD_PRESENTATION_NAME u"presentation" #define XML_STYLE_FAMILY_SD_PRESENTATION_PREFIX "pr" -#define XML_STYLE_FAMILY_SD_POOL_NAME "default" -#define XML_STYLE_FAMILY_SD_DRAWINGPAGE_NAME "drawing-page" +#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 "chart" +#define XML_STYLE_FAMILY_SCH_CHART_NAME u"chart" #define XML_STYLE_FAMILY_SCH_CHART_PREFIX "ch" #define XML_STYLE_FAMILY_CONTROL_PREFIX "ctrl" diff --git a/include/xmloff/xmlstyle.hxx b/include/xmloff/xmlstyle.hxx index d0b820258ba4..184fd19eb379 100644 --- a/include/xmloff/xmlstyle.hxx +++ b/include/xmloff/xmlstyle.hxx @@ -178,7 +178,7 @@ public: XmlStyleFamily nFamily, const OUString& rName, bool bCreateIndex = false ) const; - static XmlStyleFamily GetFamily( const OUString& rFamily ); + static XmlStyleFamily GetFamily( std::u16string_view rFamily ); virtual rtl::Reference < SvXMLImportPropertyMapper > GetImportPropertyMapper( XmlStyleFamily nFamily ) const; diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx index 0a8a12381240..19978788ec5f 100644 --- a/include/xmloff/xmltoken.hxx +++ b/include/xmloff/xmltoken.hxx @@ -3407,7 +3407,7 @@ namespace xmloff::token { /// compare eToken to the string XMLOFF_DLLPUBLIC bool IsXMLToken( - const OUString& rString, + std::u16string_view rString, enum XMLTokenEnum eToken ); /// compare eToken to the string diff --git a/include/xmloff/xmluconv.hxx b/include/xmloff/xmluconv.hxx index daca3b617f7f..6c391d74fe7f 100644 --- a/include/xmloff/xmluconv.hxx +++ b/include/xmloff/xmluconv.hxx @@ -265,7 +265,7 @@ public: /** convert num-format and num-letter-sync values to NumberingType */ bool convertNumFormat( sal_Int16& rType, const OUString& rNumFormat, - const OUString& rNumLetterSync, + std::u16string_view rNumLetterSync, bool bNumberNone = false ) const; /** convert NumberingType to num-format and num-letter-sync values */ -- cgit