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

Merge remote-tracking branch 'origin/release/v9.0.0' into feature/vs

Browse Source
This commit is contained in:
Elena Subbotina
2025-03-20 14:36:55 +03:00
parent 051169b0f5 23410ccbf9
commit dad19380a2
10 changed files with 74 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OOXML/DocxFormat/Drawing/DrawingExt.cpp
View File

@ -904,8 +904,16 @@ namespace OOX
{
if(i->m_sUri == L"{78C0D931-6437-407d-A8EE-F0AAD7539E65}")
{
auto formatPtr(new XLSB::CONDITIONALFORMATTINGS);
ptr->m_CONDITIONALFORMATTINGS = XLS::BaseObjectPtr{formatPtr};
XLSB::CONDITIONALFORMATTINGS *formatPtr = NULL;
if(!ptr->m_CONDITIONALFORMATTINGS)
{
formatPtr = new XLSB::CONDITIONALFORMATTINGS;
ptr->m_CONDITIONALFORMATTINGS = XLS::BaseObjectPtr{formatPtr};
}
else
{
formatPtr = static_cast<XLSB::CONDITIONALFORMATTINGS*>(ptr->m_CONDITIONALFORMATTINGS.get());
}
for(auto j:i->m_arrConditionalFormatting)
{
formatPtr->m_arCONDITIONALFORMATTING14.push_back(j->toBin14());