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

diff --git a/source/contacteditor/frmContactEditor-Load.cpp b/source/contacteditor/frmContactEditor-Load.cpp
index ef9f4f4..56e4b9f 100644
--- a/source/contacteditor/frmContactEditor-Load.cpp
+++ b/source/contacteditor/frmContactEditor-Load.cpp
@@ -166,6 +166,25 @@ bool frmContactEditor::LoadContact(wxString Filename){
 		
 	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){
 	
@@ -321,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