[SSE] Bug 32333.

apps/spreadsheeteditor/main/app/controller/Main.js

@@ -1347,8 +1347,8 @@ define([
             },
 
             onConfirmAction: function(id, apiCallback) {
+                var me = this;
                 if (id == Asc.c_oAscConfirm.ConfirmReplaceRange) {
-                    var me = this;
                     Common.UI.warning({
                         closable: false,
                         title: this.notcriticalErrorTitle,
@@ -1364,6 +1364,20 @@ define([
                             }
                         }, this)
                     });
+                } else if (id == Asc.c_oAscConfirm.ConfirmPutMergeRange) {
+                    Common.UI.warning({
+                        closable: false,
+                        title: this.notcriticalErrorTitle,
+                        msg: this.confirmPutMergeRange,
+                        buttons: ['ok'],
+                        primary: 'ok',
+                        callback: _.bind(function(btn) {
+                            if (apiCallback)  {
+                                apiCallback();
+                            }
+                            me.onEditComplete(me.application.getController('DocumentHolder').getView('DocumentHolder'));
+                        }, this)
+                    });
                 }
             },
 
@@ -1785,7 +1799,8 @@ define([
             textBuyNow: 'Buy now',
             textNoLicenseTitle: 'License expired or not found',
             warnNoLicense: 'The license could not be found or expired. You cannot edit files.<br>Click \'Buy now\' to purchase Enterprise Edition license or \'Contact us\' if you use Integration Edition.',
-            textContactUs: 'Contact us'
+            textContactUs: 'Contact us',
+            confirmPutMergeRange: 'The source data contains merged cells.<br>They will be unmerged before they are pasted into the table.'
         }
     })(), SSE.Controllers.Main || {}))
 });

apps/spreadsheeteditor/main/locale/en.json

@@ -112,6 +112,7 @@
   "SSE.Controllers.LeftMenu.textWorkbook": "Workbook",
   "SSE.Controllers.LeftMenu.warnDownloadAs": "If you continue saving in this format all features except the text will be lost.<br>Are you sure you want to continue?",
   "SSE.Controllers.Main.confirmMoveCellRange": "The destination cell range can contain data. Continue the operation?",
+  "SSE.Controllers.Main.confirmPutMergeRange": "The source data contains merged cells.<br>They will be unmerged before they are pasted into the table.",
   "SSE.Controllers.Main.convertationErrorText": "Conversion failed.",
   "SSE.Controllers.Main.convertationTimeoutText": "Conversion timeout exceeded.",
   "SSE.Controllers.Main.criticalErrorExtText": "Press \"OK\" to return to document list.",