[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - forms/source

[Julien Nabet (via logerrit)]

 forms/source/xforms/convert.cxx   |    2 +-
 forms/source/xforms/datatypes.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 23f54f7089eea0fb500affbed795254cb4ed6a78
Author:     Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Fri Apr 21 10:13:26 2023 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Apr 22 10:22:38 2023 +0200

    tdf#116451: XML Form: adding 2 values of decimal-fields gives wrong result
    
    Since, depending of the localization decimal separator may be ",",
    replace "," by "." before calling ::rtl::math::stringToDouble
    
    Change-Id: I461f3bdf83019d066735e10b3b6b6784e006bc7f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150750
    Tested-by: Jenkins
    (cherry picked from commit 50837fdd60d3d20b5025d94e243b09d92a166fb4)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150728
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/forms/source/xforms/convert.cxx b/forms/source/xforms/convert.cxx
index 28d30885fc7d..24c1eb869639 100644
--- a/forms/source/xforms/convert.cxx
+++ b/forms/source/xforms/convert.cxx
@@ -77,7 +77,7 @@ namespace
     {
         rtl_math_ConversionStatus eStatus;
         double f = rtl::math::stringToDouble(
-            rString, '.', ',', &eStatus );
+            rString.replace(',','.'), '.', ',', &eStatus );
         return ( eStatus == rtl_math_ConversionStatus_Ok ) ? Any( f ) : Any();
     }
 
diff --git a/forms/source/xforms/datatypes.cxx 
b/forms/source/xforms/datatypes.cxx
index c372298f0e5f..7d1c9bc126b8 100644
--- a/forms/source/xforms/datatypes.cxx
+++ b/forms/source/xforms/datatypes.cxx
@@ -403,7 +403,7 @@ namespace xforms
         rtl_math_ConversionStatus eStatus;
         sal_Int32 nEnd;
         double f = ::rtl::math::stringToDouble(
-            rValue, '.', u'\0', &eStatus, &nEnd );
+            rValue.replace(',','.'), '.', u'\0', &eStatus, &nEnd );
 
         // error checking...
         bool bReturn = false;