X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditor-Load.cpp;h=c8e13622f639d3759f8b774b56f3466bf385f274;hb=77d83d8634baf045dc48cdcc699dd7cb64538edb;hp=56e4b9ff3c4349cfcf3095070398dc681851dfa4;hpb=2077fd3163afbf00561d4d4030a087ffded67a81;p=xestiaab%2F.git diff --git a/source/contacteditor/frmContactEditor-Load.cpp b/source/contacteditor/frmContactEditor-Load.cpp index 56e4b9f..c8e1362 100644 --- a/source/contacteditor/frmContactEditor-Load.cpp +++ b/source/contacteditor/frmContactEditor-Load.cpp @@ -185,6 +185,16 @@ bool frmContactEditor::LoadContact(wxString Filename){ &ContactEditorData.BusinessAddressListPref, &ADRCount); + // Process the timezone (TZ) (frmContactEditor-LoadTimeZone.cpp) + + LoadTimeZone(&ContactEditorData.GeneralTZList, + &ContactEditorData.GeneralTZListPref, + &ContactEditorData.HomeTZList, + &ContactEditorData.HomeTZListPref, + &ContactEditorData.BusinessTZList, + &ContactEditorData.BusinessTZListPref, + &TZCount); + for (std::map::iterator iter = ContactFileLines.begin(); iter != ContactFileLines.end(); ++iter){ @@ -334,13 +344,13 @@ bool frmContactEditor::LoadContact(wxString Filename){ LoadAnniversary(wxSPropertySeg1, wxSPropertySeg2, &AnniversaryProcessed); - }*/ else if (wxSProperty == wxT("TZ")){ + } else if (wxSProperty == wxT("TZ")){ // See frmContactEditor-LoadTimeZone.cpp LoadTimeZone(wxSPropertySeg1, wxSPropertySeg2, &TZCount); - }/* else if (wxSProperty == wxT("ADR")){ + } else if (wxSProperty == wxT("ADR")){ // See frmContactEditor-LoadAddress.cpp