fix bug #27037

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

Common/Charts/DrawingObjects.js

@@ -1987,7 +1987,6 @@ function DrawingObjects() {
         _this.zoom.current = factor;
 
         _this.resizeCanvas();
-        _this.setScrollOffset();
     };
 
     _this.resizeCanvas = function() {
@@ -3527,34 +3526,6 @@ function DrawingObjects() {
             response.x = Math.abs(x);
         }
 
-        /* Проверки на максимум в листе */
-      //  function isMaxCol() {
-      //      var result = false;
-      //      if ( worksheet.cols.length >= gc_nMaxCol ) {
-      //          var lastCol = worksheet.cols[gc_nMaxCol - 1];
-      //          if ( mmToPt(x + w) + scrollX > lastCol.left ) {
-      //              response.result = false;
-      //              response.x = ptToMm( lastCol.left - (mmToPt(x + w) + scrollX) );
-      //              result = true;
-      //          }
-      //      }
-      //      return result;
-      //  }
-      //
-      //  function isMaxRow() {
-      //      var result = false;
-      //      if ( worksheet.rows.length >= gc_nMaxRow ) {
-      //          var lastRow = worksheet.rows[gc_nMaxRow - 1];
-      //          if ( mmToPt(y + h) + scrollY > lastRow.top ) {
-      //              response.result = false;
-      //              response.y = ptToMm( lastRow.top - (mmToPt(y + h) + scrollY) );
-      //              result = true;
-      //          }
-      //      }
-      //      return result;
-      //  }
-        //
-
         // выход за границу справа
         if ( x + w > right ) {
             var scrollX = scrollOffset.getX();
@@ -3597,16 +3568,6 @@ function DrawingObjects() {
         return response;
     };
 
-  // _this.setGraphicObjectLockState = function(id, state) {
-  //
-  //     for (var i = 0; i < aObjects.length; i++) {
-  //         if ( id == aObjects[i].graphicObject.Id ) {
-  //             aObjects[i].graphicObject.lockType = state;
-  //             break;
-  //         }
-  //     }
-  // };
-
     _this.resetLockedGraphicObjects = function() {
 
         for (var i = 0; i < aObjects.length; i++) {
@@ -3627,14 +3588,6 @@ function DrawingObjects() {
         return bObjectFound;
     };
 
-    _this.setScrollOffset = function() {
-        /*if ( shapeCtx && shapeOverlayCtx && autoShapeTrack ) {
-         for (var i = 0; i < _this.drawingArea.frozenPlaces.length; i++) {
-         _this.drawingArea.frozenPlaces[i].setTransform(shapeCtx, shapeOverlayCtx, autoShapeTrack);
-         }
-         }*/
-    };
-
     _this.getDrawingCanvas = function() {
         return { shapeCtx: shapeCtx, shapeOverlayCtx: shapeOverlayCtx, autoShapeTrack: autoShapeTrack, trackOverlay: trackOverlay };
     };
@@ -3648,7 +3601,7 @@ function DrawingObjects() {
 
     _this.convertPixToMM = function(pix)
     {
-        return this.convertMetric(pix, 0, 3);
+        return _this.convertMetric(pix, 0, 3);
     };
     _this.getSelectedGraphicObjects = function() {
         return _this.controller.selectedObjects;
@@ -4353,7 +4306,6 @@ function CoordsManager(ws) {
         var coords = { x: 0, y: 0 };
         //0 - px, 1 - pt, 2 - in, 3 - mm
         if ( cell ) {
-            var rowOffset;
             var rowHeight = worksheet.getRowHeight(cell.row, 3);
             var colWidth = worksheet.getColumnWidth(cell.col, 3);
             var resultRowOff = cell.rowOff > rowHeight ? rowHeight : cell.rowOff;

Excel/view/EventsController.js

@@ -243,7 +243,6 @@
 						self.hsbHSt.width = hSize + "px";
 						self.hsbApi.Reinit(opt, opt.vscrollStep * ws.getFirstVisibleCol(/*allowPane*/true));
 					}
-					ws.objectRender.setScrollOffset();
 				});
 			}
 

Excel/view/WorksheetView.js

@@ -498,7 +498,6 @@
 				this.updateResize = false;
 				
 				this.objectRender.resizeCanvas();
-				this.objectRender.setScrollOffset();
 			} else {
 				this.updateResize = true;
 			}
@@ -602,7 +601,7 @@
 
 				t.model.setColWidth(cw, col, col);
 				t._cleanCache(new asc_Range(0, 0, t.cols.length - 1, t.rows.length - 1));
-				t.changeWorksheet("update");
+				t.changeWorksheet("update", {reinitRanges: true});
 				t._updateVisibleColsCount();
 			};
 			this._isLockedAll (onChangeWidthCallback);
@@ -641,7 +640,7 @@
 
 				t.model.setRowHeight(newHeight, row, row);
 				t._cleanCache(new asc_Range(0, row, t.cols.length - 1, row));
-				t.changeWorksheet("update");
+				t.changeWorksheet("update", {reinitRanges: true});
 				t._updateVisibleRowsCount();
 			};
 
@@ -3706,15 +3705,6 @@
 				arrayCells = this.collaborativeEditing.getLockCellsOther(currentSheetId);
 			}
 
-			///if (bIsDrawObjects) {
-			///	var arrayObjects = (c_oAscLockTypes.kLockTypeMine === type) ?
-			///		this.collaborativeEditing.getLockObjectsMe(currentSheetId) : this.collaborativeEditing.getLockObjectsOther(currentSheetId);
-            ///
-			///	for (i = 0; i < arrayObjects.length; ++i) {
-			///		this.objectRender.setGraphicObjectLockState(arrayObjects[i], type);
-			///	}
-			///}
-
 			for (i = 0; i < arrayCells.length; ++i) {
 				oCellTmp = new asc_Range(arrayCells[i].c1, arrayCells[i].r1, arrayCells[i].c2, arrayCells[i].r2);
 				this._drawElements(this, this._drawSelectionElement, oCellTmp, isDashLine, lineWidth, strokeColor);
@@ -5199,8 +5189,6 @@
 			vr.r1 = start;
 			this._updateVisibleRowsCount();
 
-			this.objectRender.setScrollOffset();
-
 			var widthChanged = Math.max(calcDecades(vr.r2 + 1), 3) !== oldDec;
 			if (widthChanged) {
 				x = this.cellsLeft;
@@ -5370,8 +5358,6 @@
 			vr.c1 = start;
             this._updateVisibleColsCount();
 
-			this.objectRender.setScrollOffset();
-
 			// Перемещаем область
 			var moveWidth = oldW - lastColWidth;
 			if (moveWidth > 0) {
@@ -9384,7 +9370,8 @@
 			var checkRange = arn.getAllRange();
 
 			var range;
-			var fullRecalc = undefined;
+			var fullRecalc = false;
+			var reinitRanges = false;
 			var cw;
 			var isUpdateCols = false, isUpdateRows = false;
 			var cleanCacheCols = false, cleanCacheRows = false;
@@ -9408,7 +9395,8 @@
 				}
 				t._cleanCellsTextMetricsCache();
 				t._prepareCellTextMetricsCache();
-				t.objectRender.setScrollOffset();
+				if (reinitRanges)
+					t.objectRender.drawingArea.reinitRanges();
                 t.objectRender.rebuildChartGraphicObjects(oChangeData);
 				t.draw(lockDraw);
 
@@ -9428,6 +9416,7 @@
 						t.model.setColWidth(cw, checkRange.c1, checkRange.c2);
 						isUpdateCols = true;
 						fullRecalc = true;
+						reinitRanges = true;
 					};
 					this._isLockedAll(onChangeWorksheetCallback);
 					break;
@@ -9483,6 +9472,7 @@
 						t.model.setRowHeight(Math.min(val, t.maxRowHeight), checkRange.r1, checkRange.r2);
 						isUpdateRows = true;
 						fullRecalc = true;
+						reinitRanges = true;
 					};
 					return this._isLockedAll(onChangeWorksheetCallback);
 				case "insRowBefore":
@@ -9768,6 +9758,7 @@
 					if (val !== undefined) {
 						fullRecalc = !!val.fullRecalc;
 						lockDraw = true === val.lockDraw;
+						reinitRanges = !!val.reinitRanges;
 					}
 					onChangeWorksheetCallback(true);
 					break;