X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2Fcontacteditor%2FContactDataObject.cpp;h=5f9ca27323295e8f83ad6275a9cb58f35ca95123;hp=54e0bfd1294367f85ff8c683258232f58b759b0b;hb=b19bbc6c6d83edfefba9c98e78a57d21eb8aa1a8;hpb=02c28b750d6eb441da1053646ca981a4a6473b75

diff --git a/source/contacteditor/ContactDataObject.cpp b/source/contacteditor/ContactDataObject.cpp
index 54e0bfd..5f9ca27 100644
--- a/source/contacteditor/ContactDataObject.cpp
+++ b/source/contacteditor/ContactDataObject.cpp
@@ -479,9 +479,39 @@ void ContactDataObject::ProcessN(wxString PropertySeg1, wxString PropertySeg2){
 		
 			NameLanguage = PropertyValue;
 		
+		} else if (PropertyName == wxT("SORT-AS")){
+		
+			if (PropertyValue.Left(1) == wxT("\"") && PropertyValue.Right(1) == wxT("\"") &&
+				PropertyValue.Len() >= 3){
+				NameDisplayAs = PropertyValue.Mid(1, (PropertyValue.Len() - 2));
+			}
+		
+		} else if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty()){
+			
+			if (FirstToken == TRUE){
+				
+				PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
+				FirstToken = FALSE;
+				
+			} else {
+			
+				PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
+				
+			}
+			
 		}
 	
 	}
+	
+	// Split the name data.
+	
+	// Add the name token data.
+	
+	if (!PropertyTokens.IsEmpty()){
+	
+		NameTokens = PropertyTokens;
+	
+	}
 
 }