Commit 5ba62cb2 authored by ElenaSubbotina's avatar ElenaSubbotina

.

parent 79e05885
...@@ -282,6 +282,12 @@ namespace NSBinPptxRW ...@@ -282,6 +282,12 @@ namespace NSBinPptxRW
m_pContentTypes->AddDefault(strExts.substr(1)); m_pContentTypes->AddDefault(strExts.substr(1));
} }
if (oleData.empty() == false)
{
//plugins data - generate ole
typeAdditional = 1;
}
_imageManager2Info oImageManagerInfo = GenerateImageExec(strImage, strExts, strAdditional, typeAdditional, oleData); _imageManager2Info oImageManagerInfo = GenerateImageExec(strImage, strExts, strAdditional, typeAdditional, oleData);
if (!oImageManagerInfo.sFilepathAdditional.empty()) if (!oImageManagerInfo.sFilepathAdditional.empty())
......
...@@ -1136,8 +1136,18 @@ namespace PPTX ...@@ -1136,8 +1136,18 @@ namespace PPTX
} }
} }
if (spPr.Geometry.is_init()) bool bRect = bOle; //ole ВСЕГДА rect
if (spPr.Geometry.is<PPTX::Logic::PrstGeom>())
{ {
const PPTX::Logic::PrstGeom & lpGeom = spPr.Geometry.as<PPTX::Logic::PrstGeom>();
if( lpGeom.prst.get() == L"rect" )
bRect = true;
}
if (bRect == false)
{//custom vml shape
std::wstring strPath; std::wstring strPath;
std::wstring strTextRect; std::wstring strTextRect;
......
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