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

Merge branch 'release/v9.0.0' into feature/add-direct-xlst-xlsb-conversion

Browse Source
This commit is contained in:
Viktor Andreev
2025-03-17 15:42:21 +06:00
parent a7551f69eb 684e83f0f3
commit b7a335ef83
44 changed files with 1151 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MsBinaryFile/XlsFile/Format/Logic/Biff_records/FileSharing.h
View File

@ -56,7 +56,7 @@ public:
static const ElementType type = typeFileSharing;
Boolean<unsigned short> fReadOnlyRec;
unsigned short wResPassNum;
unsigned short wResPassNum = 0;
std::wstring wResPass;
_UINT16 iNoResPass;
XLUnicodeString stUNUsername;

3
MsBinaryFile/XlsFile/Format/Logic/Biff_structures/ODRAW/OfficeArtContainer.cpp
View File

@ -82,6 +82,7 @@ OfficeArtRecordPtr OfficeArtContainer::CreateOfficeArt(unsigned short type)
case FSP:
art_record = OfficeArtRecordPtr(new OfficeArtFSP); break;
case FOPT:
case SecondaryFOPT:
art_record = OfficeArtRecordPtr(new OfficeArtFOPT); break;
case ChildAnchor:
art_record = OfficeArtRecordPtr(new OfficeArtChildAnchor); break;
@ -116,8 +117,6 @@ OfficeArtRecordPtr OfficeArtContainer::CreateOfficeArt(unsigned short type)
art_record = OfficeArtRecordPtr(new OfficeArtBStoreContainer); break;
case TertiaryFOPT:
art_record = OfficeArtRecordPtr(new OfficeArtTertiaryFOPT); break;
case SecondaryFOPT:
case FPSPL:
case FDGSL:
case FBSE:

3
MsBinaryFile/XlsFile/Format/Logic/Biff_structures/StringPtgParser.cpp
View File

@ -317,9 +317,6 @@ const bool StringPtgParser::parseToPtgs(const std::wstring& assembled_formula, R
[&](XLS::GlobalWorkbookInfo::_xti i) {
return i.iSup == ixti;
});
if(pos->itabFirst == pos->itabLast)
rgce.addPtg(found_operand = OperandPtgPtr(new PtgRef3d(ixti, operand_str, OperandPtg::ptg_VALUE, rgce.getLocation())));
else
rgce.addPtg(found_operand = OperandPtgPtr(new PtgRef3d(ixti, operand_str, OperandPtg::ptg_REFERENCE, rgce.getLocation())));
}
else if(SyntaxPtg::extract_PtgRefErr(it, itEnd))