Bug fix

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

Common/Charts/DrawingObjects.js

@@ -963,10 +963,8 @@ asc_CChart.prototype = {
 				break;
 			
 		}
-		if ( ws ) {
-			//ws.objectRender.rebuildChartGraphicObjects();
-			//ws.objectRender.showDrawingObjects(false);
-		}
+		if ( ws )
+			ws.objectRender.rebuildChartGraphicObjects();
 	},
 	
 	Redo: function(type, data) {
@@ -1071,10 +1069,8 @@ asc_CChart.prototype = {
 				this.legend.bOverlay = data.newValue;
 				break;
 		}
-		if ( ws ) {
-			//ws.objectRender.rebuildChartGraphicObjects();
-			//ws.objectRender.showDrawingObjects(false);
-		}
+		if ( ws )
+			ws.objectRender.rebuildChartGraphicObjects();
 	}
 }
 
@@ -3792,7 +3788,7 @@ function DrawingObjects() {
 	_this.rebuildChartGraphicObjects = function() {
 		for (var i = 0; i < aObjects.length; i++) {
 			var graphicObject = aObjects[i].graphicObject;
-			if ( graphicObject.isChart() ) {
+			if ( graphicObject.isChart() && graphicObject.chart.range.intervalObject ) {
 				graphicObject.chart.rebuildSeries();
 				graphicObject.recalculate();
 			}
@@ -4367,6 +4363,7 @@ function DrawingObjects() {
 	
 	_this.deleteDrawingBase = function(graphicId) {
 		
+		var position = null;
 		var bRedraw = false;
 		for (var i = 0; i < aObjects.length; i++) {
 			if ( aObjects[i].graphicObject.Id == graphicId ) {
@@ -4375,14 +4372,15 @@ function DrawingObjects() {
 					worksheet.arrActiveChartsRanges = [];
 				aObjects.splice(i, 1);
 				bRedraw = true;
-                return i;
+                position = i;
+				break;
 			}
 		}
 		
 		if ( bRedraw )
 			_this.showDrawingObjects(true);
 		
-        return null;
+        return position;
 	};
 	
 	_this.checkGraphicObjectPosition = function(x, y, w, h) {

Excel/view/WorksheetView.js

@@ -4973,6 +4973,8 @@
 						var oHyperlink = new Hyperlink();
 						oHyperlink.Hyperlink = drawingInfo.hyperlink.Value;
 						oHyperlink.Tooltip = drawingInfo.hyperlink.ToolTip;
+						var _r = this.activeRange.clone(true);
+						oHyperlink.Ref = this.model.getRange3(_r.r1, _r.c1, _r.r2, _r.c2);
 						
 						var cellCursor = {cursor: kCurCells, target: "cells", col: (c ? c.col : -1),
 							row: (r ? r.row : -1), userId: userId,