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

Fix ptgList conversion

Browse Source
This commit is contained in:
Viktor Andreev
2025-11-05 16:14:58 +06:00
parent 270e8e41dd
commit 919d117a1f
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
MsBinaryFile/XlsFile/Format/Logic/Biff_structures/CellRangeRef.h
View File

@ -206,8 +206,13 @@ public:
switch (rel_info)
{
case rel_Present:
colFirst = (columnFirst >> 2) << 2;
colLast = (columnLast >> 2) << 2;
SETBITS(colFirst, 0, 13, columnFirst);
SETBIT(colFirst, 14, columnFirstRelative);
SETBIT(colFirst, 15, rowFirstRelative);
SETBITS(colLast, 0, 13, columnLast);
SETBIT(colLast, 14, columnLastRelative);
SETBIT(colLast, 15, rowLastRelative);
break;
case rel_Absent:
colFirst = columnFirst;

8
MsBinaryFile/XlsFile/Format/Logic/Biff_structures/SyntaxPtg.cpp
View File

@ -512,16 +512,18 @@ const bool SyntaxPtg::extract_PtgList(std::wstring::const_iterator& first, std::
ptgList.rowType = 0x01;
}
else if (insider == L"[#Headers]")
{
if (boost::regex_search(first, last, results_1, reg_inside_table2))
{ auto tempResults = results_1;
if (boost::regex_search(first, last, tempResults, reg_inside_table2))
{
if (results_1.str(0) == L"[#Headers],[#Data]")
if (tempResults.str(0) == L"[#Headers],[#Data]")
{
ptgList.rowType = 0x06;
results_1 = tempResults;
}
}
else
ptgList.rowType = 0x02;
}
else if (insider == L"[#Totals]")
{