From: Steve Brokenshire <sbrokenshire@xestia.co.uk>
Date: Mon, 28 Dec 2015 05:34:46 +0000 (+0000)
Subject: Replaced token processing in FN with ProcessTokens.
X-Git-Tag: release-0.09~153
X-Git-Url: http://Server1/repobrowser/?a=commitdiff_plain;h=e872c31783158c4a2d4bcfe689faccd6e54b8779;p=xestiaab%2F.git

Replaced token processing in FN with ProcessTokens.
---

diff --git a/source/contacteditor/ContactDataObject.cpp b/source/contacteditor/ContactDataObject.cpp
index b7a59e2..ae15502 100644
--- a/source/contacteditor/ContactDataObject.cpp
+++ b/source/contacteditor/ContactDataObject.cpp
@@ -815,20 +815,7 @@ void ContactDataObject::ProcessFN(wxString PropertySeg1, wxString PropertySeg2,
 		
 		}
 		
-		if (!PropertyName.IsEmpty() && !PropertyValue.IsEmpty()){
-			
-			if (FirstToken == TRUE){
-				
-				PropertyTokens.Append(PropertyName + wxT("=") + PropertyValue);
-				FirstToken = FALSE;
-				
-			} else {
-			
-				PropertyTokens.Append(wxT(";") + PropertyName + wxT("=") + PropertyValue);
-				
-			}
-			
-		} 
+		ProcessTokens(&PropertyName, &PropertyValue, &PropertyTokens, &FirstToken);
 	
 	}