From: Steve Brokenshire <sbrokenshire@xestia.co.uk>
Date: Sun, 10 Jan 2016 21:38:47 +0000 (+0000)
Subject: Updated TEL support in ContactDataObject
X-Git-Tag: release-0.09~66
X-Git-Url: http://Server1/repobrowser/?a=commitdiff_plain;h=72b49bab43a799167f4942a9a30ce26229e61aa3;p=xestiaab%2F.git
Updated TEL support in ContactDataObject
---
diff --git a/source/contacteditor/cdo/ContactDataObject.cpp b/source/contacteditor/cdo/ContactDataObject.cpp
index 667c8df..e715a2d 100644
--- a/source/contacteditor/cdo/ContactDataObject.cpp
+++ b/source/contacteditor/cdo/ContactDataObject.cpp
@@ -2082,6 +2082,7 @@ void ContactDataObject::ProcessTelephone(wxString PropertySeg1, wxString Propert
TypeSplitLength.insert(std::make_pair(intSplitsFound, intSplitSize));
int intTypeSeek = 0;
+ bool TypeFound = FALSE;
for (std::map<int, int>::iterator typeiter = TypeSplitPoints.begin();
typeiter != TypeSplitPoints.end(); ++typeiter){
@@ -2101,17 +2102,22 @@ void ContactDataObject::ProcessTelephone(wxString PropertySeg1, wxString Propert
}
- if (TypePropertyName == wxT("home")){
+ if (TypePropertyName == wxT("home") && TypeFound == FALSE){
PropType = PROPERTY_HOME;
+ TelTypeUI.Append("home");
+ intTypeSeek++;
+ TypeFound = TRUE;
- } else if (TypePropertyName == wxT("work")){
+ } else if (TypePropertyName == wxT("work") && TypeFound == FALSE){
PropType = PROPERTY_WORK;
-
+ TelTypeUI.Append("work");
+ intTypeSeek++;
+ TypeFound = TRUE;
+
}
-
if (TypePropertyName == wxT("text")){
TelTypeUI.Append(_("text"));