Commit d58c6161 authored by Sergey.Konovalov's avatar Sergey.Konovalov Committed by Alexander.Trofimov

картинка формул добавлялась не в тот Run, который пришел на открытие

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@62541 954022d7-b5bf-4e40-9824-e11837661b57
parent c78cf253
...@@ -7761,6 +7761,8 @@ function Binary_DocumentTableReader(doc, oReadResult, openParams, stream, bAllow ...@@ -7761,6 +7761,8 @@ function Binary_DocumentTableReader(doc, oReadResult, openParams, stream, bAllow
res = this.bcr.Read1(length, function(t, l){ res = this.bcr.Read1(length, function(t, l){
return oThis.ReadObject(t,l,oParStruct,oDrawing); return oThis.ReadObject(t,l,oParStruct,oDrawing);
}); });
if(null != oDrawing.content.GraphicObj)
oNewElem = oDrawing.content;
} }
else else
res = c_oSerConstants.ReadUnknown; res = c_oSerConstants.ReadUnknown;
...@@ -7823,16 +7825,7 @@ function Binary_DocumentTableReader(doc, oReadResult, openParams, stream, bAllow ...@@ -7823,16 +7825,7 @@ function Binary_DocumentTableReader(doc, oReadResult, openParams, stream, bAllow
} }
else if(c_oSerRunType.pptxDrawing === type) else if(c_oSerRunType.pptxDrawing === type)
{ {
var oNewElem = null;
this.ReadDrawing (type, length, oParStruct, oDrawing, res); this.ReadDrawing (type, length, oParStruct, oDrawing, res);
if(null != oDrawing.content.GraphicObj)
{
oNewElem = oDrawing.content;
var oNewRun = new ParaRun(oParStruct.paragraph);
oNewRun.Add_ToContent(0, oNewElem, false);
oParStruct.addToContent(oNewRun);
}
} }
else else
res = c_oSerConstants.ReadUnknown; res = c_oSerConstants.ReadUnknown;
......
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