Bug 20152 - [Charts] Ошибка в консоли "А" при клике на диаграмму в документе

Bug 20386 - Ошибка в консоли в процессе открытия файла


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

Common/SerializeCommonWordExcel.js

@@ -1343,12 +1343,14 @@ function Binary_ChartReader(stream, chart, chartAsGroup)
 				{
 					var first = new CellAddress(parts[0]);
 					var last = new CellAddress(parts[1]);
-					oRes.bbox = {r1: first.getRow0(), c1: first.getCol0(), r2: last.getRow0(), c2: last.getCol0()};
+					if(first.isValid() && last.isValid())
+						oRes.bbox = {r1: first.getRow0(), c1: first.getCol0(), r2: last.getRow0(), c2: last.getCol0()};
 				}
 				else
 				{
 					var cell = new CellAddress(sRef);
-					oRes.bbox = {r1: cell.getRow0(), c1: cell.getCol0(), r2: cell.getRow0(), c2: cell.getCol0()};
+					if(cell.isValid())
+						oRes.bbox = {r1: cell.getRow0(), c1: cell.getCol0(), r2: cell.getRow0(), c2: cell.getCol0()};
 				}
 			}
 		}
@@ -1424,13 +1426,15 @@ function Binary_ChartReader(stream, chart, chartAsGroup)
 			bbox = this.parseDataFormula(oFirstSeria.TxCache, bbox);
 			bbox = this.parseDataFormula(oFirstSeria.xVal, bbox);
 			bbox = this.parseDataFormula(oFirstSeria.Cat, bbox);
+			if(null != bbox)
+			{
+				var oCellStart = new CellAddress(bbox.r1, bbox.c1, 0);
+				var oCellEnd = new CellAddress(bbox.r2, bbox.c2, 0);
 				
-			var oCellStart = new CellAddress(bbox.r1, bbox.c1, 0);
-			var oCellEnd = new CellAddress(bbox.r2, bbox.c2, 0);
-			
-			if(false == rx_test_ws_name.test(sheetName))
-				sheetName = "'" + sheetName + "'";
-			chart.range.interval = sheetName + "!" + oCellStart.getID() + ":" + oCellEnd.getID();
+				if(false == rx_test_ws_name.test(sheetName))
+					sheetName = "'" + sheetName + "'";
+				chart.range.interval = sheetName + "!" + oCellStart.getID() + ":" + oCellEnd.getID();
+			}
 		}
 	}
 	this.GraphicFrame = function(type, length)

Excel/model/Serialize.js

@@ -5623,7 +5623,7 @@ function Binary_WorksheetTableReader(stream, wb, aSharedStrings, aCellXfs, Dxfs,
 			var oNewGraphicObject = new CChartAsGroup();
 			var oBinary_ChartReader = new Binary_ChartReader(this.stream,  oNewGraphicObject.chart,  oNewGraphicObject);
 			res = oBinary_ChartReader.Read(length);
-			if(null != oNewGraphicObject.chart.range.interval)
+			if(null != oNewGraphicObject.chart.range.interval && oNewGraphicObject.chart.range.interval.length > 0)
 				oDrawing.graphicObject = oNewGraphicObject;
         }
 		else if ( c_oSer_DrawingType.pptxDrawing == type )

Word/Editor/Serialize2.js

@@ -5651,7 +5651,7 @@ function Binary_DocumentTableReader(doc, oReadResult, openParams, stream, bAllow
 			var chart = new asc_CChart();;
 			var oBinary_ChartReader = new Binary_ChartReader(this.stream, chart, oNewGraphicObj);
 			oBinary_ChartReader.ReadExternal(length);
-			if(null != chart.range.interval)
+			if(null != chart.range.interval && chart.range.interval.length > 0)
 			{
 				oNewGraphicObj.chart = chart;
 				//oNewGraphicObj.setChart(chart, true);