Home | News | Projects | Releases
Bugs | RFE | Repositories | Help
Replaced string processing in XML with ProcessStringValue.
authorSteve Brokenshire <sbrokenshire@xestia.co.uk>
Mon, 28 Dec 2015 03:50:27 +0000 (03:50 +0000)
committerSteve Brokenshire <sbrokenshire@xestia.co.uk>
Mon, 28 Dec 2015 03:50:27 +0000 (03:50 +0000)
source/contacteditor/ContactDataObject.cpp

index 4c2cbc6..47fe119 100644 (file)
@@ -680,6 +680,7 @@ void ContactDataObject::ProcessXML(wxString PropertySeg1, wxString PropertySeg2,
        wxString PropertyTokens;
        std::map<int,int>::iterator SLiter;
        bool FirstToken = TRUE;
+       bool PropertyMatched = FALSE;
        
        for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
        intiter != SplitPoints.end(); ++intiter){
@@ -696,10 +697,12 @@ void ContactDataObject::ProcessXML(wxString PropertySeg1, wxString PropertySeg2,
                
                CaptureString(&PropertyValue, FALSE);
        
-               if (PropertyName == wxT("ALTID")){
-
-                       XMLListAltID.erase(*XMLCount);
-                       XMLListAltID.insert(std::make_pair(*XMLCount, PropertyValue));
+               ProcessStringValue(&PropertyName, "ALTID", &XMLListAltID, &PropertyValue, XMLCount, &PropertyMatched);
+               
+               if (PropertyMatched == TRUE){
+               
+                       PropertyMatched = FALSE;
+                       continue;
                
                }
                
Xestia Software Development
Yn Maystri
© 2006 - 2019 Xestia Software Development
Software

Xestia Address Book
Xestia Calendar
Development

Xestia Gelforn
Everything else

About
News
Privacy Policy