X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2Fvcard%2Fvcard.cpp;h=fb34ab4bab8439c9e9aaee0e49873e6acd6ee354;hp=b6a9ee9a9b039a94158dbf78462e26953a379fa3;hb=2031be04c0036b44c40c473a07fdd31e898b2a11;hpb=8119f1f7e95a62628e20418ad7d327b41efb20cb

diff --git a/source/vcard/vcard.cpp b/source/vcard/vcard.cpp
index b6a9ee9..fb34ab4 100644
--- a/source/vcard/vcard.cpp
+++ b/source/vcard/vcard.cpp
@@ -190,6 +190,15 @@ vCardName vCard::GetName(){
 	vCardName NameData;
 	ArrayvCardOutData NameArray = this->GetByPartial(wxT("N"));
 	//wxString NameDataGet = NameArray.PropValues[0];
+	
+	if (NameArray.PropValues.Count() == 0)
+	{
+		// Use FN if there is no N values set.
+		wxString fullName = this->Get(wxT("FN"));
+		NameData.Forename = fullName;
+		return NameData; 
+	}
+	
 	wxString NameDataGet = NameArray.PropValues[0];
 	std::map<int, int> SplitPoints;
 	std::map<int, int> SplitLength;
@@ -198,7 +207,6 @@ vCardName vCard::GetName(){
 	// Process the name data to get the required information.
 	
 	int intPropertyLen = NameDataGet.Len();
-	int intSplitSeek = 0;
 	int intSplitsFound = 0;
 	int intSplitSize = 0;
 	int intPrevValue = 0;					
@@ -388,10 +396,8 @@ int vCard::WriteFile(wxString WriteFilename){
     
 		int SettingLineLen = SettingLine.Len();
 		int intDivider = 74;
-		int intTimes = floor((SettingLine.Len() / intDivider));
 		int intSeek = 0;
 		int intLineSeek = 0;
-		int intPrevLine;
 		bool FirstLine = TRUE;
     
 		// Remember to round down the calculation.
@@ -405,7 +411,6 @@ int vCard::WriteFile(wxString WriteFilename){
 				intSeek = intSeek + 3;
 				SettingLineLen = SettingLineLen + 3;
 				intLineSeek = 0;
-				intPrevLine = intSeek;
 				FirstLine = FALSE;
 		
 			}
@@ -414,26 +419,6 @@ int vCard::WriteFile(wxString WriteFilename){
 			intLineSeek++;
 	
 		}
-
-	/*
-
-	for (int x = 0; x < intTimes; x++){	
-	
-	    if (x == 0){
-		SettingLine.insert((intDivider - 1), wxT("\r\n "));
-	    } else if (x == intTimes){
-	    
-	    } else {
-		if (x < intDivider){
-			SettingLine.insert((intDivider * (x+1)) + (x * 3), wxT("\r\n "));
-		}
-	    }
-	    
-	    intTimes = floor(SettingLine.Len() / intDivider);
-	
-	}
-	
-	*/
 	
 		ContactFile.Write(SettingLine);
 	
@@ -511,7 +496,6 @@ void vCard::ProcessString(wxString *ContactDataInc){
 	wxString wxSPropertySeg2;
     
 	bool FoundBegin = FALSE;
-	bool FoundEnd = FALSE;
 	bool FirstContact = TRUE;
 	wxString FirstContactData;
 	wxString ContactData;
@@ -712,10 +696,8 @@ wxString vCard::WriteString(){
     
 		int SettingLineLen = SettingLine.Len();
 		int intDivider = 74;
-		int intTimes = floor((SettingLine.Len() / intDivider));
 		int intSeek = 0;
 		int intLineSeek = 0;
-		int intPrevLine;
 		bool FirstLine = TRUE;
     
 		// Remember to round down the calculation.
@@ -729,7 +711,6 @@ wxString vCard::WriteString(){
 				intSeek = intSeek + 3;
 				SettingLineLen = SettingLineLen + 3;
 				intLineSeek = 0;
-				intPrevLine = intSeek;
 				FirstLine = FALSE;
 		
 			}