From 63f9b88369bae119aadee0f2f0426aada05cedd4 Mon Sep 17 00:00:00 2001 From: Oleg Korshul Date: Tue, 12 Jul 2016 14:38:06 +0300 Subject: [PATCH 1/2] builder bug --- common/Charts/DrawingObjects.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/Charts/DrawingObjects.js b/common/Charts/DrawingObjects.js index bfb3a2e809..6fdc4486b7 100644 --- a/common/Charts/DrawingObjects.js +++ b/common/Charts/DrawingObjects.js @@ -1608,6 +1608,8 @@ function DrawingObjects() { printPagesData } *****************************************/ + if (!worksheet || !worksheet.model) + return; // Undo/Redo if ( (worksheet.model.index != api.wb.model.getActive()) && !printOptions ) From 3e92c09c782acb2ffb13498846090594648be00b Mon Sep 17 00:00:00 2001 From: Sergey Luzyanin Date: Tue, 12 Jul 2016 15:13:19 +0300 Subject: [PATCH 2/2] fix Bug 32804 --- common/Drawings/Format/GraphicFrame.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/common/Drawings/Format/GraphicFrame.js b/common/Drawings/Format/GraphicFrame.js index 97b0007931..e4ceeb0842 100644 --- a/common/Drawings/Format/GraphicFrame.js +++ b/common/Drawings/Format/GraphicFrame.js @@ -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; }