X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FContactDataObject.cpp;h=1acc7f9626090b2d6795b2fb196df2eb5eb7763e;hb=61ae72f92285e9b558927e2f64403a243a3290b4;hp=eb30e5b9438801e6d2571f8751ea5557cce2b13a;hpb=9f12ee410502fee060799f36a768b01cfbd3a5c3;p=xestiaab%2F.git diff --git a/source/contacteditor/ContactDataObject.cpp b/source/contacteditor/ContactDataObject.cpp index eb30e5b..1acc7f9 100644 --- a/source/contacteditor/ContactDataObject.cpp +++ b/source/contacteditor/ContactDataObject.cpp @@ -5046,24 +5046,8 @@ void ContactDataObject::ProcessCalendarAddressURI(wxString PropertySeg1, wxStrin CalendarRequestListPID.insert(std::make_pair(*CalAdrURICount, PropertyValue)); } else if (PropertyName == wxT("PREF")){ - - int PriorityNumber = 0; - bool ValidNumber = TRUE; - - try{ - PriorityNumber = std::stoi(PropertyValue.ToStdString()); - } - - catch(std::invalid_argument &e){ - ValidNumber = FALSE; - } - if (ValidNumber == TRUE){ - - CalendarRequestListPref.erase(*CalAdrURICount); - CalendarRequestListPref.insert(std::make_pair(*CalAdrURICount, PriorityNumber)); - - } + ProcessIntegerValue(this, &CalendarRequestListPref, &PropertyValue, CalAdrURICount); } else if (PropertyName == wxT("MEDIATYPE")){ @@ -5198,24 +5182,8 @@ void ContactDataObject::ProcessCalendarFreeBusy(wxString PropertySeg1, wxString FreeBusyListPID.insert(std::make_pair(*FreeBusyAddressCount, PropertyValue)); } else if (PropertyName == wxT("PREF")){ - - int PriorityNumber = 0; - bool ValidNumber = TRUE; - - try{ - PriorityNumber = std::stoi(PropertyValue.ToStdString()); - } - - catch(std::invalid_argument &e){ - ValidNumber = FALSE; - } - if (ValidNumber == TRUE){ - - FreeBusyListPref.erase(*FreeBusyAddressCount); - FreeBusyListPref.insert(std::make_pair(*FreeBusyAddressCount, PriorityNumber)); - - } + ProcessIntegerValue(this, &FreeBusyListPref, &PropertyValue, FreeBusyAddressCount); } else if (PropertyName == wxT("MEDIATYPE")){