Commit 280e8bcf authored by Sergey.Luzyanin's avatar Sergey.Luzyanin Committed by Alexander.Trofimov

Bug 27562 - Формат ячеек игнорируется при построении диаграммы

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@59675 954022d7-b5bf-4e40-9824-e11837661b57
parent 53c590af
......@@ -11116,14 +11116,15 @@ function CreateRadarChart(chartSeries, bUseCache)
function parseSeriesHeaders (ws, rangeBBox) {
var cntLeft = 0, cntTop = 0;
var headers = { bLeft: false, bTop: false };
var i, cell, value;
var i, cell, value, numFormatType;
if (rangeBBox) {
if (rangeBBox.c2 - rangeBBox.c1 > 0) {
for (i = rangeBBox.r1 + 1; i <= rangeBBox.r2; i++) {
cell = ws.getCell3(i, rangeBBox.c1);
value = cell.getValue();
if (!isNumber(value) && (value != ""))
numFormatType = cell.getNumFormatType();
if (!isNumber(value) && (value != "") || numFormatType === c_oAscNumFormatType.Time || numFormatType === c_oAscNumFormatType.Date )
cntLeft++;
}
if ((cntLeft > 0) && (cntLeft >= rangeBBox.r2 - rangeBBox.r1))
......@@ -11135,7 +11136,8 @@ function parseSeriesHeaders (ws, rangeBBox) {
cell = ws.getCell3(rangeBBox.r1, i);
value = cell.getValue();
if (!isNumber(value) && (value != ""))
numFormatType= cell.getNumFormatType();
if (!isNumber(value) && (value != "") || numFormatType === c_oAscNumFormatType.Time || numFormatType === c_oAscNumFormatType.Date)
cntTop++;
}
if ((cntTop > 0) && (cntTop >= rangeBBox.c2 - rangeBBox.c1))
......
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