X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FContactDataObject.cpp;h=44a361d3b1da291de934629cc0273e1d158bcac1;hb=cccf4ec6bbbc80aaf383dbe9b88fc91671bdbaf5;hp=7d8f53511f9795064c901f4e493f1c5e8e629130;hpb=0a90006dce811f5df16fabea1a13c26232a4b775;p=xestiaab%2F.git

diff --git a/source/contacteditor/ContactDataObject.cpp b/source/contacteditor/ContactDataObject.cpp
index 7d8f535..44a361d 100644
--- a/source/contacteditor/ContactDataObject.cpp
+++ b/source/contacteditor/ContactDataObject.cpp
@@ -511,17 +511,8 @@ void ContactDataObject::ProcessRevision(wxString PropertySeg1, wxString Property
 		}			
 		
 		CaptureString(&PropertyValue, FALSE);
-								
-		if (FirstToken == TRUE){
-				
-			PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-			FirstToken = FALSE;
-				
-		} else {
-				
-			PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-				
-		}
+		
+		ProcessTokens(&PropertyName, &PropertyValue, &PropertyTokens, &FirstToken);
 	
 	}	
 	
@@ -5158,6 +5149,28 @@ void ContactDataObject::ProcessVendor(wxString PropertySeg1, wxString PropertySe
 
 }
 
+void ProcessTokens(wxString *PropertyName,
+	wxString *PropertyValue,
+	wxString *PropertyTokens,
+	bool *FirstToken){
+	
+	if (!PropertyName->IsEmpty() && !PropertyValue->IsEmpty() && *PropertyName != wxT("TYPE")){
+		
+		if (*FirstToken == TRUE){
+			
+			PropertyTokens->Append(*PropertyName + wxT("=") + *PropertyValue);
+			*FirstToken = FALSE;
+			
+		} else {
+			
+			PropertyTokens->Append(wxT(";") + *PropertyName + wxT("=") + *PropertyValue);
+			
+		}
+		
+	}
+	
+}
+
 void ProcessStringValue(wxString *PropertyName,
 	wxString PropertyNameMatch,
 	std::map<int,wxString> *MapPtr,