X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2Fcontacteditor%2FContactDataObject.cpp;h=28c29e70bc0ef8672e48278119e38aadf4100535;hp=9ced5ea15f11bf4b67da45286c4f5aa0ce93aa09;hb=f0dd29c82f3f39f76c0fd66eaed355d5c6a65074;hpb=1679607db68e8dc0de40711cb2123e68a8a52186 diff --git a/source/contacteditor/ContactDataObject.cpp b/source/contacteditor/ContactDataObject.cpp index 9ced5ea..28c29e7 100644 --- a/source/contacteditor/ContactDataObject.cpp +++ b/source/contacteditor/ContactDataObject.cpp @@ -77,6 +77,7 @@ ContactLoadStatus ContactDataObject::LoadFile(wxString Filename){ int ContactLineLen = 0; int QuoteBreakPoint = 0; int GroupCount = 0; + int FNCount = 0; wxString ContactLine; wxString PropertyLine; wxString PropertySeg1; @@ -188,6 +189,11 @@ ContactLoadStatus ContactDataObject::LoadFile(wxString Filename){ ProcessMember(PropertySeg1, PropertySeg2, &GroupCount); GroupCount++; + } else if (Property == wxT("FN")){ + + ProcessFN(PropertySeg1, PropertySeg2, &FNCount); + FNCount++; + } } @@ -312,8 +318,6 @@ void ContactDataObject::ProcessMember(wxString PropertySeg1, wxString PropertySe } - //SplitValues(&PropertySeg1, &SplitPoints, &SplitLength, intPrevValue); - GroupsList.insert(std::make_pair(*GroupCount, PropertySeg2)); if (!PropertyTokens.IsEmpty()){ @@ -325,6 +329,12 @@ void ContactDataObject::ProcessMember(wxString PropertySeg1, wxString PropertySe } +void ContactDataObject::ProcessFN(wxString PropertySeg1, wxString PropertySeg2, int *FNCount){ + + FullNamesList.insert(std::make_pair(*FNCount, PropertySeg2)); + +} + void SplitValues(wxString *PropertyLine, std::map *SplitPoints, std::map *SplitLength,