diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 11ba9da71..5df0732da 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -1493,7 +1493,7 @@ define([ onBeforeUnload: function() { Common.localStorage.save(); - var isEdit = this.permissions.edit !== false && this.editorConfig.mode !== 'view' && this.editorConfig.mode !== 'editdiagram'; + var isEdit = this.permissions.edit !== false && this.editorConfig.mode !== 'view' && this.editorConfig.mode !== 'editdiagram' && this.editorConfig.mode !== 'editmerge'; if (isEdit && this.api.asc_isDocumentModified()) { var me = this; this.api.asc_stopSaving(); diff --git a/apps/spreadsheeteditor/main/app/controller/Print.js b/apps/spreadsheeteditor/main/app/controller/Print.js index efffe7a91..878cdc93e 100644 --- a/apps/spreadsheeteditor/main/app/controller/Print.js +++ b/apps/spreadsheeteditor/main/app/controller/Print.js @@ -136,7 +136,7 @@ define([ if (item) panel.cmbPaperSize.setValue(item.get('value')); else - panel.cmbPaperSize.setValue('Custom (' + w +' x ' + h + ')'); + panel.cmbPaperSize.setValue(this.txtCustom + ' (' + w +' x ' + h + ')'); var fitwidth = opt.asc_getFitToWidth(), fitheight = opt.asc_getFitToHeight(); @@ -346,6 +346,7 @@ define([ warnCheckMargings: 'Margins are incorrect', strAllSheets: 'All Sheets', - textWarning: 'Warning' + textWarning: 'Warning', + txtCustom: 'Custom' }, SSE.Controllers.Print || {})); }); \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index c4ab72e5c..547142d96 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -546,6 +546,7 @@ "SSE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.", "SSE.Controllers.Print.strAllSheets": "All Sheets", "SSE.Controllers.Print.textWarning": "Warning", + "SSE.Controllers.Print.txtCustom": "Custom", "SSE.Controllers.Print.warnCheckMargings": "Margins are incorrect", "SSE.Controllers.Statusbar.errorLastSheet": "Workbook must have at least one visible worksheet.", "SSE.Controllers.Statusbar.errorRemoveSheet": "Cannot delete the worksheet.",