Not Logged In
|
Login
|
Register
Home
|
News
|
Projects
|
Releases
Bugs
|
RFE
|
Repositories
|
Help
projects
/
xestiaab
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed source code formatting in LANG for ConvertToV3
[xestiaab/.git]
/
source
/
contacteditor
/
cdo
/
ContactDataObject.cpp
diff --git
a/source/contacteditor/cdo/ContactDataObject.cpp
b/source/contacteditor/cdo/ContactDataObject.cpp
index
667c8df
..
5085409
100644
(file)
--- 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;
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){
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;
PropType = PROPERTY_HOME;
+ TelTypeUI.Append("home");
+ intTypeSeek++;
+ TypeFound = TRUE;
- } else if (TypePropertyName == wxT("work")){
+ } else if (TypePropertyName == wxT("work")
&& TypeFound == FALSE
){
PropType = PROPERTY_WORK;
PropType = PROPERTY_WORK;
-
+ TelTypeUI.Append("work");
+ intTypeSeek++;
+ TypeFound = TRUE;
+
}
}
-
if (TypePropertyName == wxT("text")){
TelTypeUI.Append(_("text"));
if (TypePropertyName == wxT("text")){
TelTypeUI.Append(_("text"));
@@
-2462,9
+2468,21
@@
void ContactDataObject::ProcessGeographic(wxString PropertySeg1, wxString Proper
ProcessTokens(&PropertyName, &PropertyValue, &PropertyTokens, &FirstToken);
}
ProcessTokens(&PropertyName, &PropertyValue, &PropertyTokens, &FirstToken);
}
+
+ wxStringTokenizer GeoSplitData(PropertySeg2, wxT(":"));
- GeopositionList->insert(std::make_pair(*GeographicCount, PropertySeg2));
+ if (GeoSplitData.CountTokens() > 1){
+
+ GeopositionListDataType->insert(std::make_pair(*GeographicCount, GeoSplitData.GetNextToken()));
+ GeopositionList->insert(std::make_pair(*GeographicCount, GeoSplitData.GetString()));
+ } else {
+
+ GeopositionList->insert(std::make_pair(*GeographicCount, PropertySeg2));
+ GeopositionListDataType->insert(std::make_pair(*GeographicCount, "tel"));
+
+ }
+
// Add the name token data.
if (!PropertyTokens.IsEmpty()){
// Add the name token data.
if (!PropertyTokens.IsEmpty()){
Yn Maystri
© 2006 - 2019 Xestia Software Development
Software
Xestia Address Book
Xestia Calendar
Development
Xestia Gelforn
Everything else
About
News
Privacy Policy