From bb06f51308428500c9c8d11ae05f0aa03ecc179c Mon Sep 17 00:00:00 2001 From: Noel Date: Wed, 18 Nov 2020 10:10:40 +0200 Subject: loplugin:stringviewparam extend to comparison operators which means that some call sites have to change to use unicode string literals i.e. u"foo" instead of "foo" Change-Id: Ie51c3adf56d343dd1d1710777f9d2a43ee66221c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106125 Tested-by: Jenkins Reviewed-by: Noel Grandin --- toolkit/inc/controls/controlmodelcontainerbase.hxx | 2 +- toolkit/source/controls/controlmodelcontainerbase.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'toolkit') diff --git a/toolkit/inc/controls/controlmodelcontainerbase.hxx b/toolkit/inc/controls/controlmodelcontainerbase.hxx index c2d715dc3b61..a08806ddd450 100644 --- a/toolkit/inc/controls/controlmodelcontainerbase.hxx +++ b/toolkit/inc/controls/controlmodelcontainerbase.hxx @@ -92,7 +92,7 @@ protected: css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; - UnoControlModelHolderVector::iterator ImplFindElement( const OUString& rName ); + UnoControlModelHolderVector::iterator ImplFindElement( std::u16string_view rName ); /// @throws css::lang::IllegalArgumentException /// @throws css::container::ElementExistException diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx index 880b25c53a82..6c5aedde4776 100644 --- a/toolkit/source/controls/controlmodelcontainerbase.cxx +++ b/toolkit/source/controls/controlmodelcontainerbase.cxx @@ -271,7 +271,7 @@ rtl::Reference ControlModelContainerBase::Clone() const return pClone; } -ControlModelContainerBase::UnoControlModelHolderVector::iterator ControlModelContainerBase::ImplFindElement( const OUString& rName ) +ControlModelContainerBase::UnoControlModelHolderVector::iterator ControlModelContainerBase::ImplFindElement( std::u16string_view rName ) { return ::std::find_if( maModels.begin(), maModels.end(), [&](const UnoControlModelHolder& elem) { return elem.second == rName; }); } -- cgit