summaryrefslogtreecommitdiff
path: root/sc/inc
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@collabora.com>2018-10-12 11:47:02 +0200
committerLuboš Luňák <l.lunak@collabora.com>2018-11-13 13:15:23 +0100
commit9553f2afd0527ba435dae7bf4506c620a943b150 (patch)
tree561cbb38dde5138a9498a15273eed92898fe5f9a /sc/inc
parentb15ded2ee474d6531e2a9b358d57bff9a6902a92 (diff)
thread-safe ScGlobal::GetUnitConverter()
Triggered by sc/qa/unit/data/functions/mathematical/fods/convert_ooo.fods with SC_FORCE_CALCULATION=threads. Change-Id: Ibedb32ee03519911650a0deee67011efeda57c93 Reviewed-on: https://gerrit.libreoffice.org/63175 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'sc/inc')
-rw-r--r--sc/inc/global.hxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index c051f54a4148..7c02660300e5 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -516,7 +516,7 @@ class ScGlobal
static ScFunctionList* pStarCalcFunctionList;
static ScFunctionMgr* pStarCalcFunctionMgr;
- static ScUnitConverter* pUnitConverter;
+ static std::atomic<ScUnitConverter*> pUnitConverter;
static SvNumberFormatter* pEnglishFormatter; // for UNO / XML export