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

.

Browse Source
This commit is contained in:
ElenaSubbotina
2019-01-17 15:26:20 +03:00
parent abd50ecec6
commit ec39df3ae8
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ASCOfficePPTFile/PPTFormatLib/PPTXWriter/ShapeWriter.cpp
View File

@ -429,7 +429,7 @@ std::wstring NSPresentationEditor::CShapeWriter::ConvertBrush(CBrush & brush)
brush_writer.WriteString(L"</a:blipFill>");
}
}
else if ( brush.Type == c_BrushTypeNoFill)
else if ( brush.Type == c_BrushTypeNoFill )
{
brush_writer.WriteString(L"<a:noFill/>");
}
@ -488,7 +488,7 @@ std::wstring NSPresentationEditor::CShapeWriter::ConvertBrush(CBrush & brush)
brush_writer.WriteString(L"</a:bgClr>");
brush_writer.WriteString(L"</a:pattFill>");
}
else
else if (brush.Type != c_BrushTypeNotSet)
{
brush_writer.WriteString(std::wstring(L"<a:solidFill>"));
brush_writer.WriteString(ConvertColor(brush.Color1, brush.Alpha1));

3
ASCOfficePPTFile/PPTFormatLib/Records/Drawing/ShapeContainer.cpp
View File

@ -261,7 +261,8 @@ void CPPTElement::SetUpProperties(CElementPtr pElement, CTheme* pTheme, CSlideIn
{
pElement->m_oBrush.Type = c_BrushTypeNoFill;
}
else if (pElement->m_oBrush.Type == c_BrushTypeNotSet )
else if (pElement->m_oBrush.Type == c_BrushTypeNotSet &&
(pElement->m_lPlaceholderType == 0 && pElement->m_lPlaceholderID < 0 ))
{
pElement->m_oBrush.Type = c_BrushTypeSolid;
}