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

For bug #50842

Browse Source
This commit is contained in:
Daria
2025-09-16 17:18:59 +03:00
parent dee37793f5
commit c53e7416cc
4 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
MsBinaryFile/Common/Vml/GraphicsPath.h
View File

@ -99,6 +99,7 @@ namespace ODRAW
rtFillColor = 20, rtFillColor = 20,
rtLineColor = 21, rtLineColor = 21,
rtUnknown = 22,
// OOXML // OOXML
rtOOXMLMoveTo = 0 + 100, // 2 rtOOXMLMoveTo = 0 + 100, // 2

4
MsBinaryFile/Common/Vml/PPTShape/CustomGeomShape.cpp
View File

@ -83,9 +83,11 @@ namespace NSCustomVML
m_nCount = 0; m_nCount = 0;
break; break;
case 0xac00: case 0xac00:
m_eRuler = ODRAW::rtUnknown;
break;
case 0xaa00: // nofill case 0xaa00: // nofill
case 0xad00: case 0xad00:
m_eRuler = ODRAW::rtNoFill; m_eRuler = ODRAW::rtNoFill;
break; break;
case 0xab00: // nostroke case 0xab00: // nostroke
m_eRuler = ODRAW::rtNoStroke; m_eRuler = ODRAW::rtNoStroke;

1
MsBinaryFile/Common/Vml/VmlPath.h
View File

@ -55,6 +55,7 @@ namespace ODRAW
case rtRCurveTo: { return _T("v"); } case rtRCurveTo: { return _T("v"); }
case rtNoFill: { return _T("nf"); } case rtNoFill: { return _T("nf"); }
case rtUnknown: { return _T(""); }
case rtNoStroke: { return _T("ns"); } case rtNoStroke: { return _T("ns"); }
case rtAngleEllipseTo: { return _T("ae"); } case rtAngleEllipseTo: { return _T("ae"); }

11
RtfFile/Format/RtfShape.cpp
View File

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