From 2c310d0764561957c73b5c6004d15dfab5334976 Mon Sep 17 00:00:00 2001 From: Dmitriy Aleksandrov Date: Thu, 31 Aug 2023 13:59:58 +0600 Subject: [PATCH] For bug #62819 Add ChartExSpace --- common/Drawings/Format/ChartEx.js | 134 +++++++++++++++--------------- 1 file changed, 67 insertions(+), 67 deletions(-) diff --git a/common/Drawings/Format/ChartEx.js b/common/Drawings/Format/ChartEx.js index a436ef86c3..ebc0fa7e0e 100644 --- a/common/Drawings/Format/ChartEx.js +++ b/common/Drawings/Format/ChartEx.js @@ -552,79 +552,79 @@ }; - // // ChartSpace (constains in ChartSpace.js) - // drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetChartData] = function(oClass, value) { - // oClass.chartData = value; - // }; - // drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetChart] = function(oClass, value) { - // oClass.chart = value; - // }; - // drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetSpPr] = function(oClass, value) { - // oClass.spPr = value; + // ChartExSpace (constains in ChartSpace.js) + drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetChartData] = function(oClass, value) { + oClass.chartData = value; + }; + drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetChart] = function(oClass, value) { + oClass.chart = value; + }; + drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetSpPr] = function(oClass, value) { + oClass.spPr = value; + }; + drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetTxPr] = function(oClass, value) { + oClass.txPr = value; + }; + drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetClrMapOvr] = function(oClass, value) { + oClass.clrMapOvr = value; + }; + // drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetFmtOvrs] = function(oClass, value) { + // oClass.fmtOvrs = value; // }; - // drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetTxPr] = function(oClass, value) { - // oClass.txPr = value; + // drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetPrintSettings] = function(oClass, value) { + // oClass.printSettings = value; // }; - // drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetClrMapOvr] = function(oClass, value) { - // oClass.clrMapOvr = value; - // }; - // // drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetFmtOvrs] = function(oClass, value) { - // // oClass.fmtOvrs = value; - // // }; - // // drawingsChangesMap[AscDFH.historyitem_ChartSpace_SetPrintSettings] = function(oClass, value) { - // // oClass.printSettings = value; - // // }; - // AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetChartData] = window['AscDFH'].CChangesDrawingsObjectNoId; - // AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetChart] = window['AscDFH'].CChangesDrawingsObjectNoId; - // AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetSpPr] = window['AscDFH'].CChangesDrawingsObjectNoId; - // AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetTxPr] = window['AscDFH'].CChangesDrawingsObjectNoId; - // AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetClrMapOvr] = window['AscDFH'].CChangesDrawingsObjectNoId; - // // AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetFmtOvrs] = window['AscDFH'].CChangesDrawingsObjectNoId; - // // AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetPrintSettings] = window['AscDFH'].CChangesDrawingsObjectNoId; - // function CChartSpace() { - // CBaseChartObject.call(this); - // this.chartData = null; - // this.chart = null; - // this.spPr = null; - // this.txPr = null; - // this.clrMapOvr = null; - // // unused in ChartSerializeEx.h - // // this.fmtOvrs = null; - // // this.printSettings = null; + AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetChartData] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetChart] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetSpPr] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetTxPr] = window['AscDFH'].CChangesDrawingsObjectNoId; + AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetClrMapOvr] = window['AscDFH'].CChangesDrawingsObjectNoId; + // AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetFmtOvrs] = window['AscDFH'].CChangesDrawingsObjectNoId; + // AscDFH.changesFactory[AscDFH.historyitem_ChartSpace_SetPrintSettings] = window['AscDFH'].CChangesDrawingsObjectNoId; + function CChartExSpace() { + CBaseChartObject.call(this); + this.chartData = null; + this.chart = null; + this.spPr = null; + this.txPr = null; + this.clrMapOvr = null; + // unused in ChartSerializeEx.h + // this.fmtOvrs = null; + // this.printSettings = null; - // } + } - // InitClass(CChartSpace, CBaseChartObject, AscDFH.historyitem_type_ChartSpace); + InitClass(CChartExSpace, CBaseChartObject, AscDFH.historyitem_type_ChartSpace); - // CChartSpace.prototype.setChartData = function(pr) { - // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetChartData, this.chartData, pr)); - // this.chartData = pr; - // }; - // CChartSpace.prototype.setChart = function(pr) { - // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetChart, this.chart, pr)); - // this.chart = pr; - // }; - // CChartSpace.prototype.setSpPr = function(pr) { - // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetSpPr, this.spPr, pr)); - // this.spPr = pr; + CChartExSpace.prototype.setChartData = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetChartData, this.chartData, pr)); + this.chartData = pr; + }; + CChartExSpace.prototype.setChart = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetChart, this.chart, pr)); + this.chart = pr; + }; + CChartExSpace.prototype.setSpPr = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetSpPr, this.spPr, pr)); + this.spPr = pr; + }; + CChartExSpace.prototype.setTxPr = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetTxPr, this.txPr, pr)); + this.txPr = pr; + }; + CChartExSpace.prototype.setClrMapOvr = function(pr) { + History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetClrMapOvr, this.clrMapOvr, pr)); + this.clrMapOvr = pr; + }; + // CChartExSpace.prototype.setFmtOvrs = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetFmtOvrs, this.fmtOvrs, pr)); + // this.fmtOvrs = pr; // }; - // CChartSpace.prototype.setTxPr = function(pr) { - // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetTxPr, this.txPr, pr)); - // this.txPr = pr; + // CChartExSpace.prototype.setPrintSettings = function(pr) { + // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetPrintSettings, this.printSettings, pr)); + // this.printSettings = pr; // }; - // CChartSpace.prototype.setClrMapOvr = function(pr) { - // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetClrMapOvr, this.clrMapOvr, pr)); - // this.clrMapOvr = pr; - // }; - // // CChartSpace.prototype.setFmtOvrs = function(pr) { - // // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetFmtOvrs, this.fmtOvrs, pr)); - // // this.fmtOvrs = pr; - // // }; - // // CChartSpace.prototype.setPrintSettings = function(pr) { - // // History.CanAddChanges() && History.Add(new CChangesDrawingsObjectNoId(this, AscDFH.historyitem_ChartSpace_SetPrintSettings, this.printSettings, pr)); - // // this.printSettings = pr; - // // }; - // + // // ChartTitle (CTitle instead of CChartTitle) // drawingsChangesMap[AscDFH.historyitem_ChartTitle_SetTx] = function(oClass, value) { @@ -3843,7 +3843,7 @@ window['AscFormat'].CCategoryAxisScaling = CCategoryAxisScaling; window['AscFormat'].CChartEx = CChartEx; window['AscFormat'].CChartData = CChartData; - // window['AscFormat'].CChartSpace = CChartSpace; + window['AscFormat'].CChartExSpace = CChartExSpace; // window['AscFormat'].CChartTitle = CChartTitle; window['AscFormat'].CClear = CClear; window['AscFormat'].CCopyrights = CCopyrights;