Commit d5f318de authored by Sergey Luzyanin's avatar Sergey Luzyanin

fix Bug 33914

parent d6bc5872
......@@ -24,6 +24,11 @@
}
AscCommon.extendClass(CChangesDrawingsBool, AscDFH.CChangesBaseBoolProperty);
CChangesDrawingsBool.prototype.private_SetValue = private_SetValue;
CChangesDrawingsBool.prototype.Load = function(){
this.Redo();
this.RefreshRecalcData();
};
CChangesDrawingsBool.prototype.ReadFromBinary = function (reader) {
reader.Seek2(reader.GetCurPos() - 4);
this.Type = reader.GetLong();
......@@ -42,6 +47,10 @@
AscCommon.extendClass(CChangesDrawingsLong, AscDFH.CChangesBaseLongProperty);
CChangesDrawingsLong.prototype.private_SetValue = private_SetValue;
CChangesDrawingsLong.prototype.Load = function(){
this.Redo();
this.RefreshRecalcData();
};
CChangesDrawingsLong.prototype.ReadFromBinary = function (reader) {
reader.Seek2(reader.GetCurPos() - 4);
this.Type = reader.GetLong();
......@@ -59,6 +68,11 @@
AscCommon.extendClass(CChangesDrawingsDouble, AscDFH.CChangesBaseDoubleProperty);
CChangesDrawingsDouble.prototype.private_SetValue = private_SetValue;
CChangesDrawingsDouble.prototype.Load = function(){
this.Redo();
this.RefreshRecalcData();
};
CChangesDrawingsDouble.prototype.ReadFromBinary = function (reader) {
reader.Seek2(reader.GetCurPos() - 4);
......@@ -78,6 +92,11 @@
AscCommon.extendClass(CChangesDrawingsString, AscDFH.CChangesBaseStringProperty);
CChangesDrawingsString.prototype.private_SetValue = private_SetValue;
CChangesDrawingsString.prototype.Load = function(){
this.Redo();
this.RefreshRecalcData();
};
CChangesDrawingsString.prototype.ReadFromBinary = function (reader) {
reader.Seek2(reader.GetCurPos() - 4);
this.Type = reader.GetLong();
......@@ -96,6 +115,10 @@
AscCommon.extendClass(CChangesDrawingsObjectNoId, AscDFH.CChangesBaseObjectProperty);
CChangesDrawingsObjectNoId.prototype.private_SetValue = private_SetValue;
CChangesDrawingsObjectNoId.prototype.Load = function(){
this.Redo();
this.RefreshRecalcData();
};
window['AscDFH'].CChangesDrawingsObjectNoId = CChangesDrawingsObjectNoId;
CChangesDrawingsObjectNoId.prototype.ReadFromBinary = function (reader) {
reader.Seek2(reader.GetCurPos() - 4);
......@@ -103,7 +126,6 @@
this.FromLoad = true;
CChangesDrawingsObjectNoId.superclass.ReadFromBinary.call(this, reader);
};
CChangesDrawingsObjectNoId.prototype.private_SetValue = private_SetValue;
CChangesDrawingsObjectNoId.prototype.private_CreateObject = function () {
if (AscDFH.drawingsConstructorsMap[this.Type]) {
return new AscDFH.drawingsConstructorsMap[this.Type]();
......@@ -138,7 +160,10 @@
AscDFH.drawingsChangesMap[this.Type](this.Class, oObject);
}
};
CChangesDrawingsObject.prototype.Load = function(){
this.Redo();
this.RefreshRecalcData();
};
function CChangesDrawingsContent(Class, Type, Pos, Items, isAdd) {
this.Type = Type;
CChangesDrawingsContent.superclass.constructor.call(this, Class, Pos, Items, isAdd);
......@@ -251,6 +276,7 @@
else {
this.private_RemoveInArrayLoad();
}
this.RefreshRecalcData();
};
CChangesDrawingsContent.prototype.Undo = function () {
......@@ -396,6 +422,11 @@
this.Do();
};
CChangesDrawingChangeTheme.prototype.Load = function(){
this.Redo();
this.RefreshRecalcData();
};
window['AscDFH'].CChangesDrawingChangeTheme = CChangesDrawingChangeTheme;
......@@ -445,6 +476,10 @@
oSlide.transitionLock = this.transitionLock;
oSlide.layoutLock = this.layoutLock;
};
CChangesDrawingTimingLocks.prototype.Load = function(){
this.Redo();
this.RefreshRecalcData();
};
window['AscDFH'].CChangesDrawingTimingLocks = CChangesDrawingTimingLocks;
......@@ -517,6 +552,10 @@
CChangesSparklinesChangeData.prototype.Redo = function(){
this.Fill(this.NewPr);
};
CChangesSparklinesChangeData.prototype.Load = function(){
this.Redo();
this.RefreshRecalcData();
};
window['AscDFH'].CChangesSparklinesChangeData = CChangesSparklinesChangeData;
......@@ -612,6 +651,11 @@
CChangesDrawingsExcelColor.prototype.Redo = function(){
this.Fill(this.NewPr);
};
CChangesDrawingsExcelColor.prototype.Load = function(){
this.Redo();
this.RefreshRecalcData();
};
CChangesDrawingsExcelColor.prototype.Fill = function(Pr){
var oClass = this.Class;
switch(this.Type){
......@@ -658,6 +702,10 @@
this.Class.worksheet.removeSparklineGroup(this.Class.Get_Id());
}
};
CChangesDrawingsSparklinesRemove.prototype.Load = function(){
this.Redo();
this.RefreshRecalcData();
};
window['AscDFH'].CChangesDrawingsSparklinesRemove = CChangesDrawingsSparklinesRemove;
function CChangesDrawingsSparklineRemoveData(Class, Col, Row){
......
......@@ -11114,7 +11114,12 @@ CStockChart.prototype =
},
Refresh_RecalcData: function()
{},
{
if(this.parent && this.parent.parent && this.parent.parent.parent)
{
this.parent.parent.parent.handleUpdateType();
}
},
removeSeries: function(idx)
{
if(this.series[idx])
......@@ -12646,6 +12651,7 @@ function CUpDownBars()
this.downBars = null;
this.gapWidth = null;
this.upBars = null;
this.parent = null;
this.Id = g_oIdCounter.Get_NewId();
g_oTableId.Add(this, this.Id);
}
......@@ -12659,16 +12665,30 @@ CUpDownBars.prototype =
},
Refresh_RecalcData: function()
{},
{
if(this.parent){
this.parent.Refresh_RecalcData && this.parent.Refresh_RecalcData();
}
},
getObjectType: function()
{
return AscDFH.historyitem_type_UpDownBars;
},
setParent: function(pr)
{
History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_CommonChartFormat_SetParent, this.parent, pr));
this.parent = pr;
},
setDownBars: function(pr)
{
History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_UpDownBars_SetDownBars, this.downBars, pr));
this.downBars = pr;
if(this.downBars){
this.downBars.setParent(this);
}
},
setGapWidth: function(pr)
......@@ -12682,6 +12702,21 @@ CUpDownBars.prototype =
{
History.Add(new CChangesDrawingsObject(this, AscDFH.historyitem_UpDownBars_SetUpBars, this.downBars, pr));
this.upBars = pr;
if(this.upBars){
this.upBars.setParent(this);
}
},
handleUpdateFill: function()
{
this.Refresh_RecalcData();
},
handleUpdateLn: function()
{
this.Refresh_RecalcData();
},
createDuplicate: function()
......
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