Commit b5c89b70 authored by Dmitry.Shahtanov's avatar Dmitry.Shahtanov Committed by Alexander.Trofimov

fixed: Bug 24223 - Ошибка в консоли при ручном вводе формулы и выходе за...

fixed: Bug 24223 - Ошибка в консоли при ручном вводе формулы и выходе за пределы допустимого диапазона

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@56278 954022d7-b5bf-4e40-9824-e11837661b57
parent d6251f3a
...@@ -570,7 +570,10 @@ cArea.prototype.tocBool = function () { ...@@ -570,7 +570,10 @@ cArea.prototype.tocBool = function () {
return this.getValue()[0].tocBool(); return this.getValue()[0].tocBool();
}; };
cArea.prototype.toString = function () { cArea.prototype.toString = function () {
return this.getRange().getName(); if( this.getRange() ){
return this.getRange().getName();
}
return this._cells;
}; };
cArea.prototype.setRange = function ( cell ) { cArea.prototype.setRange = function ( cell ) {
this._cells = this.value = cell; this._cells = this.value = cell;
...@@ -864,7 +867,8 @@ cArea3D.prototype.changeSheet = function ( lastName, newName ) { ...@@ -864,7 +867,8 @@ cArea3D.prototype.changeSheet = function ( lastName, newName ) {
cArea3D.prototype.toString = function () { cArea3D.prototype.toString = function () {
var wsFrom = this._wb.getWorksheetById( this.wsFrom ).getName(), var wsFrom = this._wb.getWorksheetById( this.wsFrom ).getName(),
wsTo = this._wb.getWorksheetById( this.wsTo ).getName(), wsTo = this._wb.getWorksheetById( this.wsTo ).getName(),
name = Asc.g_oRangeCache.getActiveRange(this._cells).getName(); name = Asc.g_oRangeCache.getActiveRange(this._cells);
name = name ? name : this._cells;
if ( rx_test_ws_name.test( wsFrom ) && rx_test_ws_name.test( wsTo ) ) { if ( rx_test_ws_name.test( wsFrom ) && rx_test_ws_name.test( wsTo ) ) {
return (wsFrom !== wsTo ? wsFrom + ":" + wsTo : wsFrom) + "!" + name; return (wsFrom !== wsTo ? wsFrom + ":" + wsTo : wsFrom) + "!" + name;
} }
......
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