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

Merge pull request 'For bug #50842' (#446) from Rtf/Fixbugs into release/v9.1.0

Browse Source 
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/446
This commit is contained in:
Elena Subbotina
2025-09-16 14:22:47 +00:00
parent 58e86051e6 c53e7416cc
commit a0f67ef148
4 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
RtfFile/Format/RtfShape.cpp
View File

@ -215,7 +215,7 @@ void RtfShape::SetDefault()
DEFAULT_PROPERTY( m_nConnectorStyle )
//Fill
DEFAULT_PROPERTY_DEF( m_bFilled, true )
DEFAULT_PROPERTY_DEF( m_bFilled, false )
DEFAULT_PROPERTY( m_nFillType )
DEFAULT_PROPERTY( m_nFillColor )
DEFAULT_PROPERTY( m_nFillColor2 )
@ -945,8 +945,13 @@ std::wstring RtfShape::RenderToOOXBegin(RenderParameter oRenderParameter)
sShapeStart += L" o:spt=\"" + std::to_wstring(m_nShapeType) + L"\"";
}
if (0 == m_bFilled || (m_nFillColor == PROP_DEF && m_nFillColor2 == PROP_DEF && m_nFillType == PROP_DEF))
sShapeStart += L" filled=\"f\""; //сф_850000158725_R7_M194_МО_Q194.rtf
if (0 == m_bFilled || (m_nFillColor == PROP_DEF && m_nFillColor2 == PROP_DEF && m_nFillType == PROP_DEF))
{
if (1 == m_bFilled)
sShapeStart += L" filled=\"t\"";
else
sShapeStart += L" filled=\"f\""; //сф_850000158725_R7_M194_МО_Q194.rtf
}
else
sShapeStart += L" filled=\"t\"";