(1.0.0.122): XlsxSerializerCom

Поправил баг с сохранением в csv (http://bugzserver/show_bug.cgi?id=25712)

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

XlsxSerializerCom/Writer/BinaryReader.h

@@ -3021,6 +3021,16 @@ namespace BinXlsxRW {
 									g_nCurFormatVersion = nVersion = nTempVersion;
 								}
 							}
+							// File Type
+							CString sDstPathCSV = sDstPath;
+							BYTE fileType;
+							UINT nCodePage;
+							WCHAR wcDelimiter;
+							SerializeCommon::ReadFileType(sXMLOptions, fileType, nCodePage, wcDelimiter);
+							//   CSV  ,       ( rels)    .
+							if (BinXlsxRW::c_oFileTypes::CSV == fileType)
+								sDstPath += _T("Temp");
+
 							OOX::Spreadsheet::CXlsx oXlsx;
 							CSimpleArray<CString> aDeleteFiles;
 							SaveParams oSaveParams(sDstPath + _T("\\") + OOX::Spreadsheet::FileTypes::Workbook.DefaultDirectory().GetPath() + _T("\\") + OOX::FileTypes::Theme.DefaultDirectory().GetPath());
@@ -3035,16 +3045,10 @@ namespace BinXlsxRW {
 							}
 							oXlsx.PrepareToWrite();
 
-							// File Type
-							BYTE fileType;
-							UINT nCodePage;
-							WCHAR wcDelimiter;
-							SerializeCommon::ReadFileType(sXMLOptions, fileType, nCodePage, wcDelimiter);
-
 							switch(fileType)
 							{
 							case BinXlsxRW::c_oFileTypes::CSV:
-								CSVWriter::WriteFromXlsxToCsv(sDstPath, oXlsx, nCodePage, wcDelimiter);
+								CSVWriter::WriteFromXlsxToCsv(sDstPathCSV, oXlsx, nCodePage, wcDelimiter);
 								break;
 							case BinXlsxRW::c_oFileTypes::XLSX:
 							default:

XlsxSerializerCom/version.h

@@ -2,6 +2,6 @@
 //1
 //0
 //0
-//121
-#define INTVER 1,0,0,121
-#define STRVER "1,0,0,121\0"
+//122
+#define INTVER 1,0,0,122
+#define STRVER "1,0,0,122\0"