iter != ContactEditorData.GeneralTelephoneList.end(); ++iter){
wxString strAddressFinalValue = iter->second;
+ int DataID = iter->first;
ProcessCaptureStrings(&strAddressFinalValue);
- if (ContactEditorData.GeneralTelephoneListDataType.find(iter->first) !=
- ContactEditorData.GeneralTelephoneListDataType.end()){
+ if (MapDataExists(&DataID, &ContactEditorData.GeneralTelephoneListDataType)){
std::map<int,wxString>::iterator DataTypeIter = ContactEditorData.GeneralTelephoneListDataType.find(iter->first);
}
+ wxString strAddressTypeInfo;
+
+ if (MapDataExists(&DataID, &ContactEditorData.GeneralTelephoneListTypeInfo)){
+
+ strAddressTypeInfo = ContactEditorData.GeneralTelephoneListTypeInfo.find(iter->first)->second;
+
+ }
+
ProcessSaveData(wxT("TEL"), &strValue2, &boolValue2, &boolValue,
&iter, &strAddressFinalValue, &ContactData,
wxT("ALTID"), &ContactEditorData.GeneralTelephoneListAltID,
wxT("PID"), &ContactEditorData.GeneralTelephoneListPID,
- wxT("TYPE"), &ContactEditorData.GeneralTelephoneListType,
+ wxT("TYPE"), &ContactEditorData.GeneralTelephoneListTypeInfo,
wxT("PREF"), &ContactEditorData.GeneralTelephoneListPref,
wxT(""), &ContactEditorData.GeneralTelephoneListTokens );
strAddressFinalValue.insert(0, "tel:");
}
-
+
ProcessSaveData(wxT("TEL"), &strValue2, &boolValue2, &boolValue,
&iter, &strAddressFinalValue, &ContactData,
wxT("ALTID"), &ContactEditorData.HomeTelephoneListAltID,
wxT("PID"), &ContactEditorData.HomeTelephoneListPID,
- wxT("TYPE"), &ContactEditorData.HomeTelephoneListType,
+ wxT("TYPE"), &ContactEditorData.HomeTelephoneListTypeInfo,
wxT("PREF"), &ContactEditorData.HomeTelephoneListPref,
wxT(""), &ContactEditorData.HomeTelephoneListTokens );
strAddressFinalValue.insert(0, "tel:");
}
-
+
ProcessSaveData(wxT("TEL"), &strValue2, &boolValue2, &boolValue,
&iter, &strAddressFinalValue, &ContactData,
wxT("ALTID"), &ContactEditorData.BusinessTelephoneListAltID,
wxT("PID"), &ContactEditorData.BusinessTelephoneListPID,
- wxT("TYPE"), &ContactEditorData.BusinessTelephoneListType,
+ wxT("TYPE"), &ContactEditorData.BusinessTelephoneListTypeInfo,
wxT("PREF"), &ContactEditorData.BusinessTelephoneListPref,
wxT(""), &ContactEditorData.BusinessTelephoneListTokens );