r14675 by cbradney - Its late, fix another typo

scribus-commit scribus-commit at lists.scribus.net
Wed Feb 10 00:40:47 CET 2010


Revision: 14675
Author: cbradney
Date: 2010-02-09T23:35:39.994828Z
Commit message: Its late, fix another typo

Changeset: 
M  /branches/Version135/Scribus/scribus/scclocale.cpp

Diffs:
Index: scribus/scclocale.cpp
===================================================================
--- scribus/scclocale.cpp	(revision 14674)
+++ scribus/scclocale.cpp	(revision 14675)
@@ -22,7 +22,7 @@
 #if defined(Q_WS_WIN)
 	cLocale = _create_locale(LC_ALL, "C");
 #else
-  #if not defined(Q_OS_SOLARIS
+  #if not defined(Q_OS_SOLARIS)
 	cLocale = newlocale(LC_ALL_MASK, "C", NULL);
   #endif
 #endif
@@ -33,7 +33,7 @@
 #if defined(Q_WS_WIN)
 	_free_locale(cLocale);
 #else
-  #if not defined(Q_OS_SOLARIS
+  #if not defined(Q_OS_SOLARIS)
 	freelocale(cLocale);
   #endif
 #endif
@@ -109,14 +109,14 @@
 		return _strtod_l(str, endptr, that()->cLocale);
 #else
   #if defined(Q_OS_SOLARIS)
-		return strtod_l(str, endptr, that()->cLocale);
-  #else
 		char *oldlocale=setlocale(LC_NUMERIC, NULL);
 		double result(0.0);
 		setlocale(LC_NUMERIC, "C");
 		result = strtod(str, endptr);
                 setlocale(LC_NUMERIC, oldlocale);
 		return result;
+  #else
+		return strtod_l(str, endptr, that()->cLocale);
   #endif
 #endif
 	}




More information about the scribus-commit mailing list