diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-09-17 11:24:25 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-09-17 15:03:09 +0200 |
| commit | f9e09ba0513bbd0eaf872a60e6824a5b20229dfa (patch) | |
| tree | d61bf8ef69384ef9b4b10e99f70c68d4f4cdec4c /sc/source/core/data/dpobject.cxx | |
| parent | ce707fc2d3420be9423bb5e8d0300dbb71a5db6e (diff) | |
rather return ref from GetTransliteration
since we never return a nullptr.
Also add a new utility method to simplify the call sites that need to
pick the right collator
Change-Id: I0ecf3ad32a0bf22d9e760620524f41bc18b54fff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122238
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc/source/core/data/dpobject.cxx')
| -rw-r--r-- | sc/source/core/data/dpobject.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index bd80ce3b4765..0e4d583b9391 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -1670,7 +1670,7 @@ bool isAtStart( { OUString aDequoted; bool bParsed = extractAtStart( rList, rMatched, bAllowBracket, pFunc, aDequoted); - if ( bParsed && ScGlobal::GetpTransliteration()->isEqual( aDequoted, rSearch ) ) + if ( bParsed && ScGlobal::GetTransliteration().isEqual( aDequoted, rSearch ) ) { nMatchList = rMatched; // match count in the list string, including quotes nMatchSearch = rSearch.getLength(); @@ -1679,7 +1679,7 @@ bool isAtStart( else { // otherwise look for search string at the start of rList - ScGlobal::GetpTransliteration()->equals( + ScGlobal::GetTransliteration().equals( rList, 0, rList.getLength(), nMatchList, rSearch, 0, rSearch.getLength(), nMatchSearch); } @@ -1904,10 +1904,10 @@ bool ScDPObject::ParseFilters( if (bHasQuery) { // First check given value name against both. - bThisItemFound = ScGlobal::GetpTransliteration()->isEqual( + bThisItemFound = ScGlobal::GetTransliteration().isEqual( aQueryValueName, pItemNamesArr[nItem]); if (!bThisItemFound && pItemValuesArr[nItem] != pItemNamesArr[nItem]) - bThisItemFound = ScGlobal::GetpTransliteration()->isEqual( + bThisItemFound = ScGlobal::GetTransliteration().isEqual( aQueryValueName, pItemValuesArr[nItem]); if (!bThisItemFound && aQueryValueName != aQueryValue) { @@ -1915,10 +1915,10 @@ bool ScDPObject::ParseFilters( // against both. /* TODO: or check only value string against * value string, not against the value name? */ - bThisItemFound = ScGlobal::GetpTransliteration()->isEqual( + bThisItemFound = ScGlobal::GetTransliteration().isEqual( aQueryValue, pItemNamesArr[nItem]); if (!bThisItemFound && pItemValuesArr[nItem] != pItemNamesArr[nItem]) - bThisItemFound = ScGlobal::GetpTransliteration()->isEqual( + bThisItemFound = ScGlobal::GetTransliteration().isEqual( aQueryValue, pItemValuesArr[nItem]); } } |