(1.0.0.112): XlsxSerializerCom

добавлены res = c_oSerConstants::ReadUnknown; чтобы не было проблем при чтении бинарника.
при чтении csv заполняем название sheet.

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

XlsxSerializerCom/Reader/CSVReader.h

@@ -95,6 +95,10 @@ namespace CSVReader
 		OOX::Spreadsheet::CWorksheet* pWorksheet = new OOX::Spreadsheet::CWorksheet();
 		pWorksheet->m_oSheetData.Init();
 		OOX::Spreadsheet::CSheet *pSheet = new OOX::Spreadsheet::CSheet();
+		pSheet->m_oName.Init();
+		pSheet->m_oName->Append(_T("Sheet1"));
+		pSheet->m_oSheetId.Init();
+		pSheet->m_oSheetId->SetValue(1);
 		pSheet->m_oRid.Init();
 		pSheet->m_oRid->SetValue(sSheetRId);
 

XlsxSerializerCom/Writer/BinaryReader.h

@@ -1773,6 +1773,9 @@ namespace BinXlsxRW {
 				res = Read1(length, &BinaryWorksheetsTableReader::ReadWorksheet, this, poResult);
 				if(m_pCurSheet->m_oName.IsInit())
 				{
+					const OOX::RId& oRId = m_oWorkbook.Add(smart_ptr<OOX::File>(m_pCurWorksheet));
+					m_pCurSheet->m_oRid.Init();
+					m_pCurSheet->m_oRid->SetValue(oRId.get());
 					m_mapWorksheets.SetAt(m_pCurSheet->m_oName.get(), m_pCurWorksheet);
 					m_oWorkbook.m_oSheets->m_arrItems.Add(m_pCurSheet);
 				}
@@ -1787,9 +1790,6 @@ namespace BinXlsxRW {
 			if(c_oSerWorksheetsTypes::WorksheetProp == type)
 			{
 				res = Read2(length, &BinaryWorksheetsTableReader::ReadWorksheetProp, this, poResult);
-				const OOX::RId& oRId = m_oWorkbook.Add(smart_ptr<OOX::File>(m_pCurWorksheet));
-				m_pCurSheet->m_oRid.Init();
-				m_pCurSheet->m_oRid->SetValue(oRId.get());
 			}
 			else if(c_oSerWorksheetsTypes::Cols == type)
 			{
@@ -1875,6 +1875,7 @@ namespace BinXlsxRW {
 			else if (c_oSerWorksheetsTypes::ConditionalFormatting == type)
 			{
 				// ToDo
+				res = c_oSerConstants::ReadUnknown;
 			}
 			else if(c_oSerWorksheetsTypes::Comments == type)
 			{
@@ -2845,6 +2846,7 @@ namespace BinXlsxRW {
 				BSTR bstrTempTheme = m_sTempTheme.AllocSysString();
 				m_pOfficeDrawingConverter->SaveThemeXml(m_pArray, m_oBufferedStream.GetPosition(), length, bstrTempTheme);
 				SysFreeString(bstrTempTheme);
+				res = c_oSerConstants::ReadUnknown;
 			}
 			else
 				res = c_oSerConstants::ReadUnknown;

XlsxSerializerCom/version.h

@@ -2,6 +2,6 @@
 //1
 //0
 //0
-//111
-#define INTVER 1,0,0,111
-#define STRVER "1,0,0,111\0"
+//112
+#define INTVER 1,0,0,112
+#define STRVER "1,0,0,112\0"