Fix for 155491. Don't write out the delimiter if the field is to be ignored (for export). Also, cellular number type should not be exported. R=ducarroz, sr=sspitzer.

mailnews/addrbook/src/nsAddressBook.cpp

@@ -1458,6 +1458,7 @@ nsAddressBook::ExportDirectoryToDelimitedText(nsIAbDirectory *aDirectory, const
             else {
               // something we don't support for the current export
               // for example, .tab doesn't export preferred html format
+              continue; // go to next field
             }
 
             if (i < EXPORT_ATTRIBUTES_TABLE_COUNT - 1) {

mailnews/addrbook/src/nsAddressBook.h

@@ -98,7 +98,7 @@ static ExportAttributesTableStruct EXPORT_ATTRIBUTES_TABLE[] = {
   {kPagerColumn, "pager", PR_TRUE},
   {kPagerTypeColumn, MOZ_AB_LDIF_PREFIX "PagerNumberType", PR_FALSE},
   {kCellularColumn, "mobile", PR_TRUE},
-  {kCellularTypeColumn, MOZ_AB_LDIF_PREFIX "CellularNumberType", PR_TRUE},
+  {kCellularTypeColumn, MOZ_AB_LDIF_PREFIX "CellularNumberType", PR_FALSE},
   {kHomeAddressColumn, "homePostalAddress", PR_TRUE},
   {kHomeAddress2Column, MOZ_AB_LDIF_PREFIX "HomePostalAddress2", PR_TRUE},
   {kHomeCityColumn, MOZ_AB_LDIF_PREFIX "HomeLocalityName", PR_TRUE},