summaryrefslogtreecommitdiff
path: root/sc/source/ui/docshell/docsh4.cxx
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>2020-02-16 18:37:04 +0100
committerTomaž Vajngerl <quikee@gmail.com>2020-02-22 19:56:17 +0100
commit3ac9f491c20fb56c4544444d876687dd6d8de231 (patch)
tree93d979296e5493aa2f4fd875fa9556eff700796b /sc/source/ui/docshell/docsh4.cxx
parent6fbfad6b00e8c35346ee59cd32a0d7ccc0d8c19c (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/docshell/docsh4.cxx')
-rw-r--r--sc/source/ui/docshell/docsh4.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index 0d7724a97b0a..d56594ed1895 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -259,7 +259,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
if (bIsNewArea)
{
ScDBCollection* pDBColl = m_aDocument.GetDBCollection();
- if ( !pDBColl || !pDBColl->getNamedDBs().findByUpperName(ScGlobal::pCharClass->uppercase(sTarget)) )
+ if ( !pDBColl || !pDBColl->getNamedDBs().findByUpperName(ScGlobal::getCharClassPtr()->uppercase(sTarget)) )
{
ScAddress aPos;
if ( aPos.Parse( sTarget, &m_aDocument, m_aDocument.GetAddressConvention() ) & ScRefFlags::VALID )
@@ -2349,7 +2349,7 @@ bool ScDocShell::DdeSetData( const OUString& rItem,
ScRangeName* pRange = m_aDocument.GetRangeName();
if( pRange )
{
- const ScRangeData* pData = pRange->findByUpperName(ScGlobal::pCharClass->uppercase(aPos));
+ const ScRangeData* pData = pRange->findByUpperName(ScGlobal::getCharClassPtr()->uppercase(aPos));
if (pData)
{
if( pData->HasType( ScRangeData::Type::RefArea )