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

fix bug 32958

Browse Source
This commit is contained in:
ElenaSubbotina
2016-08-18 04:16:44 +03:00
parent 49ab2346be
commit 43abe817d9
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1297,7 +1297,18 @@ CString NSPresentationEditor::CShapeWriter::ConvertImage()
m_pImageElement->m_strImageFileName.clear();
m_pImageElement->m_bImagePresent = true;
}
CString strRid;
if (!m_pImageElement->m_strImageFileName.empty())
{
strRid = m_pRels->WriteImage(m_pImageElement->m_strImageFileName);
}
else if (!m_pImageElement->m_sImageName.empty())
{
strRid = m_pRels->WriteHyperlinkImage(CorrectXmlString3(m_pImageElement->m_sImageName));
}
if (strRid.IsEmpty()) return _T("");
m_oWriter.WriteString(std::wstring(L"<p:pic>"));
WriteImageInfo();
@ -1313,18 +1324,8 @@ CString NSPresentationEditor::CShapeWriter::ConvertImage()
oInfo.m_lOriginalHeight = (LONG)m_pImageElement->m_rcBoundsOriginal.GetHeight();
m_oWriter.WriteString(std::wstring(L"<p:blipFill>"));
CString strRid;
if (m_pImageElement->m_strImageFileName.empty())
{
strRid = m_pRels->WriteHyperlinkImage(CorrectXmlString3(m_pImageElement->m_sImageName));
}
else
{
strRid = m_pRels->WriteImage(m_pImageElement->m_strImageFileName);
}
CString strWrite = _T("<a:blip r:embed=\"") + strRid + _T("\"/>");
CString strWrite = _T("<a:blip r:embed=\"") + strRid + _T("\"/>");
m_oWriter.WriteString(strWrite);
m_oWriter.WriteString(std::wstring(L"<a:srcRect"));

1
ASCOfficePPTFile/PPTFormatLib/Records/Drawing/ShapeContainer.h
View File

@ -247,6 +247,7 @@ public:
case NSPresentationEditor::etPicture:
{
//default -> line = false
pElement->m_oBrush.Type = c_BrushTypeTexture;
pElement->m_bLine = false;
for (long i = 0; i < lCount; ++i)
{