Commit 963190ac authored by Sergey.Luzyanin's avatar Sergey.Luzyanin Committed by Alexander.Trofimov

Bug 27651 - Ошибка в консоли при смене настроек осей Bar Chart построенной после Pie

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@59756 954022d7-b5bf-4e40-9824-e11837661b57
parent b239e6de
......@@ -1883,14 +1883,14 @@ DrawingObjectsController.prototype =
cat_ax = axis_obj.catAx;
val_ax = axis_obj.valAx;
}
else
if(cat_ax && val_ax)
{
if(newChartType.getObjectType() === historyitem_type_BarChart && newChartType.barDir === BAR_DIR_BAR)
{
if(cat_ax.axPos !== AX_POS_L)
{
cat_ax.setAxPos(AX_POS_L);
// if(cat_ax.title && cat_ax.title.tx && cat_ax.title.tx.rich)
// if(cat_ax.title && cat_ax.title.tx && cat_ax.title.tx.rich)
}
if(val_ax.axPos !== AX_POS_B)
{
......@@ -1908,11 +1908,11 @@ DrawingObjectsController.prototype =
val_ax.setAxPos(AX_POS_L);
}
}
newChartType.addAxId(cat_ax);
newChartType.addAxId(val_ax);
plotArea.addAxis(cat_ax);
plotArea.addAxis(val_ax);
}
newChartType.addAxId(cat_ax);
newChartType.addAxId(val_ax);
plotArea.addAxis(cat_ax);
plotArea.addAxis(val_ax);
};
var replaceChart = function(plotArea, chartType, newChartType)
......
......@@ -15483,7 +15483,7 @@ CMultiLvlStrCache.prototype =
var c = new CMultiLvlStrCache();
if(this.lvl)
{
c.setLvl(this.lv.createDuplicate());
c.setLvl(this.lvl.createDuplicate());
}
c.setPtCount(this.ptCount);
return c;
......
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