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

Make nsHTMLFormatConverter deal with an empty source string. Don't add an URL dataflavor if the source URI is empty. b=303818 r+sr=bzbarsky

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@179959 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mats.palmgren%bredband.net
2005-09-10 11:39:32 +00:00
parent 2c5ee7ad68
commit a58c670cb3
2 changed files with 59 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -235,48 +235,46 @@ nsHTMLFormatConverter::Convert(const char *aFromDataFlavor, nsISupports *aFromDa
// class of nsISupportsString. Also, since the data is in two byte chunks the
// length represents the length in 1-byte chars, so we need to divide by two.
nsCOMPtr<nsISupportsString> dataWrapper0 ( do_QueryInterface(aFromData) );
if ( dataWrapper0 ) {
nsAutoString dataStr;
dataWrapper0->GetData ( dataStr ); //¥¥¥ COPY #1
if ( !dataStr.IsEmpty() ) {
if (!dataWrapper0) {
return NS_ERROR_INVALID_ARG;
}
// note: conversion to text/plain is done inside the clipboard. we do not need to worry
// about it here.
if ( toFlavor.Equals(kHTMLMime) || toFlavor.Equals(kUnicodeMime) ) {
nsresult res;
if (toFlavor.Equals(kHTMLMime)) {
PRInt32 dataLen = dataStr.Length() * 2;
nsPrimitiveHelpers::CreatePrimitiveForData ( toFlavor.get(), (void*)dataStr.get(), dataLen, aToData );
if ( *aToData )
*aDataToLen = dataLen;
} else {
nsAutoString outStr;
res = ConvertFromHTMLToUnicode(dataStr, outStr);
if (NS_SUCCEEDED(res)) {
PRInt32 dataLen = outStr.Length() * 2;
nsPrimitiveHelpers::CreatePrimitiveForData ( toFlavor.get(), (void*)outStr.get(), dataLen, aToData );
if ( *aToData )
*aDataToLen = dataLen;
}
}
} // else if HTML or Unicode
else if ( toFlavor.Equals(kAOLMailMime) ) {
nsAutoString outStr;
if ( NS_SUCCEEDED(ConvertFromHTMLToAOLMail(dataStr, outStr)) ) {
PRInt32 dataLen = outStr.Length() * 2;
nsPrimitiveHelpers::CreatePrimitiveForData ( toFlavor.get(), (void*)outStr.get(), dataLen, aToData );
if ( *aToData )
*aDataToLen = dataLen;
}
} // else if AOL mail
else {
*aToData = nsnull;
*aDataToLen = 0;
rv = NS_ERROR_FAILURE;
nsAutoString dataStr;
dataWrapper0->GetData ( dataStr ); //¥¥¥ COPY #1
// note: conversion to text/plain is done inside the clipboard. we do not need to worry
// about it here.
if ( toFlavor.Equals(kHTMLMime) || toFlavor.Equals(kUnicodeMime) ) {
nsresult res;
if (toFlavor.Equals(kHTMLMime)) {
PRInt32 dataLen = dataStr.Length() * 2;
nsPrimitiveHelpers::CreatePrimitiveForData ( toFlavor.get(), (void*)dataStr.get(), dataLen, aToData );
if ( *aToData )
*aDataToLen = dataLen;
} else {
nsAutoString outStr;
res = ConvertFromHTMLToUnicode(dataStr, outStr);
if (NS_SUCCEEDED(res)) {
PRInt32 dataLen = outStr.Length() * 2;
nsPrimitiveHelpers::CreatePrimitiveForData ( toFlavor.get(), (void*)outStr.get(), dataLen, aToData );
if ( *aToData )
*aDataToLen = dataLen;
}
}
} // else if HTML or Unicode
else if ( toFlavor.Equals(kAOLMailMime) ) {
nsAutoString outStr;
if ( NS_SUCCEEDED(ConvertFromHTMLToAOLMail(dataStr, outStr)) ) {
PRInt32 dataLen = outStr.Length() * 2;
nsPrimitiveHelpers::CreatePrimitiveForData ( toFlavor.get(), (void*)outStr.get(), dataLen, aToData );
if ( *aToData )
*aDataToLen = dataLen;
}
} // else if AOL mail
else {
*aToData = nsnull;
*aDataToLen = 0;
rv = NS_ERROR_FAILURE;
}
} // if we got html mime
else
rv = NS_ERROR_FAILURE;