diff options
author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2020-02-16 18:37:04 +0100 |
---|---|---|
committer | Tomaž Vajngerl <quikee@gmail.com> | 2020-02-22 19:56:17 +0100 |
commit | 3ac9f491c20fb56c4544444d876687dd6d8de231 (patch) | |
tree | 93d979296e5493aa2f4fd875fa9556eff700796b /sc/source/ui/unoobj/nameuno.cxx | |
parent | 6fbfad6b00e8c35346ee59cd32a0d7ccc0d8c19c (diff) |
ScGlobal - change direct access to a static ptr for a getter
pLocalData and pCharClass static veriables on ScGlobal are always
set from SvtSysLocale on init, probably for "faster" access.
This can just be made simpler with access through a getter,
so this introduces a getter for ScGlobal::getCharClassPtr and
ScGlobal::getLocaleDataPtr, where the access is made directly to
SvtSysLocale instance.
In addition all the usages needed to be fixed, which is all over
the calc module.
Change-Id: Ie047b158094e25bbaa2aba15074d7998d9541787
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89249
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'sc/source/ui/unoobj/nameuno.cxx')
-rw-r--r-- | sc/source/ui/unoobj/nameuno.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx index b3a3e65e57ed..de209a3e745d 100644 --- a/sc/source/ui/unoobj/nameuno.cxx +++ b/sc/source/ui/unoobj/nameuno.cxx @@ -122,7 +122,7 @@ ScRangeData* ScNamedRangeObj::GetRangeData_Impl() pNames = pDocShell->GetDocument().GetRangeName(); if (pNames) { - pRet = pNames->findByUpperName(ScGlobal::pCharClass->uppercase(aName)); + pRet = pNames->findByUpperName(ScGlobal::getCharClassPtr()->uppercase(aName)); if (pRet) pRet->ValidateTabRefs(); // adjust relative tab refs to valid tables } @@ -166,7 +166,7 @@ void ScNamedRangeObj::Modify_Impl( const OUString* pNewName, const ScTokenArray* if (!pNames) return; - const ScRangeData* pOld = pNames->findByUpperName(ScGlobal::pCharClass->uppercase(aName)); + const ScRangeData* pOld = pNames->findByUpperName(ScGlobal::getCharClassPtr()->uppercase(aName)); if (!pOld) return; @@ -488,7 +488,7 @@ void SAL_CALL ScNamedRangesObj::addNewByName( const OUString& aName, { ScDocument& rDoc = pDocShell->GetDocument(); ScRangeName* pNames = GetRangeName_Impl(); - if (pNames && !pNames->findByUpperName(ScGlobal::pCharClass->uppercase(aName))) + if (pNames && !pNames->findByUpperName(ScGlobal::getCharClassPtr()->uppercase(aName))) { std::unique_ptr<ScRangeName> pNewRanges(new ScRangeName( *pNames )); // GRAM_API for API compatibility. @@ -543,7 +543,7 @@ void SAL_CALL ScNamedRangesObj::removeByName( const OUString& aName ) ScRangeName* pNames = GetRangeName_Impl(); if (pNames) { - const ScRangeData* pData = pNames->findByUpperName(ScGlobal::pCharClass->uppercase(aName)); + const ScRangeData* pData = pNames->findByUpperName(ScGlobal::getCharClassPtr()->uppercase(aName)); if (pData && lcl_UserVisibleName(*pData)) { std::unique_ptr<ScRangeName> pNewRanges(new ScRangeName(*pNames)); @@ -685,7 +685,7 @@ sal_Bool SAL_CALL ScNamedRangesObj::hasByName( const OUString& aName ) ScRangeName* pNames = GetRangeName_Impl(); if (pNames) { - const ScRangeData* pData = pNames->findByUpperName(ScGlobal::pCharClass->uppercase(aName)); + const ScRangeData* pData = pNames->findByUpperName(ScGlobal::getCharClassPtr()->uppercase(aName)); if (pData && lcl_UserVisibleName(*pData)) return true; } |