From 01e29b99dcd3be935b9a000b0d31e25b26bbae7d Mon Sep 17 00:00:00 2001 From: "peterv%propagandism.org" Date: Thu, 16 Sep 2004 12:39:49 +0000 Subject: [PATCH] Fix for 209699 (bug convert some consumers over to CopyUTF8toUTF16 / CopyUTF16toUTF8). r=jshin, sr=jst. git-svn-id: svn://10.0.0.236/trunk@162447 18797224-902f-48f8-a5cc-f745e15eee43 --- .../base/src/nsXMLContentSerializer.cpp | 6 ++-- .../editor/composer/src/nsEditingSession.cpp | 2 +- .../composer/src/nsEditorSpellCheck.cpp | 2 +- .../activex/src/control/MozillaBrowser.cpp | 5 ++- .../activex/src/plugin/PrefObserver.cpp | 2 +- .../activex/src/plugin/XPCDocument.cpp | 2 +- .../browser/gtk/src/EmbedPrivate.cpp | 2 +- .../browser/gtk/src/EmbedPrompter.cpp | 20 ++++++------ .../powerplant/source/CBrowserShell.cpp | 4 +-- .../powerplant/source/CHeaderSniffer.cpp | 11 +++---- .../src/nsWebBrowserPersist.cpp | 10 +++--- .../windowwatcher/src/nsWindowWatcher.cpp | 2 +- .../tests/mfcembed/CPageSetupPropSheet.cpp | 32 ++++++++----------- .../tests/os2Embed/WebBrowserChrome.cpp | 10 +++--- .../tests/winEmbed/WebBrowserChrome.cpp | 10 +++--- .../wrappers/DotNETEmbed/DotNETEmbed.cpp | 2 +- 16 files changed, 57 insertions(+), 65 deletions(-) diff --git a/mozilla/content/base/src/nsXMLContentSerializer.cpp b/mozilla/content/base/src/nsXMLContentSerializer.cpp index aef8a9b9d92..2267f32195b 100644 --- a/mozilla/content/base/src/nsXMLContentSerializer.cpp +++ b/mozilla/content/base/src/nsXMLContentSerializer.cpp @@ -294,7 +294,7 @@ nsXMLContentSerializer::AppendDoctype(nsIDOMDocumentType *aDoctype, return NS_OK; } -#define kXMLNS NS_LITERAL_STRING("xmlns") +#define kXMLNS "xmlns" nsresult nsXMLContentSerializer::PushNameSpaceDecl(const nsAString& aPrefix, @@ -337,7 +337,7 @@ PRBool nsXMLContentSerializer::ConfirmPrefix(nsAString& aPrefix, const nsAString& aURI) { - if (aPrefix.Equals(kXMLNS)) { + if (aPrefix.EqualsLiteral(kXMLNS)) { return PR_FALSE; } if (aURI.IsEmpty()) { @@ -480,7 +480,7 @@ nsXMLContentSerializer::AppendElementStart(nsIDOMElement *aElement, nsAutoString tagPrefix, tagLocalName, tagNamespaceURI; nsAutoString xmlnsStr; - xmlnsStr.Assign(kXMLNS); + xmlnsStr.AssignLiteral(kXMLNS); nsCOMPtr content(do_QueryInterface(aElement)); if (!content) return NS_ERROR_FAILURE; diff --git a/mozilla/editor/composer/src/nsEditingSession.cpp b/mozilla/editor/composer/src/nsEditingSession.cpp index 842c921d0b3..997c872730c 100644 --- a/mozilla/editor/composer/src/nsEditingSession.cpp +++ b/mozilla/editor/composer/src/nsEditingSession.cpp @@ -312,7 +312,7 @@ nsEditingSession::SetupEditorOnWindow(nsIDOMWindow *aWindow) { nsAutoString mimeType; if (NS_SUCCEEDED(nsdoc->GetContentType(mimeType))) - CopyUTF16toUTF8(mimeType, mimeCType); + AppendUTF16toUTF8(mimeType, mimeCType); if (IsSupportedTextType(mimeCType.get())) { diff --git a/mozilla/editor/composer/src/nsEditorSpellCheck.cpp b/mozilla/editor/composer/src/nsEditorSpellCheck.cpp index 7dd94bbd663..cc9f1c02e76 100644 --- a/mozilla/editor/composer/src/nsEditorSpellCheck.cpp +++ b/mozilla/editor/composer/src/nsEditorSpellCheck.cpp @@ -180,7 +180,7 @@ nsEditorSpellCheck::InitSpellChecker(nsIEditor* aEditor, PRBool aEnableSelection nsCAutoString utf8DictName; rv = packageRegistry->GetSelectedLocale(NS_LITERAL_CSTRING("editor"), utf8DictName); - CopyUTF8toUTF16(utf8DictName, dictName); + AppendUTF8toUTF16(utf8DictName, dictName); } } diff --git a/mozilla/embedding/browser/activex/src/control/MozillaBrowser.cpp b/mozilla/embedding/browser/activex/src/control/MozillaBrowser.cpp index cdeb1cd861f..3a4e0021d25 100644 --- a/mozilla/embedding/browser/activex/src/control/MozillaBrowser.cpp +++ b/mozilla/embedding/browser/activex/src/control/MozillaBrowser.cpp @@ -787,9 +787,8 @@ LRESULT CMozillaBrowser::OnViewSource(WORD wNotifyCode, WORD wID, HWND hWndCtl, nsCAutoString aURI; uri->GetSpec(aURI); - nsAutoString strURI; - strURI.AssignLiteral("view-source:"); - strURI.Append(NS_ConvertUTF8toUCS2(aURI)); + nsAutoString strURI(NS_LITERAL_STRING("view-source:")); + AppendUTF8toUTF16(aURI, strURI); // Ask the client to create a window to view the source in CIPtr(IDispatch) spDispNew; diff --git a/mozilla/embedding/browser/activex/src/plugin/PrefObserver.cpp b/mozilla/embedding/browser/activex/src/plugin/PrefObserver.cpp index fd3b61776ab..09ef3567872 100644 --- a/mozilla/embedding/browser/activex/src/plugin/PrefObserver.cpp +++ b/mozilla/embedding/browser/activex/src/plugin/PrefObserver.cpp @@ -126,7 +126,7 @@ NS_IMETHODIMP PrefObserver::Observe(nsISupports *aSubject, const char *aTopic, c if (NS_FAILED(rv)) return rv; - nsCAutoString pref = NS_ConvertUCS2toUTF8(aData); + NS_ConvertUTF16toUTF8 pref(aData); if (nsCRT::strcmp(kActiveXHostingFlags, pref.get()) == 0 || nsCRT::strcmp(kUserAgentPref, pref.get()) == 0 || nsCRT::strcmp(kProxyPref, pref.get()) == 0) diff --git a/mozilla/embedding/browser/activex/src/plugin/XPCDocument.cpp b/mozilla/embedding/browser/activex/src/plugin/XPCDocument.cpp index 8635a7b0eaf..3c9b5ab8909 100644 --- a/mozilla/embedding/browser/activex/src/plugin/XPCDocument.cpp +++ b/mozilla/embedding/browser/activex/src/plugin/XPCDocument.cpp @@ -1821,7 +1821,7 @@ END_COM_MAP() hr = pihlNavigate->GetTargetFrameName(&szTargetFrame); if (szTarget && szTarget[0] != WCHAR('\0')) { - nsCAutoString spec = NS_ConvertUCS2toUTF8(szTarget); + NS_ConvertUTF16toUTF8 spec(szTarget); nsCOMPtr uri; nsresult rv = NS_NewURI(getter_AddRefs(uri), spec); if (NS_SUCCEEDED(rv) && uri) diff --git a/mozilla/embedding/browser/gtk/src/EmbedPrivate.cpp b/mozilla/embedding/browser/gtk/src/EmbedPrivate.cpp index fda51b7b215..874c6c07e6e 100644 --- a/mozilla/embedding/browser/gtk/src/EmbedPrivate.cpp +++ b/mozilla/embedding/browser/gtk/src/EmbedPrivate.cpp @@ -394,7 +394,7 @@ EmbedPrivate::SetURI(const char *aURI) #endif #ifdef MOZ_WIDGET_GTK2 - mURI.Assign(NS_ConvertUTF8toUCS2(aURI)); + CopyUTF8toUTF16(aURI, mURI); #endif } diff --git a/mozilla/embedding/browser/gtk/src/EmbedPrompter.cpp b/mozilla/embedding/browser/gtk/src/EmbedPrompter.cpp index 7becd625acb..fa3444685ec 100644 --- a/mozilla/embedding/browser/gtk/src/EmbedPrompter.cpp +++ b/mozilla/embedding/browser/gtk/src/EmbedPrompter.cpp @@ -255,37 +255,37 @@ EmbedPrompter::Create(PromptType aType, GtkWindow* aParentWindow) void EmbedPrompter::SetTitle(const PRUnichar *aTitle) { - mTitle = NS_ConvertUCS2toUTF8(aTitle); + CopyUTF16toUTF8(aTitle, mTitle); } void EmbedPrompter::SetTextValue(const PRUnichar *aTextValue) { - mTextValue = NS_ConvertUCS2toUTF8(aTextValue); + CopyUTF16toUTF8(aTextValue, mTextValue); } void EmbedPrompter::SetCheckMessage(const PRUnichar *aMessage) { - mCheckMessage = NS_ConvertUCS2toUTF8(aMessage); + CopyUTF16toUTF8(aMessage, mCheckMessage); } void EmbedPrompter::SetMessageText(const PRUnichar *aMessageText) { - mMessageText = NS_ConvertUCS2toUTF8(aMessageText); + CopyUTF16toUTF8(aMessageText, mMessageText); } void EmbedPrompter::SetUser(const PRUnichar *aUser) { - mUser = NS_ConvertUCS2toUTF8(aUser); + CopyUTF16toUTF8(aUser, mUser); } void EmbedPrompter::SetPassword(const PRUnichar *aPass) { - mPass = NS_ConvertUCS2toUTF8(aPass); + CopyUTF16toUTF8(aPass, mPass); } void @@ -303,7 +303,7 @@ EmbedPrompter::SetItems(const PRUnichar** aItemArray, PRUint32 aCount) mItemCount = aCount; mItemList = new nsCString[aCount]; for (PRUint32 i = 0; i < aCount; ++i) - mItemList[i] = NS_ConvertUCS2toUTF8(aItemArray[i]); + CopyUTF16toUTF8(aItemArray[i], mItemList[i]); } void @@ -311,9 +311,9 @@ EmbedPrompter::SetButtons(const PRUnichar* aButton0Label, const PRUnichar* aButton1Label, const PRUnichar* aButton2Label) { - mButtonLabels[0] = NS_ConvertUCS2toUTF8(aButton0Label); - mButtonLabels[1] = NS_ConvertUCS2toUTF8(aButton1Label); - mButtonLabels[2] = NS_ConvertUCS2toUTF8(aButton2Label); + CopyUTF16toUTF8(aButton0Label, mButtonLabels[0]); + CopyUTF16toUTF8(aButton1Label, mButtonLabels[1]); + CopyUTF16toUTF8(aButton2Label, mButtonLabels[2]); } void diff --git a/mozilla/embedding/browser/powerplant/source/CBrowserShell.cpp b/mozilla/embedding/browser/powerplant/source/CBrowserShell.cpp index 4c7b2573a1e..3bad537558b 100644 --- a/mozilla/embedding/browser/powerplant/source/CBrowserShell.cpp +++ b/mozilla/embedding/browser/powerplant/source/CBrowserShell.cpp @@ -564,13 +564,13 @@ Boolean CBrowserShell::ObeyCommand(PP_PowerPlant::CommandT inCommand, void* ioPa nsAutoString temp; rv = mContextMenuInfo->GetAssociatedLink(temp); ThrowIfError_(rv); - nsCAutoString urlSpec = NS_ConvertUCS2toUTF8(temp); + NS_ConvertUTF16toUTF8 urlSpec(temp); if (inCommand == cmd_OpenLinkInNewWindow) { nsCAutoString referrer; rv = GetFocusedWindowURL(temp); if (NS_SUCCEEDED(rv)) - referrer = NS_ConvertUCS2toUTF8(temp); + AppendUTF16toUTF8(temp, referrer); PostOpenURLEvent(urlSpec, referrer); } else diff --git a/mozilla/embedding/browser/powerplant/source/CHeaderSniffer.cpp b/mozilla/embedding/browser/powerplant/source/CHeaderSniffer.cpp index 824d0c23403..f0206f977eb 100644 --- a/mozilla/embedding/browser/powerplant/source/CHeaderSniffer.cpp +++ b/mozilla/embedding/browser/powerplant/source/CHeaderSniffer.cpp @@ -215,9 +215,8 @@ nsresult CHeaderSniffer::PerformSave(nsIURI* inOriginalURI, const ESaveFormat in if (index >= 0) { // Take the substring following the prefix. index += 9; - nsCAutoString filename; - mContentDisposition.Right(filename, mContentDisposition.Length() - index); - defaultFileName = NS_ConvertUTF8toUCS2(filename); + AppendUTF8toUTF16(Substring(mContentDisposition, index), + defaultFileName); } } @@ -226,7 +225,7 @@ nsresult CHeaderSniffer::PerformSave(nsIURI* inOriginalURI, const ESaveFormat in if (url) { nsCAutoString fileNameCString; url->GetFileName(fileNameCString); // (2) For file URLs, use the file name. - defaultFileName = NS_ConvertUTF8toUCS2(fileNameCString); + AppendUTF8toUTF16(fileNameCString, defaultFileName); } } @@ -245,7 +244,7 @@ nsresult CHeaderSniffer::PerformSave(nsIURI* inOriginalURI, const ESaveFormat in // (5) Use the host. nsCAutoString hostName; mURL->GetHost(hostName); - defaultFileName = NS_ConvertUTF8toUCS2(hostName); + AppendUTF8toUTF16(hostName, defaultFileName); } // One last case to handle about:blank and other fruity untitled pages. @@ -294,7 +293,7 @@ nsresult CHeaderSniffer::PerformSave(nsIURI* inOriginalURI, const ESaveFormat in nsCAutoString ext; extensions->GetNext(ext); defaultFileName.Append(PRUnichar('.')); - defaultFileName.Append(NS_ConvertUTF8toUCS2(ext)); + AppendUTF8toUTF16(ext, defaultFileName); } } diff --git a/mozilla/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.cpp b/mozilla/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.cpp index 7cd2a1eeff0..8c7d427edd6 100644 --- a/mozilla/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.cpp +++ b/mozilla/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.cpp @@ -1012,7 +1012,7 @@ nsresult nsWebBrowserPersist::SendErrorStatusChange( { nsCAutoString fileurl; aURI->GetSpec(fileurl); - path = NS_ConvertUTF8toUCS2(fileurl); + AppendUTF8toUTF16(fileurl, path); } nsAutoString msgId; @@ -1115,7 +1115,7 @@ nsresult nsWebBrowserPersist::AppendPathToURI(nsIURI *aURI, const nsAString & aP } // Store the path back on the URI - newPath += NS_ConvertUCS2toUTF8(aPath); + AppendUTF16toUTF8(aPath, newPath); aURI->SetPath(newPath); return NS_OK; @@ -3187,14 +3187,14 @@ nsWebBrowserPersist::FixupURI(nsAString &aURI) rawPathURL.Append(filename); nsCAutoString buf; - newValue = NS_ConvertUTF8toUCS2( - NS_EscapeURL(rawPathURL, esc_FilePath, buf)); + AppendUTF8toUTF16(NS_EscapeURL(rawPathURL, esc_FilePath, buf), + newValue); } else { nsCAutoString fileurl; fileAsURI->GetSpec(fileurl); - newValue.Assign(NS_ConvertUTF8toUCS2(fileurl)); + AppendUTF8toUTF16(fileurl, newValue); } if (data->mIsSubFrame) { diff --git a/mozilla/embedding/components/windowwatcher/src/nsWindowWatcher.cpp b/mozilla/embedding/components/windowwatcher/src/nsWindowWatcher.cpp index 2ed80cac0bf..7372d6511f3 100644 --- a/mozilla/embedding/components/windowwatcher/src/nsWindowWatcher.cpp +++ b/mozilla/embedding/components/windowwatcher/src/nsWindowWatcher.cpp @@ -502,7 +502,7 @@ nsWindowWatcher::OpenWindowJS(nsIDOMWindow *aParent, nameSpecified = PR_FALSE; if (aName) { - name.Assign(NS_ConvertUTF8toUCS2(aName)); + CopyUTF8toUTF16(aName, name); CheckWindowName(name); nameSpecified = PR_TRUE; } diff --git a/mozilla/embedding/tests/mfcembed/CPageSetupPropSheet.cpp b/mozilla/embedding/tests/mfcembed/CPageSetupPropSheet.cpp index 9ccf72bbdfa..b7a3adc0703 100644 --- a/mozilla/embedding/tests/mfcembed/CPageSetupPropSheet.cpp +++ b/mozilla/embedding/tests/mfcembed/CPageSetupPropSheet.cpp @@ -144,30 +144,24 @@ void CPageSetupPropSheet::SetPrintSettingsValues(nsIPrintSettings* aPrintSetting aPrintSettings->GetPrintBGImages(&boolVal); m_FormatOptionTab.m_BGImages = boolVal == PR_TRUE; - PRUnichar* uStr; - aPrintSettings->GetHeaderStrLeft(&uStr); - m_MarginHeaderFooterTab.m_HeaderLeftText = NS_LossyConvertUCS2toASCII(uStr).get(); - if (uStr != nsnull) nsMemory::Free(uStr); + nsXPIDLString uStr; + aPrintSettings->GetHeaderStrLeft(getter_Copies(uStr)); + LossyCopyUTF16toASCII(uStr, m_MarginHeaderFooterTab.m_HeaderLeftText); - aPrintSettings->GetHeaderStrCenter(&uStr); - m_MarginHeaderFooterTab.m_HeaderCenterText = NS_LossyConvertUCS2toASCII(uStr).get(); - if (uStr != nsnull) nsMemory::Free(uStr); + aPrintSettings->GetHeaderStrCenter(getter_Copies(uStr)); + LossyCopyUTF16toASCII(uStr, m_MarginHeaderFooterTab.m_HeaderCenterText); - aPrintSettings->GetHeaderStrRight(&uStr); - m_MarginHeaderFooterTab.m_HeaderRightText = NS_LossyConvertUCS2toASCII(uStr).get(); - if (uStr != nsnull) nsMemory::Free(uStr); + aPrintSettings->GetHeaderStrRight(getter_Copies(uStr)); + LossyCopyUTF16toASCII(uStr, m_MarginHeaderFooterTab.m_HeaderRightText); - aPrintSettings->GetFooterStrLeft(&uStr); - m_MarginHeaderFooterTab.m_FooterLeftText = NS_LossyConvertUCS2toASCII(uStr).get(); - if (uStr != nsnull) nsMemory::Free(uStr); + aPrintSettings->GetFooterStrLeft(getter_Copies(uStr)); + LossyCopyUTF16toASCII(uStr, m_MarginHeaderFooterTab.m_FooterLeftText); - aPrintSettings->GetFooterStrCenter(&uStr); - m_MarginHeaderFooterTab.m_FooterCenterText = NS_LossyConvertUCS2toASCII(uStr).get(); - if (uStr != nsnull) nsMemory::Free(uStr); + aPrintSettings->GetFooterStrCenter(getter_Copies(uStr)); + LossyCopyUTF16toASCII(uStr, m_MarginHeaderFooterTab.m_FooterCenterText); - aPrintSettings->GetFooterStrRight(&uStr); - m_MarginHeaderFooterTab.m_FooterRightText = NS_LossyConvertUCS2toASCII(uStr).get(); - if (uStr != nsnull) nsMemory::Free(uStr); + aPrintSettings->GetFooterStrRight(getter_Copies(uStr)); + LossyCopyUTF16toASCII(uStr, m_MarginHeaderFooterTab.m_FooterRightText); } } diff --git a/mozilla/embedding/tests/os2Embed/WebBrowserChrome.cpp b/mozilla/embedding/tests/os2Embed/WebBrowserChrome.cpp index d12b5c463be..a21608e5617 100644 --- a/mozilla/embedding/tests/os2Embed/WebBrowserChrome.cpp +++ b/mozilla/embedding/tests/os2Embed/WebBrowserChrome.cpp @@ -384,13 +384,13 @@ WebBrowserChrome::SendHistoryStatusMessage(nsIURI * aURI, char * operation, PRIn { // Going back. XXX Get string from a resource file uriAStr.AppendLiteral("Going back to url:"); - uriAStr.Append(NS_ConvertUTF8toUCS2(uriCStr)); + AppendUTF8toUTF16(uriCStr, uriAStr); } else if (!(nsCRT::strcmp(operation, "forward"))) { // Going forward. XXX Get string from a resource file uriAStr.AppendLiteral("Going forward to url:"); - uriAStr.Append(NS_ConvertUTF8toUCS2(uriCStr)); + AppendUTF8toUTF16(uriCStr, uriAStr); } else if (!(nsCRT::strcmp(operation, "reload"))) { @@ -412,12 +412,12 @@ WebBrowserChrome::SendHistoryStatusMessage(nsIURI * aURI, char * operation, PRIn { uriAStr.Append(NS_LITERAL_STRING("Reloading url, (normal):")); } - uriAStr.Append(NS_ConvertASCIItoUCS2(uriCStr)); + AppendUTF8toUTF16(uriCStr, uriAStr); } else if (!(nsCRT::strcmp(operation, "add"))) { // Adding new entry. XXX Get string from a resource file - uriAStr.Append(NS_ConvertASCIItoUCS2(uriCStr)); + AppendUTF8toUTF16(uriCStr, uriAStr); uriAStr.AppendLiteral(" added to session History"); } else if (!(nsCRT::strcmp(operation, "goto"))) @@ -426,7 +426,7 @@ WebBrowserChrome::SendHistoryStatusMessage(nsIURI * aURI, char * operation, PRIn uriAStr.AppendLiteral("Going to HistoryIndex:"); uriAStr.AppendInt(info1); uriAStr.AppendLiteral(" Url:"); - uriAStr.Append(NS_ConvertASCIItoUCS2(uriCStr)); + AppendUTF8toUTF16(uriCStr, uriAStr); } else if (!(nsCRT::strcmp(operation, "purge"))) { diff --git a/mozilla/embedding/tests/winEmbed/WebBrowserChrome.cpp b/mozilla/embedding/tests/winEmbed/WebBrowserChrome.cpp index a7c73905137..fab1808b75e 100644 --- a/mozilla/embedding/tests/winEmbed/WebBrowserChrome.cpp +++ b/mozilla/embedding/tests/winEmbed/WebBrowserChrome.cpp @@ -379,13 +379,13 @@ WebBrowserChrome::SendHistoryStatusMessage(nsIURI * aURI, char * operation, PRIn { // Going back. XXX Get string from a resource file uriAStr.AppendLiteral("Going back to url:"); - uriAStr.Append(NS_ConvertUTF8toUCS2(uriCStr)); + AppendUTF8toUTF16(uriCStr, uriAStr); } else if (!(strcmp(operation, "forward"))) { // Going forward. XXX Get string from a resource file uriAStr.AppendLiteral("Going forward to url:"); - uriAStr.Append(NS_ConvertUTF8toUCS2(uriCStr)); + AppendUTF8toUTF16(uriCStr, uriAStr); } else if (!(strcmp(operation, "reload"))) { @@ -407,12 +407,12 @@ WebBrowserChrome::SendHistoryStatusMessage(nsIURI * aURI, char * operation, PRIn { uriAStr.Append(NS_LITERAL_STRING("Reloading url, (normal):")); } - uriAStr.Append(NS_ConvertASCIItoUCS2(uriCStr)); + AppendUTF8toUTF16(uriCStr, uriAStr); } else if (!(strcmp(operation, "add"))) { // Adding new entry. XXX Get string from a resource file - uriAStr.Append(NS_ConvertASCIItoUCS2(uriCStr)); + AppendUTF8toUTF16(uriCStr, uriAStr); uriAStr.AppendLiteral(" added to session History"); } else if (!(strcmp(operation, "goto"))) @@ -421,7 +421,7 @@ WebBrowserChrome::SendHistoryStatusMessage(nsIURI * aURI, char * operation, PRIn uriAStr.AppendLiteral("Going to HistoryIndex:"); uriAStr.AppendInt(info1); uriAStr.AppendLiteral(" Url:"); - uriAStr.Append(NS_ConvertASCIItoUCS2(uriCStr)); + AppendUTF8toUTF16(uriCStr, uriAStr); } else if (!(strcmp(operation, "purge"))) { diff --git a/mozilla/embedding/wrappers/DotNETEmbed/DotNETEmbed.cpp b/mozilla/embedding/wrappers/DotNETEmbed/DotNETEmbed.cpp index 362367b3057..21207185f93 100644 --- a/mozilla/embedding/wrappers/DotNETEmbed/DotNETEmbed.cpp +++ b/mozilla/embedding/wrappers/DotNETEmbed/DotNETEmbed.cpp @@ -86,7 +86,7 @@ Mozilla::Embedding::CopyString(String *aSrc, nsAFlatCString& aDest) { const wchar_t __pin * strbuf = PtrToStringChars(aSrc); - aDest = NS_ConvertUCS2toUTF8(nsDependentString(strbuf, aSrc->Length)); + CopyUTF16toUTF8(nsDependentString(strbuf, aSrc->Length), aDest); return aDest; }