изменения в DocxFormat rev 58053

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

ASCOfficeDocxFile2/DocWrapper/FontProcessor.cpp

@@ -20,8 +20,8 @@ namespace DocWrapper {
 		initFontManager();
 	}
 	void FontProcessor::setFontTable(OOX::CFontTable* fontTable) {
-		for (int i = 0; i < fontTable->m_arrFonts.GetSize(); ++i)
-			addToFontMap(fontTable->m_arrFonts[i]);
+		for (int i = 0; i < fontTable->m_arrFonts.size(); ++i)
+			addToFontMap(*fontTable->m_arrFonts[i]);
 	}
 	
 	CString FontProcessor::getFont(const CString& name) {

XlsxSerializerCom/Reader/CSVReader.h

@@ -27,7 +27,7 @@ namespace CSVReader
 			pCell->m_oRichText.Init();
 			OOX::Spreadsheet::CText *pText = new OOX::Spreadsheet::CText();
 			pText->m_sText = sText;
-			pCell->m_oRichText->m_arrItems.Add(pText);
+			pCell->m_oRichText->m_arrItems.push_back(pText);
 		}
 		else
 		{
@@ -45,7 +45,7 @@ namespace CSVReader
 
 		pCell->m_oRef.Init();
 		pCell->m_oRef = OOX::Spreadsheet::CWorksheet::combineRef(nRow, nCol);
-		oRow.m_arrItems.Add(pCell);
+		oRow.m_arrItems.push_back(pCell);
 	}
 	void ReadFromCsvToXlsx(CString &sFileName, OOX::Spreadsheet::CXlsx &oXlsx, UINT nCodePage, CONST WCHAR wcDelimiter)
 	{
@@ -71,7 +71,7 @@ namespace CSVReader
 		pXfs->m_oFontId->SetValue(0);
 		pXfs->m_oNumFmtId.Init();
 		pXfs->m_oNumFmtId->SetValue(0);
-		pStyles->m_oCellXfs->m_arrItems.Add(pXfs);
+		pStyles->m_oCellXfs->m_arrItems.push_back(pXfs);
 
 		// Wrap style
 		pXfs = new OOX::Spreadsheet::CXfs();
@@ -89,7 +89,7 @@ namespace CSVReader
 		pXfs->m_oAligment.Init();
 		pXfs->m_oAligment->m_oWrapText.Init();
 		pXfs->m_oAligment->m_oWrapText->SetValue(SimpleTypes::onoffTrue);
-		pStyles->m_oCellXfs->m_arrItems.Add(pXfs);
+		pStyles->m_oCellXfs->m_arrItems.push_back(pXfs);
 
 		CString sSheetRId = _T("rId1");
 		OOX::Spreadsheet::CWorksheet* pWorksheet = new OOX::Spreadsheet::CWorksheet();
@@ -104,7 +104,7 @@ namespace CSVReader
 
 		OOX::Spreadsheet::CWorkbook *pWorkbook = oXlsx.GetWorkbook();
 		pWorkbook->m_oSheets.Init();
-		pWorkbook->m_oSheets->m_arrItems.Add(pSheet);
+		pWorkbook->m_oSheets->m_arrItems.push_back(pSheet);
 
 		MemoryMapping::CMappingFile oMappingFile = MemoryMapping::CMappingFile();
 		if(FALSE != oMappingFile.Open(sFileName))
@@ -148,7 +148,7 @@ namespace CSVReader
 					nStartCell = nIndex + 1;
 					if (nStartCell == nSize)
 					{
-						pWorksheet->m_oSheetData->m_arrItems.Add(pRow);
+						pWorksheet->m_oSheetData->m_arrItems.push_back(pRow);
 						pRow = NULL;
 					}
 				}
@@ -176,7 +176,7 @@ namespace CSVReader
 					
 					nStartCell = nIndex + 1;
 
-					pWorksheet->m_oSheetData->m_arrItems.Add(pRow);
+					pWorksheet->m_oSheetData->m_arrItems.push_back(pRow);
 					pRow = new OOX::Spreadsheet::CRow();
 					pRow->m_oR.Init();
 					pRow->m_oR->SetValue(++nIndexRow + 1);
@@ -215,7 +215,7 @@ namespace CSVReader
 				// New line
 				CString sCellText(pTemp + nStartCell, nSize - nStartCell);
 				AddCell(sCellText, nStartCell, oDeleteChars, *pRow, nIndexRow, nIndexCol++, bIsWrap);
