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

fix for #71952. fix assertions when printing ab cards. r=shliang, sr=bienvenu, a=asa.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@115623 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
sspitzer%netscape.com
2002-03-02 01:18:38 +00:00
parent 0e56cc4e71
commit d33de75519
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mozilla/mailnews/addrbook/src/nsAbCardProperty.cpp
View File

@@ -1076,8 +1076,10 @@ NS_IMETHODIMP nsAbCardProperty::ConvertToXMLPrintData(PRUnichar **aXMLSubstr)
// use ScanTXT to convert < > & to safe values.
nsXPIDLString safeText;
rv = conv->ScanTXT(generatedName.get(), mozITXTToHTMLConv::kEntities , getter_Copies(safeText));
NS_ENSURE_SUCCESS(rv,rv);
if (!generatedName.IsEmpty()) {
rv = conv->ScanTXT(generatedName.get(), mozITXTToHTMLConv::kEntities , getter_Copies(safeText));
NS_ENSURE_SUCCESS(rv,rv);
}
if (!safeText.IsEmpty())
xmlStr.Append(safeText.get());
@@ -1309,7 +1311,7 @@ nsresult AppendLabel(nsAbCardProperty *aCard, AppendItem *aItem, mozITXTToHTMLCo
NS_ENSURE_SUCCESS(rv,rv);
if (attrValue.IsEmpty())
return NS_ERROR_FAILURE;
return NS_OK;
rv = bundle->GetStringFromName(NS_ConvertASCIItoUCS2(aItem->mLabel).get(), getter_Copies(label));
NS_ENSURE_SUCCESS(rv, rv);