передача названий заголовка и осей в меню

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

Common/Charts/DrawingObjects.js

@@ -3893,7 +3893,7 @@ function ObjectLocker(ws) {
 	
 	_t.checkObjects = function(callback) {
 		
-		if (false === worksheet.collaborativeEditing.isCoAuthoringExcellEnable()) {
+		if ( !aObjectId.length || (false === worksheet.collaborativeEditing.isCoAuthoringExcellEnable()) ) {
 			// Запрещено совместное редактирование
 			if ($.isFunction(callback)) {callback(true);}
 			return;

Excel/model/DrawingObjects/DrawingObjectsController.js

@@ -186,14 +186,19 @@ DrawingObjectsController.prototype =
     {
         if (this.selectedObjects.length === 1)
         {
-            if(this.selectedObjects[0].isChart())
+            if ( this.selectedObjects[0].isChart() ) {
+				this.selectedObjects[0].syncAscChart();
                 return this.selectedObjects[0].chart;
-            if(isRealObject(this.curState.group))
+			}
+			
+            if ( isRealObject(this.curState.group) )
             {
                 if(this.curState.group.selectedObjects.length === 1)
                 {
-                    if(this.curState.group.selectedObjects[0].isChart())
+                    if ( this.curState.group.selectedObjects[0].isChart() ) {
+						this.curState.group.selectedObjects[0].syncAscChart();
                         return this.curState.group.selectedObjects[0].chart;
+					}
                 }
             }
         }

Excel/model/DrawingObjects/Format/Chart.js

@@ -85,6 +85,18 @@ CChartAsGroup.prototype =
         return false;
     },
 
+	syncAscChart: function() {
+		
+		if ( this.chartTitle && this.chartTitle.txBody && this.chartTitle.txBody.content ) {
+			this.chart.asc_getHeader().asc_setTitle(this.chartTitle.txBody.content.getTextString());
+		}
+		if ( this.vAxisTitle && this.vAxisTitle.txBody && this.vAxisTitle.txBody.content ) {
+			this.chart.asc_getYAxis().asc_setTitle(this.vAxisTitle.txBody.content.getTextString());
+		}
+		if ( this.hAxisTitle && this.hAxisTitle.txBody && this.hAxisTitle.txBody.content ) {
+			this.chart.asc_getXAxis().asc_setTitle(this.hAxisTitle.txBody.content.getTextString());
+		}
+	},
 
     setDrawingObjects: function(drawingObjects)
     {

Excel/model/DrawingObjects/Format/DocumentContent.js

@@ -6760,6 +6760,7 @@ CDocumentContent.prototype =
                     ret += " ";
             }
         }
+		return ret;
     },
 
     Clear_ContentChanges : function()