From 42c659b27b1081ea89c19977b28c27cc3bd8e3fb Mon Sep 17 00:00:00 2001 From: Steve Brokenshire Date: Mon, 28 Dec 2015 02:19:12 +0000 Subject: [PATCH] Replaced the PREF code in ORG with ProcessIntegerValue. --- source/contacteditor/ContactDataObject.cpp | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/source/contacteditor/ContactDataObject.cpp b/source/contacteditor/ContactDataObject.cpp index 3e800a8..11e7549 100644 --- a/source/contacteditor/ContactDataObject.cpp +++ b/source/contacteditor/ContactDataObject.cpp @@ -3742,25 +3742,9 @@ void ContactDataObject::ProcessOrganisation(wxString PropertySeg1, wxString Prop OrganisationsListSortAs->insert(std::make_pair(*OrganisationCount, 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){ - OrganisationsListPref->erase(*OrganisationCount); - OrganisationsListPref->insert(std::make_pair(*OrganisationCount, PriorityNumber)); - - } - + ProcessIntegerValue(this, OrganisationsListPref, &PropertyValue, OrganisationCount); + } else if (PropertyName == wxT("LANGUAGE")){ OrganisationsListLanguage->erase(*OrganisationCount); -- 2.39.5