Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug 157624 - freeze nsISupportsPrimitives, which includes changing nsISupport[C]String over to using A[C]String and fixing consumers

Browse Source 
r=dougt, sr=darin


git-svn-id: svn://10.0.0.236/trunk@128163 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
alecf%netscape.com
2002-08-26 21:20:34 +00:00
parent 6487e8df55
commit e3b2da9c83
63 changed files with 335 additions and 532 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mozilla/widget/src/xpwidgets/nsHTMLFormatConverter.cpp
View File

@@ -160,7 +160,7 @@ nsHTMLFormatConverter :: AddFlavorToList ( nsISupportsArray* inList, const char*
nsresult rv = nsComponentManager::CreateInstance(NS_SUPPORTS_CSTRING_CONTRACTID, nsnull,
NS_GET_IID(nsISupportsCString), getter_AddRefs(dataFlavor));
if ( dataFlavor ) {
dataFlavor->SetData ( NS_CONST_CAST(char*, inFlavor) );
dataFlavor->SetData ( nsDependentCString(inFlavor) );
// add to list as an nsISupports so the correct interface gets the addref
// in AppendElement()
nsCOMPtr<nsISupports> genericFlavor ( do_QueryInterface(dataFlavor) );
@@ -234,11 +234,9 @@ nsHTMLFormatConverter::Convert(const char *aFromDataFlavor, nsISupports *aFromDa
// length represents the length in 1-byte chars, so we need to divide by two.
nsCOMPtr<nsISupportsString> dataWrapper0 ( do_QueryInterface(aFromData) );
if ( dataWrapper0 ) {
nsXPIDLString data;
dataWrapper0->ToString ( getter_Copies(data) ); //¥¥¥ COPY #1
if ( data ) {
PRUnichar* castedData = NS_CONST_CAST(PRUnichar*, NS_STATIC_CAST(const PRUnichar*, data));
nsAutoString dataStr ( CBufDescriptor(castedData, PR_TRUE, aDataLen) ); //¥¥¥ try not to copy the data
nsAutoString dataStr;
dataWrapper0->GetData ( dataStr ); //¥¥¥ COPY #1
if ( !dataStr.IsEmpty() ) {
// note: conversion to text/plain is done inside the clipboard. we do not need to worry
// about it here.