Removed commented out form code from ADR in ContactDataObject.

diff --git a/source/contacteditor/ContactDataObject.cpp b/source/contacteditor/ContactDataObject.cpp
index b543ebb..75612ac 100644 (file)
--- a/source/contacteditor/ContactDataObject.cpp
+++ b/source/contacteditor/ContactDataObject.cpp
@@ -1901,7 +1901,6 @@ void ContactDataObject::ProcessAddress(wxString PropertySeg1, wxString PropertyS
                        
                        SLiter = SplitLength.find(1);
                                                                
-                       //txtSurname->SetValue(ContactData.Convert(wxSPropertySeg2.Mid(0, SLiter->second), TRUE));
                        AddressPOBox = PropertySeg2.Mid(0, SLiter->second);
                        intPrevValue = intiter->second;
                
@@ -1912,7 +1911,6 @@ void ContactDataObject::ProcessAddress(wxString PropertySeg1, wxString PropertyS
                        SLiter = SplitLength.find(2);
                        
                        AddressExtended = PropertySeg2.Mid(intPrevValue, SLiter->second);
-                       //txtForename->SetValue(ContactData.Convert(wxSPropertySeg2.Mid(intPrevValue, SLiter->second), TRUE));
                        intPrevValue = intiter->second;
                
                } else if (intiter->first == 3){
@@ -1922,7 +1920,6 @@ void ContactDataObject::ProcessAddress(wxString PropertySeg1, wxString PropertyS
                        SLiter = SplitLength.find(3);
                                                                
                        AddressStreet = PropertySeg2.Mid(intPrevValue, SLiter->second);
-                       //txtOtherNames->SetValue(ContactData.Convert(wxSPropertySeg2.Mid(intPrevValue, SLiter->second), TRUE));
                        intPrevValue = intiter->second;
                
                } else if (intiter->first == 4){
@@ -1932,10 +1929,7 @@ void ContactDataObject::ProcessAddress(wxString PropertySeg1, wxString PropertyS
                        SLiter = SplitLength.find(4);
                        
                        AddressLocality = PropertySeg2.Mid(intPrevValue, SLiter->second);
-                       //txtTitle->SetValue(ContactData.Convert(wxSPropertySeg2.Mid(intPrevValue, SLiter->second), TRUE));
                        intPrevValue = intiter->second;
-                       
-                       //txtSuffix->SetValue(ContactData.Convert(wxSPropertySeg2.Mid(intPrevValue), TRUE));
                
                } else if (intiter->first == 5){
                
@@ -1944,10 +1938,8 @@ void ContactDataObject::ProcessAddress(wxString PropertySeg1, wxString PropertyS
                        SLiter = SplitLength.find(5);
                        
                        AddressRegion = PropertySeg2.Mid(intPrevValue, SLiter->second);
-                       //txtTitle->SetValue(ContactData.Convert(wxSPropertySeg2.Mid(intPrevValue, SLiter->second), TRUE));
                        intPrevValue = intiter->second;
                        
-                       //txtSuffix->SetValue(ContactData.Convert(wxSPropertySeg2.Mid(intPrevValue), TRUE));
                
                } else if (intiter->first == 6){
                
@@ -1956,14 +1948,12 @@ void ContactDataObject::ProcessAddress(wxString PropertySeg1, wxString PropertyS
                        SLiter = SplitLength.find(6);
                        
                        AddressPostalCode = PropertySeg2.Mid(intPrevValue, SLiter->second);
-                       //txtTitle->SetValue(ContactData.Convert(wxSPropertySeg2.Mid(intPrevValue, SLiter->second), TRUE));
                        intPrevValue = intiter->second;
                        
                        // Deal with country.
                                                
                        AddressCountry = PropertySeg2.Mid(intPrevValue, wxString::npos);
-                       //txtSuffix->SetValue(ContactData.Convert(wxSPropertySeg2.Mid(intPrevValue), TRUE));
-                       
+
                        break;
                
                }