From 7e80dd415c7dc8af2d4e61fcfa4f10ebe1dfb71d Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Thu, 2 Aug 2018 17:53:06 +0200 Subject: sw user field type: fix locale of string -> float conversion The key part is the SwUserFieldType::GetValue() hunk, the field type has to always use the same locale, which means if we get an SwCalc reference that works with the document or field locale that has to be switched temporarily. Reviewed-on: https://gerrit.libreoffice.org/58492 Reviewed-by: Miklos Vajna Tested-by: Jenkins (cherry picked from commit 6ca5d288ca810f128163da121777ee2e11c46edc) Conflicts: sw/qa/extras/layout/layout.cxx Change-Id: I26ff18e74f477729a66b066c4baf6d215a7685bc --- sw/source/core/bastyp/calc.cxx | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'sw/source/core/bastyp/calc.cxx') diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx index 0edb21517878..1532a3a898b7 100644 --- a/sw/source/core/bastyp/calc.cxx +++ b/sw/source/core/bastyp/calc.cxx @@ -637,6 +637,11 @@ void SwCalc::Pop() m_aRekurStack.pop_back(); } +CharClass* SwCalc::GetCharClass() +{ + return m_pCharClass; +} + SwCalcOper SwCalc::GetToken() { if( m_nCommandPos >= m_sCommand.getLength() ) -- cgit