Добавил функции getColHidden и getColHidden

Поправил работу с getCell, getRowHidden, getColHidden

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

Common/Charts/DrawingObjects.js

@@ -2810,7 +2810,7 @@ function DrawingObjects() {
                                                 for(j = range.c1;  j <= range.c2; ++j)
                                                 {
 
-                                                    cell = source_worksheet.getCell( new CellAddress(range.r1, j, 0) );
+                                                    cell = source_worksheet.getCell3(range.r1, j);
                                                     pt = cache.getPtByIndex(pt_index);
                                                     if(pt)
                                                     {
@@ -2824,7 +2824,7 @@ function DrawingObjects() {
                                             {
                                                 for(j = range.r1; j <= range.r2; ++j)
                                                 {
-                                                    cell = source_worksheet.getCell( new CellAddress(j, range.c1, 0) );
+                                                    cell = source_worksheet.getCell3(j, range.c1);
                                                     pt = cache.getPtByIndex(pt_index);
                                                     if(pt)
                                                     {

Excel/model/Workbook.js

@@ -2789,6 +2789,10 @@ Woorksheet.prototype.setColWidth=function(width, start, stop){
 		}
 	}
 };
+Woorksheet.prototype.getColHidden=function(index){
+	var col = this._getColNoEmptyWithAll(index);
+	return col ? col.hd : false;
+};
 Woorksheet.prototype.setColHidden=function(bHidden, start, stop){
 	//start, stop 0 based
 	if(null == start)
@@ -2971,6 +2975,10 @@ Woorksheet.prototype.setRowHeight=function(height, start, stop){
 		}
 	}
 };
+Woorksheet.prototype.getRowHidden=function(index){
+	var row = this._getRowNoEmptyWithAll(index);
+	return row ? row.hd : false;
+};
 Woorksheet.prototype.setRowHidden=function(bHidden, start, stop){
 	//start, stop 0 based
 	if(null == start)
@@ -3190,8 +3198,8 @@ Woorksheet.prototype._getRowNoEmpty=function(row){
 		return oCurRow;
 	return null;
 };
-Woorksheet.prototype._getRowNoEmptyWithAll=function(col){
-	var oRes = this._getRowNoEmpty(col);
+Woorksheet.prototype._getRowNoEmptyWithAll=function(row){
+	var oRes = this._getRowNoEmpty(row);
 	if(null == oRes)
 		oRes = this.oSheetFormatPr.oAllRow;
 	return oRes;
@@ -6336,7 +6344,7 @@ Range.prototype.merge=function(type){
 		oLeftTopCell.setValueData(oFirstCellValue);
 		if(null != oFirstCellHyperlink)
 		{
-			var oLeftTopRange = this.worksheet.getCell(new CellAddress(oBBox.r1, oBBox.c1, 0));
+			var oLeftTopRange = this.worksheet.getCell3(oBBox.r1, oBBox.c1);
 			oLeftTopRange.setHyperlink(oFirstCellHyperlink, true);
 		}
 	}

Excel/model/clipboard.js

@@ -2632,7 +2632,7 @@
 							nLoc++;
 							isImage = true;
 						
-						t._addLocalStorage(isImage,isChart,range.worksheet.getCell( new CellAddress(row, col, 0) ),bbox, image.from.row, image.from.col, worksheet, isCut);
+						t._addLocalStorage(isImage,isChart,range.worksheet.getCell3(row, col),bbox, image.from.row, image.from.col, worksheet, isCut);
 					}
 
 				}
@@ -2648,7 +2648,7 @@
 							for (col = bbox.c1; col <= bbox.c2; ++col) {
 								if(col != bbox.c1)
 									localStText += ' ';
-								var currentRange = range.worksheet.getCell( new CellAddress(row, col, 0) );
+								var currentRange = range.worksheet.getCell3(row, col);
 								//добавляем текст
 								var textRange = currentRange.getValue();
 								if(textRange == '')
@@ -2670,7 +2670,7 @@
 						for (col = bbox.c1; col <= bbox.c2; ++col) {
 							if (skipMerged()) {continue;}
 
-							cell = range.worksheet.getCell( new CellAddress(row, col, 0) );
+							cell = range.worksheet.getCell3(row, col);
 							td = doc.createElement("TD");
 
 							mbbox = cell.hasMerged();
@@ -2695,7 +2695,7 @@
 							b = cell.getBorderFull();
 							if(mbbox)
 							{
-								var cellMergeFinish = range.worksheet.getCell( new CellAddress(mbbox.r2, mbbox.c2, 0) );
+								var cellMergeFinish = range.worksheet.getCell3(mbbox.r2, mbbox.c2);
 								var borderMergeCell = cellMergeFinish.getBorderFull();
 								td.style.borderRight = makeBorder(borderMergeCell.r);
 								td.style.borderBottom = makeBorder(borderMergeCell.b);

Excel/view/WorksheetView.js

@@ -8971,7 +8971,7 @@
 						for (var c = arn.c1; c < cMax; ++c) {
 							var pasteRow = r - arn.r1 + activeCellsPasteFragment.r1;
 							var pasteCol = c - arn.c1 + activeCellsPasteFragment.c1;
-							newVal = val.getCell( new CellAddress(pasteRow, pasteCol, 0));
+							newVal = val.getCell3(pasteRow, pasteCol);
 
 							curMerge = newVal.hasMerged();