More enhancements for IMPP and TEL in frmContactEditor and frmContactEditorTelephone.

[xestiaab/.git] / source / contacteditor / frmContactEditorTelephone.cpp

diff --git a/source/contacteditor/frmContactEditorTelephone.cpp b/source/contacteditor/frmContactEditorTelephone.cpp
index d3ac345..d6d8399 100644 (file)
--- a/source/contacteditor/frmContactEditorTelephone.cpp
+++ b/source/contacteditor/frmContactEditorTelephone.cpp
@@ -1,3 +1,21 @@
+// frmContactEditorTelephone.cpp - frmContactEditorTelephone form.
+//
+// (c) 2012-2015 Xestia Software Development.
+//
+// This file is part of Xestia Address Book.
+//
+// Xestia Address Book is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by the
+// Free Software Foundation, version 3 of the license.
+//
+// Xestia Address Book is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with Xestia Address Book. If not, see <http://www.gnu.org/licenses/>
+
 #include "frmContactEditorTelephone.h"
 #include "../common/textprocessing.h"
 #include <wx/tokenzr.h>
@@ -421,13 +439,19 @@ void frmContactEditorTelephone::SetEditorMode(bool EditMode, SectionType SectTyp
                
                // Get the phone types in.
                
-               striter = TelephoneListTypePtr->find(TelephoneListIndex);
+               
+               if (TelephoneListTypeInfoPtr->find(TelephoneListIndex) !=
+                       TelephoneListTypeInfoPtr->end()){
+               
+                       striter = TelephoneListTypeInfoPtr->find(TelephoneListIndex);
                 
-               if (striter->first == TelephoneListIndex){
+                       if (striter->first == TelephoneListIndex){
                
-                       strValue = striter->second;
+                               strValue = striter->second;
                
-               }               
+                       }       
+               
+               }       
                
                wxStringTokenizer TelephonePrefToken (strValue, wxT(","));
                
@@ -511,6 +535,7 @@ void frmContactEditorTelephone::SetupPointers(std::map<int, wxString> *Telephone
        std::map<int, wxString> *TelephoneListAltID,
        std::map<int, wxString> *TelephoneListPID,
        std::map<int, wxString> *TelephoneListType,
+       std::map<int, wxString> *TelephoneListTypeInfo,
        std::map<int, wxString> *TelephoneListTokens,
        std::map<int, int> *TelephoneListPref,
        wxListCtrl *TelephoneListCtrl,
@@ -521,6 +546,7 @@ void frmContactEditorTelephone::SetupPointers(std::map<int, wxString> *Telephone
        TelephoneListAltIDPtr = TelephoneListAltID;
        TelephoneListPIDPtr = TelephoneListPID;
        TelephoneListTypePtr = TelephoneListType;
+       TelephoneListTypeInfoPtr = TelephoneListTypeInfo;
        TelephoneListTokensPtr = TelephoneListTokens;
        TelephoneListPrefPtr = TelephoneListPref;
        TelephoneListCtrlPtr = TelephoneListCtrl;