From 0e4d3c3de0b8fa7ed86349babc2f4e138a0c856b Mon Sep 17 00:00:00 2001 From: "mkaply%us.ibm.com" Date: Thu, 27 May 2004 18:56:36 +0000 Subject: [PATCH] Init charset utils if they are not initted yet - Firefox bringup git-svn-id: svn://10.0.0.236/trunk@157024 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/xpcom/io/nsNativeCharsetUtils.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/mozilla/xpcom/io/nsNativeCharsetUtils.cpp b/mozilla/xpcom/io/nsNativeCharsetUtils.cpp index a751889b87f..55b5c63cbee 100644 --- a/mozilla/xpcom/io/nsNativeCharsetUtils.cpp +++ b/mozilla/xpcom/io/nsNativeCharsetUtils.cpp @@ -949,6 +949,7 @@ NS_ShutdownNativeCharsetUtils() #include #include "nsAString.h" #include +#include "nsNativeCharsetUtils.h" static UconvObject UnicodeConverter = NULL; @@ -972,6 +973,9 @@ NS_CopyNativeToUnicode(const nsACString &input, nsAString &output) size_t cSubs = 0; size_t resultLeft = resultLen; + if (!UnicodeConverter) + NS_StartupNativeCharsetUtils(); + int unirc = ::UniUconvToUcs(UnicodeConverter, (void**)&inputStr, &inputLen, &result, &resultLeft, &cSubs); @@ -1008,6 +1012,9 @@ NS_CopyUnicodeToNative(const nsAString &input, nsACString &output) size_t cSubs = 0; size_t resultLeft = resultLen; + + if (!UnicodeConverter) + NS_StartupNativeCharsetUtils(); int unirc = ::UniUconvFromUcs(UnicodeConverter, &inputStr, &inputLen, (void**)&result, &resultLeft, &cSubs);