Commit 5d089c65 authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

fix bug #27616

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@59776 954022d7-b5bf-4e40-9824-e11837661b57
parent f7b81a2b
...@@ -6679,9 +6679,7 @@ ...@@ -6679,9 +6679,7 @@
this.isSelectOnShape = isSelectOnShape; this.isSelectOnShape = isSelectOnShape;
// отправляем евент для получения свойств картинки, шейпа или группы // отправляем евент для получения свойств картинки, шейпа или группы
this.model.workbook.handlers.trigger("asc_onHideComment"); this.model.workbook.handlers.trigger("asc_onHideComment");
this.handlers.trigger("selectionNameChanged", this.getSelectionName()); this._updateSelectionNameAndInfo();
this.handlers.trigger("selectionChanged", this.getSelectionInfo());
this.handlers.trigger("selectionMathInfoChanged", this.getSelectionMathInfo());
}; };
WorksheetView.prototype.getActiveRangeObj = function (){ WorksheetView.prototype.getActiveRangeObj = function (){
return this.activeRange.clone(true); return this.activeRange.clone(true);
...@@ -6718,10 +6716,7 @@ ...@@ -6718,10 +6716,7 @@
this.activeRange.normalize(); this.activeRange.normalize();
this._drawSelection(); this._drawSelection();
this.handlers.trigger("selectionNameChanged", this.getSelectionName(/*bRangeText*/false)); this._updateSelectionNameAndInfo();
this.handlers.trigger("selectionChanged", this.getSelectionInfo());
this.handlers.trigger("selectionMathInfoChanged", this.getSelectionMathInfo());
return this._calcActiveCellOffset(); return this._calcActiveCellOffset();
}; };
...@@ -6743,10 +6738,7 @@ ...@@ -6743,10 +6738,7 @@
this.activeRange = ar; this.activeRange = ar;
this._drawSelection(); this._drawSelection();
this.handlers.trigger("selectionNameChanged", this.getSelectionName(/*bRangeText*/false)); this._updateSelectionNameAndInfo();
this.handlers.trigger("selectionChanged", this.getSelectionInfo());
this.handlers.trigger("selectionMathInfoChanged", this.getSelectionMathInfo());
oRes = this._calcActiveCellOffset(); oRes = this._calcActiveCellOffset();
} }
return oRes; return oRes;
...@@ -7851,9 +7843,7 @@ ...@@ -7851,9 +7843,7 @@
t._recalculateAfterUpdate([arnFrom, arnTo]); t._recalculateAfterUpdate([arnFrom, arnTo]);
// Вызовем на всякий случай, т.к. мы можем уже обновиться из-за формул ToDo возможно стоит убрать это в дальнейшем (но нужна переработка формул) - http://bugzserver/show_bug.cgi?id=24505 // Вызовем на всякий случай, т.к. мы можем уже обновиться из-за формул ToDo возможно стоит убрать это в дальнейшем (но нужна переработка формул) - http://bugzserver/show_bug.cgi?id=24505
t.handlers.trigger("selectionNameChanged", t.getSelectionName(/*bRangeText*/false)); t._updateSelectionNameAndInfo();
t.handlers.trigger("selectionChanged", t.getSelectionInfo());
t.handlers.trigger("selectionMathInfoChanged", t.getSelectionMathInfo());
}; };
this._isLockedCells ([arnFrom, arnTo], null, onApplyMoveRangeHandleCallback); this._isLockedCells ([arnFrom, arnTo], null, onApplyMoveRangeHandleCallback);
...@@ -10624,9 +10614,7 @@ ...@@ -10624,9 +10614,7 @@
if (this._isLargeRange(range)) { if (this._isLargeRange(range)) {
this.changeWorksheet("update", {lockDraw: lockDraw}); this.changeWorksheet("update", {lockDraw: lockDraw});
this.handlers.trigger("selectionNameChanged", this.getSelectionName(/*bRangeText*/false)); this._updateSelectionNameAndInfo();
this.handlers.trigger("selectionChanged", this.getSelectionInfo());
this.handlers.trigger("selectionMathInfoChanged", this.getSelectionMathInfo());
return; return;
} }
...@@ -10693,10 +10681,9 @@ ...@@ -10693,10 +10681,9 @@
this._cleanCellsTextMetricsCache(); this._cleanCellsTextMetricsCache();
this._prepareCellTextMetricsCache(); this._prepareCellTextMetricsCache();
this.handlers.trigger("reinitializeScroll"); this.handlers.trigger("reinitializeScroll");
this.handlers.trigger("selectionNameChanged", this.getSelectionName(/*bRangeText*/false));
this.handlers.trigger("selectionChanged", this.getSelectionInfo());
this.handlers.trigger("selectionMathInfoChanged", this.getSelectionMathInfo());
} }
if (!lockDraw)
this._updateSelectionNameAndInfo();
this.objectRender.rebuildChartGraphicObjects(new CChangeTableData(null, null, null, null, arrChanged)); this.objectRender.rebuildChartGraphicObjects(new CChangeTableData(null, null, null, null, arrChanged));
this.cellCommentator.updateCommentPosition(); this.cellCommentator.updateCommentPosition();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment