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

Bug 25122 - При выделении нескольких диаграмм становится активным меню изображений

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57052 954022d7-b5bf-4e40-9824-e11837661b57
parent 4ac88e21
...@@ -7323,8 +7323,8 @@ CValAx.prototype = ...@@ -7323,8 +7323,8 @@ CValAx.prototype =
} }
c.setMajorTickMark(this.majorTickMark); c.setMajorTickMark(this.majorTickMark);
c.setMajorUnit(this.majorUnit); c.setMajorUnit(this.majorUnit);
c.setNumFmt(this.numFmt.createDuplicate()); this.numFmt && c.setNumFmt(this.numFmt.createDuplicate());
c.setScaling(this.scaling.createDuplicate()); this.scaling && c.setScaling(this.scaling.createDuplicate());
if(this.spPr) if(this.spPr)
{ {
c.setSpPr(this.spPr.createDuplicate()); c.setSpPr(this.spPr.createDuplicate());
......
...@@ -339,7 +339,7 @@ CGraphicObjects.prototype = ...@@ -339,7 +339,7 @@ CGraphicObjects.prototype =
image_props.Width = props_by_types.imageProps.w; image_props.Width = props_by_types.imageProps.w;
image_props.Height = props_by_types.imageProps.h; image_props.Height = props_by_types.imageProps.h;
} }
if(props_by_types.chartProps) if(props_by_types.chartProps && !(props_by_types.chartProps.severalCharts === true))
{ {
chart_props = new CImgProperty(para_drawing_props); chart_props = new CImgProperty(para_drawing_props);
chart_props.ChartProperties = props_by_types.chartProps.chartProps; chart_props.ChartProperties = props_by_types.chartProps.chartProps;
......
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