r19875 by jghali - put back scribus specific change in fparser.cc in order to deal with locale issues

scribus-commit scribus-commit at lists.scribus.net
Tue Feb 24 20:39:01 UTC 2015


Author: jghali
Date: Tue Feb 24 20:39:00 2015
New Revision: 19875

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19875
Log:
put back scribus specific change in fparser.cc in order to deal with locale issues

Modified:
    trunk/Scribus/scribus/third_party/fparser/fparser.cc

Modified: trunk/Scribus/scribus/third_party/fparser/fparser.cc
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19875&path=/trunk/Scribus/scribus/third_party/fparser/fparser.cc
==============================================================================
--- trunk/Scribus/scribus/third_party/fparser/fparser.cc (original)
+++ trunk/Scribus/scribus/third_party/fparser/fparser.cc Tue Feb 24 20:39:00 2015
@@ -27,6 +27,7 @@
 #define M_PI 3.1415926535897932384626433832795
 #endif
 
+#include "scclocale.h"
 
 //=========================================================================
 // Name handling functions
@@ -1232,7 +1233,7 @@
     if(isdigit(c) || c=='.') // Number
     {
         char* endPtr;
-        const double val = strtod(function, &endPtr);
+        const double val = ScCLocale::strtod(function, &endPtr);
         if(endPtr == function) return SetErrorType(SYNTAX_ERROR, function);
 
         data->Immed.push_back(val);




More information about the scribus-commit mailing list