diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-05-01 20:34:18 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-05-03 09:12:32 +0200 |
commit | ddef1e2c017b7d8e421dedc1a0ce722ff4208985 (patch) | |
tree | 54e52c86e4e33bcb61eee44706117b1616e99624 /xmloff | |
parent | 0a6d946694e4fcb39228c5e1fec58fcfd8a45989 (diff) |
add o3tl::equalsAscii
Change-Id: I042b8dcadbf7581de325c161763fe35aecde5ca2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133694
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'xmloff')
-rw-r--r-- | xmloff/inc/XMLNumberStylesImport.hxx | 2 | ||||
-rw-r--r-- | xmloff/source/draw/XMLNumberStyles.cxx | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/xmloff/inc/XMLNumberStylesImport.hxx b/xmloff/inc/XMLNumberStylesImport.hxx index 25be98cbb0bb..7ff731245da2 100644 --- a/xmloff/inc/XMLNumberStylesImport.hxx +++ b/xmloff/inc/XMLNumberStylesImport.hxx @@ -40,7 +40,7 @@ class SdXMLNumberFormatImportContext final : public SvXMLNumFormatContext bool compareStyle( const SdXMLFixedDataStyle* pStyle, sal_Int16& nIndex ) const; - void add( std::u16string_view rNumberStyle, bool bLong, bool bTextual, bool bDecimal02, OUString const & rText ); + void add( std::u16string_view rNumberStyle, bool bLong, bool bTextual, bool bDecimal02, std::u16string_view rText ); public: diff --git a/xmloff/source/draw/XMLNumberStyles.cxx b/xmloff/source/draw/XMLNumberStyles.cxx index baf9f1fbf924..48bf04c82419 100644 --- a/xmloff/source/draw/XMLNumberStyles.cxx +++ b/xmloff/source/draw/XMLNumberStyles.cxx @@ -24,6 +24,7 @@ #include <xmloff/namespacemap.hxx> #include <xmloff/xmltoken.hxx> +#include <o3tl/string_view.hxx> #include <sal/log.hxx> #include "sdxmlexp_impl.hxx" @@ -600,7 +601,7 @@ SdXMLNumberFormatImportContext::~SdXMLNumberFormatImportContext() { } -void SdXMLNumberFormatImportContext::add( std::u16string_view rNumberStyle, bool bLong, bool bTextual, bool bDecimal02, OUString const & rText ) +void SdXMLNumberFormatImportContext::add( std::u16string_view rNumberStyle, bool bLong, bool bTextual, bool bDecimal02, std::u16string_view rText ) { if (mnIndex == 16) return; @@ -612,8 +613,8 @@ void SdXMLNumberFormatImportContext::add( std::u16string_view rNumberStyle, bool (pStyleMember->mbLong == bLong) && (pStyleMember->mbTextual == bTextual) && (pStyleMember->mbDecimal02 == bDecimal02) && - ( ( (pStyleMember->mpText == nullptr) && (rText.isEmpty()) ) || - ( pStyleMember->mpText && (rText.equalsAscii( pStyleMember->mpText ) ) ) ) ) + ( ( (pStyleMember->mpText == nullptr) && (rText.empty()) ) || + ( pStyleMember->mpText && (o3tl::equalsAscii( rText, pStyleMember->mpText ) ) ) ) ) { mnElements[mnIndex++] = static_cast<DataStyleNumber>(nIndex + 1); return; |