fix bug #36740

ASCOfficeDocxFile2/BinWriter/BinEquationWriter.h

@@ -416,7 +416,7 @@ namespace MathEquation
 
 			virtual void BeginEquation()
 			{
-				int nCurPos = WriteItemStart(BinDocxRW::c_oSerParType::OMath);
+				int nCurPos = WriteItemStart(BinDocxRW::c_oSer_OMathContentType::OMath);
 				m_aEquationStack.push(nCurPos);
 			}
 			virtual void EndEquation()
@@ -618,7 +618,7 @@ namespace MathEquation
                         nRows = m_aRowsCounter.top();
                         m_aRowsCounter.pop();
                     }
-                    int nPos = m_oStream.GetPosition();
+                    int nPos = 0;
                     if (!m_aRowsPosCounter.empty())
                     {
                         nPos = m_aRowsPosCounter.top();

ASCOfficeDocxFile2/DocWrapper/XlsxSerializer.cpp

@@ -137,10 +137,10 @@ namespace BinXlsxRW{
 		oOfficeDrawingConverter.SetFontPicker(pFontPicker);
 
 		BinXlsxRW::BinaryFileWriter oBinaryFileWriter(fp);
-		oBinaryFileWriter.Open(sSrcPath, sDstFileName, pEmbeddedFontsManager, &oOfficeDrawingConverter, sXMLOptions, m_bIsNoBase64);
+		bool result = oBinaryFileWriter.Open(sSrcPath, sDstFileName, pEmbeddedFontsManager, &oOfficeDrawingConverter, sXMLOptions, m_bIsNoBase64);
 
 		RELEASEOBJECT(pFontPicker);
-		return true;
+		return result;
 	}
  	bool CXlsxSerializer::saveChart(NSBinPptxRW::CBinaryFileReader* pReader, long lLength, const std::wstring& sFilepath, const long& lChartNumber)
 	{

ASCOfficePPTXFile/PPTXFormat/Logic/Pic.cpp

@@ -335,6 +335,17 @@ namespace PPTX
 							std::wstring strOlePath = pReader->GetString(_embed_data_size);
 							m_OleObjectFile->set_filename(strOlePath, false); //temp !!! for ImageManager original file name
 						}
+						else if (embedded_type == 4)
+						{
+							pReader->Seek(pReader->GetPos() - 4); //roll back to size record
+							std::wstring sXmlContent;
+							pReader->m_pMainDocument->getXmlContentElem(OOX::et_m_oMathPara, *pReader, sXmlContent);
+
+							if (!sXmlContent.empty())
+							{
+								m_sAlternateContenteXml = sXmlContent;
+							}
+						}
 						else if (embedded_type == 1)
 						{
 							m_OleObjectFile = new OOX::OleObject(NULL, true, pReader->m_nDocumentType == XMLWRITER_DOC_TYPE_DOCX);

ASCOfficePPTXFile/PPTXFormat/Logic/Pic.h

@@ -221,6 +221,8 @@ namespace PPTX
 		
 			nullable_int						m_oDxaOrig;
 			nullable_int						m_oDyaOrig;
+
+			nullable_string						m_sAlternateContenteXml;
 		};
 
 		class Pic : public WrapperWritingElement

X2tConverter/src/cextracttools.h

@@ -637,7 +637,7 @@ namespace NExtractTools
 		{
             std::wstring sRes;
 			int nCsvEncoding = 46;//65001 utf8
-			std::wstring cDelimiter = L"";
+			std::wstring cDelimiter = L",";
 
             if(NULL != m_nCsvTxtEncoding)
 				nCsvEncoding = *m_nCsvTxtEncoding;

XlsxSerializerCom/Reader/BinaryWriter.h

@@ -4322,9 +4322,11 @@ namespace BinXlsxRW
 		{
 			RELEASEOBJECT(m_oBcw);
 		}
-        void Open(const std::wstring& sInputDir, const std::wstring& sFileDst, NSFontCutter::CEmbeddedFontsManager* pEmbeddedFontsManager,
+        bool Open(const std::wstring& sInputDir, const std::wstring& sFileDst, NSFontCutter::CEmbeddedFontsManager* pEmbeddedFontsManager,
             NSBinPptxRW::CDrawingConverter* pOfficeDrawingConverter, const std::wstring& sXMLOptions, bool bIsNoBase64)
 		{
+			bool result = true;
+
 			OOX::CPath path(sFileDst);
 	//создаем папку для media
             std::wstring mediaDir = path.GetDirectory() + L"media";
@@ -4348,17 +4350,26 @@ namespace BinXlsxRW
 			OOX::Spreadsheet::CXlsx *pXlsx = NULL;
 			switch(fileType)
 			{
-			case BinXlsxRW::c_oFileTypes::CSV:
-				pXlsx = new OOX::Spreadsheet::CXlsx();
-				CSVReader::ReadFromCsvToXlsx(sInputDir, *pXlsx, nCodePage, sDelimiter);
-				break;
-			case BinXlsxRW::c_oFileTypes::XLSX:
-			default:
-				pXlsx = new OOX::Spreadsheet::CXlsx(OOX::CPath(sInputDir));
-				break;
+				case BinXlsxRW::c_oFileTypes::CSV:
+				{
+					pXlsx = new OOX::Spreadsheet::CXlsx();
+					result = CSVReader::ReadFromCsvToXlsx(sInputDir, *pXlsx, nCodePage, sDelimiter);
+				}break;
+				case BinXlsxRW::c_oFileTypes::XLSX:
+				default:
+				{
+					pXlsx = new OOX::Spreadsheet::CXlsx(OOX::CPath(sInputDir));
+				}break;
 			}		
+
 			pXlsx->PrepareWorkbook();
 
+			if (false == result || NULL == pXlsx->m_pWorkbook)
+			{
+				RELEASEOBJECT(pXlsx);
+				return false;
+			}			
+
 			if (BinXlsxRW::c_oFileTypes::JSON == saveFileType)
 			{
 				//todo 46 временно CP_UTF8
@@ -4393,11 +4404,17 @@ namespace BinXlsxRW
 						oFile.WriteFile(pbBase64Buffer, nBase64BufferLen);
 						oFile.CloseFile();
 					}
+					else
+					{
+						result = false;
+					}
 					RELEASEARRAYOBJECTS(pbBase64Buffer);
 				}
 			}
 
 			RELEASEOBJECT(pXlsx);
+
+			return result;
 		}
 		void intoBindoc(OOX::Spreadsheet::CXlsx &oXlsx, NSBinPptxRW::CBinaryFileWriter &oBufferedStream, NSFontCutter::CEmbeddedFontsManager* pEmbeddedFontsManager, NSBinPptxRW::CDrawingConverter* pOfficeDrawingConverter)
 		{

XlsxSerializerCom/Reader/CSVReader.cpp

@@ -225,19 +225,22 @@ namespace CSVReader
 		pCell->setRowCol(nRow, nCol);
 		oRow.m_arrItems.push_back(pCell);
 	}
-	void ReadFromCsvToXlsx(const std::wstring &sFileName, OOX::Spreadsheet::CXlsx &oXlsx, UINT nCodePage, const std::wstring& sDelimiter)
+	bool ReadFromCsvToXlsx(const std::wstring &sFileName, OOX::Spreadsheet::CXlsx &oXlsx, UINT nCodePage, const std::wstring& sDelimiter)
 	{
-		// Создадим Workbook
+		NSFile::CFileBinary oFile;
+		if (false == oFile.OpenFile(sFileName)) return false;
+//-----------------------------------------------------------------------------------
+	// Создадим Workbook
 		oXlsx.CreateWorkbook();
-		// Создадим стили
+	// Создадим стили
 		oXlsx.CreateStyles();
 
-		// Добавим стили для wrap-а
+	// Добавим стили для wrap-а
 		oXlsx.m_pStyles->m_oCellXfs.Init();
 		oXlsx.m_pStyles->m_oCellXfs->m_oCount.Init();
 		oXlsx.m_pStyles->m_oCellXfs->m_oCount->SetValue(2);
 
-		// Normall default
+	// Normall default
 		OOX::Spreadsheet::CXfs* pXfs = NULL;
 		pXfs = new OOX::Spreadsheet::CXfs();
 		pXfs->m_oBorderId.Init();
@@ -251,7 +254,7 @@ namespace CSVReader
 		
 		oXlsx.m_pStyles->m_oCellXfs->m_arrItems.push_back(pXfs);
 
-		// Wrap style
+	// Wrap style
 		pXfs = new OOX::Spreadsheet::CXfs();
 		pXfs->m_oBorderId.Init();
 		pXfs->m_oBorderId->SetValue(0);
@@ -286,176 +289,182 @@ namespace CSVReader
 		oXlsx.m_pWorkbook->m_oSheets.Init();
 		oXlsx.m_pWorkbook->m_oSheets->m_arrItems.push_back(pSheet);
 
-		NSFile::CFileBinary oFile;
-		if(oFile.OpenFile(sFileName))
+//-----------------------------------------------------------------------------------
+		DWORD nFileSize = 0;
+		BYTE* pFileData = new BYTE[oFile.GetFileSize()];
+		
+		oFile.ReadFile(pFileData, oFile.GetFileSize(), nFileSize);
+		oFile.CloseFile();
+	//skip bom
+		DWORD nInputBufferSize = nFileSize;
+		BYTE* pInputBuffer = pFileData;
+		if (nInputBufferSize >= 3 && 0xef == pInputBuffer[0] && 0xbb == pInputBuffer[1] && 0xbf == pInputBuffer[2])
 		{
-			DWORD nFileSize = 0;
-			BYTE* pFileData = new BYTE[oFile.GetFileSize()];
-			oFile.ReadFile(pFileData, oFile.GetFileSize(), nFileSize);
-			oFile.CloseFile();
-			//skip bom
-			DWORD nInputBufferSize = nFileSize;
-			BYTE* pInputBuffer = pFileData;
-			if (nInputBufferSize >= 3 && 0xef == pInputBuffer[0] && 0xbb == pInputBuffer[1] && 0xbf == pInputBuffer[2])
-			{
-				nInputBufferSize -= 3;
-				pInputBuffer += 3;
-			}
-			else if (nInputBufferSize >= 2 && ((0xfe == pInputBuffer[0] && 0xff == pInputBuffer[1]) || (0xff == pInputBuffer[0] && 0xfe == pInputBuffer[1])))
-			{
-				nInputBufferSize -= 2;
-				pInputBuffer += 2;
-			}
-			
-			std::wstring sFileDataW;
+			nInputBufferSize -= 3;
+			pInputBuffer += 3;
+		}
+		else if (nInputBufferSize >= 2 && ((0xfe == pInputBuffer[0] && 0xff == pInputBuffer[1]) || (0xff == pInputBuffer[0] && 0xfe == pInputBuffer[1])))
+		{
+			nInputBufferSize -= 2;
+			pInputBuffer += 2;
+		}
+		
+		std::wstring sFileDataW;
 
-			if (nCodePage == 1000)
-			{
-				sFileDataW = ansi_2_unicode(pInputBuffer, nInputBufferSize);
-			}
-			else if (nCodePage == 46)//utf-8
-			{
-				sFileDataW = utf8_2_unicode(pInputBuffer, nInputBufferSize);
-			}
-			else if (nCodePage == 48)//utf-16
-			{
-				sFileDataW = utf16_2_unicode(pInputBuffer, nInputBufferSize);
-			}
-			else if (nCodePage == 50) // utf-32
-			{
-				sFileDataW = utf32_2_unicode(pInputBuffer, nInputBufferSize);
-			}
-			else
-			{
-				const NSUnicodeConverter::EncodindId& oEncodindId = NSUnicodeConverter::Encodings[nCodePage];
-	            
-				NSUnicodeConverter::CUnicodeConverter oUnicodeConverter;
-				sFileDataW = oUnicodeConverter.toUnicode((const char*)pInputBuffer, nInputBufferSize, oEncodindId.Name);
-			}
+		if (nCodePage == 1000)
+		{
+			sFileDataW = ansi_2_unicode(pInputBuffer, nInputBufferSize);
+		}
+		else if (nCodePage == 46)//utf-8
+		{
+			sFileDataW = utf8_2_unicode(pInputBuffer, nInputBufferSize);
+		}
+		else if (nCodePage == 48)//utf-16
+		{
+			sFileDataW = utf16_2_unicode(pInputBuffer, nInputBufferSize);
+		}
+		else if (nCodePage == 50) // utf-32
+		{
+			sFileDataW = utf32_2_unicode(pInputBuffer, nInputBufferSize);
+		}
+		else
+		{
+			const NSUnicodeConverter::EncodindId& oEncodindId = NSUnicodeConverter::Encodings[nCodePage];
             
-			INT nSize = sFileDataW.length();
-            const WCHAR *pTemp =sFileDataW.c_str();
+			NSUnicodeConverter::CUnicodeConverter oUnicodeConverter;
+			sFileDataW = oUnicodeConverter.toUnicode((const char*)pInputBuffer, nInputBufferSize, oEncodindId.Name);
+		}
+ //------------------------------------------------------------------------------------------------------------------------------     
 
-			WCHAR wcDelimiterLeading = L'\0';
-			WCHAR wcDelimiterTrailing = L'\0';
-			int nDelimiterSize = 0;
-			if (sDelimiter.length() > 0)
+		size_t nSize = sFileDataW.length();
+
+		if (nSize < 1 && nInputBufferSize > 0)
+		{
+			return false;
+		}
+        const WCHAR *pTemp = sFileDataW.c_str();
+
+		WCHAR wcDelimiterLeading = L'\0';
+		WCHAR wcDelimiterTrailing = L'\0';
+		int nDelimiterSize = 0;
+		
+		if (sDelimiter.length() > 0)
+		{
+			wcDelimiterLeading = sDelimiter[0];
+			nDelimiterSize = 1;
+			if (2 == sizeof(wchar_t) && 0xD800 <= wcDelimiterLeading && wcDelimiterLeading <= 0xDBFF && sDelimiter.length() > 1)
 			{
-				wcDelimiterLeading = sDelimiter[0];
-				nDelimiterSize = 1;
-				if (2 == sizeof(wchar_t) && 0xD800 <= wcDelimiterLeading && wcDelimiterLeading <= 0xDBFF && sDelimiter.length() > 1)
-				{
-					wcDelimiterTrailing = sDelimiter[1];
-					nDelimiterSize = 2;
-				}
-			}
-
-            const WCHAR wcNewLineN = _T('\n');
-            const WCHAR wcNewLineR = _T('\r');
-            const WCHAR wcQuote = _T('"');
-            const WCHAR wcTab = _T('\t');
-
-            bool bIsWrap = false;
-			WCHAR wcCurrent;
-			INT nStartCell = 0;
-			std::stack<INT> oDeleteChars;
-
-            bool bInQuote = false;
-			INT nIndexRow = 0;
-			INT nIndexCol = 0;
-			OOX::Spreadsheet::CRow *pRow = new OOX::Spreadsheet::CRow();
-			pRow->m_oR.Init();
-			pRow->m_oR->SetValue(nIndexRow + 1);
-			for (INT nIndex = 0; nIndex < nSize; ++nIndex)
-			{
-				wcCurrent = pTemp[nIndex];
-				if (wcDelimiterLeading == wcCurrent && (L'\0' == wcDelimiterTrailing || (nIndex + 1 < nSize && wcDelimiterTrailing == pTemp[nIndex + 1])))
-				{
-					if (bInQuote)
-						continue;
-					// New Cell
-                    std::wstring sCellText(pTemp + nStartCell, nIndex - nStartCell);
-					AddCell(sCellText, nStartCell, oDeleteChars, *pRow, nIndexRow, nIndexCol++, bIsWrap);
-                    bIsWrap = false;
-
-					nStartCell = nIndex + nDelimiterSize;
-					if (nStartCell == nSize)
-					{
-						pWorksheet->m_oSheetData->m_arrItems.push_back(pRow);
-						pRow = NULL;
-					}
-				}
-				else if (wcNewLineN == wcCurrent || wcNewLineR == wcCurrent)
-				{
-					if (bInQuote)
-					{
-						// Добавим Wrap
-                        bIsWrap = true;
-						continue;
-					}
-					// New line
-					if (nStartCell != nIndex)
-					{
-                        std::wstring sCellText(pTemp + nStartCell, nIndex - nStartCell);
-						AddCell(sCellText, nStartCell, oDeleteChars, *pRow, nIndexRow, nIndexCol++, bIsWrap);
-                        bIsWrap = false;
-					}
-
-					if (wcNewLineR == wcCurrent && nIndex + 1 != nSize && wcNewLineN == pTemp[nIndex + 1])
-					{
-						// На комбинацию \r\n должен быть только 1 перенос
-						++nIndex;
-					}
-					
-					nStartCell = nIndex + 1;
-
-					pWorksheet->m_oSheetData->m_arrItems.push_back(pRow);
-					pRow = new OOX::Spreadsheet::CRow();
-					pRow->m_oR.Init();
-					pRow->m_oR->SetValue(++nIndexRow + 1);
-					nIndexCol = 0;
-				}
-				else if (wcQuote == wcCurrent)
-				{
-					// Quote
-                    if (false == bInQuote && nStartCell == nIndex && nIndex + 1 != nSize)
-					{
-						// Начало новой ячейки (только если мы сразу после разделителя и не в конце файла)
-						bInQuote = !bInQuote;
-						nStartCell = nIndex + 1;
-					}
-                    else if ( bInQuote )
-					{
-						// Нужно удалить кавычку ограничитель
-						oDeleteChars.push(nIndex);
-
-						// Если следующий символ кавычка, то мы не закончили ограничитель строки (1997,Ford,E350,"Super, ""luxurious"" truck")
-						if (nIndex + 1 != nSize && wcQuote == pTemp[nIndex + 1])
-							++nIndex;
-						else
-							bInQuote = !bInQuote;
-					}
-				}
-				else if (wcTab == wcCurrent)
-				{
-					// delete tab if not delimiter
-					oDeleteChars.push(nIndex);
-				}
-			}
-
-			if (nStartCell != nSize)
-			{
-				// New line
-                std::wstring sCellText(pTemp + nStartCell, nSize - nStartCell);
-				AddCell(sCellText, nStartCell, oDeleteChars, *pRow, nIndexRow, nIndexCol++, bIsWrap);
-				pWorksheet->m_oSheetData->m_arrItems.push_back(pRow);
-			}
-			else
-			{
-				RELEASEOBJECT(pRow);
+				wcDelimiterTrailing = sDelimiter[1];
+				nDelimiterSize = 2;
 			}
 		}
 
+        const WCHAR wcNewLineN = _T('\n');
+        const WCHAR wcNewLineR = _T('\r');
+        const WCHAR wcQuote = _T('"');
+        const WCHAR wcTab = _T('\t');
+
+        bool bIsWrap = false;
+		WCHAR wcCurrent;
+		INT nStartCell = 0;
+		std::stack<INT> oDeleteChars;
+
+        bool bInQuote = false;
+		INT nIndexRow = 0;
+		INT nIndexCol = 0;
+		OOX::Spreadsheet::CRow *pRow = new OOX::Spreadsheet::CRow();
+		pRow->m_oR.Init();
+		pRow->m_oR->SetValue(nIndexRow + 1);
+		
+		for (size_t nIndex = 0; nIndex < nSize; ++nIndex)
+		{
+			wcCurrent = pTemp[nIndex];
+			if (wcDelimiterLeading == wcCurrent && (L'\0' == wcDelimiterTrailing || (nIndex + 1 < nSize && wcDelimiterTrailing == pTemp[nIndex + 1])))
+			{
+				if (bInQuote)
+					continue;
+				// New Cell
+                std::wstring sCellText(pTemp + nStartCell, nIndex - nStartCell);
+				AddCell(sCellText, nStartCell, oDeleteChars, *pRow, nIndexRow, nIndexCol++, bIsWrap);
+                bIsWrap = false;
+
+				nStartCell = nIndex + nDelimiterSize;
+				if (nStartCell == nSize)
+				{
+					pWorksheet->m_oSheetData->m_arrItems.push_back(pRow);
+					pRow = NULL;
+				}
+			}
+			else if (wcNewLineN == wcCurrent || wcNewLineR == wcCurrent)
+			{
+				if (bInQuote)
+				{
+					// Добавим Wrap
+                    bIsWrap = true;
+					continue;
+				}
+				// New line
+				if (nStartCell != nIndex)
+				{
+                    std::wstring sCellText(pTemp + nStartCell, nIndex - nStartCell);
+					AddCell(sCellText, nStartCell, oDeleteChars, *pRow, nIndexRow, nIndexCol++, bIsWrap);
+                    bIsWrap = false;
+				}
+
+				if (wcNewLineR == wcCurrent && nIndex + 1 != nSize && wcNewLineN == pTemp[nIndex + 1])
+				{
+					// На комбинацию \r\n должен быть только 1 перенос
+					++nIndex;
+				}
+				
+				nStartCell = nIndex + 1;
+
+				pWorksheet->m_oSheetData->m_arrItems.push_back(pRow);
+				pRow = new OOX::Spreadsheet::CRow();
+				pRow->m_oR.Init();
+				pRow->m_oR->SetValue(++nIndexRow + 1);
+				nIndexCol = 0;
+			}
+			else if (wcQuote == wcCurrent)
+			{
+				// Quote
+                if (false == bInQuote && nStartCell == nIndex && nIndex + 1 != nSize)
+				{
+					// Начало новой ячейки (только если мы сразу после разделителя и не в конце файла)
+					bInQuote = !bInQuote;
+					nStartCell = nIndex + 1;
+				}
+                else if ( bInQuote )
+				{
+					// Нужно удалить кавычку ограничитель
+					oDeleteChars.push(nIndex);
+
+					// Если следующий символ кавычка, то мы не закончили ограничитель строки (1997,Ford,E350,"Super, ""luxurious"" truck")
+					if (nIndex + 1 != nSize && wcQuote == pTemp[nIndex + 1])
+						++nIndex;
+					else
+						bInQuote = !bInQuote;
+				}
+			}
+			else if (wcTab == wcCurrent)
+			{
+				// delete tab if not delimiter
+				oDeleteChars.push(nIndex);
+			}
+		}
+
+		if (nStartCell != nSize)
+		{
+			// New line
+            std::wstring sCellText(pTemp + nStartCell, nSize - nStartCell);
+			AddCell(sCellText, nStartCell, oDeleteChars, *pRow, nIndexRow, nIndexCol++, bIsWrap);
+			pWorksheet->m_oSheetData->m_arrItems.push_back(pRow);
+		}
+		else
+		{
+			RELEASEOBJECT(pRow);
+		}
 		oXlsx.m_arWorksheets.push_back(pWorksheet);
+		oXlsx.m_mapWorksheets.insert(std::make_pair(sSheetRId, pWorksheet));
 	}
 }

XlsxSerializerCom/Reader/CSVReader.h

@@ -41,7 +41,7 @@
 namespace CSVReader
 {
     void AddCell(std::wstring &sText, INT nStartCell, std::stack<INT> &oDeleteChars, OOX::Spreadsheet::CRow &oRow, INT nRow, INT nCol, bool bIsWrap);
-	void ReadFromCsvToXlsx(const std::wstring &sFileName, OOX::Spreadsheet::CXlsx &oXlsx, UINT nCodePage, const std::wstring& wcDelimiter);
+	bool ReadFromCsvToXlsx(const std::wstring &sFileName, OOX::Spreadsheet::CXlsx &oXlsx, UINT nCodePage, const std::wstring& wcDelimiter);
 }
 
 #endif //CSV_READER