pengjunjie/sdkjs
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/sdkjs.git synced 2026-04-07 14:09:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/4.0.1' into develop

Browse Source
This commit is contained in:
Sergey Luzyanin
2016-07-12 15:13:52 +03:00
parent c5f45b269f 3e92c09c78
commit a3393f0f2e
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/Charts/DrawingObjects.js
View File

@ -1608,6 +1608,8 @@ function DrawingObjects() {
printPagesData
}
*****************************************/
if (!worksheet || !worksheet.model)
return;
// Undo/Redo
if ( (worksheet.model.index != api.wb.model.getActive()) && !printOptions )

4
common/Drawings/Format/GraphicFrame.js
View File

@ -181,6 +181,7 @@ CGraphicFrame.prototype.setGraphicObject= function(graphicObject)
if(this.graphicObject)
{
this.graphicObject.Index = 0;
this.graphicObject.Parent = this;
}
};
@ -1093,6 +1094,7 @@ CGraphicFrame.prototype.Undo = function(data)
if(this.graphicObject)
{
this.graphicObject.Index = 0;
this.graphicObject.Parent = this;
}
break;
}
@ -1139,6 +1141,7 @@ CGraphicFrame.prototype.Redo = function(data)
if(this.graphicObject)
{
this.graphicObject.Index = 0;
this.graphicObject.Parent = this;
}
break;
}
@ -1213,6 +1216,7 @@ CGraphicFrame.prototype.Load_Changes = function(r)
if(this.graphicObject)
{
this.graphicObject.Index = 0;
this.graphicObject.Parent = this;
}
break;
}