tengel/ContactBook
Archived
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

1.3 updates

Browse source
This commit is contained in:
troyengel 2014-11-26 14:26:40 -06:00
parent bb4769dbba
commit 78071b1635
13 changed files with 627 additions and 725 deletions
Download patch file Download diff file Expand all files Collapse all files

10
CB32Doc.cpp
View file

@ -218,7 +218,7 @@ BOOL CCB32Doc::FileImport(CString fileName, char* whitesp, char* breakch)
CConvertDlg convertDlg;
if (inFile.ReadString(strLine,511)!=NULL)
{
newline = strstr(strLine, "\n");
newline = _tcsstr(strLine, "\n");
strpos = newline - strLine;
if (strpos != NULL)
strLine[strpos]='\0';
@ -386,7 +386,7 @@ BOOL CCB32Doc::FileImport(CString fileName, char* whitesp, char* breakch)
int z=0, next=0;
BOOL addexpr = FALSE;
CExpr *expr = new CExpr("contact");
CExpr *expr = new CExpr(_T("contact"));
inList.RemoveAll();
while(parser(0,strToken,sizeof(strLine),strLine,whitesp,breakch,
@ -402,7 +402,7 @@ BOOL CCB32Doc::FileImport(CString fileName, char* whitesp, char* breakch)
if (convertDlg.m_xlname>0 && convertDlg.m_xlname<z)
{
posIndex = inList.FindIndex(convertDlg.m_xlname-1);
expr->AddAttributeValueString("LastName", inList.GetAt(posIndex));
expr->AddAttributeValueString(_T("LastName"), inList.GetAt(posIndex));
addexpr = TRUE;
}
if (convertDlg.m_xfname>0 && convertDlg.m_xfname<z)
@ -804,7 +804,7 @@ BOOL CCB32Doc::FileExport(CString fileName, char* breakch)
// add firstline identifier
db.ClearDatabase();
CExpr *expr = new CExpr("contact");
expr->AddAttributeValueString("LastName", "LASTNAME");
expr->AddAttributeValueString(_T("LastName"), _T("LASTNAME"));
expr->AddAttributeValueString("FirstName", "FIRSTNAME");
expr->AddAttributeValueString("MiddleInitial", "MI");
expr->AddAttributeValueString("Title", "TITLE");
@ -861,7 +861,7 @@ BOOL CCB32Doc::FileExport(CString fileName, char* breakch)
if (convertDlg.m_xlname>0)
{
expr->GetAttributeValue("LastName", strTemp);
expr->GetAttributeValue(_T("LastName"), strTemp);
dataArray.SetAtGrow(convertDlg.m_xlname, strTemp);
}
if (convertDlg.m_xfname>0)