Commit bfe23293 authored by konovalovsergey's avatar konovalovsergey Committed by Alexander.Trofimov

fix bug 30699

parent dea0300f
...@@ -2008,14 +2008,25 @@ function CellFormat(format) ...@@ -2008,14 +2008,25 @@ function CellFormat(format)
this.oTextFormat = null; this.oTextFormat = null;
this.aComporationFormats = null; this.aComporationFormats = null;
var aFormats = format.split(";"); var aFormats = format.split(";");
var nFormatsLength = aFormats.length;
var aParsedFormats = []; var aParsedFormats = [];
for(var i = 0; i < nFormatsLength; ++i) for(var i = 0; i < aFormats.length; ++i)
{ {
var sNewFormat = aFormats[i];
//если sNewFormat заканчивается на нечетное число '\', значит ';' был экранирован и это текст
while(true){
var formatTail = sNewFormat.match(/\\+$/g);
if (formatTail && formatTail.length > 0 && 1 === formatTail[0].length % 2 && i + 1 < aFormats.length) {
sNewFormat += ';';
sNewFormat += aFormats[++i];
} else {
break;
}
}
var oNewFormat = new NumFormat(false); var oNewFormat = new NumFormat(false);
oNewFormat.setFormat(aFormats[i]); oNewFormat.setFormat(sNewFormat);
aParsedFormats.push(oNewFormat); aParsedFormats.push(oNewFormat);
} }
var nFormatsLength = aParsedFormats.length;
var bComporationOperator = false; var bComporationOperator = false;
if(nFormatsLength > 0) if(nFormatsLength > 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