Commit c1bb4f74 authored by Igor.Zotov's avatar Igor.Zotov Committed by Alexander.Trofimov

загрузка картинок, находящихся внутри автофигуры/диаграммы

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@56602 954022d7-b5bf-4e40-9824-e11837661b57
parent b95ca030
...@@ -3087,7 +3087,7 @@ ...@@ -3087,7 +3087,7 @@
_insertImagesFromBinary: function(ws, data, isIntoShape) _insertImagesFromBinary: function(ws, data, isIntoShape)
{ {
var activeRange = ws.activeRange; var activeRange = ws.activeRange;
var curCol, drawingObject, curRow, startCol, startRow, xfrm, aImagesSync = [], activeRow, activeCol; var curCol, drawingObject, curRow, startCol, startRow, xfrm, aImagesSync = [], activeRow, activeCol, tempArr;
History.Create_NewPoint(); History.Create_NewPoint();
History.StartTransaction(); History.StartTransaction();
...@@ -3172,8 +3172,16 @@ ...@@ -3172,8 +3172,16 @@
drawingObject.graphicObject.addToDrawingObjects(); drawingObject.graphicObject.addToDrawingObjects();
drawingObject.graphicObject.select(ws.objectRender.controller, 0); drawingObject.graphicObject.select(ws.objectRender.controller, 0);
if(drawingObject.graphicObject.isImage()) tempArr = [];
aImagesSync.push(drawingObject.graphicObject.getImageUrl()); drawingObject.graphicObject.getAllRasterImages(tempArr);
if(tempArr.length)
{
for(var n = 0; n < tempArr.length; n++)
{
aImagesSync.push(tempArr[n]);
}
};
}; };
window["Asc"]["editor"].ImageLoader.LoadDocumentImages(aImagesSync, null, ws.objectRender.asyncImagesDocumentEndLoaded); window["Asc"]["editor"].ImageLoader.LoadDocumentImages(aImagesSync, null, ws.objectRender.asyncImagesDocumentEndLoaded);
......
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