Commit 0708c1f4 authored by ElenaSubbotina's avatar ElenaSubbotina

.

parent ee577e62
...@@ -247,9 +247,8 @@ namespace DocFileFormat ...@@ -247,9 +247,8 @@ namespace DocFileFormat
{ {
freeform = false; freeform = false;
m_pXmlWriter->WriteAttribute( L"type", (std::wstring(L"#") + VMLShapeTypeMapping::GenerateTypeId(pShape->GetShapeType()))); m_pXmlWriter->WriteAttribute( L"type", (std::wstring(L"#") + VMLShapeTypeMapping::GenerateTypeId(pShape->GetShapeType())));
m_pXmlWriter->WriteAttribute( L"style", FormatUtils::XmlEncode(buildStyle(pShape, pAnchor, options, pContainer->Index)));
} }
m_pXmlWriter->WriteAttribute( L"style", FormatUtils::XmlEncode(buildStyle(pShape, pAnchor, options, pContainer->Index)));
if (pShape->is<LineType>()) if (pShape->is<LineType>())
{ {
...@@ -446,7 +445,7 @@ namespace DocFileFormat ...@@ -446,7 +445,7 @@ namespace DocFileFormat
{ {
yCoord = iter->op; yCoord = iter->op;
}break; }break;
// OUTLINE // LINE
case lineColor: case lineColor:
{ {
RGBColor lineColor((int)iter->op, RedFirst); RGBColor lineColor((int)iter->op, RedFirst);
...@@ -493,6 +492,21 @@ namespace DocFileFormat ...@@ -493,6 +492,21 @@ namespace DocFileFormat
{ {
appendValueAttribute(&m_stroke, L"startarrowwidth", getArrowWidth( iter->op )); appendValueAttribute(&m_stroke, L"startarrowwidth", getArrowWidth( iter->op ));
}break; }break;
case cxstyle:
{
if (pShape->GetShapeType() == NULL)
{
freeform = false;
m_pXmlWriter->WriteAttribute(L"type", L"#_x0000_t32");
}
switch(iter->op)
{
case 0: m_pXmlWriter->WriteAttribute(L"o:connectortype", L"straight"); break;
case 1: m_pXmlWriter->WriteAttribute(L"o:connectortype", L"elbow"); break;
case 2: m_pXmlWriter->WriteAttribute(L"o:connectortype", L"curved"); break;
case 3: m_pXmlWriter->WriteAttribute(L"o:connectortype", L"none"); break;
}
}break;
// FILL // FILL
case fillColor: case fillColor:
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment