Commit 40520afd authored by Sergey.Konovalov's avatar Sergey.Konovalov Committed by Alexander.Trofimov

изменены default значения в asc_CChartSeria Formula с null на ""

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@54371 954022d7-b5bf-4e40-9824-e11837661b57
parent 407ab140
...@@ -1157,7 +1157,7 @@ BinaryChartWriter.prototype.WriteSeria = function(chart, seria, nIndex) ...@@ -1157,7 +1157,7 @@ BinaryChartWriter.prototype.WriteSeria = function(chart, seria, nIndex)
if(null != seria.TxCache) if(null != seria.TxCache)
{ {
var TxCache = seria.TxCache; var TxCache = seria.TxCache;
if(null != TxCache.Formula) if(TxCache.Formula)
{ {
var oTempNumCache = {Formula: TxCache.Formula, NumCache: [{val: TxCache.Tx, index: 0}]}; var oTempNumCache = {Formula: TxCache.Formula, NumCache: [{val: TxCache.Tx, index: 0}]};
this.bs.WriteItem(c_oSer_ChartSeriesType.TxRef, function(){oThis.WriteSeriesNumCache(oTempNumCache);}); this.bs.WriteItem(c_oSer_ChartSeriesType.TxRef, function(){oThis.WriteSeriesNumCache(oTempNumCache);});
...@@ -1184,13 +1184,13 @@ BinaryChartWriter.prototype.WriteSeria = function(chart, seria, nIndex) ...@@ -1184,13 +1184,13 @@ BinaryChartWriter.prototype.WriteSeria = function(chart, seria, nIndex)
oTempSpPr.Fill = oFill; oTempSpPr.Fill = oFill;
this.bs.WriteItem(c_oSer_ChartSeriesType.SpPr, function(){window.global_pptx_content_writer.WriteSpPr(oThis.memory, oTempSpPr);}); this.bs.WriteItem(c_oSer_ChartSeriesType.SpPr, function(){window.global_pptx_content_writer.WriteSpPr(oThis.memory, oTempSpPr);});
} }
if(c_oAscChartType.scatter != chart.type && null != seria.Cat && (null != seria.Cat.Formula || seria.Cat.NumCache.length > 0)) if(c_oAscChartType.scatter != chart.type && null != seria.Cat && (seria.Cat.Formula || seria.Cat.NumCache.length > 0))
this.bs.WriteItem(c_oSer_ChartSeriesType.Cat, function(){oThis.WriteSeriesNumCache(seria.Cat);}); this.bs.WriteItem(c_oSer_ChartSeriesType.Cat, function(){oThis.WriteSeriesNumCache(seria.Cat);});
}; };
BinaryChartWriter.prototype.WriteSeriesNumCache = function(oCache) BinaryChartWriter.prototype.WriteSeriesNumCache = function(oCache)
{ {
var oThis = this; var oThis = this;
if(null != oCache.Formula) if(oCache.Formula)
{ {
this.memory.WriteByte(c_oSer_ChartSeriesNumCacheType.Formula); this.memory.WriteByte(c_oSer_ChartSeriesNumCacheType.Formula);
this.memory.WriteString2(oCache.Formula); this.memory.WriteString2(oCache.Formula);
......
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