X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditor-Load.cpp;h=56e4b9ff3c4349cfcf3095070398dc681851dfa4;hb=97ebb2bdd18e21f4ed3e7a99e91b411cf5827324;hp=4049a225fba42284358ebb7140e351cae3988e89;hpb=10578374729faf0e812c1953dee1b539a48ce091;p=xestiaab%2F.git

diff --git a/source/contacteditor/frmContactEditor-Load.cpp b/source/contacteditor/frmContactEditor-Load.cpp
index 4049a22..56e4b9f 100644
--- a/source/contacteditor/frmContactEditor-Load.cpp
+++ b/source/contacteditor/frmContactEditor-Load.cpp
@@ -161,6 +161,29 @@ bool frmContactEditor::LoadContact(wxString Filename){
 	LoadName(&ContactEditorData.NameTitle, &ContactEditorData.NameForename,
 		&ContactEditorData.NameSurname, &ContactEditorData.NameOtherNames,
 		&ContactEditorData.NameSuffix);
+		
+	// Process the group members (MEMBER) (frmContactEditor-LoadGroup.cpp)
+		
+	LoadMember(&ContactEditorData.GroupsList);
+
+	// Process the address (ADR) (frmContactEditor-LoadAddress.cpp)
+	
+	LoadAddress(&ContactEditorData.GeneralAddressList,
+		&ContactEditorData.GeneralAddressListTown,
+		&ContactEditorData.GeneralAddressListCounty,
+		&ContactEditorData.GeneralAddressListPostCode,
+		&ContactEditorData.GeneralAddressListPref,
+		&ContactEditorData.HomeAddressList,
+		&ContactEditorData.HomeAddressListTown,
+		&ContactEditorData.HomeAddressListCounty,
+		&ContactEditorData.HomeAddressListPostCode,
+		&ContactEditorData.HomeAddressListPref,
+		&ContactEditorData.BusinessAddressList,
+		&ContactEditorData.BusinessAddressListTown,
+		&ContactEditorData.BusinessAddressListCounty,
+		&ContactEditorData.BusinessAddressListPostCode,
+		&ContactEditorData.BusinessAddressListPref,
+		&ADRCount);
 
 	for (std::map<int,wxString>::iterator iter = ContactFileLines.begin(); 
 	 iter != ContactFileLines.end(); ++iter){
@@ -269,13 +292,13 @@ bool frmContactEditor::LoadContact(wxString Filename){
 		
 			LoadKind(wxSPropertySeg2);
 		
-		}*/ else if (wxSProperty == wxT("MEMBER")){
+		}/* else if (wxSProperty == wxT("MEMBER")){
 
 			// See frmContactEditor-LoadGroup.cpp
 
 			LoadMember(wxSPropertySeg2, &GroupCount);		
 		
-		} else if (wxSProperty == wxT("FN")){
+		}*/ else if (wxSProperty == wxT("FN")){
 		
 			// See frmContactEditor-LoadName.cpp
 		
@@ -317,13 +340,13 @@ bool frmContactEditor::LoadContact(wxString Filename){
 		
 			LoadTimeZone(wxSPropertySeg1, wxSPropertySeg2, &TZCount);	
 		
-		} else if (wxSProperty == wxT("ADR")){
+		}/* else if (wxSProperty == wxT("ADR")){
 			
 			// See frmContactEditor-LoadAddress.cpp
 		
 			LoadADR(wxSPropertySeg1, wxSPropertySeg2, &ADRCount);
 		
-		} else if (wxSProperty == wxT("EMAIL")){
+		}*/ else if (wxSProperty == wxT("EMAIL")){
 		
 			// See frmContactEditor-LoadEmail.cpp