From b726fc0e22ab5a05bda90fadbc9e43a09b40ebf7 Mon Sep 17 00:00:00 2001 From: "Alexander.Trofimov" Date: Fri, 20 Jan 2017 13:34:52 +0300 Subject: [PATCH] fix bug 33812 --- .../main/app/controller/Toolbar.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index 840352abb..f9460c963 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -1941,11 +1941,14 @@ define([ toolbar.lockToolbar(SSE.enumLock.multiselect, this._state.multiselect, { array: [toolbar.btnTableTemplate, toolbar.btnInsertHyperlink]}); } - val = info.asc_getNumFormatInfo().asc_getType(); - this._state.numformat = info.asc_getNumFormat(); - if (this._state.numformattype !== val) { - toolbar.cmbNumberFormat.setValue(val, toolbar.txtCustom); - this._state.numformattype = val; + val = info.asc_getNumFormatInfo(); + if (val) { + this._state.numformat = info.asc_getNumFormat(); + val = val.asc_getType(); + if (this._state.numformattype !== val) { + toolbar.cmbNumberFormat.setValue(val, toolbar.txtCustom); + this._state.numformattype = val; + } } val = info.asc_getAngle();