summaryrefslogtreecommitdiff
path: root/sc/inc
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/inc
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/inc')
-rw-r--r--sc/inc/global.hxx7
1 files changed, 2 insertions, 5 deletions
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index 0fef008448d5..ca8591990e4d 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -537,11 +537,8 @@ class ScGlobal
public:
static SvtSysLocale* pSysLocale;
- // for faster access a pointer to the single instance provided by SvtSysLocale
- SC_DLLPUBLIC static const CharClass* pCharClass;
- // for faster access a pointer to the single instance provided by SvtSysLocale
- SC_DLLPUBLIC static const LocaleDataWrapper* pLocaleData;
- SC_DLLPUBLIC static const LocaleDataWrapper* GetpLocaleData();
+ SC_DLLPUBLIC static const LocaleDataWrapper* getLocaleDataPtr();
+ SC_DLLPUBLIC static const CharClass* getCharClassPtr();
static CalendarWrapper* GetCalendar();
SC_DLLPUBLIC static CollatorWrapper* GetCollator();