From afec184c2d317e7ecaf95bfea9b747c60c672e2e Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 21 Mar 2017 14:20:18 +0300 Subject: [PATCH] [SSE] Fix Bug 34443. --- .../spreadsheeteditor/main/app/view/FormatSettingsDialog.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/view/FormatSettingsDialog.js b/apps/spreadsheeteditor/main/app/view/FormatSettingsDialog.js index 1d6d1dddc..bfbb743f1 100644 --- a/apps/spreadsheeteditor/main/app/view/FormatSettingsDialog.js +++ b/apps/spreadsheeteditor/main/app/view/FormatSettingsDialog.js @@ -288,8 +288,10 @@ define([ this.cmbType.selectRecord(selectedItem); else if (props.formatInfo.asc_getType() == Asc.c_oAscNumFormatType.Fraction) this.cmbType.setValue(this.txtCustom); + else if (props.formatInfo.asc_getType() == Asc.c_oAscNumFormatType.Time) + this.cmbType.setValue(this.api.asc_getLocaleExample(props.format, 1.534)); else - this.cmbType.setValue(this.api.asc_getLocaleExample(props.format), 37973); + this.cmbType.setValue(this.api.asc_getLocaleExample(props.format, 37973)); } this.Format = props.format; } @@ -439,7 +441,7 @@ define([ var formatsarr = this.api.asc_getFormatCells(info), data = [], - exampleVal = (record.value == Asc.c_oAscNumFormatType.Date) ? 37973 : ((record.value == Asc.c_oAscNumFormatType.Time) ? 0.123 : parseFloat("-1234.12345678901234567890")); + exampleVal = (record.value == Asc.c_oAscNumFormatType.Date) ? 37973 : ((record.value == Asc.c_oAscNumFormatType.Time) ? 1.534 : parseFloat("-1234.12345678901234567890")); formatsarr.forEach(function(item) { data.push({value: item, displayValue: me.api.asc_getLocaleExample(item, exampleVal)}); });