Changeset 437 for trunk/BAL/OWBAL/Concretizations/Internationalization/WK/BCStringWK.cpp

Timestamp:

08/15/08 13:25:16 (5 months ago)

Author:

mbensi

Message:

merge with webkit revision 35774

Files:

• trunk/BAL/OWBAL/Concretizations/Internationalization/WK/BCStringWK.cpp (modified) (2 diffs)

trunk/BAL/OWBAL/Concretizations/Internationalization/WK/BCStringWK.cpp

@@ -314 +314 @@
-String String::format(const char *format, ...)
-{
+#if PLATFORM(QT)
+    // Use QString::vsprintf to avoid the locale dependent formatting of vsnprintf.
+    // https://bugs.webkit.org/show_bug.cgi?id=18994
+    va_list args;
+    va_start(args, format);
+
+    QString buffer;
+    buffer.vsprintf(format, args);
+
+    va_end(args);
+
+    return buffer;
+#else
-    va_list args;
-    va_start(args, format);
@@ -348 +361 @@
-    
-    return StringImpl::create(buffer.data(), len);
+#endif
-}
-