pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-07-18 19:19:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/ppt_8' into fix/v7.0.0-ppt1

Browse Source
This commit is contained in:
Ivan Morozov
2021-12-17 12:20:25 +03:00
parent a30e9ac37f afe1c7b341
commit c0dd3db439
1802 changed files with 254091 additions and 18170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
XlsxSerializerCom/Reader/BinaryWriter.cpp
View File

@ -7150,11 +7150,15 @@ _UINT32 BinaryFileWriter::Open(const std::wstring& sInputDir, const std::wstring
result = CSVReader::ReadFromCsvToXlsx(sInputDir, *pXlsx, nCodePage, sDelimiter);
}break;
case BinXlsxRW::c_oFileTypes::XLSX:
case BinXlsxRW::c_oFileTypes::XLSB:
default:
{
if (bIsNoBase64 && BinXlsxRW::c_oFileTypes::JSON != saveFileType)
{
pXlsx = new OOX::Spreadsheet::CXlsx();
if(fileType == BinXlsxRW::c_oFileTypes::XLSB)
pXlsx = new OOX::Spreadsheet::CXlsb();
else
pXlsx = new OOX::Spreadsheet::CXlsx();
pXlsx->m_bNeedCalcChain = false;
NSBinPptxRW::CXlsbBinaryWriter oXlsbWriter;
@ -7200,7 +7204,13 @@ _UINT32 BinaryFileWriter::Open(const std::wstring& sInputDir, const std::wstring
{
RELEASEOBJECT(pXlsx);
return AVS_FILEUTILS_ERROR_CONVERT;
}
}
if (fileType == BinXlsxRW::c_oFileTypes::XLSB)
{
dynamic_cast<OOX::Spreadsheet::CXlsb*>(pXlsx)->PrepareSi();
dynamic_cast<OOX::Spreadsheet::CXlsb*>(pXlsx)->PrepareTableFormula();
}
}
if (BinXlsxRW::c_oFileTypes::JSON == saveFileType)