Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[SSE] For Bug 34118 (when select format from Accounting style menu and open FormatSettingsDialog - asc_getSymbol in format properties is null).

Browse source
This commit is contained in:
Julia Radzhabova 2017-02-20 15:51:42 +03:00
parent d1e3f6ea3d
commit 2a52cc7afc
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/spreadsheeteditor/main/app/controller/Toolbar.js
View file

@ -898,8 +898,15 @@ define([
}, },
onNumberFormatMenu: function(menu, item) { onNumberFormatMenu: function(menu, item) {
if (this.api) if (this.api) {
this.api.asc_setCellFormat(item.value); var info = new Asc.asc_CFormatCellsInfo();
info.asc_setType(Asc.c_oAscNumFormatType.Accounting);
info.asc_setSeparator(false);
info.asc_setSymbol(item.value);
var format = this.api.asc_getFormatCells(info);
if (format && format.length>0)
this.api.asc_setCellFormat(format[0]);
}
Common.NotificationCenter.trigger('edit:complete', this.toolbar); Common.NotificationCenter.trigger('edit:complete', this.toolbar);
Common.component.Analytics.trackEvent('ToolBar', 'Number Format'); Common.component.Analytics.trackEvent('ToolBar', 'Number Format');

10
apps/spreadsheeteditor/main/app/view/Toolbar.js
View file

@ -692,23 +692,23 @@ define([
items : [ items : [
{ {
caption : me.txtDollar, caption : me.txtDollar,
value : '_($* #,##0.00_);_($* (#,##0.00);_($* "-"??_);_(@_)' value : 0x0409 // $ en-US
}, },
{ {
caption : me.txtEuro, caption : me.txtEuro,
value : '_(€* #,##0.00_);_(€* (#,##0.00);_(€* "-"??_);_(@_)' value : 0x0407 // € de-DE
}, },
{ {
caption : me.txtPound, caption : me.txtPound,
value : '_(£* #,##0.00_);_(£* (#,##0.00);_(£* "-"??_);_(@_)' value : 0x0809 // £ en-GB
}, },
{ {
caption : me.txtRouble, caption : me.txtRouble,
value : '_-* #,##0.00[$ ₽-419]_-;-* #,##0.00[$ ₽-419]_-;_-* "-"??[$ ₽-419]_-;_-@_-' value : 0x0419 // ₽ ru-RU
}, },
{ {
caption : me.txtYen, caption : me.txtYen,
value : '_(¥* #,##0.00_);_(¥* (#,##0.00);_(¥* "-"??_);_(@_)' value : 0x0411 // ¥ ja-JP
} }
] ]
}) })