diff options
| author | Tor Lillqvist <tml@iki.fi> | 2021-12-02 12:37:07 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2021-12-04 21:54:56 +0100 |
| commit | d3ecf88b2820edfab0b5bba6fca5790d9ea7505e (patch) | |
| tree | 4f454845667ab82c689666007974fdc3f8a9126b /basic/source/sbx/sbxuint.cxx | |
| parent | nss: upgrade to release 3.73 (diff) | |
| download | core-d3ecf88b2820edfab0b5bba6fca5790d9ea7505e.tar.gz core-d3ecf88b2820edfab0b5bba6fca5790d9ea7505e.zip | |
Make the tdf#97983 changes to BASIC optional based on an environment variable
If you want to keep the string to floating point conversion semantics
in BASIC as they were in LibreOffice 6, set the
LIBREOFFICE6FLOATINGPOINTMODE environment variable to some non-empty
value.
Change-Id: I13d6d5d834e1bb81ef8df489db2b1da79f01dfc5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125803
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'basic/source/sbx/sbxuint.cxx')
| -rw-r--r-- | basic/source/sbx/sbxuint.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/basic/source/sbx/sbxuint.cxx b/basic/source/sbx/sbxuint.cxx index a3751e2661a4..4270fb72608b 100644 --- a/basic/source/sbx/sbxuint.cxx +++ b/basic/source/sbx/sbxuint.cxx @@ -23,6 +23,7 @@ #include <vcl/errcode.hxx> #include <basic/sberrors.hxx> #include "sbxconv.hxx" +#include "rtlproto.hxx" sal_uInt16 ImpGetUShort( const SbxValues* p ) { @@ -154,7 +155,7 @@ start: { double d; SbxDataType t; - if( ImpScan( *p->pOUString, d, t, nullptr, true ) != ERRCODE_NONE ) + if( ImpScan( *p->pOUString, d, t, nullptr, !LibreOffice6FloatingPointMode() ) != ERRCODE_NONE ) nRes = 0; else if( !o3tl::convertsToAtMost(o3tl::roundAway(d), SbxMAXUINT) ) { |