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

[xlsb][write] delete extra prop

Browse Source
This commit is contained in:
Vladimir.Gorshenkov
2022-03-25 00:06:15 +03:00
committed by Vladimir.Gorshenkov
parent 3917422889
commit 02ffd2c680
4 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Common/DocxFormat/Source/XlsxFormat/Workbook/Workbook.h
View File

@ -395,13 +395,13 @@ xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\">
}
}
}
virtual void write(const CPath& oPath, const CPath& oDirectory, CContentTypes& oContent) const
{
if(dynamic_cast<CXlsx*>(File::m_pMainDocument)->m_bIsBin)
{
writeBin(oPath);
}
virtual void write(const CPath& oPath, const CPath& oDirectory, CContentTypes& oContent) const
{
if(dynamic_cast<CXlsb*>(File::m_pMainDocument))
{
writeBin(oPath);
}
else
{
NSStringUtils::CStringBuilder sXml;
@ -460,13 +460,13 @@ xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\">
}
}
virtual const OOX::FileType type() const
{
if (m_bMacroEnabled) return OOX::Spreadsheet::FileTypes::WorkbookMacro;
else if (dynamic_cast<CXlsx*>(File::m_pMainDocument)->m_bIsBin) return OOX::Spreadsheet::FileTypes::WorkbookBin;
else return OOX::Spreadsheet::FileTypes::Workbook;
}
virtual const CPath DefaultDirectory() const
virtual const OOX::FileType type() const
{
if (m_bMacroEnabled) return OOX::Spreadsheet::FileTypes::WorkbookMacro;
else if (dynamic_cast<CXlsb*>(File::m_pMainDocument)) return OOX::Spreadsheet::FileTypes::WorkbookBin;
else return OOX::Spreadsheet::FileTypes::Workbook;
}
virtual const CPath DefaultDirectory() const
{
return type().DefaultDirectory();
}

1
Common/DocxFormat/Source/XlsxFormat/Xlsx.cpp
View File

@ -82,7 +82,6 @@ void OOX::Spreadsheet::CXlsx::init()
m_nLastReadRow = 0;
m_nLastReadCol = -1;
m_bNeedCalcChain = true;
m_bIsBin = false;
bDeleteWorkbook = false;
bDeleteSharedStrings = false;

1
Common/DocxFormat/Source/XlsxFormat/Xlsx.h
View File

@ -103,7 +103,6 @@ namespace OOX
int m_nLastReadRow;
int m_nLastReadCol;
bool m_bNeedCalcChain;// disable because it is useless but reading takes considerable time
bool m_bIsBin; // save to xlsb/xls format
std::vector<CWorksheet*> m_arWorksheets; //order as is
std::map<std::wstring, OOX::Spreadsheet::CWorksheet*> m_mapWorksheets; //copy, for fast find - order by rId(name)

1
X2tConverter/src/ASCConverters.cpp
View File

@ -3078,7 +3078,6 @@ namespace NExtractTools
oXlsb.Read(OOX::CPath(sXlsxDir));
OOX::CContentTypes oContentTypes;
oXlsb.m_bIsBin = true;
nRes = oXlsb.WriteNative(sTempUnpackedXLSB, oContentTypes) ? S_OK : AVS_FILEUTILS_ERROR_CONVERT;
if (SUCCEEDED_X2T(nRes))