From 88a336631d90dc20057564b3adcee1e1d5475a4d Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 3 Apr 2017 10:35:24 +0300 Subject: [PATCH] [SSE] Fix Bug 34640. --- .../main/app/controller/Main.js | 20 ++++++++++--------- .../mobile/app/controller/Main.js | 2 ++ 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 8f778c613..2448521e6 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -1047,6 +1047,16 @@ define([ config.closable = true; break; + case Asc.c_oAscError.ID.FrmlOperandExpected: + config.msg = this.errorOperandExpected; + config.closable = true; + break; + + case Asc.c_oAscError.ID.FrmlWrongReferences: + config.msg = this.errorFrmlWrongReferences; + config.closable = true; + break; + case Asc.c_oAscError.ID.UnexpectedGuid: config.msg = this.errorUnexpectedGuid; break; @@ -1071,10 +1081,6 @@ define([ config.msg = this.errorDataRange; break; - case Asc.c_oAscError.ID.FrmlOperandExpected: - config.msg = this.errorOperandExpected; - break; - case Asc.c_oAscError.ID.VKeyEncrypt: config.msg = this.errorToken; break; @@ -1160,10 +1166,6 @@ define([ config.msg = this.errorOpenWarning; break; - case Asc.c_oAscError.ID.FrmlWrongReferences: - config.msg = this.errorFrmlWrongReferences; - break; - case Asc.c_oAscError.ID.CopyMultiselectAreaError: config.msg = this.errorCopyMultiselectArea; break; @@ -2057,7 +2059,7 @@ define([ errorFileVKey: 'External error.
Incorrect securety key. Please, contact support.', errorStockChart: 'Incorrect row order. To build a stock chart place the data on the sheet in the following order:
opening price, max price, min price, closing price.', errorDataRange: 'Incorrect data range.', - errorOperandExpected: 'Operand expected', + errorOperandExpected: 'The entered function syntax is not correct. Please check if you are missing one of the parentheses - \'(\' or \')\'.', errorKeyEncrypt: 'Unknown key descriptor', errorKeyExpire: 'Key descriptor expired', errorUsersExceed: 'Count of users was exceed', diff --git a/apps/spreadsheeteditor/mobile/app/controller/Main.js b/apps/spreadsheeteditor/mobile/app/controller/Main.js index b16b005a3..a6de91ff3 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/Main.js +++ b/apps/spreadsheeteditor/mobile/app/controller/Main.js @@ -786,6 +786,7 @@ define([ case Asc.c_oAscError.ID.FrmlOperandExpected: config.msg = this.errorOperandExpected; + config.closable = true; break; case Asc.c_oAscError.ID.VKeyEncrypt: @@ -875,6 +876,7 @@ define([ case Asc.c_oAscError.ID.FrmlWrongReferences: config.msg = this.errorFrmlWrongReferences; + config.closable = true; break; case Asc.c_oAscError.ID.CopyMultiselectAreaError: