Commit da88207d authored by Sergey.Luzyanin's avatar Sergey.Luzyanin Committed by Alexander.Trofimov

Проверка на наличие spPr в автофигурах и картинках. Картинки и автофигуры без spPr не добавляются.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57432 954022d7-b5bf-4e40-9824-e11837661b57
parent 406a2007
...@@ -5772,7 +5772,7 @@ ...@@ -5772,7 +5772,7 @@
// res = c_oSerConstants.ReadUnknown; // res = c_oSerConstants.ReadUnknown;
var oGraphicObject = this.oPPTXContentLoader.ReadGraphicObject(this.stream, this.curWorksheet); var oGraphicObject = this.oPPTXContentLoader.ReadGraphicObject(this.stream, this.curWorksheet);
if(null != oGraphicObject) if(null != oGraphicObject && !((oGraphicObject.getObjectType() === historyitem_type_Shape || oGraphicObject.getObjectType() === historyitem_type_ImageShape) && !oGraphicObject.spPr))
{ {
oDrawing.graphicObject = oGraphicObject; oDrawing.graphicObject = oGraphicObject;
//TODO при copy/paste в word из excel пропадает метод setDrawingBase //TODO при copy/paste в word из excel пропадает метод setDrawingBase
......
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