Indented ClearData properly in ContactDataObject.

diff --git a/source/contacteditor/cdo/ContactDataObject.cpp b/source/contacteditor/cdo/ContactDataObject.cpp
index de1a2bf..c017406 100644 (file)
--- a/source/contacteditor/cdo/ContactDataObject.cpp
+++ b/source/contacteditor/cdo/ContactDataObject.cpp
@@ -4654,506 +4654,506 @@ void ContactDataObject::ProcessVendor(wxString PropertySeg1, wxString PropertySe
 void ContactDataObject::ClearData(){
 
        // Clear the contact information.
-       
-    NameTitle.clear();
-    NameForename.clear();
-    NameSurname.clear();
-    NameOtherNames.clear();
-    NameSuffix.clear();
-    NameNickname.clear();
-    NameDisplayAs.clear();
-    NameLanguage.clear();
-    NameAltID.clear();
-    NameTokens.clear();
-    
-    Birthday.clear();
-    BirthdayAltID.clear();
-    BirthdayCalScale.clear();
-    BirthdayTokens.clear();
-    Anniversary.clear();
-    AnniversaryAltID.clear();
-    AnniversaryCalScale.clear();
-    AnniversaryTokens.clear();
-    
-    Gender.clear();
-    GenderDetails.clear();
-    GenderTokens.clear();
-    
-    UIDToken.clear();
-    Revision.clear();
-    RevisionTokens.clear();
-    
-    SourceList.clear();
-    SourceListAltID.clear();
-    SourceListPID.clear();
-    SourceListType.clear();
-    SourceListTokens.clear();
-    SourceListMediatype.clear();
-    SourceListPref.clear();
-    
-    XMLList.clear();
-    XMLListAltID.clear();
-    
-    ClientPIDList.clear();
-    ClientPIDListTokens.clear();
-    
-    FullNamesList.clear();    
-    FullNamesListType.clear();
-    FullNamesListLanguage.clear();
-    FullNamesListAltID.clear();
-    FullNamesListPID.clear();
-    FullNamesListTokens.clear();
-    FullNamesListPref.clear();
-    
-    GeneralNicknamesList.clear();
-    GeneralNicknamesListType.clear();
-    GeneralNicknamesListLanguage.clear();
-    GeneralNicknamesListAltID.clear();
-    GeneralNicknamesListPID.clear();
-    GeneralNicknamesListTokens.clear();        
-    GeneralNicknamesListPref.clear();        
-    
-    GeneralAddressList.clear();
-    GeneralAddressListTown.clear();
-    GeneralAddressListCounty.clear();
-    GeneralAddressListPostCode.clear();
-    GeneralAddressListCountry.clear();
-    GeneralAddressListLabel.clear();
-    GeneralAddressListLang.clear();        
-    GeneralAddressListAltID.clear();
-    GeneralAddressListPID.clear();
-    GeneralAddressListTokens.clear();
-    GeneralAddressListGeo.clear();
-    GeneralAddressListTimezone.clear();        
-    GeneralAddressListType.clear();
-    GeneralAddressListMediatype.clear();
-    GeneralAddressListPref.clear();
-    
-    GeneralEmailList.clear();
-    GeneralEmailListAltID.clear();
-    GeneralEmailListPID.clear();
-    GeneralEmailListType.clear();
-    GeneralEmailListTokens.clear();
-    GeneralEmailListPref.clear();
-    
-    GeneralIMList.clear();
-    GeneralIMListAltID.clear();
-    GeneralIMListPID.clear();
-    GeneralIMListType.clear();
-    GeneralIMListTypeInfo.clear();
-    GeneralIMListTokens.clear();
-    GeneralIMListMediatype.clear();
-    GeneralIMListPref.clear();
-    
-    GeneralTelephoneList.clear();
-    GeneralTelephoneListAltID.clear();
-    GeneralTelephoneListPID.clear();
-    GeneralTelephoneListType.clear();
-    GeneralTelephoneListTokens.clear();
-    GeneralTelephoneListTypeInfo.clear();
-    GeneralTelephoneListPref.clear();
-    
-    GeneralLanguageList.clear();
-    GeneralLanguageListAltID.clear();
-    GeneralLanguageListPID.clear();
-    GeneralLanguageListType.clear();
-    GeneralLanguageListTokens.clear();
-    GeneralLanguageListPref.clear();
-    
-    GeneralTZList.clear();
-    GeneralTZListAltID.clear();
-    GeneralTZListPID.clear();
-    GeneralTZListType.clear();
-    GeneralTZListTokens.clear();
-    GeneralTZListMediatype.clear();
-    GeneralTZListPref.clear();
-    
-    GeneralGeographyList.clear();
-    GeneralGeographyListAltID.clear();
-    GeneralGeographyListPID.clear();
-    GeneralGeographyListType.clear();
-    GeneralGeographyListTokens.clear();
-    GeneralGeographyListMediatype.clear();
-    GeneralGeographyListPref.clear();
-    
-    GeneralRelatedList.clear();
-    GeneralRelatedListRelType.clear();
-    GeneralRelatedListLanguage.clear();
-    GeneralRelatedListAltID.clear();
-    GeneralRelatedListPID.clear();
-    GeneralRelatedListType.clear();
-    GeneralRelatedListTokens.clear();
-    GeneralRelatedListPref.clear();
-    
-    GeneralWebsiteList.clear();
-    GeneralWebsiteListAltID.clear();
-    GeneralWebsiteListPID.clear();
-    GeneralWebsiteListType.clear();
-    GeneralWebsiteListTokens.clear();
-    GeneralWebsiteListMediatype.clear();
-    GeneralWebsiteListPref.clear();
-    
-    GeneralTitleList.clear();
-    GeneralTitleListLanguage.clear();        
-    GeneralTitleListAltID.clear();
-    GeneralTitleListPID.clear();
-    GeneralTitleListType.clear();
-    GeneralTitleListTokens.clear();
-    GeneralTitleListPref.clear();
-    
-    GeneralRoleList.clear();
-    GeneralRoleListLanguage.clear();        
-    GeneralRoleListAltID.clear();
-    GeneralRoleListPID.clear();
-    GeneralRoleListType.clear();
-    GeneralRoleListTokens.clear();
-    GeneralRoleListPref.clear();
-    
-    GeneralOrganisationsList.clear();
-    GeneralOrganisationsListLanguage.clear();        
-    GeneralOrganisationsListAltID.clear();
-    GeneralOrganisationsListPID.clear();
-    GeneralOrganisationsListType.clear();
-    GeneralOrganisationsListTokens.clear();
-    GeneralOrganisationsListSortAs.clear();
-    GeneralOrganisationsListPref.clear();
-    
-    GeneralNoteList.clear();
-    GeneralNoteListLanguage.clear();        
-    GeneralNoteListAltID.clear();
-    GeneralNoteListPID.clear();
-    GeneralNoteListType.clear();
-    GeneralNoteListTokens.clear();
-    GeneralNoteListPref.clear();
-    
-    /* Items on Home Tab */        
-    
-    HomeNicknamesList.clear();
-    HomeNicknamesListType.clear();
-    HomeNicknamesListLanguage.clear();
-    HomeNicknamesListAltID.clear();
-    HomeNicknamesListPID.clear();
-    HomeNicknamesListTokens.clear();        
-    HomeNicknamesListPref.clear();        
-    
-    HomeAddressList.clear();
-    HomeAddressListTown.clear();
-    HomeAddressListCounty.clear();
-    HomeAddressListPostCode.clear();
-    HomeAddressListCountry.clear();
-    HomeAddressListLabel.clear();
-    HomeAddressListLang.clear();        
-    HomeAddressListAltID.clear();
-    HomeAddressListPID.clear();
-    HomeAddressListTokens.clear();
-    HomeAddressListGeo.clear();
-    HomeAddressListTimezone.clear();        
-    HomeAddressListType.clear();
-    HomeAddressListMediatype.clear();
-    HomeAddressListPref.clear();
-    
-    HomeEmailList.clear();
-    HomeEmailListAltID.clear();
-    HomeEmailListPID.clear();
-    HomeEmailListType.clear();
-    HomeEmailListTokens.clear();
-    HomeEmailListPref.clear();
-    
-    HomeIMList.clear();
-    HomeIMListAltID.clear();
-    HomeIMListPID.clear();
-    HomeIMListType.clear();
-    HomeIMListTypeInfo.clear();
-    HomeIMListTokens.clear();
-    HomeIMListMediatype.clear();
-    HomeIMListPref.clear();
-    
-    HomeTelephoneList.clear();
-    HomeTelephoneListAltID.clear();
-    HomeTelephoneListPID.clear();
-    HomeTelephoneListType.clear();
-    HomeTelephoneListTokens.clear();
-    HomeTelephoneListTypeInfo.clear();
-    HomeTelephoneListPref.clear();
-    
-    HomeLanguageList.clear();
-    HomeLanguageListAltID.clear();
-    HomeLanguageListPID.clear();
-    HomeLanguageListType.clear();
-    HomeLanguageListTokens.clear();
-    HomeLanguageListPref.clear();
-    
-    HomeTZList.clear();
-    HomeTZListAltID.clear();
-    HomeTZListPID.clear();
-    HomeTZListType.clear();
-    HomeTZListTokens.clear();
-    HomeTZListMediatype.clear();
-    HomeTZListPref.clear();
-    
-    HomeGeographyList.clear();
-    HomeGeographyListAltID.clear();
-    HomeGeographyListPID.clear();
-    HomeGeographyListType.clear();
-    HomeGeographyListTokens.clear();
-    HomeGeographyListMediatype.clear();
-    HomeGeographyListPref.clear();       
-    
-    HomeWebsiteList.clear();
-    HomeWebsiteListAltID.clear();
-    HomeWebsiteListPID.clear();
-    HomeWebsiteListType.clear();
-    HomeWebsiteListTokens.clear();
-    HomeWebsiteListMediatype.clear();
-    HomeWebsiteListPref.clear();
-    
-    HomeTitleList.clear();
-    HomeTitleListLanguage.clear();
-    HomeTitleListAltID.clear();
-    HomeTitleListPID.clear();
-    HomeTitleListType.clear();
-    HomeTitleListTokens.clear();
-    HomeTitleListPref.clear();
-    
-    HomeRoleList.clear();
-    HomeRoleListLanguage.clear();        
-    HomeRoleListAltID.clear();
-    HomeRoleListPID.clear();
-    HomeRoleListType.clear();
-    HomeRoleListTokens.clear();
-    HomeRoleListPref.clear();
-    
-    HomeOrganisationsList.clear();
-    HomeOrganisationsListLanguage.clear();        
-    HomeOrganisationsListAltID.clear();
-    HomeOrganisationsListPID.clear();
-    HomeOrganisationsListType.clear();
-    HomeOrganisationsListTokens.clear();
-    HomeOrganisationsListSortAs.clear();
-    HomeOrganisationsListPref.clear();
-    
-    HomeNoteList.clear();
-    HomeNoteListLanguage.clear();        
-    HomeNoteListAltID.clear();
-    HomeNoteListPID.clear();
-    HomeNoteListType.clear();
-    HomeNoteListTokens.clear();
-    HomeNoteListPref.clear();        
-    
-    /* Items on the Business tab */
-    
-    BusinessNicknamesList.clear();
-    BusinessNicknamesListType.clear();
-    BusinessNicknamesListLanguage.clear();
-    BusinessNicknamesListAltID.clear();
-    BusinessNicknamesListPID.clear();
-    BusinessNicknamesListTokens.clear();        
-    BusinessNicknamesListPref.clear();        
-    
-    BusinessAddressList.clear();
-    BusinessAddressListTown.clear();
-    BusinessAddressListCounty.clear();
-    BusinessAddressListPostCode.clear();
-    BusinessAddressListCountry.clear();
-    BusinessAddressListLabel.clear();
-    BusinessAddressListLang.clear();        
-    BusinessAddressListAltID.clear();
-    BusinessAddressListPID.clear();
-    BusinessAddressListTokens.clear();
-    BusinessAddressListGeo.clear();
-    BusinessAddressListTimezone.clear();        
-    BusinessAddressListType.clear();
-    BusinessAddressListMediatype.clear();
-    BusinessAddressListPref.clear();
-    
-    BusinessEmailList.clear();
-    BusinessEmailListAltID.clear();
-    BusinessEmailListPID.clear();
-    BusinessEmailListType.clear();
-    BusinessEmailListTokens.clear();
-    BusinessEmailListPref.clear();
-    
-    BusinessIMList.clear();
-    BusinessIMListAltID.clear();
-    BusinessIMListPID.clear();
-    BusinessIMListType.clear();
-    BusinessIMListTokens.clear();
-    BusinessIMListMediatype.clear();
-    BusinessIMListPref.clear();
-    
-    BusinessTelephoneList.clear();
-    BusinessTelephoneListAltID.clear();
-    BusinessTelephoneListPID.clear();
-    BusinessTelephoneListType.clear();
-    BusinessTelephoneListTokens.clear();
-    BusinessTelephoneListPref.clear();
-    
-    BusinessLanguageList.clear();
-    BusinessLanguageListAltID.clear();
-    BusinessLanguageListPID.clear();
-    BusinessLanguageListType.clear();
-    BusinessLanguageListTokens.clear();
-    BusinessLanguageListPref.clear();
-    
-    BusinessTZList.clear();
-    BusinessTZListAltID.clear();
-    BusinessTZListPID.clear();
-    BusinessTZListType.clear();
-    BusinessTZListTokens.clear();
-    BusinessTZListMediatype.clear();
-    BusinessTZListPref.clear();
-    
-    BusinessGeographyList.clear();
-    BusinessGeographyListAltID.clear();
-    BusinessGeographyListPID.clear();
-    BusinessGeographyListType.clear();
-    BusinessGeographyListTokens.clear();
-    BusinessGeographyListMediatype.clear();
-    BusinessGeographyListPref.clear();          
-    
-    BusinessWebsiteList.clear();
-    BusinessWebsiteListAltID.clear();
-    BusinessWebsiteListPID.clear();
-    BusinessWebsiteListType.clear();
-    BusinessWebsiteListTokens.clear();
-    BusinessWebsiteListMediatype.clear();
-    BusinessWebsiteListPref.clear();
-    
-    BusinessTitleList.clear();
-    BusinessTitleListLanguage.clear();        
-    BusinessTitleListAltID.clear();
-    BusinessTitleListPID.clear();
-    BusinessTitleListType.clear();
-    BusinessTitleListTokens.clear();
-    BusinessTitleListPref.clear();
-    
-    BusinessRoleList.clear();
-    BusinessRoleListLanguage.clear();        
-    BusinessRoleListAltID.clear();
-    BusinessRoleListPID.clear();
-    BusinessRoleListType.clear();
-    BusinessRoleListTokens.clear();
-    BusinessRoleListPref.clear();
-    
-    BusinessOrganisationsList.clear();
-    BusinessOrganisationsListLanguage.clear();        
-    BusinessOrganisationsListAltID.clear();
-    BusinessOrganisationsListPID.clear();
-    BusinessOrganisationsListType.clear();
-    BusinessOrganisationsListTokens.clear();
-    BusinessOrganisationsListSortAs.clear();        
-    BusinessOrganisationsListPref.clear();
-    
-    BusinessNoteList.clear();
-    BusinessNoteListLanguage.clear();        
-    BusinessNoteListAltID.clear();
-    BusinessNoteListPID.clear();
-    BusinessNoteListType.clear();
-    BusinessNoteListTokens.clear();
-    BusinessNoteListPref.clear();        
-    
-    /* Items on the Categories tab */
-    
-    CategoriesList.clear();
-    CategoriesListAltID.clear();
-    CategoriesListPID.clear();
-    CategoriesListType.clear();
-    CategoriesListTokens.clear();
-    CategoriesListLanguage.clear();
-    CategoriesListPref.clear();    
-    
-    /* Items on the Groups tab */
-    
-    GroupsList.clear();
-    GroupsListAltID.clear();
-    GroupsListPID.clear();
-    GroupsListType.clear();
-    GroupsListMediaType.clear();
-    GroupsListTokens.clear();
-    GroupsListPref.clear();
-    
-    /* Items on the Pictures tab */
-    
-    PicturesList.clear();
-    PicturesListAltID.clear();
-    PicturesListPID.clear();
-    PicturesListType.clear();
-    PicturesListPicEncType.clear();
-    PicturesListPictureType.clear();
-    PicturesListTokens.clear();
-    PicturesListMediatype.clear();        
-    PicturesListPref.clear();
-    
-    /* Items on the Logos tab */
-    
-    LogosList.clear();
-    LogosListAltID.clear();
-    LogosListPID.clear();
-    LogosListType.clear();
-    LogosListPicEncType.clear();        
-    LogosListPictureType.clear();
-    LogosListTokens.clear();
-    LogosListMediatype.clear();        
-    LogosListPref.clear();
-    
-    /* Items on the Sounds tab */
-    
-    SoundsList.clear();
-    SoundsListAltID.clear();
-    SoundsListPID.clear();
-    SoundsListType.clear();
-    SoundsListAudioEncType.clear();        
-    SoundsListAudioType.clear();        
-    SoundsListTokens.clear();
-    SoundsListMediatype.clear();        
-    SoundsListPref.clear();    
-    
-    /* Items on the Calendaring tab */
-    
-    CalendarList.clear();
-    CalendarListAltID.clear();
-    CalendarListPID.clear();
-    CalendarListType.clear();
-    CalendarListTokens.clear();
-    CalendarListMediatype.clear();        
-    CalendarListPref.clear();
-    
-    CalendarRequestList.clear();
-    CalendarRequestListAltID.clear();
-    CalendarRequestListPID.clear();
-    CalendarRequestListType.clear();
-    CalendarRequestListTokens.clear();
-    CalendarRequestListMediatype.clear();        
-    CalendarRequestListPref.clear();        
-    
-    FreeBusyList.clear();
-    FreeBusyListAltID.clear();
-    FreeBusyListPID.clear();
-    FreeBusyListType.clear();
-    FreeBusyListTokens.clear();
-    FreeBusyListMediatype.clear();        
-    FreeBusyListPref.clear();
-    
-    /* Items on the Security tab */
-    
-    KeyList.clear();
-    KeyListAltID.clear();
-    KeyListPID.clear();
-    KeyListKeyType.clear();        
-    KeyListDataType.clear();        
-    KeyListDataEncType.clear();
-    KeyListType.clear();
-    KeyListTokens.clear();
-    KeyListPref.clear();
-    
-    /* Items on the Other tab */
-    
-    VendorList.clear();
-    VendorListPEN.clear();
-    VendorListElement.clear();
-    
-    XTokenList.clear();
-    XTokenListTokens.clear();
+
+       NameTitle.clear();
+       NameForename.clear();
+       NameSurname.clear();
+       NameOtherNames.clear();
+       NameSuffix.clear();
+       NameNickname.clear();
+       NameDisplayAs.clear();
+       NameLanguage.clear();
+       NameAltID.clear();
+       NameTokens.clear();
+
+       Birthday.clear();
+       BirthdayAltID.clear();
+       BirthdayCalScale.clear();
+       BirthdayTokens.clear();
+       Anniversary.clear();
+       AnniversaryAltID.clear();
+       AnniversaryCalScale.clear();
+       AnniversaryTokens.clear();
+
+       Gender.clear();
+       GenderDetails.clear();
+       GenderTokens.clear();
+
+       UIDToken.clear();
+       Revision.clear();
+       RevisionTokens.clear();
+
+       SourceList.clear();
+       SourceListAltID.clear();
+       SourceListPID.clear();
+       SourceListType.clear();
+       SourceListTokens.clear();
+       SourceListMediatype.clear();
+       SourceListPref.clear();
+
+       XMLList.clear();
+       XMLListAltID.clear();
+
+       ClientPIDList.clear();
+       ClientPIDListTokens.clear();
+
+       FullNamesList.clear();    
+       FullNamesListType.clear();
+       FullNamesListLanguage.clear();
+       FullNamesListAltID.clear();
+       FullNamesListPID.clear();
+       FullNamesListTokens.clear();
+       FullNamesListPref.clear();
+
+       GeneralNicknamesList.clear();
+       GeneralNicknamesListType.clear();
+       GeneralNicknamesListLanguage.clear();
+       GeneralNicknamesListAltID.clear();
+       GeneralNicknamesListPID.clear();
+       GeneralNicknamesListTokens.clear();        
+       GeneralNicknamesListPref.clear();        
+
+       GeneralAddressList.clear();
+       GeneralAddressListTown.clear();
+       GeneralAddressListCounty.clear();
+       GeneralAddressListPostCode.clear();
+       GeneralAddressListCountry.clear();
+       GeneralAddressListLabel.clear();
+       GeneralAddressListLang.clear();        
+       GeneralAddressListAltID.clear();
+       GeneralAddressListPID.clear();
+       GeneralAddressListTokens.clear();
+       GeneralAddressListGeo.clear();
+       GeneralAddressListTimezone.clear();        
+       GeneralAddressListType.clear();
+       GeneralAddressListMediatype.clear();
+       GeneralAddressListPref.clear();
+
+       GeneralEmailList.clear();
+       GeneralEmailListAltID.clear();
+       GeneralEmailListPID.clear();
+       GeneralEmailListType.clear();
+       GeneralEmailListTokens.clear();
+       GeneralEmailListPref.clear();
+
+       GeneralIMList.clear();
+       GeneralIMListAltID.clear();
+       GeneralIMListPID.clear();
+       GeneralIMListType.clear();
+       GeneralIMListTypeInfo.clear();
+       GeneralIMListTokens.clear();
+       GeneralIMListMediatype.clear();
+       GeneralIMListPref.clear();
+
+       GeneralTelephoneList.clear();
+       GeneralTelephoneListAltID.clear();
+       GeneralTelephoneListPID.clear();
+       GeneralTelephoneListType.clear();
+       GeneralTelephoneListTokens.clear();
+       GeneralTelephoneListTypeInfo.clear();
+       GeneralTelephoneListPref.clear();
+
+       GeneralLanguageList.clear();
+       GeneralLanguageListAltID.clear();
+       GeneralLanguageListPID.clear();
+       GeneralLanguageListType.clear();
+       GeneralLanguageListTokens.clear();
+       GeneralLanguageListPref.clear();
+
+       GeneralTZList.clear();
+       GeneralTZListAltID.clear();
+       GeneralTZListPID.clear();
+       GeneralTZListType.clear();
+       GeneralTZListTokens.clear();
+       GeneralTZListMediatype.clear();
+       GeneralTZListPref.clear();
+
+       GeneralGeographyList.clear();
+       GeneralGeographyListAltID.clear();
+       GeneralGeographyListPID.clear();
+       GeneralGeographyListType.clear();
+       GeneralGeographyListTokens.clear();
+       GeneralGeographyListMediatype.clear();
+       GeneralGeographyListPref.clear();
+
+       GeneralRelatedList.clear();
+       GeneralRelatedListRelType.clear();
+       GeneralRelatedListLanguage.clear();
+       GeneralRelatedListAltID.clear();
+       GeneralRelatedListPID.clear();
+       GeneralRelatedListType.clear();
+       GeneralRelatedListTokens.clear();
+       GeneralRelatedListPref.clear();
+
+       GeneralWebsiteList.clear();
+       GeneralWebsiteListAltID.clear();
+       GeneralWebsiteListPID.clear();
+       GeneralWebsiteListType.clear();
+       GeneralWebsiteListTokens.clear();
+       GeneralWebsiteListMediatype.clear();
+       GeneralWebsiteListPref.clear();
+
+       GeneralTitleList.clear();
+       GeneralTitleListLanguage.clear();        
+       GeneralTitleListAltID.clear();
+       GeneralTitleListPID.clear();
+       GeneralTitleListType.clear();
+       GeneralTitleListTokens.clear();
+       GeneralTitleListPref.clear();
+
+       GeneralRoleList.clear();
+       GeneralRoleListLanguage.clear();        
+       GeneralRoleListAltID.clear();
+       GeneralRoleListPID.clear();
+       GeneralRoleListType.clear();
+       GeneralRoleListTokens.clear();
+       GeneralRoleListPref.clear();
+
+       GeneralOrganisationsList.clear();
+       GeneralOrganisationsListLanguage.clear();        
+       GeneralOrganisationsListAltID.clear();
+       GeneralOrganisationsListPID.clear();
+       GeneralOrganisationsListType.clear();
+       GeneralOrganisationsListTokens.clear();
+       GeneralOrganisationsListSortAs.clear();
+       GeneralOrganisationsListPref.clear();
+
+       GeneralNoteList.clear();
+       GeneralNoteListLanguage.clear();        
+       GeneralNoteListAltID.clear();
+       GeneralNoteListPID.clear();
+       GeneralNoteListType.clear();
+       GeneralNoteListTokens.clear();
+       GeneralNoteListPref.clear();
+
+       /* Items on Home Tab */        
+
+       HomeNicknamesList.clear();
+       HomeNicknamesListType.clear();
+       HomeNicknamesListLanguage.clear();
+       HomeNicknamesListAltID.clear();
+       HomeNicknamesListPID.clear();
+       HomeNicknamesListTokens.clear();        
+       HomeNicknamesListPref.clear();        
+
+       HomeAddressList.clear();
+       HomeAddressListTown.clear();
+       HomeAddressListCounty.clear();
+       HomeAddressListPostCode.clear();
+       HomeAddressListCountry.clear();
+       HomeAddressListLabel.clear();
+       HomeAddressListLang.clear();        
+       HomeAddressListAltID.clear();
+       HomeAddressListPID.clear();
+       HomeAddressListTokens.clear();
+       HomeAddressListGeo.clear();
+       HomeAddressListTimezone.clear();        
+       HomeAddressListType.clear();
+       HomeAddressListMediatype.clear();
+       HomeAddressListPref.clear();
+
+       HomeEmailList.clear();
+       HomeEmailListAltID.clear();
+       HomeEmailListPID.clear();
+       HomeEmailListType.clear();
+       HomeEmailListTokens.clear();
+       HomeEmailListPref.clear();
+
+       HomeIMList.clear();
+       HomeIMListAltID.clear();
+       HomeIMListPID.clear();
+       HomeIMListType.clear();
+       HomeIMListTypeInfo.clear();
+       HomeIMListTokens.clear();
+       HomeIMListMediatype.clear();
+       HomeIMListPref.clear();
+
+       HomeTelephoneList.clear();
+       HomeTelephoneListAltID.clear();
+       HomeTelephoneListPID.clear();
+       HomeTelephoneListType.clear();
+       HomeTelephoneListTokens.clear();
+       HomeTelephoneListTypeInfo.clear();
+       HomeTelephoneListPref.clear();
+
+       HomeLanguageList.clear();
+       HomeLanguageListAltID.clear();
+       HomeLanguageListPID.clear();
+       HomeLanguageListType.clear();
+       HomeLanguageListTokens.clear();
+       HomeLanguageListPref.clear();
+
+       HomeTZList.clear();
+       HomeTZListAltID.clear();
+       HomeTZListPID.clear();
+       HomeTZListType.clear();
+       HomeTZListTokens.clear();
+       HomeTZListMediatype.clear();
+       HomeTZListPref.clear();
+
+       HomeGeographyList.clear();
+       HomeGeographyListAltID.clear();
+       HomeGeographyListPID.clear();
+       HomeGeographyListType.clear();
+       HomeGeographyListTokens.clear();
+       HomeGeographyListMediatype.clear();
+       HomeGeographyListPref.clear();       
+
+       HomeWebsiteList.clear();
+       HomeWebsiteListAltID.clear();
+       HomeWebsiteListPID.clear();
+       HomeWebsiteListType.clear();
+       HomeWebsiteListTokens.clear();
+       HomeWebsiteListMediatype.clear();
+       HomeWebsiteListPref.clear();
+
+       HomeTitleList.clear();
+       HomeTitleListLanguage.clear();
+       HomeTitleListAltID.clear();
+       HomeTitleListPID.clear();
+       HomeTitleListType.clear();
+       HomeTitleListTokens.clear();
+       HomeTitleListPref.clear();
+
+       HomeRoleList.clear();
+       HomeRoleListLanguage.clear();        
+       HomeRoleListAltID.clear();
+       HomeRoleListPID.clear();
+       HomeRoleListType.clear();
+       HomeRoleListTokens.clear();
+       HomeRoleListPref.clear();
+
+       HomeOrganisationsList.clear();
+       HomeOrganisationsListLanguage.clear();        
+       HomeOrganisationsListAltID.clear();
+       HomeOrganisationsListPID.clear();
+       HomeOrganisationsListType.clear();
+       HomeOrganisationsListTokens.clear();
+       HomeOrganisationsListSortAs.clear();
+       HomeOrganisationsListPref.clear();
+
+       HomeNoteList.clear();
+       HomeNoteListLanguage.clear();        
+       HomeNoteListAltID.clear();
+       HomeNoteListPID.clear();
+       HomeNoteListType.clear();
+       HomeNoteListTokens.clear();
+       HomeNoteListPref.clear();        
+
+       /* Items on the Business tab */
+
+       BusinessNicknamesList.clear();
+       BusinessNicknamesListType.clear();
+       BusinessNicknamesListLanguage.clear();
+       BusinessNicknamesListAltID.clear();
+       BusinessNicknamesListPID.clear();
+       BusinessNicknamesListTokens.clear();        
+       BusinessNicknamesListPref.clear();        
+
+       BusinessAddressList.clear();
+       BusinessAddressListTown.clear();
+       BusinessAddressListCounty.clear();
+       BusinessAddressListPostCode.clear();
+       BusinessAddressListCountry.clear();
+       BusinessAddressListLabel.clear();
+       BusinessAddressListLang.clear();        
+       BusinessAddressListAltID.clear();
+       BusinessAddressListPID.clear();
+       BusinessAddressListTokens.clear();
+       BusinessAddressListGeo.clear();
+       BusinessAddressListTimezone.clear();        
+       BusinessAddressListType.clear();
+       BusinessAddressListMediatype.clear();
+       BusinessAddressListPref.clear();
+
+       BusinessEmailList.clear();
+       BusinessEmailListAltID.clear();
+       BusinessEmailListPID.clear();
+       BusinessEmailListType.clear();
+       BusinessEmailListTokens.clear();
+       BusinessEmailListPref.clear();
+
+       BusinessIMList.clear();
+       BusinessIMListAltID.clear();
+       BusinessIMListPID.clear();
+       BusinessIMListType.clear();
+       BusinessIMListTokens.clear();
+       BusinessIMListMediatype.clear();
+       BusinessIMListPref.clear();
+
+       BusinessTelephoneList.clear();
+       BusinessTelephoneListAltID.clear();
+       BusinessTelephoneListPID.clear();
+       BusinessTelephoneListType.clear();
+       BusinessTelephoneListTokens.clear();
+       BusinessTelephoneListPref.clear();
+
+       BusinessLanguageList.clear();
+       BusinessLanguageListAltID.clear();
+       BusinessLanguageListPID.clear();
+       BusinessLanguageListType.clear();
+       BusinessLanguageListTokens.clear();
+       BusinessLanguageListPref.clear();
+
+       BusinessTZList.clear();
+       BusinessTZListAltID.clear();
+       BusinessTZListPID.clear();
+       BusinessTZListType.clear();
+       BusinessTZListTokens.clear();
+       BusinessTZListMediatype.clear();
+       BusinessTZListPref.clear();
+
+       BusinessGeographyList.clear();
+       BusinessGeographyListAltID.clear();
+       BusinessGeographyListPID.clear();
+       BusinessGeographyListType.clear();
+       BusinessGeographyListTokens.clear();
+       BusinessGeographyListMediatype.clear();
+       BusinessGeographyListPref.clear();          
+
+       BusinessWebsiteList.clear();
+       BusinessWebsiteListAltID.clear();
+       BusinessWebsiteListPID.clear();
+       BusinessWebsiteListType.clear();
+       BusinessWebsiteListTokens.clear();
+       BusinessWebsiteListMediatype.clear();
+       BusinessWebsiteListPref.clear();
+
+       BusinessTitleList.clear();
+       BusinessTitleListLanguage.clear();        
+       BusinessTitleListAltID.clear();
+       BusinessTitleListPID.clear();
+       BusinessTitleListType.clear();
+       BusinessTitleListTokens.clear();
+       BusinessTitleListPref.clear();
+
+       BusinessRoleList.clear();
+       BusinessRoleListLanguage.clear();        
+       BusinessRoleListAltID.clear();
+       BusinessRoleListPID.clear();
+       BusinessRoleListType.clear();
+       BusinessRoleListTokens.clear();
+       BusinessRoleListPref.clear();
+
+       BusinessOrganisationsList.clear();
+       BusinessOrganisationsListLanguage.clear();        
+       BusinessOrganisationsListAltID.clear();
+       BusinessOrganisationsListPID.clear();
+       BusinessOrganisationsListType.clear();
+       BusinessOrganisationsListTokens.clear();
+       BusinessOrganisationsListSortAs.clear();        
+       BusinessOrganisationsListPref.clear();
+
+       BusinessNoteList.clear();
+       BusinessNoteListLanguage.clear();        
+       BusinessNoteListAltID.clear();
+       BusinessNoteListPID.clear();
+       BusinessNoteListType.clear();
+       BusinessNoteListTokens.clear();
+       BusinessNoteListPref.clear();        
+
+       /* Items on the Categories tab */
+
+       CategoriesList.clear();
+       CategoriesListAltID.clear();
+       CategoriesListPID.clear();
+       CategoriesListType.clear();
+       CategoriesListTokens.clear();
+       CategoriesListLanguage.clear();
+       CategoriesListPref.clear();    
+
+       /* Items on the Groups tab */
+
+       GroupsList.clear();
+       GroupsListAltID.clear();
+       GroupsListPID.clear();
+       GroupsListType.clear();
+       GroupsListMediaType.clear();
+       GroupsListTokens.clear();
+       GroupsListPref.clear();
+
+       /* Items on the Pictures tab */
+
+       PicturesList.clear();
+       PicturesListAltID.clear();
+       PicturesListPID.clear();
+       PicturesListType.clear();
+       PicturesListPicEncType.clear();
+       PicturesListPictureType.clear();
+       PicturesListTokens.clear();
+       PicturesListMediatype.clear();        
+       PicturesListPref.clear();
+
+       /* Items on the Logos tab */
+
+       LogosList.clear();
+       LogosListAltID.clear();
+       LogosListPID.clear();
+       LogosListType.clear();
+       LogosListPicEncType.clear();        
+       LogosListPictureType.clear();
+       LogosListTokens.clear();
+       LogosListMediatype.clear();        
+       LogosListPref.clear();
+
+       /* Items on the Sounds tab */
+
+       SoundsList.clear();
+       SoundsListAltID.clear();
+       SoundsListPID.clear();
+       SoundsListType.clear();
+       SoundsListAudioEncType.clear();        
+       SoundsListAudioType.clear();        
+       SoundsListTokens.clear();
+       SoundsListMediatype.clear();        
+       SoundsListPref.clear();    
+
+       /* Items on the Calendaring tab */
+
+       CalendarList.clear();
+       CalendarListAltID.clear();
+       CalendarListPID.clear();
+       CalendarListType.clear();
+       CalendarListTokens.clear();
+       CalendarListMediatype.clear();        
+       CalendarListPref.clear();
+
+       CalendarRequestList.clear();
+       CalendarRequestListAltID.clear();
+       CalendarRequestListPID.clear();
+       CalendarRequestListType.clear();
+       CalendarRequestListTokens.clear();
+       CalendarRequestListMediatype.clear();        
+       CalendarRequestListPref.clear();        
+
+       FreeBusyList.clear();
+       FreeBusyListAltID.clear();
+       FreeBusyListPID.clear();
+       FreeBusyListType.clear();
+       FreeBusyListTokens.clear();
+       FreeBusyListMediatype.clear();        
+       FreeBusyListPref.clear();
+
+       /* Items on the Security tab */
+
+       KeyList.clear();
+       KeyListAltID.clear();
+       KeyListPID.clear();
+       KeyListKeyType.clear();        
+       KeyListDataType.clear();        
+       KeyListDataEncType.clear();
+       KeyListType.clear();
+       KeyListTokens.clear();
+       KeyListPref.clear();
+
+       /* Items on the Other tab */
+
+       VendorList.clear();
+       VendorListPEN.clear();
+       VendorListElement.clear();
+
+       XTokenList.clear();
+       XTokenListTokens.clear();
 
 }