(2.0.0.182): ASCOfficeDocxFile2

Поднял версию, т.к. dll-ка и h-файл были разных версий.
Поправил баг http://bugzserver/show_bug.cgi?id=26653 (создавался пустой CSV-файл)

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@58462 954022d7-b5bf-4e40-9824-e11837661b57

ASCOfficeDocxFile2/version.h

@@ -2,6 +2,6 @@
 //2
 //0
 //0
-//177
-#define INTVER 2,0,0,177
-#define STRVER "2,0,0,177\0"
+//182
+#define INTVER 2,0,0,182
+#define STRVER "2,0,0,182\0"

XlsxSerializerCom/Writer/CSVWriter.cpp

@@ -68,7 +68,11 @@ namespace CSVWriter
 			oFile.WriteFile(arBigEndian, 2);
 		}
 
+		CString sNewLineN = _T("\n");
 		LONG lActiveSheet = 0;
+		INT nCurrentIndex = 0;
+		WCHAR *pWriteBuffer = NULL;
+
 		CString sSheetRId = _T("Sheet1"); //    rId,    
 		OOX::Spreadsheet::CWorkbook *pWorkbook = oXlsx.GetWorkbook();
 		if (NULL != pWorkbook)
@@ -101,15 +105,11 @@ namespace CSVWriter
 				if (NULL != pWorksheet && pWorksheet->m_oSheetData.IsInit())
 				{
 					OOX::Spreadsheet::CSharedStrings *pSharedStrings = oXlsx.GetSharedStrings();
-					CString sNewLineN = _T("\n");
 					CString sDelimiter = _T(""); sDelimiter += wcDelimiter;
 					CONST WCHAR wcQuote = _T('"');
 					CString sEscape = _T("\"\n");
 					sEscape += wcDelimiter;
 
-					INT nCurrentIndex = 0;
-					WCHAR *pWriteBuffer = NULL;
-
 					INT nRowCurrent = 1;
 					for (INT i = 0; i < pWorksheet->m_oSheetData->m_arrItems.size(); ++i)
 					{
@@ -178,13 +178,14 @@ namespace CSVWriter
 							WriteFile(&oFile, &pWriteBuffer, nCurrentIndex, sCellValue, nCodePage);
 						}
 					}
-
-					WriteFile(&oFile, &pWriteBuffer, nCurrentIndex, sNewLineN, nCodePage, TRUE);
-					RELEASEARRAYOBJECTS(pWriteBuffer);
 				}
 			}
 		}
 
+		//     MS Excel (    )
+		WriteFile(&oFile, &pWriteBuffer, nCurrentIndex, sNewLineN, nCodePage);
+		WriteFile(&oFile, &pWriteBuffer, nCurrentIndex, sNewLineN, nCodePage, TRUE);
+		RELEASEARRAYOBJECTS(pWriteBuffer);
 		oFile.CloseFile();
 	}
 }
\ No newline at end of file