From d33de755191c489f6777f3fd73981ca9e8ef4255 Mon Sep 17 00:00:00 2001 From: "sspitzer%netscape.com" Date: Sat, 2 Mar 2002 01:18:38 +0000 Subject: [PATCH] fix for #71952. fix assertions when printing ab cards. r=shliang, sr=bienvenu, a=asa. git-svn-id: svn://10.0.0.236/trunk@115623 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/mailnews/addrbook/src/nsAbCardProperty.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mozilla/mailnews/addrbook/src/nsAbCardProperty.cpp b/mozilla/mailnews/addrbook/src/nsAbCardProperty.cpp index 39cdb1ce0da..ae6067e8de3 100644 --- a/mozilla/mailnews/addrbook/src/nsAbCardProperty.cpp +++ b/mozilla/mailnews/addrbook/src/nsAbCardProperty.cpp @@ -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);