Skip to content

S
sdkjs
Commit 43e84baa authored by Sergey.Luzyanin's avatar Sergey.Luzyanin Committed by Alexander.Trofimov
Browse files
Options

Bug 26254 - У диаграммы типа "point" диапазон значений уменьшается на один... 

Bug 26254 - У диаграммы типа "point" диапазон значений уменьшается на один ряд/строку при смена типа "data series. Добавил скрипт Fields.js в html.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@60770 954022d7-b5bf-4e40-9824-e11837661b57
parent a23318aa
Hide whitespace changes
Inline Side-by-side
Showing with 349 additions and 450 deletions
Common/Drawings/CommonController.js
View file @ 43e84baa
...@@ -1877,11 +1877,11 @@ DrawingObjectsController.prototype = ...@@ -1877,11 +1877,11 @@ DrawingObjectsController.prototype =
} }
if( parsed_formula && ws && new_bbox ) if( parsed_formula && ws && new_bbox )
{ {
var oCommonBBox = chart_space.getCommonBBox();
var b_equal_bbox = chart_space.bbox && chart_space.bbox.seriesBBox.r1 === new_bbox.r1 var b_equal_bbox = oCommonBBox && oCommonBBox.r1 === new_bbox.r1
&& chart_space.bbox.seriesBBox.r2 === new_bbox.r2 && oCommonBBox.r2 === new_bbox.r2
&& chart_space.bbox.seriesBBox.c1 === new_bbox.c1 && oCommonBBox.c1 === new_bbox.c1
&& chart_space.bbox.seriesBBox.c2 === new_bbox.c2; && oCommonBBox.c2 === new_bbox.c2;
var b_equal_ws = chart_space.bbox && chart_space.bbox.worksheet === ws; var b_equal_ws = chart_space.bbox && chart_space.bbox.worksheet === ws;
var b_equal_vert = chart_space.bbox && chartSettings.getInColumns() === !chart_space.bbox.seriesBBox.bVert; var b_equal_vert = chart_space.bbox && chartSettings.getInColumns() === !chart_space.bbox.seriesBBox.bVert;
......
Common/Drawings/Format/ChartSpace.js
View file @ 43e84baa
...@@ -1172,7 +1172,6 @@ CChartSpace.prototype = ...@@ -1172,7 +1172,6 @@ CChartSpace.prototype =
var asc_series = asc_chart.series; var asc_series = asc_chart.series;
var chart_type = this.chart.plotArea.charts[0]; var chart_type = this.chart.plotArea.charts[0];
var first_series = chart_type.series[0] ? chart_type.series[0] : chart_type.getSeriesConstructor(); var first_series = chart_type.series[0] ? chart_type.series[0] : chart_type.getSeriesConstructor();
var first_series2 = chart_type.series[0] ? chart_type.series[0] : null;
removeAllSeriesFromChart(chart_type); removeAllSeriesFromChart(chart_type);
if(chart_type.getObjectType() !== historyitem_type_ScatterChart) if(chart_type.getObjectType() !== historyitem_type_ScatterChart)
{ {
...@@ -1182,39 +1181,11 @@ CChartSpace.prototype = ...@@ -1182,39 +1181,11 @@ CChartSpace.prototype =
series.setIdx(i); series.setIdx(i);
series.setOrder(i); series.setOrder(i);
series.setVal(new CYVal()); series.setVal(new CYVal());
var val = series.val; FillValNum(series.val, asc_series[i].Val, true, false);
val.setNumRef(new CNumRef());
var num_ref = val.numRef;
num_ref.setF(asc_series[i].Val.Formula);
num_ref.setNumCache(new CNumLit());
var num_cache = num_ref.numCache;
num_cache.setPtCount(asc_series[i].Val.NumCache.length);
// for(var j = 0; j < asc_series[i].Val.NumCache.length; ++j)
// {
// var pt = new CNumericPoint();
// pt.setIdx(j);
// pt.setFormatCode(asc_series[i].Val.NumCache[j].numFormatStr);
// pt.setVal(asc_series[i].Val.NumCache[j].val);
// num_cache.addPt(pt);
// }
if(asc_series[i].Cat && asc_series[i].Cat.NumCache && typeof asc_series[i].Cat.Formula === "string" && asc_series[i].Cat.Formula.length > 0) if(asc_series[i].Cat && asc_series[i].Cat.NumCache && typeof asc_series[i].Cat.Formula === "string" && asc_series[i].Cat.Formula.length > 0)
{ {
series.setCat(new CCat()); series.setCat(new CCat());
var cat = series.cat; FillCatStr(series.cat, asc_series[i].Cat, true, false);
cat.setStrRef(new CStrRef());
var str_ref = cat.strRef;
str_ref.setF(asc_series[i].Cat.Formula);
str_ref.setStrCache(new CStrCache());
var str_cache = str_ref.strCache;
var cat_num_cache = asc_series[i].Cat.NumCache;
str_cache.setPtCount(cat_num_cache.length);
//for(var j= 0; j < cat_num_cache.length; ++j)
//{
// var string_pt = new CStringPoint();
// string_pt.setIdx(j);
// string_pt.setVal(cat_num_cache[j].val);
// str_cache.addPt(string_pt);
//}
} }
else else
{ {
...@@ -1222,18 +1193,7 @@ CChartSpace.prototype = ...@@ -1222,18 +1193,7 @@ CChartSpace.prototype =
} }
if(asc_series[i].TxCache && typeof asc_series[i].TxCache.Formula === "string" && asc_series[i].TxCache.Formula.length > 0) if(asc_series[i].TxCache && typeof asc_series[i].TxCache.Formula === "string" && asc_series[i].TxCache.Formula.length > 0)
{ {
series.setTx(new CTx()); FillSeriesTx(series, asc_series[i].TxCache, true, false);
var tx= series.tx;
tx.setStrRef(new CStrRef());
var str_ref = tx.strRef;
str_ref.setF(asc_series[i].TxCache.Formula);
str_ref.setStrCache(new CStrCache());
var str_cache = str_ref.strCache;
str_cache.setPtCount(1);
//str_cache.addPt(new CStringPoint());
//var pt = str_cache.pt[0];
//pt.setIdx(0);
//pt.setVal(asc_series[i].TxCache.Tx);
} }
else else
{ {
...@@ -1244,49 +1204,35 @@ CChartSpace.prototype = ...@@ -1244,49 +1204,35 @@ CChartSpace.prototype =
} }
else else
{ {
var first_series = asc_series.length > 1 ? asc_series[0] : null; var oXVal;
var start_index = asc_series.length > 1 ? 1 : 0; var first_series = null;
var minus = start_index === 1 ? 1 : 0; var start_index = 0;
var minus = 0;
if(asc_series[0].xVal && asc_series[0].xVal.NumCache && typeof asc_series[0].xVal.Formula === "string" && asc_series[0].xVal.Formula.length > 0)
{
oXVal = new CXVal();
FillCatStr(oXVal, asc_series[0].xVal, true, false);
}
else if(asc_series[0].Cat && asc_series[0].Cat.NumCache && typeof asc_series[0].Cat.Formula === "string" && asc_series[0].Cat.Formula.length > 0)
{
oXVal = new CXVal();
FillCatStr(oXVal, asc_series[0].Cat, true, false);
}
for(var i = start_index; i < asc_series.length; ++i) for(var i = start_index; i < asc_series.length; ++i)
{ {
var series = first_series2.createDuplicate(); var series = new CScatterSeries();
series.setIdx(i - minus); series.setIdx(i - minus);
series.setOrder(i - minus); series.setOrder(i - minus);
if(first_series) if(oXVal)
{ {
series.setXVal(new CXVal()); series.setXVal(oXVal.createDuplicate());
var x_val = series.xVal;
x_val.setNumRef(new CNumRef());
var num_ref = x_val.numRef;
num_ref.setF(first_series.Val.Formula);
num_ref.setNumCache(new CNumLit());
var num_cache = num_ref.numCache;
num_cache.setPtCount(first_series.Val.NumCache.length);
//for(var j = 0; j < first_series.Val.NumCache.length; ++j)
//{
// var pt = new CNumericPoint();
// pt.setIdx(j);
// pt.setFormatCode(first_series.Val.NumCache[j].numFormatStr);
// pt.setVal(first_series.Val.NumCache[j].val);
// num_cache.addPt(pt);
//}
} }
series.setYVal(new CYVal()); series.setYVal(new CYVal());
var y_val = series.yVal; FillValNum(series.yVal, asc_series[i].Val, true, false);
y_val.setNumRef(new CNumRef()); if(asc_series[i].TxCache && typeof asc_series[i].TxCache.Formula === "string" && asc_series[i].TxCache.Formula.length > 0)
var num_ref = y_val.numRef; {
num_ref.setF(asc_series[i].Val.Formula); FillSeriesTx(series, asc_series[i].TxCache, true, false);
num_ref.setNumCache(new CNumLit()); }
var num_cache = num_ref.numCache;
num_cache.setPtCount(asc_series[i].Val.NumCache.length);
//for(var j = 0; j < asc_series[i].Val.NumCache.length; ++j)
//{
// var pt = new CNumericPoint();
// pt.setIdx(j);
// pt.setFormatCode(asc_series[i].Val.NumCache[j].numFormatStr);
// pt.setVal(asc_series[i].Val.NumCache[j].val);
// num_cache.addPt(pt);
//}
chart_type.addSer(series); chart_type.addSer(series);
} }
} }
...@@ -2214,6 +2160,78 @@ CChartSpace.prototype = ...@@ -2214,6 +2160,78 @@ CChartSpace.prototype =
} }
}, },
getCommonBBox: function()
{
if(this.recalcInfo.recalculateBBox)
{
this.recalculateBBox();
this.recalcInfo.recalculateBBox = false;
}
var oRet = null;
if(this.bbox.seriesBBox && isRealBool(this.bbox.seriesBBox.bVert))
{
oRet = {r1: this.bbox.seriesBBox.r1, r2: this.bbox.seriesBBox.r2, c1: this.bbox.seriesBBox.c1, c2: this.bbox.seriesBBox.c2};
if(this.bbox.seriesBBox.bVert)
{
if(this.bbox.catBBox )
{
if(this.bbox.catBBox.r1 === this.bbox.catBBox.r2 && this.bbox.catBBox.r1 === this.bbox.seriesBBox.r1 - 1)
{
--oRet.r1;
}
else
{
oRet = null;
}
}
if(oRet)
{
if(this.bbox.serBBox)
{
if(this.bbox.serBBox.c1 === this.bbox.serBBox.c2 && this.bbox.serBBox.c1 === this.bbox.seriesBBox.c1 - 1)
{
--oRet.c1;
}
else
{
oRet = null;
}
}
}
}
else
{
if(this.bbox.catBBox )
{
if(this.bbox.catBBox.c1 === this.bbox.catBBox.c2 && this.bbox.catBBox.c1 === this.bbox.seriesBBox.c1 - 1)
{
--oRet.c1;
}
else
{
oRet = null;
}
}
if(oRet)
{
if(this.bbox.serBBox)
{
if(this.bbox.serBBox.r1 === this.bbox.serBBox.r2 && this.bbox.serBBox.r1 === this.bbox.seriesBBox.r1 - 1)
{
--oRet.r1;
}
else
{
oRet = null;
}
}
}
}
}
return oRet;
},
recalculateReferences: function() recalculateReferences: function()
{ {
var worksheet = this.worksheet; var worksheet = this.worksheet;
...@@ -9744,7 +9762,7 @@ CPageSetup.prototype = ...@@ -9744,7 +9762,7 @@ CPageSetup.prototype =
}; };
function CreateLineChart(chartSeries, type, bUseCache) function CreateLineChart(chartSeries, type, bUseCache, oOptions)
{ {
var asc_series = chartSeries.series; var asc_series = chartSeries.series;
var chart_space = new CChartSpace(); var chart_space = new CChartSpace();
...@@ -9792,6 +9810,15 @@ function CreateLineChart(chartSeries, type, bUseCache) ...@@ -9792,6 +9810,15 @@ function CreateLineChart(chartSeries, type, bUseCache)
line_chart.addAxId(val_ax); line_chart.addAxId(val_ax);
plot_area.valAx.setCrosses(2); plot_area.valAx.setCrosses(2);
var parsedHeaders = chartSeries.parsedHeaders; var parsedHeaders = chartSeries.parsedHeaders;
var bInCols;
if(isRealObject(oOptions))
{
bInCols = oOptions.inColumns === true;
}
else
{
bInCols = false;
}
for(var i = 0; i < asc_series.length; ++i) for(var i = 0; i < asc_series.length; ++i)
{ {
var series = new CLineSeries(); var series = new CLineSeries();
...@@ -9801,63 +9828,15 @@ function CreateLineChart(chartSeries, type, bUseCache) ...@@ -9801,63 +9828,15 @@ function CreateLineChart(chartSeries, type, bUseCache)
series.marker.setSymbol(SYMBOL_NONE); series.marker.setSymbol(SYMBOL_NONE);
series.setSmooth(false); series.setSmooth(false);
series.setVal(new CYVal()); series.setVal(new CYVal());
var val = series.val; FillValNum(series.val, asc_series[i].Val, bUseCache);
val.setNumRef(new CNumRef()); if(parsedHeaders.bTop && !bInCols || bInCols && parsedHeaders.bLeft)
var num_ref = val.numRef;
num_ref.setF(asc_series[i].Val.Formula);
if(bUseCache)
{
num_ref.setNumCache(new CNumLit());
var num_cache = num_ref.numCache;
num_cache.setPtCount(asc_series[i].Val.NumCache.length);
for(var j = 0; j < asc_series[i].Val.NumCache.length; ++j)
{
var pt = new CNumericPoint();
pt.setIdx(j);
pt.setFormatCode(asc_series[i].Val.NumCache[j].numFormatStr);
pt.setVal(asc_series[i].Val.NumCache[j].val);
num_cache.addPt(pt);
}
}
if(parsedHeaders.bTop)
{ {
series.setCat(new CCat()); series.setCat(new CCat());
var cat = series.cat; FillCatStr(series.cat, asc_series[i].Cat, bUseCache);
cat.setStrRef(new CStrRef());
var str_ref = cat.strRef;
str_ref.setF(asc_series[i].Cat.Formula);
if(bUseCache)
{
str_ref.setStrCache(new CStrCache());
var str_cache = str_ref.strCache;
var cat_num_cache = asc_series[i].Cat.NumCache;
str_cache.setPtCount(cat_num_cache.length);
for(var j= 0; j < cat_num_cache.length; ++j)
{
var string_pt = new CStringPoint();
string_pt.setIdx(j);
string_pt.setVal(cat_num_cache[j].val);
str_cache.addPt(string_pt);
}
}
} }
if(parsedHeaders.bLeft && asc_series[i].TxCache && typeof asc_series[i].TxCache.Formula === "string" && asc_series[i].TxCache.Formula.length > 0) if((parsedHeaders.bLeft && !bInCols || bInCols && parsedHeaders.bTop) && asc_series[i].TxCache && typeof asc_series[i].TxCache.Formula === "string" && asc_series[i].TxCache.Formula.length > 0)
{ {
series.setTx(new CTx()); FillSeriesTx(series, asc_series[i].TxCache, bUseCache);
var tx= series.tx;
tx.setStrRef(new CStrRef());
var str_ref = tx.strRef;
str_ref.setF(asc_series[i].TxCache.Formula);
if(bUseCache)
{
str_ref.setStrCache(new CStrCache());
var str_cache = str_ref.strCache;
str_cache.setPtCount(1);
str_cache.addPt(new CStringPoint());
var pt = str_cache.pt[0];
pt.setIdx(0);
pt.setVal(asc_series[i].TxCache.Tx);
}
} }
line_chart.addSer(series); line_chart.addSer(series);
} }
...@@ -9918,7 +9897,7 @@ function CreateLineChart(chartSeries, type, bUseCache) ...@@ -9918,7 +9897,7 @@ function CreateLineChart(chartSeries, type, bUseCache)
return chart_space; return chart_space;
} }
function CreateBarChart(chartSeries, type, bUseCache) function CreateBarChart(chartSeries, type, bUseCache, oOptions)
{ {
var asc_series = chartSeries.series; var asc_series = chartSeries.series;
var chart_space = new CChartSpace(); var chart_space = new CChartSpace();
...@@ -9938,7 +9917,15 @@ function CreateBarChart(chartSeries, type, bUseCache) ...@@ -9938,7 +9917,15 @@ function CreateBarChart(chartSeries, type, bUseCache)
plot_area.setLayout(new CLayout()); plot_area.setLayout(new CLayout());
plot_area.addChart(new CBarChart()); plot_area.addChart(new CBarChart());
var bInCols;
if(isRealObject(oOptions))
{
bInCols = oOptions.inColumns === true;
}
else
{
bInCols = false;
}
var cat_ax = new CCatAx(); var cat_ax = new CCatAx();
...@@ -9963,63 +9950,15 @@ function CreateBarChart(chartSeries, type, bUseCache) ...@@ -9963,63 +9950,15 @@ function CreateBarChart(chartSeries, type, bUseCache)
series.setOrder(i); series.setOrder(i);
series.setInvertIfNegative(false); series.setInvertIfNegative(false);
series.setVal(new CYVal()); series.setVal(new CYVal());
var val = series.val; FillValNum(series.val, asc_series[i].Val, bUseCache);
val.setNumRef(new CNumRef()); if(parsedHeaders.bTop && !bInCols || bInCols && parsedHeaders.bLeft)
var num_ref = val.numRef;
num_ref.setF(asc_series[i].Val.Formula);
if(bUseCache)
{
num_ref.setNumCache(new CNumLit());
var num_cache = num_ref.numCache;
num_cache.setPtCount(asc_series[i].Val.NumCache.length);
for(var j = 0; j < asc_series[i].Val.NumCache.length; ++j)
{
var pt = new CNumericPoint();
pt.setIdx(j);
pt.setFormatCode(asc_series[i].Val.NumCache[j].numFormatStr);
pt.setVal(asc_series[i].Val.NumCache[j].val);
num_cache.addPt(pt);
}
}
if(parsedHeaders.bTop)
{ {
series.setCat(new CCat()); series.setCat(new CCat());
var cat = series.cat; FillCatStr(series.cat, asc_series[i].Cat, bUseCache);
cat.setStrRef(new CStrRef());
var str_ref = cat.strRef;
str_ref.setF(asc_series[i].Cat.Formula);
if(bUseCache)
{
str_ref.setStrCache(new CStrCache());
var str_cache = str_ref.strCache;
var cat_num_cache = asc_series[i].Cat.NumCache;
str_cache.setPtCount(cat_num_cache.length);
for(var j= 0; j < cat_num_cache.length; ++j)
{
var string_pt = new CStringPoint();
string_pt.setIdx(j);
string_pt.setVal(cat_num_cache[j].val);
str_cache.addPt(string_pt);
}
}
} }
if(parsedHeaders.bLeft && asc_series[i].TxCache && typeof asc_series[i].TxCache.Formula === "string" && asc_series[i].TxCache.Formula.length > 0) if((parsedHeaders.bLeft && !bInCols || bInCols && parsedHeaders.bTop) && asc_series[i].TxCache && typeof asc_series[i].TxCache.Formula === "string" && asc_series[i].TxCache.Formula.length > 0)
{ {
series.setTx(new CTx()); FillSeriesTx(series, asc_series[i].TxCache, bUseCache);
var tx= series.tx;
tx.setStrRef(new CStrRef());
var str_ref = tx.strRef;
str_ref.setF(asc_series[i].TxCache.Formula);
if(bUseCache)
{
str_ref.setStrCache(new CStrCache());
var str_cache = str_ref.strCache;
str_cache.setPtCount(1);
str_cache.addPt(new CStringPoint());
var pt = str_cache.pt[0];
pt.setIdx(0);
pt.setVal(asc_series[i].TxCache.Tx);
}
} }
bar_chart.addSer(series); bar_chart.addSer(series);
} }
...@@ -10084,7 +10023,7 @@ function CreateBarChart(chartSeries, type, bUseCache) ...@@ -10084,7 +10023,7 @@ function CreateBarChart(chartSeries, type, bUseCache)
return chart_space; return chart_space;
} }
function CreateHBarChart(chartSeries, type, bUseCache) function CreateHBarChart(chartSeries, type, bUseCache, oOptions)
{ {
var asc_series = chartSeries.series; var asc_series = chartSeries.series;
var chart_space = new CChartSpace(); var chart_space = new CChartSpace();
...@@ -10120,6 +10059,17 @@ function CreateHBarChart(chartSeries, type, bUseCache) ...@@ -10120,6 +10059,17 @@ function CreateHBarChart(chartSeries, type, bUseCache)
bar_chart.setGrouping(type); bar_chart.setGrouping(type);
bar_chart.setVaryColors(false); bar_chart.setVaryColors(false);
var parsedHeaders = chartSeries.parsedHeaders; var parsedHeaders = chartSeries.parsedHeaders;
var bInCols;
if(isRealObject(oOptions))
{
bInCols = oOptions.inColumns === true;
}
else
{
bInCols = false;
}
for(var i = 0; i < asc_series.length; ++i) for(var i = 0; i < asc_series.length; ++i)
{ {
var series = new CBarSeries(); var series = new CBarSeries();
...@@ -10127,66 +10077,16 @@ function CreateHBarChart(chartSeries, type, bUseCache) ...@@ -10127,66 +10077,16 @@ function CreateHBarChart(chartSeries, type, bUseCache)
series.setOrder(i); series.setOrder(i);
series.setInvertIfNegative(false); series.setInvertIfNegative(false);
series.setVal(new CYVal()); series.setVal(new CYVal());
var val = series.val; FillValNum(series.val, asc_series[i].Val, bUseCache);
val.setNumRef(new CNumRef()); if((parsedHeaders.bTop && !bInCols || bInCols && parsedHeaders.bLeft))
var num_ref = val.numRef;
num_ref.setF(asc_series[i].Val.Formula);
if(bUseCache)
{
num_ref.setNumCache(new CNumLit());
var num_cache = num_ref.numCache;
num_cache.setPtCount(asc_series[i].Val.NumCache.length);
for(var j = 0; j < asc_series[i].Val.NumCache.length; ++j)
{
var pt = new CNumericPoint();
pt.setIdx(j);
pt.setFormatCode(asc_series[i].Val.NumCache[j].numFormatStr);
pt.setVal(asc_series[i].Val.NumCache[j].val);
num_cache.addPt(pt);
}
}
if(parsedHeaders.bTop)
{ {
series.setCat(new CCat()); series.setCat(new CCat());
var cat = series.cat; FillCatStr(series.cat, asc_series[i].Cat, bUseCache);
cat.setStrRef(new CStrRef());
var str_ref = cat.strRef;
str_ref.setF(asc_series[i].Cat.Formula);
if(bUseCache)
{
str_ref.setStrCache(new CStrCache());
var str_cache = str_ref.strCache;
var cat_num_cache = asc_series[i].Cat.NumCache;
str_cache.setPtCount(cat_num_cache.length);
for(var j= 0; j < cat_num_cache.length; ++j)
{
var string_pt = new CStringPoint();
string_pt.setIdx(j);
string_pt.setVal(cat_num_cache[j].val);
str_cache.addPt(string_pt);
}
}
} }
if(parsedHeaders.bLeft && asc_series[i].TxCache && typeof asc_series[i].TxCache.Formula === "string" && asc_series[i].TxCache.Formula.length > 0) if((parsedHeaders.bLeft && !bInCols || bInCols && parsedHeaders.bTop) && asc_series[i].TxCache && typeof asc_series[i].TxCache.Formula === "string" && asc_series[i].TxCache.Formula.length > 0)
{ {
series.setTx(new CTx()); FillSeriesTx(series, asc_series[i].TxCache, bUseCache);
var tx= series.tx;
tx.setStrRef(new CStrRef());
var str_ref = tx.strRef;
str_ref.setF(asc_series[i].TxCache.Formula);
if(bUseCache)
{
str_ref.setStrCache(new CStrCache());
var str_cache = str_ref.strCache;
str_cache.setPtCount(1);
str_cache.addPt(new CStringPoint());
var pt = str_cache.pt[0];
pt.setIdx(0);
pt.setVal(asc_series[i].TxCache.Tx);
}
} }
bar_chart.addSer(series); bar_chart.addSer(series);
} }
//bar_chart.setDLbls(new CDLbls()); //bar_chart.setDLbls(new CDLbls());
...@@ -10255,7 +10155,7 @@ function CreateHBarChart(chartSeries, type, bUseCache) ...@@ -10255,7 +10155,7 @@ function CreateHBarChart(chartSeries, type, bUseCache)
return chart_space; return chart_space;
} }
function CreateAreaChart(chartSeries, type, bUseCache) function CreateAreaChart(chartSeries, type, bUseCache, oOptions)
{ {
var asc_series = chartSeries.series; var asc_series = chartSeries.series;
var chart_space = new CChartSpace(); var chart_space = new CChartSpace();
...@@ -10275,8 +10175,6 @@ function CreateAreaChart(chartSeries, type, bUseCache) ...@@ -10275,8 +10175,6 @@ function CreateAreaChart(chartSeries, type, bUseCache)
plot_area.setLayout(new CLayout()); plot_area.setLayout(new CLayout());
plot_area.addChart(new CAreaChart()); plot_area.addChart(new CAreaChart());
var cat_ax = new CCatAx(); var cat_ax = new CCatAx();
var val_ax = new CValAx(); var val_ax = new CValAx();
cat_ax.setAxId(++GLOBAL_AX_ID_COUNTER); cat_ax.setAxId(++GLOBAL_AX_ID_COUNTER);
...@@ -10287,6 +10185,15 @@ function CreateAreaChart(chartSeries, type, bUseCache) ...@@ -10287,6 +10185,15 @@ function CreateAreaChart(chartSeries, type, bUseCache)
plot_area.addAxis(cat_ax); plot_area.addAxis(cat_ax);
plot_area.addAxis(val_ax); plot_area.addAxis(val_ax);
var bInCols;
if(isRealObject(oOptions))
{
bInCols = oOptions.inColumns === true;
}
else
{
bInCols = false;
}
var area_chart = plot_area.charts[0]; var area_chart = plot_area.charts[0];
area_chart.setGrouping(type); area_chart.setGrouping(type);
...@@ -10298,64 +10205,15 @@ function CreateAreaChart(chartSeries, type, bUseCache) ...@@ -10298,64 +10205,15 @@ function CreateAreaChart(chartSeries, type, bUseCache)
series.setIdx(i); series.setIdx(i);
series.setOrder(i); series.setOrder(i);
series.setVal(new CYVal()); series.setVal(new CYVal());
var val = series.val; FillValNum(series.val, asc_series[i].Val, bUseCache);
val.setNumRef(new CNumRef()); if(parsedHeaders.bTop && !bInCols || bInCols && parsedHeaders.bLeft)
var num_ref = val.numRef;
num_ref.setF(asc_series[i].Val.Formula);
if(bUseCache)
{
num_ref.setNumCache(new CNumLit());
var num_cache = num_ref.numCache;
num_cache.setPtCount(asc_series[i].Val.NumCache.length);
for(var j = 0; j < asc_series[i].Val.NumCache.length; ++j)
{
var pt = new CNumericPoint();
pt.setIdx(j);
pt.setFormatCode(asc_series[i].Val.NumCache[j].numFormatStr);
pt.setVal(asc_series[i].Val.NumCache[j].val);
num_cache.addPt(pt);
}
}
if(parsedHeaders.bTop)
{ {
series.setCat(new CCat()); series.setCat(new CCat());
var cat = series.cat; FillCatStr(series.cat, asc_series[i].Cat, bUseCache);
cat.setStrRef(new CStrRef());
var str_ref = cat.strRef;
str_ref.setF(asc_series[i].Cat.Formula);
if(bUseCache)
{
str_ref.setStrCache(new CStrCache());
var str_cache = str_ref.strCache;
var cat_num_cache = asc_series[i].Cat.NumCache;
str_cache.setPtCount(cat_num_cache.length);
for(var j= 0; j < cat_num_cache.length; ++j)
{
var string_pt = new CStringPoint();
string_pt.setIdx(j);
string_pt.setVal(cat_num_cache[j].val);
str_cache.addPt(string_pt);
}
}
} }
if(parsedHeaders.bLeft && asc_series[i].TxCache && typeof asc_series[i].TxCache.Formula === "string" && asc_series[i].TxCache.Formula.length > 0) if((parsedHeaders.bLeft && !bInCols || bInCols && parsedHeaders.bTop) && asc_series[i].TxCache && typeof asc_series[i].TxCache.Formula === "string" && asc_series[i].TxCache.Formula.length > 0)
{ {
series.setTx(new CTx()); FillSeriesTx(series, asc_series[i].TxCache, bUseCache);
var tx= series.tx;
tx.setStrRef(new CStrRef());
var str_ref = tx.strRef;
str_ref.setF(asc_series[i].TxCache.Formula);
if(bUseCache)
{
str_ref.setStrCache(new CStrCache());
var str_cache = str_ref.strCache;
str_cache.setPtCount(1);
str_cache.addPt(new CStringPoint());
var pt = str_cache.pt[0];
pt.setIdx(0);
pt.setVal(asc_series[i].TxCache.Tx);
}
} }
area_chart.addSer(series); area_chart.addSer(series);
...@@ -10422,7 +10280,7 @@ function CreateAreaChart(chartSeries, type, bUseCache) ...@@ -10422,7 +10280,7 @@ function CreateAreaChart(chartSeries, type, bUseCache)
return chart_space; return chart_space;
} }
function CreatePieChart(chartSeries, bDoughnut, bUseCache) function CreatePieChart(chartSeries, bDoughnut, bUseCache, oOptions)
{ {
var asc_series = chartSeries.series; var asc_series = chartSeries.series;
var chart_space = new CChartSpace(); var chart_space = new CChartSpace();
...@@ -10440,6 +10298,15 @@ function CreatePieChart(chartSeries, bDoughnut, bUseCache) ...@@ -10440,6 +10298,15 @@ function CreatePieChart(chartSeries, bDoughnut, bUseCache)
var pie_chart = plot_area.charts[0]; var pie_chart = plot_area.charts[0];
pie_chart.setVaryColors(true); pie_chart.setVaryColors(true);
var parsedHeaders = chartSeries.parsedHeaders; var parsedHeaders = chartSeries.parsedHeaders;
var bInCols;
if(isRealObject(oOptions))
{
bInCols = oOptions.inColumns === true;
}
else
{
bInCols = false;
}
for(var i = 0; i < asc_series.length; ++i) for(var i = 0; i < asc_series.length; ++i)
{ {
var series = new CPieSeries(); var series = new CPieSeries();
...@@ -10447,70 +10314,19 @@ function CreatePieChart(chartSeries, bDoughnut, bUseCache) ...@@ -10447,70 +10314,19 @@ function CreatePieChart(chartSeries, bDoughnut, bUseCache)
series.setOrder(i); series.setOrder(i);
series.setVal(new CYVal()); series.setVal(new CYVal());
var val = series.val; var val = series.val;
val.setNumRef(new CNumRef()); FillValNum(series.val, asc_series[i].Val, bUseCache);
var num_ref = val.numRef; if(parsedHeaders.bTop && !bInCols || bInCols && parsedHeaders.bLeft)
num_ref.setF(asc_series[i].Val.Formula);
if(bUseCache)
{
num_ref.setNumCache(new CNumLit());
var num_cache = num_ref.numCache;
num_cache.setPtCount(asc_series[i].Val.NumCache.length);
for(var j = 0; j < asc_series[i].Val.NumCache.length; ++j)
{
var pt = new CNumericPoint();
pt.setIdx(j);
pt.setFormatCode(asc_series[i].Val.NumCache[j].numFormatStr);
pt.setVal(asc_series[i].Val.NumCache[j].val);
num_cache.addPt(pt);
}
}
if(parsedHeaders.bTop)
{ {
series.setCat(new CCat()); series.setCat(new CCat());
var cat = series.cat; FillCatStr(series.cat, asc_series[i].Cat, bUseCache);
cat.setStrRef(new CStrRef());
var str_ref = cat.strRef;
str_ref.setF(asc_series[i].Cat.Formula);
if(bUseCache)
{
str_ref.setStrCache(new CStrCache());
var str_cache = str_ref.strCache;
var cat_num_cache = asc_series[i].Cat.NumCache;
str_cache.setPtCount(cat_num_cache.length);
for(var j= 0; j < cat_num_cache.length; ++j)
{
var string_pt = new CStringPoint();
string_pt.setIdx(j);
string_pt.setVal(cat_num_cache[j].val);
str_cache.addPt(string_pt);
}
}
} }
if(parsedHeaders.bLeft && asc_series[i].TxCache && typeof asc_series[i].TxCache.Formula === "string" && asc_series[i].TxCache.Formula.length > 0) if((parsedHeaders.bLeft && !bInCols || bInCols && parsedHeaders.bTop) && asc_series[i].TxCache && typeof asc_series[i].TxCache.Formula === "string" && asc_series[i].TxCache.Formula.length > 0)
{ {
series.setTx(new CTx()); FillSeriesTx(series, asc_series[i].TxCache, bUseCache);
var tx= series.tx;
tx.setStrRef(new CStrRef());
var str_ref = tx.strRef;
str_ref.setF(asc_series[i].TxCache.Formula);
if(bUseCache)
{
str_ref.setStrCache(new CStrCache());
var str_cache = str_ref.strCache;
str_cache.setPtCount(1);
str_cache.addPt(new CStringPoint());
var pt = str_cache.pt[0];
pt.setIdx(0);
pt.setVal(asc_series[i].TxCache.Tx);
}
} }
pie_chart.addSer(series); pie_chart.addSer(series);
} }
//pie_chart.setDLbls(new CDLbls());
//pie_chart.dLbls.setShowLegendKey(false);
//pie_chart.dLbls.setShowVal(true);
pie_chart.setFirstSliceAng(0); pie_chart.setFirstSliceAng(0);
if(bDoughnut) if(bDoughnut)
pie_chart.setHoleSize(50); pie_chart.setHoleSize(50);
...@@ -10537,7 +10353,79 @@ function CreatePieChart(chartSeries, bDoughnut, bUseCache) ...@@ -10537,7 +10353,79 @@ function CreatePieChart(chartSeries, bDoughnut, bUseCache)
return chart_space; return chart_space;
} }
function CreateScatterChart(chartSeries, bUseCache) function FillCatStr(oCat, oCatCache, bUseCache, bFillCache)
{
oCat.setStrRef(new CStrRef());
var str_ref = oCat.strRef;
str_ref.setF(oCatCache.Formula);
if(bUseCache)
{
str_ref.setStrCache(new CStrCache());
var str_cache = str_ref.strCache;
var cat_num_cache = oCatCache.NumCache;
str_cache.setPtCount(cat_num_cache.length);
if(!(bFillCache === false))
{
for(var j = 0; j < cat_num_cache.length; ++j)
{
var string_pt = new CStringPoint();
string_pt.setIdx(j);
string_pt.setVal(cat_num_cache[j].val);
str_cache.addPt(string_pt);
}
}
}
}
function FillValNum(oVal, oValCache, bUseCache, bFillCache)
{
oVal.setNumRef(new CNumRef());
var num_ref = oVal.numRef;
num_ref.setF(oValCache.Formula);
if(bUseCache)
{
num_ref.setNumCache(new CNumLit());
var num_cache = num_ref.numCache;
num_cache.setPtCount(oValCache.NumCache.length);
if(!(bFillCache === false))
{
for(var j = 0; j < oValCache.NumCache.length; ++j)
{
var pt = new CNumericPoint();
pt.setIdx(j);
pt.setFormatCode(oValCache.NumCache[j].numFormatStr);
pt.setVal(oValCache.NumCache[j].val);
num_cache.addPt(pt);
}
}
}
}
function FillSeriesTx(oSeries, oTxCache, bUseCache, bFillCache)
{
oSeries.setTx(new CTx());
var tx= oSeries.tx;
tx.setStrRef(new CStrRef());
var str_ref = tx.strRef;
str_ref.setF(oTxCache.Formula);
if(bUseCache)
{
str_ref.setStrCache(new CStrCache());
var str_cache = str_ref.strCache;
str_cache.setPtCount(1);
if(!(bFillCache === false))
{
str_cache.addPt(new CStringPoint());
var pt = str_cache.pt[0];
pt.setIdx(0);
pt.setVal(oTxCache.Tx);
}
}
}
function CreateScatterChart(chartSeries, bUseCache, oOptions)
{ {
var asc_series = chartSeries.series; var asc_series = chartSeries.series;
var chart_space = new CChartSpace(); var chart_space = new CChartSpace();
...@@ -10556,7 +10444,17 @@ function CreateScatterChart(chartSeries, bUseCache) ...@@ -10556,7 +10444,17 @@ function CreateScatterChart(chartSeries, bUseCache)
scatter_chart.setScatterStyle(SCATTER_STYLE_MARKER); scatter_chart.setScatterStyle(SCATTER_STYLE_MARKER);
scatter_chart.setVaryColors(false); scatter_chart.setVaryColors(false);
var bInCols;
if(isRealObject(oOptions))
{
bInCols = oOptions.inColumns === true;
}
else
{
bInCols = false;
}
var parsedHeaders = chartSeries.parsedHeaders;
var cat_ax = new CValAx(); var cat_ax = new CValAx();
var val_ax = new CValAx(); var val_ax = new CValAx();
...@@ -10564,93 +10462,43 @@ function CreateScatterChart(chartSeries, bUseCache) ...@@ -10564,93 +10462,43 @@ function CreateScatterChart(chartSeries, bUseCache)
val_ax.setAxId(++GLOBAL_AX_ID_COUNTER); val_ax.setAxId(++GLOBAL_AX_ID_COUNTER);
cat_ax.setCrossAx(val_ax); cat_ax.setCrossAx(val_ax);
val_ax.setCrossAx(cat_ax); val_ax.setCrossAx(cat_ax);
plot_area.addAxis(cat_ax); plot_area.addAxis(cat_ax);
plot_area.addAxis(val_ax); plot_area.addAxis(val_ax);
var oXVal;
var first_series = null;
var first_series = asc_series.length > 1 ? asc_series[0] : null; var start_index = 0;
var start_index = asc_series.length > 1 ? 1 : 0; var minus = 0;
var minus = start_index === 1 ? 1 : 0; if(parsedHeaders.bTop && !bInCols || bInCols && parsedHeaders.bLeft)
{
oXVal = new CXVal();
FillCatStr(oXVal, asc_series[0].xVal, bUseCache);
}
else
{
first_series = asc_series.length > 1 ? asc_series[0] : null;
start_index = asc_series.length > 1 ? 1 : 0;
minus = start_index === 1 ? 1 : 0;
oXVal = new CXVal();
if(first_series)
{
FillValNum(oXVal, first_series.Val, bUseCache);
}
}
for(var i = start_index; i < asc_series.length; ++i) for(var i = start_index; i < asc_series.length; ++i)
{ {
var series = new CScatterSeries(); var series = new CScatterSeries();
series.setIdx(i - minus); series.setIdx(i - minus);
series.setOrder(i - minus); series.setOrder(i - minus);
if(first_series) if(oXVal)
{ {
series.setXVal(new CXVal()); series.setXVal(oXVal.createDuplicate());
var x_val = series.xVal;
x_val.setNumRef(new CNumRef());
var num_ref = x_val.numRef;
num_ref.setF(first_series.Val.Formula);
if(bUseCache)
{
num_ref.setNumCache(new CNumLit());
var num_cache = num_ref.numCache;
num_cache.setPtCount(first_series.Val.NumCache.length);
for(var j = 0; j < first_series.Val.NumCache.length; ++j)
{
var pt = new CNumericPoint();
pt.setIdx(j);
pt.setFormatCode(first_series.Val.NumCache[j].numFormatStr);
pt.setVal(first_series.Val.NumCache[j].val);
num_cache.addPt(pt);
}
}
} }
series.setYVal(new CYVal()); series.setYVal(new CYVal());
var y_val = series.yVal; FillValNum(series.yVal, asc_series[i].Val, bUseCache);
y_val.setNumRef(new CNumRef()); if((parsedHeaders.bLeft && !bInCols || bInCols && parsedHeaders.bTop) && asc_series[i].TxCache && typeof asc_series[i].TxCache.Formula === "string" && asc_series[i].TxCache.Formula.length > 0)
var num_ref = y_val.numRef;
num_ref.setF(asc_series[i].Val.Formula);
if(bUseCache)
{ {
num_ref.setNumCache(new CNumLit()); FillSeriesTx(series, asc_series[i].TxCache, bUseCache)
var num_cache = num_ref.numCache;
num_cache.setPtCount(asc_series[i].Val.NumCache.length);
for(var j = 0; j < asc_series[i].Val.NumCache.length; ++j)
{
var pt = new CNumericPoint();
pt.setIdx(j);
pt.setFormatCode(asc_series[i].Val.NumCache[j].numFormatStr);
pt.setVal(asc_series[i].Val.NumCache[j].val);
num_cache.addPt(pt);
}
} }
//if(parsedHeaders.bTop)
//{
// series.setCat(new CCat());
// var cat = series.cat;
// cat.setStrRef(new CStrRef());
// var str_ref = cat.strRef;
// str_ref.setF(asc_series[i].Cat.Formula);
// str_ref.setStrCache(new CStrCache());
// var str_cache = str_ref.strCache;
// var cat_num_cache = asc_series[i].Cat.NumCache;
// str_cache.setPtCount(cat_num_cache.length);
// for(var j= 0; j < cat_num_cache.length; ++j)
// {
// var string_pt = new CStringPoint();
// string_pt.setIdx(j);
// string_pt.setVal(cat_num_cache[j].val);
// str_cache.addPt(string_pt);
// }
//}
//if(parsedHeaders.bLeft && asc_series[i].TxCache)
//{
// series.setTx(new CTx());
// var tx= series.tx;
// tx.setStrRef(new CStrRef());
// var str_ref = tx.strRef;
// str_ref.setF(asc_series[i].TxCache.Formula);
// str_ref.setStrCache(new CStrCache());
// var str_cache = str_ref.strCache;
// str_cache.setPtCount(1);
// str_cache.addPt(new CStringPoint());
// var pt = str_cache.pt[0];
// pt.setVal(asc_series[i].TxCache.Tx);
//}
scatter_chart.addSer(series); scatter_chart.addSer(series);
} }
scatter_chart.addAxId(cat_ax); scatter_chart.addAxId(cat_ax);
...@@ -10699,7 +10547,7 @@ function CreateScatterChart(chartSeries, bUseCache) ...@@ -10699,7 +10547,7 @@ function CreateScatterChart(chartSeries, bUseCache)
return chart_space; return chart_space;
} }
function CreateStockChart(chartSeries, bUseCache) function CreateStockChart(chartSeries, bUseCache, oOptions)
{ {
var asc_series = chartSeries.series; var asc_series = chartSeries.series;
var chart_space = new CChartSpace(); var chart_space = new CChartSpace();
...@@ -10721,7 +10569,15 @@ function CreateStockChart(chartSeries, bUseCache) ...@@ -10721,7 +10569,15 @@ function CreateStockChart(chartSeries, bUseCache)
plot_area.setLayout(new CLayout()); plot_area.setLayout(new CLayout());
plot_area.addChart(new CStockChart()); plot_area.addChart(new CStockChart());
var bInCols;
if(isRealObject(oOptions))
{
bInCols = oOptions.inColumns === true;
}
else
{
bInCols = false;
}
var cat_ax = new CCatAx(); var cat_ax = new CCatAx();
...@@ -10776,7 +10632,7 @@ function CreateStockChart(chartSeries, bUseCache) ...@@ -10776,7 +10632,7 @@ function CreateStockChart(chartSeries, bUseCache)
} }
} }
if(parsedHeaders.bTop) if((parsedHeaders.bTop && !bInCols || bInCols && parsedHeaders.bLeft))
{ {
series.setCat(new CCat()); series.setCat(new CCat());
var cat = series.cat; var cat = series.cat;
...@@ -10828,7 +10684,7 @@ function CreateStockChart(chartSeries, bUseCache) ...@@ -10828,7 +10684,7 @@ function CreateStockChart(chartSeries, bUseCache)
} }
} }
if(parsedHeaders.bLeft && asc_series[i].TxCache && typeof asc_series[i].TxCache.Formula === "string" && asc_series[i].TxCache.Formula.length > 0) if((parsedHeaders.bLeft && !bInCols || bInCols && parsedHeaders.bTop) && asc_series[i].TxCache && typeof asc_series[i].TxCache.Formula === "string" && asc_series[i].TxCache.Formula.length > 0)
{ {
series.setTx(new CTx()); series.setTx(new CTx());
var tx= series.tx; var tx= series.tx;
...@@ -11275,12 +11131,51 @@ function getChartSeries (worksheet, options, catHeadersBBox, serHeadersBBox) { ...@@ -11275,12 +11131,51 @@ function getChartSeries (worksheet, options, catHeadersBBox, serHeadersBBox) {
} }
var parsedHeaders = parseSeriesHeaders(ws, bbox); var parsedHeaders = parseSeriesHeaders(ws, bbox);
var data_bbox = {
r1: parsedHeaders.bTop ? bbox.r1 + 1 : bbox.r1, var data_bbox = {r1: bbox.r1, r2: bbox.r2, c1: bbox.c1, c2: bbox.c2};
r2: bbox.r2, if(parsedHeaders.bTop)
c1: parsedHeaders.bLeft ? bbox.c1 + 1 : bbox.c1, {
c2: bbox.c2 ++data_bbox.r1;
}; }
else
{
if(!options.getInColumns())
{
if(catHeadersBBox && catHeadersBBox.c1 === data_bbox.c1 && catHeadersBBox.c2 === data_bbox.c2 && catHeadersBBox.r1 === catHeadersBBox.r2 && catHeadersBBox.r1 === data_bbox.r1)
{
++data_bbox.r1;
}
}
else
{
if(serHeadersBBox && serHeadersBBox.c1 === data_bbox.c1 && serHeadersBBox.c2 === data_bbox.c2 && serHeadersBBox.r1 === serHeadersBBox.r2 && serHeadersBBox.r1 === data_bbox.r1)
{
++data_bbox.r1;
}
}
}
if(parsedHeaders.bLeft)
{
++data_bbox.c1;
}
else
{
if(!options.getInColumns())
{
if(serHeadersBBox && serHeadersBBox.c1 === serHeadersBBox.c2 && serHeadersBBox.r1 === data_bbox.r1 && serHeadersBBox.r2 === data_bbox.r2 && serHeadersBBox.c1 === data_bbox.c1)
{
++data_bbox.c1;
}
}
else
{
if(catHeadersBBox && catHeadersBBox.c1 === catHeadersBBox.c2 && catHeadersBBox.r1 === data_bbox.r1 && catHeadersBBox.r2 === data_bbox.r2 && catHeadersBBox.c1 === data_bbox.c1)
{
++data_bbox.c1;
}
}
}
var bIsScatter = (c_oAscChartTypeSettings.scatter <= options.type && options.type <= c_oAscChartTypeSettings.scatterSmoothMarker); var bIsScatter = (c_oAscChartTypeSettings.scatter <= options.type && options.type <= c_oAscChartTypeSettings.scatterSmoothMarker);
var top_header_bbox, left_header_bbox, ser, startCell, endCell, formulaCell, seriaName, start, end, formula, numCache; var top_header_bbox, left_header_bbox, ser, startCell, endCell, formulaCell, seriaName, start, end, formula, numCache;
......
Excel/SpreadsheetTestMenu.html
View file @ 43e84baa
...@@ -180,6 +180,7 @@ ...@@ -180,6 +180,7 @@
<script src="../Word/Editor/Run.js"></script> <script src="../Word/Editor/Run.js"></script>
<script src="../Word/Editor/Math.js"></script> <script src="../Word/Editor/Math.js"></script>
<script src="../Word/Editor/Hyperlink.js"></script> <script src="../Word/Editor/Hyperlink.js"></script>
<script src="../Word/Editor/Field.js"></script>
<script src="../Word/Editor/Comments.js"></script> <script src="../Word/Editor/Comments.js"></script>
<script src="../Word/Editor/FlowObjects.js"></script> <script src="../Word/Editor/FlowObjects.js"></script>
......
Excel/index.html
View file @ 43e84baa
...@@ -358,6 +358,7 @@ ...@@ -358,6 +358,7 @@
<script src="../../../../OfficeWeb/Word/Editor/ParagraphContent.js"></script> <script src="../../../../OfficeWeb/Word/Editor/ParagraphContent.js"></script>
<script src="../../../../OfficeWeb/Word/Editor/ParagraphContentBase.js"></script> <script src="../../../../OfficeWeb/Word/Editor/ParagraphContentBase.js"></script>
<script src="../../../../OfficeWeb/Word/Editor/Hyperlink.js"></script> <script src="../../../../OfficeWeb/Word/Editor/Hyperlink.js"></script>
<script src="../../../../OfficeWeb/Word/Editor/Field.js"></script>
<script src="../../../../OfficeWeb/Word/Editor/Run.js"></script> <script src="../../../../OfficeWeb/Word/Editor/Run.js"></script>
<script src="../../../../OfficeWeb/Word/Editor/Math.js"></script> <script src="../../../../OfficeWeb/Word/Editor/Math.js"></script>
<script src="../../../../OfficeWeb/Word/Editor/Paragraph.js"></script> <script src="../../../../OfficeWeb/Word/Editor/Paragraph.js"></script>
......
PowerPoint/PowerPoint.html
View file @ 43e84baa
...@@ -172,6 +172,7 @@ ...@@ -172,6 +172,7 @@
<script src="../Word/Editor/ParagraphContent.js"></script> <script src="../Word/Editor/ParagraphContent.js"></script>
<script src="../Word/Editor/Run.js"></script> <script src="../Word/Editor/Run.js"></script>
<script src="../Word/Editor/Hyperlink.js"></script> <script src="../Word/Editor/Hyperlink.js"></script>
<script src="../Word/Editor/Field.js"></script>
<script src="../Word/Editor/FlowObjects.js"></script> <script src="../Word/Editor/FlowObjects.js"></script>
<script src="../Word/Editor/Paragraph.js"></script> <script src="../Word/Editor/Paragraph.js"></script>
......
PowerPoint/index.html
View file @ 43e84baa
...@@ -343,6 +343,7 @@ ...@@ -343,6 +343,7 @@
<script src="../../../../OfficeWeb/Word/Editor/ParagraphContent.js"></script> <script src="../../../../OfficeWeb/Word/Editor/ParagraphContent.js"></script>
<script src="../../../../OfficeWeb/Word/Editor/ParagraphContentBase.js"></script> <script src="../../../../OfficeWeb/Word/Editor/ParagraphContentBase.js"></script>
<script src="../../../../OfficeWeb/Word/Editor/Hyperlink.js"></script> <script src="../../../../OfficeWeb/Word/Editor/Hyperlink.js"></script>
<script src="../../../../OfficeWeb/Word/Editor/Field.js"></script>
<script src="../../../../OfficeWeb/Word/Editor/Run.js"></script> <script src="../../../../OfficeWeb/Word/Editor/Run.js"></script>
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7