-				pWorksheet->m_oSheetData->m_arrItems.Add(pRow);
+				pWorksheet->m_oSheetData->m_arrItems.push_back(pRow);
 			}
 			else
 			{

XlsxSerializerCom/Reader/CommonWriter.cpp

@@ -46,7 +46,7 @@ namespace BinXlsxRW {
 			if(color.m_oIndexed.IsInit())
 			{
 				int nIndex = (int)color.m_oIndexed->GetValue();
-				if(NULL != pIndexedColors && nIndex < pIndexedColors->m_arrItems.GetSize())
+				if(NULL != pIndexedColors && nIndex < pIndexedColors->m_arrItems.size())
 				{
 					OOX::Spreadsheet::CRgbColor* pRgbColor = pIndexedColors->m_arrItems[nIndex];
 					if(pRgbColor->m_oRgb.IsInit())

XlsxSerializerCom/Reader/FontProcessor.h

@@ -30,7 +30,7 @@ namespace BinXlsxRW {
 		}
 		void setFontTable(const OOX::Spreadsheet::CFonts& oFonts)
 		{
-			for (int i = 0, length = oFonts.m_arrItems.GetSize(); i < length; ++i)
+			for (int i = 0, length = oFonts.m_arrItems.size(); i < length; ++i)
 			{
 					OOX::Spreadsheet::CFont* pFont = oFonts.m_arrItems[i];
 					if(NULL != pFont)

XlsxSerializerCom/Writer/CSVWriter.h

@@ -76,7 +76,7 @@ namespace CSVWriter
 		if (NULL != pWorkbook)
 		{
 			// Get active sheet
-			if (pWorkbook->m_oBookViews.IsInit() && 0 < pWorkbook->m_oBookViews->m_arrItems.GetSize())
+			if (pWorkbook->m_oBookViews.IsInit() && 0 < pWorkbook->m_oBookViews->m_arrItems.size())
 			{
 				if (pWorkbook->m_oBookViews->m_arrItems[0]->m_oActiveTab.IsInit())
 				{
@@ -87,9 +87,9 @@ namespace CSVWriter
 			}
 
 			// Get active sheet rId
-			if (pWorkbook->m_oSheets.IsInit() && 0 <= pWorkbook->m_oSheets->m_arrItems.GetSize())
+			if (pWorkbook->m_oSheets.IsInit() && 0 <= pWorkbook->m_oSheets->m_arrItems.size())
 			{
-				if (lActiveSheet <= pWorkbook->m_oSheets->m_arrItems.GetSize())
+				if (lActiveSheet <= pWorkbook->m_oSheets->m_arrItems.size())
 					sSheetRId = pWorkbook->m_oSheets->m_arrItems[lActiveSheet]->m_oName.get2();
 				else
 					sSheetRId = pWorkbook->m_oSheets->m_arrItems[0]->m_oName.get2();
@@ -113,7 +113,7 @@ namespace CSVWriter
 					WCHAR *pWriteBuffer = NULL;
 
 					INT nRowCurrent = 1;
-					for (INT i = 0; i < pWorksheet->m_oSheetData->m_arrItems.GetSize(); ++i)
+					for (INT i = 0; i < pWorksheet->m_oSheetData->m_arrItems.size(); ++i)
 					{
 						OOX::Spreadsheet::CRow *pRow = static_cast<OOX::Spreadsheet::CRow *>(pWorksheet->m_oSheetData->m_arrItems[i]);
 						INT nRow = pRow->m_oR.IsInit() ? pRow->m_oR->GetValue() : 0 == i ? nRowCurrent : nRowCurrent + 1;
@@ -126,7 +126,7 @@ namespace CSVWriter
 						}
 
 						INT nColCurrent = 1;
-						for (INT j = 0; j < pRow->m_arrItems.GetSize(); ++j)
+						for (INT j = 0; j < pRow->m_arrItems.size(); ++j)
 						{
 							INT nRowTmp = 0;
 							INT nCol = 0;
@@ -149,11 +149,11 @@ namespace CSVWriter
 								if (pCell->m_oType.IsInit() && SimpleTypes::Spreadsheet::celltypeNumber != pCell->m_oType->GetValue())
 								{
 									int nValue = _wtoi(pCell->m_oValue->ToString());
-									if (0 <= nValue && nValue < pSharedStrings->m_arrItems.GetSize())
+									if (0 <= nValue && nValue < pSharedStrings->m_arrItems.size())
 									{
 										OOX::Spreadsheet::CSi *pSi = static_cast<OOX::Spreadsheet::CSi *>(pSharedStrings->m_arrItems[nValue]);
-										if (NULL != pSi && pSi->m_arrItems.GetSize() > 0)
-											if(NULL != pSi && pSi->m_arrItems.GetSize() > 0)
+										if (NULL != pSi && pSi->m_arrItems.size() > 0)
+											if(NULL != pSi && pSi->m_arrItems.size() > 0)
 											{
 												OOX::Spreadsheet::WritingElement* pWe = pSi->m_arrItems[0];
 												if(OOX::Spreadsheet::et_t == pWe->getType())