From d2e512c2da9fa34a6a8be978f1f3ef0ee90e797e Mon Sep 17 00:00:00 2001
From: Steve Brokenshire <sbrokenshire@xestia.co.uk>
Date: Wed, 30 Dec 2015 00:55:59 +0000
Subject: [PATCH] Implemented ROLE, ORG and NOTE with ContactDataObject.

---
 .../contacteditor/frmContactEditor-Load.cpp   | 45 ++++++++++++++++++-
 1 file changed, 43 insertions(+), 2 deletions(-)

diff --git a/source/contacteditor/frmContactEditor-Load.cpp b/source/contacteditor/frmContactEditor-Load.cpp
index 7e35538..02262fe 100644
--- a/source/contacteditor/frmContactEditor-Load.cpp
+++ b/source/contacteditor/frmContactEditor-Load.cpp
@@ -275,6 +275,47 @@ bool frmContactEditor::LoadContact(wxString Filename){
 		&ContactEditorData.BusinessTitleListPref,
 		lboBusinessTitles,
 		&TitleCount);
+		
+	// Process the roles (ROLE).
+	
+	LoadData(&ContactEditorData.GeneralRoleList,
+		&ContactEditorData.GeneralRoleListPref,
+		lboRoles,
+		&ContactEditorData.HomeRoleList,
+		&ContactEditorData.HomeRoleListPref,
+		lboHomeRoles,
+		&ContactEditorData.BusinessRoleList,
+		&ContactEditorData.BusinessRoleListPref,
+		lboBusinessRoles,
+		&RoleCount);
+
+	// Process the roles (ORG).
+	
+	LoadData(&ContactEditorData.GeneralOrganisationsList,
+		&ContactEditorData.GeneralOrganisationsListPref,
+		lboOrganisations,
+		&ContactEditorData.HomeOrganisationsList,
+		&ContactEditorData.HomeOrganisationsListPref,
+		lboHomeOrganisations,
+		&ContactEditorData.BusinessOrganisationsList,
+		&ContactEditorData.BusinessOrganisationsListPref,
+		lboBusinessOrganisations,
+		&OrgCount);
+		
+	// Process the notes (NOTE).
+		
+	LoadData(&ContactEditorData.GeneralNoteList,
+		&ContactEditorData.GeneralNoteListPref,
+		lboNotes,
+		&ContactEditorData.HomeNoteList,
+		&ContactEditorData.HomeNoteListPref,
+		lboHomeNotes,
+		&ContactEditorData.BusinessNoteList,
+		&ContactEditorData.BusinessNoteListPref,
+		lboBusinessNotes,
+		&NoteCount);
+		
+	// Process the 
 
 	for (std::map<int,wxString>::iterator iter = ContactFileLines.begin(); 
 	 iter != ContactFileLines.end(); ++iter){
@@ -485,7 +526,7 @@ bool frmContactEditor::LoadContact(wxString Filename){
 			
 			LoadTitle(wxSPropertySeg1, wxSPropertySeg2, &TitleCount);
 			
-		}*/ else if (wxSProperty == wxT("ROLE")) {
+		} else if (wxSProperty == wxT("ROLE")) {
 
 			// See frmContactEditor-LoadRole.cpp
 		
@@ -503,7 +544,7 @@ bool frmContactEditor::LoadContact(wxString Filename){
 
 			LoadNote(wxSPropertySeg1, wxSPropertySeg2, &NoteCount);	
 			
-		} else if (wxSProperty == wxT("CATEGORIES")) {
+		}*/ else if (wxSProperty == wxT("CATEGORIES")) {
 		
 			// See frmContactEditor-LoadCategory.cpp
 		
-- 
2.39.5