mirror of
https://github.com/ONLYOFFICE/core.git
synced 2026-02-10 18:05:41 +08:00
fix bug #78960
This commit is contained in:
@ -55,6 +55,8 @@ void DataFormat::readFields(CFRecord& record)
|
||||
unsigned short flags;
|
||||
record >> xi >> yi >> iss >> flags;
|
||||
fUnknown = GETBIT(flags, 0);
|
||||
if(iss > 1000)
|
||||
iss = 0;
|
||||
}
|
||||
|
||||
void DataFormat::writeFields(CFRecord& record)
|
||||
|
||||
@ -148,7 +148,7 @@ int MarkerFormat::serialize(std::wostream & _stream, int index, BaseObjectPtr _G
|
||||
{
|
||||
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_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"); }
|
||||
|
||||
@ -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 (ind >= 0 && m_isAutoLine)
|
||||
if (ind >= 0 && default_series_line_color->size() > ind && m_isAutoLine)
|
||||
{
|
||||
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_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")
|
||||
|
||||
Reference in New Issue
Block a user