diff --git a/mailnews/addrbook/src/nsAddressBook.cpp b/mailnews/addrbook/src/nsAddressBook.cpp index bbf7c0c5fec3..fb1c65fb993a 100644 --- a/mailnews/addrbook/src/nsAddressBook.cpp +++ b/mailnews/addrbook/src/nsAddressBook.cpp @@ -552,12 +552,12 @@ nsAddressBook::ExportDirectoryToDelimitedText(nsIAbDirectory *aDirectory, const nsXPIDLString columnName; for (i = 0; i < EXPORT_ATTRIBUTES_TABLE_COUNT; i++) { - if (EXPORT_ATTRIBUTES_TABLE[i].plainTextStringId != 0) { + if (EXPORT_ATTRIBUTES_TABLE[i].plainTextStringID != 0) { // We don't need to truncate the string here as getter_Copies will // do that for us. - if (NS_FAILED(bundle->GetStringFromID(EXPORT_ATTRIBUTES_TABLE[i].plainTextStringId, getter_Copies(columnName)))) - columnName.AppendInt(EXPORT_ATTRIBUTES_TABLE[i].plainTextStringId); + if (NS_FAILED(bundle->GetStringFromID(EXPORT_ATTRIBUTES_TABLE[i].plainTextStringID, getter_Copies(columnName)))) + columnName.AppendInt(EXPORT_ATTRIBUTES_TABLE[i].plainTextStringID); importService->SystemStringFromUnicode(columnName.get(), revisedName); @@ -607,7 +607,7 @@ nsAddressBook::ExportDirectoryToDelimitedText(nsIAbDirectory *aDirectory, const nsCString valueCStr; for (i = 0; i < EXPORT_ATTRIBUTES_TABLE_COUNT; i++) { - if (EXPORT_ATTRIBUTES_TABLE[i].plainTextStringId != 0) { + if (EXPORT_ATTRIBUTES_TABLE[i].plainTextStringID != 0) { rv = card->GetCardValue(EXPORT_ATTRIBUTES_TABLE[i].abColName, getter_Copies(value)); NS_ENSURE_SUCCESS(rv,rv); diff --git a/mailnews/addrbook/src/nsAddressBook.h b/mailnews/addrbook/src/nsAddressBook.h index dba87ba33d34..a749de4a30fa 100644 --- a/mailnews/addrbook/src/nsAddressBook.h +++ b/mailnews/addrbook/src/nsAddressBook.h @@ -70,7 +70,7 @@ struct ExportAttributesTableStruct { const char* abColName; const char* ldapPropertyName; - PRUint32 plainTextStringId; + PRUint32 plainTextStringID; }; const extern ExportAttributesTableStruct EXPORT_ATTRIBUTES_TABLE[EXPORT_ATTRIBUTES_TABLE_COUNT];