Commit 468be9de authored by Dmitry.Shahtanov's avatar Dmitry.Shahtanov

fix: Bug 30295 - Неподдерживаемые формулы удаляются при открытии файла и...

fix: Bug 30295 - Неподдерживаемые формулы удаляются при открытии файла и заменяются ошибкой #NAME? (http://bugzserver/show_bug.cgi?id=30295)

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@64770 954022d7-b5bf-4e40-9824-e11837661b57
parent 8523676e
...@@ -1698,7 +1698,7 @@ cBaseFunction.prototype = { ...@@ -1698,7 +1698,7 @@ cBaseFunction.prototype = {
str += ","; str += ",";
} }
} }
return new cString( this.name + "(" + str + ")" ); return new cString( this.toString() + "(" + str + ")" );
}, },
Assemble2:function ( arg, start, count ) { Assemble2:function ( arg, start, count ) {
...@@ -1709,11 +1709,11 @@ cBaseFunction.prototype = { ...@@ -1709,11 +1709,11 @@ cBaseFunction.prototype = {
str += ","; str += ",";
} }
} }
return new cString( this.name + "(" + str + ")" ); return new cString( this.toString() + "(" + str + ")" );
}, },
Assemble2Locale:function ( arg, start, count, locale, digitDelim ) { Assemble2Locale:function ( arg, start, count, locale, digitDelim ) {
var str = "", c = start + count - 1, localeName = locale ? locale[this.name] : this.name; var str = "", c = start + count - 1, localeName = locale ? locale[this.toString()] : this.toString();
for ( var i = start; i <= c; i++ ) { for ( var i = start; i <= c; i++ ) {
str += arg[i].toLocaleString( digitDelim ); str += arg[i].toLocaleString( digitDelim );
if ( i !== c ) { if ( i !== c ) {
...@@ -1723,7 +1723,7 @@ cBaseFunction.prototype = { ...@@ -1723,7 +1723,7 @@ cBaseFunction.prototype = {
return new cString( localeName + "(" + str + ")" ); return new cString( localeName + "(" + str + ")" );
}, },
toString:function () { toString:function () {
return this.name; return this.name.replace(/_xlfn\./i,"_xlfn.");
}, },
setCA:function ( arg, ca, numFormat ) { setCA:function ( arg, ca, numFormat ) {
this.value = arg; this.value = arg;
......
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