diff --git a/MsBinaryFile/Common/Vml/GraphicsPath.h b/MsBinaryFile/Common/Vml/GraphicsPath.h index 5fb582c335..5d81cca316 100644 --- a/MsBinaryFile/Common/Vml/GraphicsPath.h +++ b/MsBinaryFile/Common/Vml/GraphicsPath.h @@ -99,6 +99,7 @@ namespace ODRAW rtFillColor = 20, rtLineColor = 21, + rtUnknown = 22, // OOXML rtOOXMLMoveTo = 0 + 100, // 2 diff --git a/MsBinaryFile/Common/Vml/PPTShape/CustomGeomShape.cpp b/MsBinaryFile/Common/Vml/PPTShape/CustomGeomShape.cpp index d1253afaf4..a36e34b6a0 100644 --- a/MsBinaryFile/Common/Vml/PPTShape/CustomGeomShape.cpp +++ b/MsBinaryFile/Common/Vml/PPTShape/CustomGeomShape.cpp @@ -83,9 +83,11 @@ namespace NSCustomVML m_nCount = 0; break; case 0xac00: + m_eRuler = ODRAW::rtUnknown; + break; case 0xaa00: // nofill case 0xad00: - m_eRuler = ODRAW::rtNoFill; + m_eRuler = ODRAW::rtNoFill; break; case 0xab00: // nostroke m_eRuler = ODRAW::rtNoStroke; diff --git a/MsBinaryFile/Common/Vml/VmlPath.h b/MsBinaryFile/Common/Vml/VmlPath.h index 73de4c0923..cc60bca69e 100644 --- a/MsBinaryFile/Common/Vml/VmlPath.h +++ b/MsBinaryFile/Common/Vml/VmlPath.h @@ -55,6 +55,7 @@ namespace ODRAW case rtRCurveTo: { return _T("v"); } case rtNoFill: { return _T("nf"); } + case rtUnknown: { return _T(""); } case rtNoStroke: { return _T("ns"); } case rtAngleEllipseTo: { return _T("ae"); } diff --git a/RtfFile/Format/RtfShape.cpp b/RtfFile/Format/RtfShape.cpp index cb85f9f299..42b9840a8f 100644 --- a/RtfFile/Format/RtfShape.cpp +++ b/RtfFile/Format/RtfShape.cpp @@ -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\"";