Commit 0f31b883 authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

Баг с файлами

"\\mediaserver\Exchange\Bannov A\Golubev A\BoosterMembers_20142015.xlsx" 
"\\mediaserver\Exchange\Bannov A\Golubev A\Booster Members_14-15_Calendar (3).xlsx"

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57910 954022d7-b5bf-4e40-9824-e11837661b57
parent 150732db
...@@ -1743,7 +1743,7 @@ NumFormat.prototype = ...@@ -1743,7 +1743,7 @@ NumFormat.prototype =
res += "?"; res += "?";
} }
return res; return res;
} };
//Color //Color
if(null != this.Color) if(null != this.Color)
{ {
...@@ -2000,9 +2000,9 @@ function CellFormat(format) ...@@ -2000,9 +2000,9 @@ function CellFormat(format)
if(null == oPositive) if(null == oPositive)
oPositive = oCurFormat; oPositive = oCurFormat;
else if(null == oNegative) else if(null == oNegative)
oNegative = oCurFormat oNegative = oCurFormat;
else if(null == oNull) else if(null == oNull)
oNull = oCurFormat oNull = oCurFormat;
} }
else else
{ {
...@@ -2025,7 +2025,8 @@ function CellFormat(format) ...@@ -2025,7 +2025,8 @@ function CellFormat(format)
} }
} }
} }
this.oTextFormat = new NumFormat(false).setFormat("@"); this.oTextFormat = new NumFormat(false);
this.oTextFormat.setFormat("@");
if(null == oPositive || null == oNegative || null == oNull) if(null == oPositive || null == oNegative || null == oNull)
{ {
//по результатам опытов, если оператор сравнения проходит через 0, то надо добавлять знак минус в зависимости от значения //по результатам опытов, если оператор сравнения проходит через 0, то надо добавлять знак минус в зависимости от значения
...@@ -2127,10 +2128,7 @@ CellFormat.prototype = ...@@ -2127,10 +2128,7 @@ CellFormat.prototype =
if (null == this.aComporationFormats) { if (null == this.aComporationFormats) {
if (null != this.oTextFormat && this.oTextFormat.bTextFormat) if (null != this.oTextFormat && this.oTextFormat.bTextFormat)
oRes = this.oTextFormat; oRes = this.oTextFormat;
} } else {
else {
var nLength = this.aComporationFormats.length;
var oDefaultComporationFormat = null;
for (var i = 0, length = this.aComporationFormats.length; i < length ; ++i) { for (var i = 0, length = this.aComporationFormats.length; i < length ; ++i) {
var oCurFormat = this.aComporationFormats[i]; var oCurFormat = this.aComporationFormats[i];
if (null == oCurFormat.ComporationOperator && oCurFormat.bTextFormat) { if (null == oCurFormat.ComporationOperator && oCurFormat.bTextFormat) {
...@@ -2641,7 +2639,7 @@ GeneralEditFormatCache.prototype = ...@@ -2641,7 +2639,7 @@ GeneralEditFormatCache.prototype =
var nLastNoZero = nLength - 1; var nLastNoZero = nLength - 1;
for(var i = val.length - 1; i >= 0; --i) for(var i = val.length - 1; i >= 0; --i)
{ {
nLastNoZero = i nLastNoZero = i;
if("0" != val[i]) if("0" != val[i])
break; break;
} }
...@@ -2967,7 +2965,7 @@ FormatParser.prototype = ...@@ -2967,7 +2965,7 @@ FormatParser.prototype =
nGroupSize = cultureInfo.NumberGroupSizes[nGroupSizeIndex]; nGroupSize = cultureInfo.NumberGroupSizes[nGroupSizeIndex];
} }
else else
nGroupSize = 1 nGroupSize = 1;
nPrevIndex = nIndex + 1; nPrevIndex = nIndex + 1;
} }
if (!bError) { if (!bError) {
...@@ -3070,7 +3068,7 @@ FormatParser.prototype = ...@@ -3070,7 +3068,7 @@ FormatParser.prototype =
} }
if(!bError){ if(!bError){
var aDate = []; var aDate = [];
var nMonthIndex = null var nMonthIndex = null;
var sMonthFormat = null; var sMonthFormat = null;
var aTime = []; var aTime = [];
var am = false; var am = false;
......
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