diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-09-16 15:55:30 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-09-17 08:40:59 +0200 |
| commit | 7fd3c5e8e5897617f1e89fda26f8cdbd4092071d (patch) | |
| tree | 60704a90ddff313e6702925224a747cac0d6f1cc /formula | |
| parent | 388685ea72fc22bd375e9f31a339632e175f4290 (diff) | |
remove GetCharClassPtr from SvtSysLocale
we already have GetCharClass and we never return a nullptr
Change-Id: I3cb79bc60be614c0474ecfdaad17991f2ecb6368
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122208
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'formula')
| -rw-r--r-- | formula/source/ui/dlg/FormulaHelper.cxx | 2 | ||||
| -rw-r--r-- | formula/source/ui/dlg/funcpage.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/formula/source/ui/dlg/FormulaHelper.cxx b/formula/source/ui/dlg/FormulaHelper.cxx index 709a927e5040..15d3b411a4a2 100644 --- a/formula/source/ui/dlg/FormulaHelper.cxx +++ b/formula/source/ui/dlg/FormulaHelper.cxx @@ -69,7 +69,7 @@ FormulaHelper::FormulaHelper(const IFunctionManager* _pFunctionManager) ,arrayOpen(_pFunctionManager->getSingleToken(IFunctionManager::eArrayOpen)) ,arrayClose(_pFunctionManager->getSingleToken(IFunctionManager::eArrayClose)) { - m_pCharClass = m_pSysLocale->GetCharClassPtr(); + m_pCharClass = &m_pSysLocale->GetCharClass(); } sal_Int32 FormulaHelper::GetCategoryCount() const diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx index 338f37bd2dd7..f591c73a21e6 100644 --- a/formula/source/ui/dlg/funcpage.cxx +++ b/formula/source/ui/dlg/funcpage.cxx @@ -132,8 +132,8 @@ void FuncPage::UpdateFunctionList(const OUString& aStr) else { SvtSysLocale aSysLocale; - const CharClass* pCharClass = aSysLocale.GetCharClassPtr(); - const OUString aSearchStr(pCharClass->uppercase(aStr)); + const CharClass& rCharClass = aSysLocale.GetCharClass(); + const OUString aSearchStr(rCharClass.uppercase(aStr)); const sal_uInt32 nCategoryCount = m_pFunctionManager->getCount(); // Category listbox holds additional entries for Last Used and All, so @@ -159,7 +159,7 @@ void FuncPage::UpdateFunctionList(const OUString& aStr) for (sal_uInt32 j = 0; j < nFunctionCount; ++j) { TFunctionDesc pDesc(pCategory->getFunction(j)); - if (pCharClass->uppercase(pDesc->getFunctionName()).indexOf(aSearchStr) >= 0) + if (rCharClass.uppercase(pDesc->getFunctionName()).indexOf(aSearchStr) >= 0) { if (!pDesc->isHidden()) { |