X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fvcard%2Fvcard34conv-v3conv.cpp;h=8639a746fedf3bba87aef09af1d3da18a21b6159;hb=c139f797277a0cd85fe9f0b6b8244b791e0cf9ab;hp=0a308736fa2a02fe966cd2d41005a4f5a61048ec;hpb=e718a6dfeb482c14ce1d5c532113158e50abf994;p=xestiaab%2F.git

diff --git a/source/vcard/vcard34conv-v3conv.cpp b/source/vcard/vcard34conv-v3conv.cpp
index 0a30873..8639a74 100644
--- a/source/vcard/vcard34conv-v3conv.cpp
+++ b/source/vcard/vcard34conv-v3conv.cpp
@@ -1632,15 +1632,15 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){
             
 			intPrevValue = 6;
 			
-                    if (((QuoteBreakPoint + 1) - intPrevValue) <= 0){
+			if (((QuoteBreakPoint + 1) - intPrevValue) <= 0){
                         
-                        ContactDatav3.AddRaw(wxT("X-VCARD4-FBURL"), wxSPropertySeg2);
+				ContactDatav3.AddRaw(wxT("X-VCARD4-FBURL"), wxSPropertySeg2);
 
-                    } else {
+			} else {
                         
-                        ContactDatav3.AddRaw(wxT("X-VCARD4-FBURL;") + ContactLine.Mid(intPrevValue, ((QuoteBreakPoint + 1) - (intPrevValue + 1))), wxSPropertySeg2);
+				ContactDatav3.AddRaw(wxT("X-VCARD4-FBURL;") + ContactLine.Mid(intPrevValue, ((QuoteBreakPoint + 1) - (intPrevValue + 1))), wxSPropertySeg2);
 
-                    }
+			}
 		
 		} else if (wxSProperty == wxT("KEY")){
 		
@@ -1655,15 +1655,15 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){
 			
 			intPrevValue = 4;
 						
-            if (((QuoteBreakPoint + 1) - intPrevValue) <= 0){
+			if (((QuoteBreakPoint + 1) - intPrevValue) <= 0){
                         
-                ContactDatav3.AddRaw(wxT("X-VCARD4-KEY"), wxSPropertySeg2);
+				ContactDatav3.AddRaw(wxT("X-VCARD4-KEY"), wxSPropertySeg2);
 
-            } else {
+			} else {
                         
-                ContactDatav3.AddRaw(wxT("X-VCARD4-KEY;") + ContactLine.Mid(intPrevValue, ((QuoteBreakPoint + 1) - (intPrevValue + 1))), wxSPropertySeg2);
+				ContactDatav3.AddRaw(wxT("X-VCARD4-KEY;") + ContactLine.Mid(intPrevValue, ((QuoteBreakPoint + 1) - (intPrevValue + 1))), wxSPropertySeg2);
 
-            }
+			}
 		
 		} else if (wxSProperty == wxT("UID")){
 		
@@ -1689,30 +1689,84 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){
 			
 			}
 
-                    if (((QuoteBreakPoint + 1) - intPrevValue) <= 0){
+			if (((QuoteBreakPoint + 1) - intPrevValue) <= 0){
                         
-                        ContactDatav3.AddRaw(wxT("X-VCARD4-") + wxSProperty, wxSPropertySeg2);
+				ContactDatav3.AddRaw(wxT("X-VCARD4-") + wxSProperty, wxSPropertySeg2);
 
-                    } else {
+			} else {
                         
-                        ContactDatav3.AddRaw(wxT("X-VCARD4-") + wxSProperty + wxT(";") + ContactLine.Mid(intPrevValue, ((QuoteBreakPoint + 1) - (intPrevValue + 1))), wxSPropertySeg2);
+				ContactDatav3.AddRaw(wxT("X-VCARD4-") + wxSProperty + wxT(";") + ContactLine.Mid(intPrevValue, ((QuoteBreakPoint + 1) - (intPrevValue + 1))), wxSPropertySeg2);
 
-                    }
+			}
 		
 		} else if (wxSProperty.Mid(0, 2) == wxT("X-")){
 			
 			size_t intPrevValue = (wxSProperty.Len() + 1);
 			
-            if (((QuoteBreakPoint + 1) - intPrevValue) <= 0){
+			if (((QuoteBreakPoint + 1) - intPrevValue) <= 0){
                         
-                ContactDatav3.AddRaw(wxSProperty, wxSPropertySeg2);
+		                ContactDatav3.AddRaw(wxSProperty, wxSPropertySeg2);
 
-            } else {
+			} else {
                         
-                ContactDatav3.AddRaw(wxSProperty + wxT(";") + ContactLine.Mid(intPrevValue, ((QuoteBreakPoint + 1) - (intPrevValue + 1))), wxSPropertySeg2);
+				ContactDatav3.AddRaw(wxSProperty + wxT(";") + ContactLine.Mid(intPrevValue, ((QuoteBreakPoint + 1) - (intPrevValue + 1))), wxSPropertySeg2);
 
-            }
+			}
+			
+		} else if (wxSProperty.Mid(0, 12) == wxT("CLIENTPIDMAP")){
+		
+			// Process the Client PID maps.
+			
+			int intPrevValue = 14;
+			
+			intPrevValue = 12;
+			
+			if (((QuoteBreakPoint + 1) - intPrevValue) <= 0){
+                        
+		                ContactDatav3.AddRaw(wxT("X-VCARD4-CLIENTPIDMAP"), wxSPropertySeg2);
+
+			} else {
+                        
+				ContactDatav3.AddRaw(wxT("X-VCARD4-CLIENTPIDMAP;") + ContactLine.Mid(intPrevValue, ((QuoteBreakPoint + 1) - (intPrevValue + 1))), wxSPropertySeg2);
+
+			}
+		
+		} else if (wxSProperty.Mid(0, 3) == wxT("XML")){
+		
+			// Process the XML values.
 			
+			int intPrevValue = 5;
+			
+			intPrevValue = 3;
+			
+			if (((QuoteBreakPoint + 1) - intPrevValue) <= 0){
+                        
+		                ContactDatav3.AddRaw(wxT("X-VCARD4-XML"), wxSPropertySeg2);
+
+			} else {
+                        
+				ContactDatav3.AddRaw(wxT("X-VCARD4-XML;") + ContactLine.Mid(intPrevValue, ((QuoteBreakPoint + 1) - (intPrevValue + 1))), wxSPropertySeg2);
+
+			}
+		
+		} else if (wxSProperty.Mid(0, 6) == wxT("SOURCE")){
+		
+			// Process the source links.
+			
+			int intPrevValue = 8;
+			
+			intPrevValue = 6;
+			
+			if (((QuoteBreakPoint + 1) - intPrevValue) <= 0){
+                        
+		                ContactDatav3.AddRaw(wxT("X-VCARD4-SOURCE"), wxSPropertySeg2);
+
+			} else {
+                        
+				ContactDatav3.AddRaw(wxT("X-VCARD4-SOURCE;") + ContactLine.Mid(intPrevValue, ((QuoteBreakPoint + 1) - (intPrevValue + 1))), wxSPropertySeg2);
+
+			}
+		
 		}
 		
 		// Reset the variables.