git-svn-id:...

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@55461 954022d7-b5bf-4e40-9824-e11837661b57

Common/Drawings/CommonController.js

@@ -214,9 +214,14 @@ DrawingObjectsController.prototype =
         }
         if(this.selection.textSelection)
         {
-            this.selection.textSelection.getDocContent().Selection_Remove();
+            var content = this.selection.textSelection.getDocContent();
+            content && content.Selection_Remove();
             this.selection.textSelection = null;
         }
+        if(this.selection.wrapPolygonSelection)
+        {
+            this.selection.wrapPolygonSelection = null;
+        }
     },
 
     handleHandleHit: function(hit, selectedObject, group, pageIndex, bWord)
@@ -1862,12 +1867,16 @@ DrawingObjectsController.prototype =
             //TODO: переделать ret.putHorAxisLabel(hor_axis ? (isRealObject(hor_axis.title) ? (hor_axis.title.overlay ? c_oAscChartTitleShowSettings.overlay : c_oAscChartTitleShowSettings.noOverlay) : c_oAscChartTitleShowSettings.none): null);
             //TODO: переделать ret.putVertAxisLabel(vert_axis ? (isRealObject(vert_axis.title) ? (vert_axis.title.overlay ? c_oAscChartTitleShowSettings.overlay : c_oAscChartTitleShowSettings.noOverlay) : c_oAscChartTitleShowSettings.none): null);
 
+
             var data_labels = plot_area.chart.dLbls;
-            ret.putShowSerName(data_labels.showSerName === true);
-            ret.putShowCatName(data_labels.showCatName === true);
-            ret.putShowVal(data_labels.showVal === true);
-            ret.putSeparator(data_labels.separator);
-            ret.putDataLabelsPos(REV_DLBL_POS_DEFINES_MAP[data_labels.dLblPos]);
+            if(data_labels)
+            {
+                ret.putShowSerName(data_labels.showSerName === true);
+                ret.putShowCatName(data_labels.showCatName === true);
+                ret.putShowVal(data_labels.showVal === true);
+                ret.putSeparator(data_labels.separator);
+                ret.putDataLabelsPos(REV_DLBL_POS_DEFINES_MAP[data_labels.dLblPos]);
+            }
 
 
             if(chart.legend)

Common/Drawings/Format/ChartFormat.js

@@ -4946,6 +4946,8 @@ CDLbl.prototype =
 
     },
 
+
+
     getTextHeight: function()
     {
 
@@ -5001,6 +5003,7 @@ CDLbl.prototype =
 
     recalculateBrush: CShape.prototype.recalculateBrush,
     recalculatePen: CShape.prototype.recalculatePen,
+    check_bounds: CShape.prototype.check_bounds,
 
     getCompiledStyle: function()
     {
@@ -5009,7 +5012,7 @@ CDLbl.prototype =
 
     getParentObjects: function()
     {
-        return this.chart.getParentObjects;
+        return this.chart.getParentObjects();
     },
 
     recalculateTransform: function()

Common/Drawings/Format/ChartSpace.js

@@ -230,6 +230,11 @@ CChartSpace.prototype =
         return historyitem_type_ChartSpace;
     },
 
+    getAllRasterImages: function(images)
+    {
+        //todo
+    },
+
     setParent: CShape.prototype.setParent,
 
     setChart: function(chart)
@@ -4406,9 +4411,9 @@ CChartSpace.prototype =
                                     var compiled_line = new CLn();
                                     compiled_line.merge(default_line);
                                     compiled_line.Fill.merge(style.line2[0]);
-                                    if(ser.spPr && spPr.ln)
+                                    if(ser.spPr && ser.spPr.ln)
                                     {
-                                        compiled_line.merge(spPr.ln);
+                                        compiled_line.merge(ser.spPr.ln);
                                     }
                                     if(j === 0)
                                         ser.compiledSeriesPen = compiled_line.createDuplicate();