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

fix bug #78960

Browse Source
This commit is contained in:
Viktor Andreev
2025-12-05 20:10:56 +06:00
parent d1d94f481d
commit bebb39a619
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MsBinaryFile/XlsFile/Format/Logic/Biff_records/DataFormat.cpp
View File

@ -55,6 +55,8 @@ void DataFormat::readFields(CFRecord& record)
unsigned short flags; unsigned short flags;
record >> xi >> yi >> iss >> flags; record >> xi >> yi >> iss >> flags;
fUnknown = GETBIT(flags, 0); fUnknown = GETBIT(flags, 0);
if(iss > 1000)
iss = 0;
} }
void DataFormat::writeFields(CFRecord& record) void DataFormat::writeFields(CFRecord& record)

4
MsBinaryFile/XlsFile/Format/Logic/Biff_records/MarkerFormat.cpp
View File

@ -148,7 +148,7 @@ int MarkerFormat::serialize(std::wostream & _stream, int index, BaseObjectPtr _G
{ {
CP_XML_NODE(L"a:srgbClr") CP_XML_NODE(L"a:srgbClr")
{ {
CP_XML_ATTR(L"val", (false == fAuto || index < 0) ? rgbBack.strRGB : default_marker_color[index]); CP_XML_ATTR(L"val", (false == fAuto || index < 0 || index > default_marker_color->size()) ? rgbBack.strRGB : default_marker_color[index]);
} }
} }
} }
@ -158,7 +158,7 @@ int MarkerFormat::serialize(std::wostream & _stream, int index, BaseObjectPtr _G
{ {
CP_XML_NODE(L"a:srgbClr") CP_XML_NODE(L"a:srgbClr")
{ {
CP_XML_ATTR(L"val", (false == fAuto || index < 0) ? rgbFore.strRGB : default_marker_color[index]); CP_XML_ATTR(L"val", (false == fAuto || index < 0 || index > default_marker_color->size()) ? rgbFore.strRGB : default_marker_color[index]);
} }
} }
CP_XML_NODE(L"a:prstDash") { CP_XML_ATTR(L"val", L"solid"); } CP_XML_NODE(L"a:prstDash") { CP_XML_ATTR(L"val", L"solid"); }

5
MsBinaryFile/XlsFile/Format/Logic/Biff_unions/SS.cpp
View File

@ -305,7 +305,7 @@ int SS::serialize_default(std::wostream & _stream, int series_type, int ind )
if ((line) && (line->lns == (_UINT16)5)) ind = -1; if ((line) && (line->lns == (_UINT16)5)) ind = -1;
} }
if (ind >= 0 && m_isAutoLine) if (ind >= 0 && default_series_line_color->size() > ind && m_isAutoLine)
{ {
CP_XML_NODE(L"a:ln") CP_XML_NODE(L"a:ln")
{ {
@ -444,7 +444,8 @@ int SS::serialize(std::wostream & _stream, int series_type, int indPt)
{ {
CP_XML_NODE(L"a:srgbClr") CP_XML_NODE(L"a:srgbClr")
{ {
CP_XML_ATTR(L"val", default_series_line_color[ind]); if(default_series_line_color->size() > ind)
CP_XML_ATTR(L"val", default_series_line_color[ind]);
} }
} }
CP_XML_NODE(L"a:prstDash") CP_XML_NODE(L"a:prstDash")