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 /oox | |
| 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 'oox')
| -rw-r--r-- | oox/source/ppt/pptfilterhelpers.cxx | 4 | ||||
| -rw-r--r-- | oox/source/ppt/slidetransition.cxx | 2 | ||||
| -rw-r--r-- | oox/source/ppt/timenodelistcontext.cxx | 7 |
3 files changed, 7 insertions, 6 deletions
diff --git a/oox/source/ppt/pptfilterhelpers.cxx b/oox/source/ppt/pptfilterhelpers.cxx index fff1d3ddd3b5..054bf6260c07 100644 --- a/oox/source/ppt/pptfilterhelpers.cxx +++ b/oox/source/ppt/pptfilterhelpers.cxx @@ -127,13 +127,13 @@ namespace oox::ppt { return aList; } - const transition* transition::find( const OUString& rName ) + const transition* transition::find( std::u16string_view rName ) { const transition* p = transition::getList(); while( p->mpName ) { - if( rName.equalsAscii( p->mpName ) ) + if( o3tl::equalsAscii( rName, p->mpName ) ) return p; p++; diff --git a/oox/source/ppt/slidetransition.cxx b/oox/source/ppt/slidetransition.cxx index 3ec5100583c1..5221c2f68710 100644 --- a/oox/source/ppt/slidetransition.cxx +++ b/oox/source/ppt/slidetransition.cxx @@ -52,7 +52,7 @@ namespace oox::ppt { } - SlideTransition::SlideTransition(const OUString & sFilterName) + SlideTransition::SlideTransition(std::u16string_view sFilterName) : mnTransitionType( 0 ) , mnTransitionSubType( 0 ) , mbTransitionDirectionNormal( true ) diff --git a/oox/source/ppt/timenodelistcontext.cxx b/oox/source/ppt/timenodelistcontext.cxx index ae35e8e4d7eb..f58a1e205ae2 100644 --- a/oox/source/ppt/timenodelistcontext.cxx +++ b/oox/source/ppt/timenodelistcontext.cxx @@ -38,6 +38,7 @@ #include <oox/ppt/slidetransition.hxx> #include <oox/token/namespaces.hxx> #include <oox/token/tokens.hxx> +#include <o3tl/string_view.hxx> #include "animvariantcontext.hxx" #include "commonbehaviorcontext.hxx" @@ -59,13 +60,13 @@ using ::com::sun::star::beans::NamedValue; namespace { - oox::ppt::AnimationAttributeEnum getAttributeEnumByAPIName(const OUString &rAPIName) + oox::ppt::AnimationAttributeEnum getAttributeEnumByAPIName(std::u16string_view rAPIName) { oox::ppt::AnimationAttributeEnum eResult = oox::ppt::AnimationAttributeEnum::UNKNOWN; const oox::ppt::ImplAttributeNameConversion *attrConv = oox::ppt::getAttributeConversionList(); while(attrConv->mpAPIName != nullptr) { - if(rAPIName.equalsAscii(attrConv->mpAPIName)) + if(o3tl::equalsAscii(rAPIName, attrConv->mpAPIName)) { eResult = attrConv->meAttribute; break; @@ -82,7 +83,7 @@ namespace { aAny >>= aNameList; // only get first token. - return oox::ppt::convertAnimationValue(getAttributeEnumByAPIName(aNameList.getToken(0, ';')), rAny); + return oox::ppt::convertAnimationValue(getAttributeEnumByAPIName(o3tl::getToken(aNameList, 0, ';')), rAny); } css::uno::Any convertPointPercent(const css::awt::Point& rPoint) |