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

fix:

Bug 20134 - Ошибки в консоли при добавлении адреса ячейки к ошибке в результате вычисления формулы
Bug 20140 - Ошибка в консоле при указании аргумента sheet_text в формуле ADDRESS

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@49470 954022d7-b5bf-4e40-9824-e11837661b57
parent 80755e9f
......@@ -99,10 +99,10 @@ cFormulaFunction.LookupAndReference = {
}
else {
if ( !rx_test_ws_name.test( sheetName.toString() ) ) {
return this.value = "'" + sheetName.toString().replace( /'/g, "''" ) + "'" + "!" + strRef;
return this.value = new cString( "'" + sheetName.toString().replace( /'/g, "''" ) + "'" + "!" + strRef );
}
else {
return this.value = sheetName.toString() + "!" + strRef;
return this.value = new cString( sheetName.toString() + "!" + strRef ) ;
}
}
......
......@@ -6075,9 +6075,10 @@
// Окончание выделения
changeSelectionDone: function () {
if (this.isFormulaEditMode) {
if (this.isFormulaEditMode && this.arrActiveFormulaRanges.length > 0) {
// Нормализуем range
this.arrActiveFormulaRanges[this.arrActiveFormulaRanges.length - 1].normalize();
this.arrActiveFormulaRanges[this.arrActiveFormulaRanges.length - 1].normalize();
} else {
// Нормализуем range
this.activeRange.normalize();
......
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