X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FContactDataObject.cpp;h=caf08ee2d7ca0a8e3b7077591ee9f64b81d2bbc9;hb=7bd0c2c82c3574e95245fec7dc8a1ae2e184324a;hp=e9784dc661df6b09a1cbf8f694c42d0766816bc6;hpb=c556f865d9d5e104b8f60dd16828da22ea79b087;p=xestiaab%2F.git

diff --git a/source/contacteditor/ContactDataObject.cpp b/source/contacteditor/ContactDataObject.cpp
index e9784dc..caf08ee 100644
--- a/source/contacteditor/ContactDataObject.cpp
+++ b/source/contacteditor/ContactDataObject.cpp
@@ -2871,24 +2871,8 @@ void ContactDataObject::ProcessGeographic(wxString PropertySeg1, wxString Proper
 			GeopositionListMediatype->insert(std::make_pair(*GeographicCount, 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){
 
-				GeopositionListPref->erase(*GeographicCount);
-				GeopositionListPref->insert(std::make_pair(*GeographicCount, PriorityNumber));
-
-			}
+			ProcessIntegerValue(this, GeopositionListPref, &PropertyValue, GeographicCount);
 		
 		} else {
 		
@@ -3123,9 +3107,8 @@ void ContactDataObject::ProcessRelated(wxString PropertySeg1, wxString PropertyS
 			}
 		
 		} else if (PropertyName == wxT("LANGUAGE")){
-		
-			GeneralRelatedListLanguage.erase(*RelatedCount);
-			GeneralRelatedListLanguage.insert(std::make_pair(*RelatedCount, PropertyValue));
+
+			ProcessIntegerValue(this, &GeneralRelatedListPref, &PropertyValue, RelatedCount);
 		
 		} else if (PropertyName != wxT("TYPE")) {
 		
@@ -3276,25 +3259,9 @@ void ContactDataObject::ProcessURL(wxString PropertySeg1, wxString PropertySeg2,
 			WebsiteListPID->insert(std::make_pair(*URLCount, 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){
 
-				WebsiteListPref->erase(*URLCount);
-				WebsiteListPref->insert(std::make_pair(*URLCount, PriorityNumber));
-
-			}
-					
+			ProcessIntegerValue(this, WebsiteListPref, &PropertyValue, URLCount);
+							
 		} else if (PropertyName == wxT("MEDIATYPE")){
 		
 			WebsiteListMediatype->erase(*URLCount);