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

Bug 26585 - Не отрисовывается диаграмма, которая вставлена ниже области видимости из CDE

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@58385 954022d7-b5bf-4e40-9824-e11837661b57
parent 3ebdb1ad
...@@ -1123,6 +1123,7 @@ CChartSpace.prototype = ...@@ -1123,6 +1123,7 @@ CChartSpace.prototype =
convertToPPTX: function(drawingDocument, worksheet) convertToPPTX: function(drawingDocument, worksheet)
{ {
this.setBDeleted(false);
this.setWorksheet(worksheet); this.setWorksheet(worksheet);
this.setParent(null); this.setParent(null);
return this; return this;
......
...@@ -309,6 +309,7 @@ CGroupShape.prototype = ...@@ -309,6 +309,7 @@ CGroupShape.prototype =
var sp_tree_copy = [].concat(this.spTree), i; var sp_tree_copy = [].concat(this.spTree), i;
this.setWorksheet(worksheet); this.setWorksheet(worksheet);
this.setParent(null); this.setParent(null);
this.setBDeleted(false);
for(i = this.spTree.length-1; i > -1; --i) for(i = this.spTree.length-1; i > -1; --i)
{ {
this.removeFromSpTreeByPos(i); this.removeFromSpTreeByPos(i);
......
...@@ -381,6 +381,7 @@ CImageShape.prototype = ...@@ -381,6 +381,7 @@ CImageShape.prototype =
{ {
this.setWorksheet(worksheet); this.setWorksheet(worksheet);
this.setParent(null); this.setParent(null);
this.setBDeleted(false);
return this; return this;
}, },
......
...@@ -3145,6 +3145,7 @@ ...@@ -3145,6 +3145,7 @@
graphicObject = data[i].image.GraphicObj; graphicObject = data[i].image.GraphicObj;
//convert from word //convert from word
graphicObject.bDeleted = true;
graphicObject = graphicObject.convertToPPTX(ws.model.DrawingDocument, ws.model) graphicObject = graphicObject.convertToPPTX(ws.model.DrawingDocument, ws.model)
//create new drawingBase //create new drawingBase
...@@ -3212,9 +3213,9 @@ ...@@ -3212,9 +3213,9 @@
//drawingObject.graphicObject.setDrawingDocument(ws.objectRender.drawingDocument); //drawingObject.graphicObject.setDrawingDocument(ws.objectRender.drawingDocument);
drawingObject.graphicObject.recalculate(); drawingObject.graphicObject.recalculate();
drawingObject.graphicObject.addToDrawingObjects(); drawingObject.graphicObject.addToDrawingObjects();
drawingObject.graphicObject.select(ws.objectRender.controller, 0); drawingObject.graphicObject.recalculateTransform();
drawingObject.graphicObject.select(ws.objectRender.controller, 0);
if(drawingObject.graphicObject.isImage()) if(drawingObject.graphicObject.isImage())
aImagesSync.push(drawingObject.graphicObject.getImageUrl()); aImagesSync.push(drawingObject.graphicObject.getImageUrl());
......
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