X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FContactDataObject.cpp;h=1acc7f9626090b2d6795b2fb196df2eb5eb7763e;hb=61ae72f92285e9b558927e2f64403a243a3290b4;hp=11e7549c3fbf919c38247757093af28b96c96ded;hpb=42c659b27b1081ea89c19977b28c27cc3bd8e3fb;p=xestiaab%2F.git

diff --git a/source/contacteditor/ContactDataObject.cpp b/source/contacteditor/ContactDataObject.cpp
index 11e7549..1acc7f9 100644
--- a/source/contacteditor/ContactDataObject.cpp
+++ b/source/contacteditor/ContactDataObject.cpp
@@ -3900,25 +3900,9 @@ void ContactDataObject::ProcessNote(wxString PropertySeg1, wxString PropertySeg2
 			NoteListPID->insert(std::make_pair(*NoteCount, 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){
-
-				NoteListPref->erase(*NoteCount);
-				NoteListPref->insert(std::make_pair(*NoteCount, PriorityNumber));
 
-			}
-					
+			ProcessIntegerValue(this, NoteListPref, &PropertyValue, NoteCount);
+		
 		} else if (PropertyName == wxT("LANGUAGE")){
 		
 			NoteListLanguage->erase(*NoteCount);
@@ -4045,25 +4029,9 @@ void ContactDataObject::ProcessCategory(wxString PropertySeg1, wxString Property
 			CategoriesListPID.insert(std::make_pair(*CategoryCount, 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){
-
-				CategoriesListPref.erase(*CategoryCount);
-				CategoriesListPref.insert(std::make_pair(*CategoryCount, PriorityNumber));
 
-			}
-					
+			ProcessIntegerValue(this, &CategoriesListPref, &PropertyValue, CategoryCount);
+			
 		} else if (PropertyName == wxT("LANGUAGE")){
 		
 			CategoriesListLanguage.erase(*CategoryCount);
@@ -4334,24 +4302,8 @@ void ContactDataObject::ProcessPhoto(wxString PropertySeg1, wxString PropertySeg
 			PicturesListPID.insert(std::make_pair(*PhotoCount, 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){
 
-				PicturesListPref.erase(*PhotoCount);
-				PicturesListPref.insert(std::make_pair(*PhotoCount, PriorityNumber));
-
-			}
+			ProcessIntegerValue(this, &PicturesListPref, &PropertyValue, PhotoCount);
 		
 		} else if (PropertyName == wxT("MEDIATYPE")){
 		
@@ -4551,24 +4503,8 @@ void ContactDataObject::ProcessLogo(wxString PropertySeg1, wxString PropertySeg2
 			LogosListPID.insert(std::make_pair(*LogoCount, 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){
 
-				LogosListPref.erase(*LogoCount);
-				LogosListPref.insert(std::make_pair(*LogoCount, PriorityNumber));
-
-			}
+			ProcessIntegerValue(this, &LogosListPref, &PropertyValue, LogoCount);
 		
 		} else if (PropertyName == wxT("MEDIATYPE")){
 		
@@ -4768,24 +4704,8 @@ void ContactDataObject::ProcessSound(wxString PropertySeg1, wxString PropertySeg
 			SoundsListPID.insert(std::make_pair(*SoundCount, 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){
-
-				SoundsListPref.erase(*SoundCount);
-				SoundsListPref.insert(std::make_pair(*SoundCount, PriorityNumber));
 
-			}
+			ProcessIntegerValue(this, &SoundsListPref, &PropertyValue, SoundCount);
 		
 		} else if (PropertyName == wxT("MEDIATYPE")){
 		
@@ -4990,24 +4910,8 @@ void ContactDataObject::ProcessCalendarURI(wxString PropertySeg1, wxString Prope
 			CalendarListPID.insert(std::make_pair(*CalURICount, 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){
-
-				CalendarListPref.erase(*CalURICount);
-				CalendarListPref.insert(std::make_pair(*CalURICount, PriorityNumber));
 
-			}
+			ProcessIntegerValue(this, &CalendarListPref, &PropertyValue, CalURICount);
 		
 		} else if (PropertyName == wxT("MEDIATYPE")){
 		
@@ -5142,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")){
 		
@@ -5294,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")){