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

Fixed issue #31872

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@68720 954022d7-b5bf-4e40-9824-e11837661b57
parent 81d1025a
...@@ -2369,7 +2369,7 @@ cRangeIntersectionOperator.prototype.Calculate = function ( arg ) { ...@@ -2369,7 +2369,7 @@ cRangeIntersectionOperator.prototype.Calculate = function ( arg ) {
this.value = new cArea( arg0.getName(), ws ); this.value = new cArea( arg0.getName(), ws );
} }
else else
return this.value = new cError( cErrorType.wrong_value_type ); return this.value = new cError( cErrorType.null_value );
} }
else { else {
...@@ -4802,6 +4802,7 @@ parserFormula.prototype = { ...@@ -4802,6 +4802,7 @@ parserFormula.prototype = {
_changeOffsetHelper: function ( ref, offset ) { _changeOffsetHelper: function ( ref, offset ) {
var m = ref._cells.match( /\$/g ); var m = ref._cells.match( /\$/g );
if(!m){return;}
if ( m.length == 1 ) {//для cRef, cRef3D, cArea. $A2, A$2, Sheet1!$A2, Sheet1!A$2, $A2:C4, A$2:C4, A2:$C4, A2:C$4. if ( m.length == 1 ) {//для cRef, cRef3D, cArea. $A2, A$2, Sheet1!$A2, Sheet1!A$2, $A2:C4, A$2:C4, A2:$C4, A2:C$4.
if ( !(ref instanceof cArea) ) { if ( !(ref instanceof cArea) ) {
if ( ref._cells.indexOf( "$" ) == 0 ) { if ( ref._cells.indexOf( "$" ) == 0 ) {
......
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