Commit 9a85b70d authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander Trofimov

(1.0.0.106): XlsxSerializerCom

На комбинацию \r\n должен быть только 1 перенос

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@54346 954022d7-b5bf-4e40-9824-e11837661b57
parent d9fea845
...@@ -164,6 +164,12 @@ namespace CSVReader ...@@ -164,6 +164,12 @@ namespace CSVReader
bIsWrap = FALSE; bIsWrap = FALSE;
} }
if (wcNewLineR == wcCurrent && nIndex + 1 != nSize && wcNewLineN == pTemp[nIndex + 1])
{
// \r\n 1
++nIndex;
}
nStartCell = nIndex + 1; nStartCell = nIndex + 1;
pWorksheet->m_oSheetData->m_arrItems.Add(pRow); pWorksheet->m_oSheetData->m_arrItems.Add(pRow);
......
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
//1 //1
//0 //0
//0 //0
//105 //106
#define INTVER 1,0,0,105 #define INTVER 1,0,0,106
#define STRVER "1,0,0,105\0" #define STRVER "1,0,0,106\0"
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment