Merge branch 'release/4.0.1' into develop

cell/api.js

@@ -3216,6 +3216,16 @@ var editor;
     return _ret.data;
   };
 
+  spreadsheet_api.prototype.asc_canPaste = function () {
+    History.Create_NewPoint();
+    History.StartTransaction();
+    return true;
+  };
+  spreadsheet_api.prototype.asc_Recalculate = function () {
+    History.EndTransaction();
+    this._onUpdateAfterApplyChanges();
+  };
+
   spreadsheet_api.prototype._onEndLoadSdk = function() {
     History = AscCommon.History;
 
@@ -3512,6 +3522,4 @@ var editor;
   prot["asc_pluginButtonClick"]     = prot.asc_pluginButtonClick;
   prot["asc_addOleObject"]          = prot.asc_addOleObject;
   prot["asc_editOleObject"]         = prot.asc_editOleObject;
-  prot["asc_Recalculate"]           = prot.asc_Recalculate;
-  prot["asc_canPaste"]              = prot.asc_canPaste;
 })(window);

common/Shapes/SerializeWriter.js

@@ -3180,8 +3180,8 @@ function CBinaryFileWriter()
 					fMaxBottomBorder = oBorders.Bottom.Size;
 				}
 			}
-		}
             oThis._WriteInt1(0, ( (row.Pr.Height.Value + fMaxBottomMargin + fMaxTopMargin + fMaxTopBorder + fMaxBottomBorder) * 36000) >> 0);
+		}
         
         oThis.WriteUChar(g_nodeAttributeEnd);
 

common/plugins.js

@@ -348,48 +348,48 @@
                     window.g_asc_plugins.closeAttackTimer = -1;
                 }
 
-                if (value && value != "")
-                {
-                    try
-                    {
-						if (window.g_asc_plugins.api.asc_canPaste())
-						{
-							var _script = "(function(){ var Api = window.g_asc_plugins.api;\n" + value + "})();";
-							eval(_script);
-
-							var oLogicDocument = window.g_asc_plugins.api.WordControl ? window.g_asc_plugins.api.WordControl.m_oLogicDocument : null;
-							if (pluginData.getAttribute("recalculate") == true)
-							{
-								var _fonts = oLogicDocument.Document_Get_AllFontNames();
-								var _imagesArray = oLogicDocument.Get_AllImageUrls();
-								var _images = {};
-								for (var i = 0; i < _imagesArray.length; i++)
-								{
-									_images[_imagesArray[i]] = _imagesArray[i];
-								}
-
-                                window.g_asc_plugins.images_rename = _images;
-								AscCommon.Check_LoadingDataBeforePrepaste(window.g_asc_plugins.api, _fonts, _images, function()
-								{
-                                    if (window.g_asc_plugins.api.WordControl &&
-                                        window.g_asc_plugins.api.WordControl.m_oLogicDocument &&
-                                        window.g_asc_plugins.api.WordControl.m_oLogicDocument.Reassign_ImageUrls)
-                                    {
-                                        window.g_asc_plugins.api.WordControl.m_oLogicDocument.Reassign_ImageUrls(window.g_asc_plugins.images_rename);
+                if (value && value != "") {
+                    try {
+                        if (window.g_asc_plugins.api.asc_canPaste()) {
+                            var _script = "(function(){ var Api = window.g_asc_plugins.api;\n" + value + "})();";
+                            eval(_script);
+
+                            if (pluginData.getAttribute("recalculate") == true) {
+                                var editorId = window.g_asc_plugins.api.getEditorId();
+                                if (AscCommon.c_oEditorId.Word === editorId) {
+                                    var oLogicDocument = window.g_asc_plugins.api.WordControl ?
+                                      window.g_asc_plugins.api.WordControl.m_oLogicDocument : null;
+                                    var _fonts = oLogicDocument.Document_Get_AllFontNames();
+                                    var _imagesArray = oLogicDocument.Get_AllImageUrls();
+                                    var _images = {};
+                                    for (var i = 0; i < _imagesArray.length; i++) {
+                                        _images[_imagesArray[i]] = _imagesArray[i];
                                     }
-                                    delete window.g_asc_plugins.images_rename;
-									window.g_asc_plugins.api.asc_Recalculate();
-								});
-							}
-						}
-                    }
-                    catch (err)
-                    {
+
+                                    window.g_asc_plugins.images_rename = _images;
+                                    AscCommon.Check_LoadingDataBeforePrepaste(window.g_asc_plugins.api, _fonts, _images,
+                                      function () {
+                                          if (window.g_asc_plugins.api.WordControl &&
+                                            window.g_asc_plugins.api.WordControl.m_oLogicDocument &&
+                                            window.g_asc_plugins.api.WordControl.m_oLogicDocument.Reassign_ImageUrls) {
+                                              window.g_asc_plugins.api.WordControl.m_oLogicDocument.Reassign_ImageUrls(
+                                                window.g_asc_plugins.images_rename);
+                                          }
+                                          delete window.g_asc_plugins.images_rename;
+                                          window.g_asc_plugins.api.asc_Recalculate();
+                                      });
+                                } else if (AscCommon.c_oEditorId.Spreadsheet === editorId) {
+                                    window.g_asc_plugins.api.asc_Recalculate();
+                                }
+                            }
+                        }
+                    } catch (err) {
                     }
                 }
 
-                if ("close" == name)
-                    window.g_asc_plugins.close();
+							if ("close" == name) {
+                  window.g_asc_plugins.close();
+              }
             }
         }
     }

slide/Editor/Format/Presentation.js

@@ -1393,7 +1393,7 @@ CPresentation.prototype =
                 var oMargins = FirstCell.Get_Margins();
                 if(oMargins)
                 {
-                    ResultHeight -= (oMargins.Top + oMargins.Bottom);
+                    ResultHeight -= (oMargins.Top.W + oMargins.Bottom.W);
         }
             }
             content[i].Set_Height(ResultHeight, Asc.linerule_AtLeast );