summaryrefslogtreecommitdiff
path: root/linguistic
diff options
context:
space:
mode:
authorNoel <noelgrandin@gmail.com>2020-11-18 10:10:40 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-11-24 09:45:04 +0100
commitbb06f51308428500c9c8d11ae05f0aa03ecc179c (patch)
treeb18620e8572ed6d4c43c8605660d59f5f7a7e531 /linguistic
parent42e8e16cf93dcf944e5c1106f76aaa32057c0397 (diff)
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 <noel.grandin@collabora.co.uk>
Diffstat (limited to 'linguistic')
-rw-r--r--linguistic/source/convdic.cxx4
-rw-r--r--linguistic/source/convdic.hxx4
-rw-r--r--linguistic/source/convdiclist.cxx12
-rw-r--r--linguistic/source/spelldsp.cxx4
-rw-r--r--linguistic/source/spelldta.cxx2
5 files changed, 13 insertions, 13 deletions
diff --git a/linguistic/source/convdic.cxx b/linguistic/source/convdic.cxx
index 4803dd3ad74d..573e2eb04517 100644
--- a/linguistic/source/convdic.cxx
+++ b/linguistic/source/convdic.cxx
@@ -244,7 +244,7 @@ void ConvDic::Save()
}
-ConvMap::iterator ConvDic::GetEntry( ConvMap &rMap, const OUString &rFirstText, const OUString &rSecondText )
+ConvMap::iterator ConvDic::GetEntry( ConvMap &rMap, const OUString &rFirstText, std::u16string_view rSecondText )
{
pair< ConvMap::iterator, ConvMap::iterator > aRange =
rMap.equal_range( rFirstText );
@@ -260,7 +260,7 @@ ConvMap::iterator ConvDic::GetEntry( ConvMap &rMap, const OUString &rFirstText,
}
-bool ConvDic::HasEntry( const OUString &rLeftText, const OUString &rRightText )
+bool ConvDic::HasEntry( const OUString &rLeftText, std::u16string_view rRightText )
{
if (bNeedEntries)
Load();
diff --git a/linguistic/source/convdic.hxx b/linguistic/source/convdic.hxx
index ed26c81f244b..df0cd955a4c9 100644
--- a/linguistic/source/convdic.hxx
+++ b/linguistic/source/convdic.hxx
@@ -77,7 +77,7 @@ protected:
ConvDic(const ConvDic &);
ConvDic & operator = (const ConvDic &);
- static ConvMap::iterator GetEntry( ConvMap &rMap, const OUString &rFirstText, const OUString &rSecondText );
+ static ConvMap::iterator GetEntry( ConvMap &rMap, const OUString &rFirstText, std::u16string_view rSecondText );
void Load();
void Save();
@@ -116,7 +116,7 @@ public:
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
- bool HasEntry( const OUString &rLeftText, const OUString &rRightText );
+ bool HasEntry( const OUString &rLeftText, std::u16string_view rRightText );
void AddEntry( const OUString &rLeftText, const OUString &rRightText );
void RemoveEntry( const OUString &rLeftText, const OUString &rRightText );
};
diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx
index fd291e2130f2..afea6469ed38 100644
--- a/linguistic/source/convdiclist.cxx
+++ b/linguistic/source/convdiclist.cxx
@@ -74,7 +74,7 @@ class ConvDicNameContainer :
{
std::vector< uno::Reference< XConversionDictionary > > aConvDics;
- sal_Int32 GetIndexByName_Impl( const OUString& rName );
+ sal_Int32 GetIndexByName_Impl( std::u16string_view rName );
public:
ConvDicNameContainer();
@@ -105,7 +105,7 @@ public:
void FlushDics() const;
sal_Int32 GetCount() const { return aConvDics.size(); }
- uno::Reference< XConversionDictionary > GetByName( const OUString& rName );
+ uno::Reference< XConversionDictionary > GetByName( std::u16string_view rName );
const uno::Reference< XConversionDictionary >& GetByIndex( sal_Int32 nIdx )
{
@@ -138,7 +138,7 @@ void ConvDicNameContainer::FlushDics() const
}
sal_Int32 ConvDicNameContainer::GetIndexByName_Impl(
- const OUString& rName )
+ std::u16string_view rName )
{
sal_Int32 nRes = -1;
sal_Int32 nLen = aConvDics.size();
@@ -151,7 +151,7 @@ sal_Int32 ConvDicNameContainer::GetIndexByName_Impl(
}
uno::Reference< XConversionDictionary > ConvDicNameContainer::GetByName(
- const OUString& rName )
+ std::u16string_view rName )
{
uno::Reference< XConversionDictionary > xRes;
sal_Int32 nIdx = GetIndexByName_Impl( rName );
@@ -370,9 +370,9 @@ ConvDicNameContainer & ConvDicList::GetNameContainer()
// since there is no UI to active/deactivate the dictionaries
// for chinese text conversion they should be activated by default
uno::Reference< XConversionDictionary > xS2TDic =
- mxNameContainer->GetByName( "ChineseS2T" );
+ mxNameContainer->GetByName( u"ChineseS2T" );
uno::Reference< XConversionDictionary > xT2SDic =
- mxNameContainer->GetByName( "ChineseT2S" );
+ mxNameContainer->GetByName( u"ChineseT2S" );
if (xS2TDic.is())
xS2TDic->setActive( true );
if (xT2SDic.is())
diff --git a/linguistic/source/spelldsp.cxx b/linguistic/source/spelldsp.cxx
index fb58843a0efb..dbece3def648 100644
--- a/linguistic/source/spelldsp.cxx
+++ b/linguistic/source/spelldsp.cxx
@@ -59,7 +59,7 @@ class ProposalList
{
std::vector< OUString > aVec;
- bool HasEntry( const OUString &rText ) const;
+ bool HasEntry( std::u16string_view rText ) const;
public:
ProposalList() {}
@@ -76,7 +76,7 @@ public:
}
-bool ProposalList::HasEntry( const OUString &rText ) const
+bool ProposalList::HasEntry( std::u16string_view rText ) const
{
bool bFound = false;
size_t nCnt = aVec.size();
diff --git a/linguistic/source/spelldta.cxx b/linguistic/source/spelldta.cxx
index 7588cb949eda..7ae3d3d7f42d 100644
--- a/linguistic/source/spelldta.cxx
+++ b/linguistic/source/spelldta.cxx
@@ -45,7 +45,7 @@ namespace linguistic
static bool SeqHasEntry(
const std::vector< OUString > &rSeq,
- const OUString &rTxt)
+ std::u16string_view rTxt)
{
bool bRes = false;
sal_Int32 nLen = rSeq.size();