diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-08-02 17:53:06 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2018-11-15 15:41:22 +0100 |
| commit | 5109f63c66dc8b91e7ff4ac62ebec59ece5eb3a9 (patch) | |
| tree | 3cddb06bb628d5f0ad974b142502c4dd28f7ba05 /sw/inc/calc.hxx | |
| parent | 386398ed194c1fd175bbc0c6ef1fb058c228a4fc (diff) | |
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 <vmiklos@collabora.co.uk>
Tested-by: Jenkins
(cherry picked from commit 6ca5d288ca810f128163da121777ee2e11c46edc)
Conflicts:
sw/qa/extras/layout/layout.cxx
sw/source/core/fields/usrfld.cxx
Change-Id: I26ff18e74f477729a66b066c4baf6d215a7685bc
Diffstat (limited to 'sw/inc/calc.hxx')
| -rw-r--r-- | sw/inc/calc.hxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx index 6b85dbdf0968..fd68e0708ced 100644 --- a/sw/inc/calc.hxx +++ b/sw/inc/calc.hxx @@ -197,6 +197,7 @@ public: bool Push(const SwUserFieldType* pUserFieldType); void Pop(); + CharClass* GetCharClass(); void SetCalcError( SwCalcError eErr ) { eError = eErr; } bool IsCalcError() const { return 0 != eError; } |