X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FContactDataObject.cpp;h=44a361d3b1da291de934629cc0273e1d158bcac1;hb=cccf4ec6bbbc80aaf383dbe9b88fc91671bdbaf5;hp=ddb6a573c0dad0532ed314662467c390f69e5b29;hpb=fc09ab48fbdbbe77b63ce30e051b3118eb006f0b;p=xestiaab%2F.git diff --git a/source/contacteditor/ContactDataObject.cpp b/source/contacteditor/ContactDataObject.cpp index ddb6a57..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); } @@ -5161,14 +5152,14 @@ void ContactDataObject::ProcessVendor(wxString PropertySeg1, wxString PropertySe void ProcessTokens(wxString *PropertyName, wxString *PropertyValue, wxString *PropertyTokens, - bool FirstToken){ + bool *FirstToken){ if (!PropertyName->IsEmpty() && !PropertyValue->IsEmpty() && *PropertyName != wxT("TYPE")){ - if (FirstToken == TRUE){ + if (*FirstToken == TRUE){ PropertyTokens->Append(*PropertyName + wxT("=") + *PropertyValue); - FirstToken = FALSE; + *FirstToken = FALSE; } else {