Merge branch 'release/4.0.1' into develop

common/Shapes/Serialize.js

@@ -5940,6 +5940,9 @@ function BinaryPPTYLoader()
 
         s.Skip2(1); // start attributes
 
+		var fMaxTopMargin = 0, fMaxBottomMargin = 0, fMaxTopBorder = 0, fMaxBottomBorder = 0;
+		
+		var fRowHeight = 5;
         while (true)
         {
             var _at = s.GetUChar();
@@ -5950,7 +5953,8 @@ function BinaryPPTYLoader()
             {
                 case 0:
                 {
-                    row.Set_Height(s.GetULong() / 36000, Asc.linerule_AtLeast);
+					fRowHeight = s.GetULong() / 36000;
+                   
                     break;
                 }
                 default:
@@ -5961,53 +5965,68 @@ function BinaryPPTYLoader()
         s.Skip2(5); // type + len
         var _count = s.GetULong();
 
-        if (true)
-        {
-            for (var i = 0; i < _count; i++)
-            {
-                s.Skip2(1);
-                var bIsNoHMerge = this.ReadCell(row.Content[i]);
-                if (bIsNoHMerge === false)
-                {
-                    row.Remove_Cell(i);
-                    i--;
-                    _count--;
-                }
-                var _gridCol = 1;
-                if ("number" == typeof (row.Content[i].Pr.GridSpan))
-                {
-                    _gridCol = row.Content[i].Pr.GridSpan;
-                }
+		for (var i = 0; i < _count; i++)
+		{
+			s.Skip2(1);
+			var bIsNoHMerge = this.ReadCell(row.Content[i]);
+			if (bIsNoHMerge === false)
+			{
+				row.Remove_Cell(i);
+				i--;
+				_count--;
+			}
+			var _gridCol = 1;
+			if ("number" == typeof (row.Content[i].Pr.GridSpan))
+			{
+				_gridCol = row.Content[i].Pr.GridSpan;
+			}
 
-                if (_gridCol > (_count - i))
-                {
-                    _gridCol = _count - i;
-                    row.Content[i].Pr.GridSpan = _gridCol;
-                    if (1 == row.Content[i].Pr.GridSpan)
-                        row.Content[i].Pr.GridSpan = undefined;
-                }
+			if (_gridCol > (_count - i))
+			{
+				_gridCol = _count - i;
+				row.Content[i].Pr.GridSpan = _gridCol;
+				if (1 == row.Content[i].Pr.GridSpan)
+					row.Content[i].Pr.GridSpan = undefined;
+			}
 
-                _gridCol--;
-                while (_gridCol > 0)
-                {
-                    i++;
-                    if (i >= _count)
-                        break;
+			_gridCol--;
+			while (_gridCol > 0)
+			{
+				i++;
+				if (i >= _count)
+					break;
 
-                    s.Skip2(1);
-                    this.ReadCell(row.Content[i]);
+				s.Skip2(1);
+				this.ReadCell(row.Content[i]);
 
-                    // удаляем
-                    row.Remove_Cell(i);
-                    i--;
-                    _count--;
+				// удаляем
+				row.Remove_Cell(i);
+				i--;
+				_count--;
 
-                    --_gridCol;
-                }
-            }
-        }
+				--_gridCol;
+			}
+		}
 
-        /*
+        for(i = 0;  i < row.Content.length; ++i){
+			var oCell = row.Content[i];
+			var oMargins = oCell.Get_Margins();
+			if(oMargins.Bottom.W > fMaxBottomMargin){
+				fMaxBottomMargin = oMargins.Bottom.W;
+			}
+			if(oMargins.Top.W > fMaxTopMargin){
+				fMaxTopMargin = oMargins.Top.W;
+			}
+			var oBorders = oCell.Get_Borders();
+			if(oBorders.Top.Size > fMaxTopBorder){
+				fMaxTopBorder = oBorders.Top.Size;
+			}
+			if(oBorders.Bottom.Size > fMaxBottomBorder){
+				fMaxBottomBorder = oBorders.Bottom.Size;
+			}
+		}
+		 row.Set_Height(Math.max(1, fRowHeight - fMaxTopMargin - fMaxBottomMargin - fMaxTopBorder - fMaxBottomBorder), Asc.linerule_AtLeast);
+		/*
         if (row.Content.length == _count)
         {
             for (var i = 0; i < _count; i++)

common/Shapes/SerializeWriter.js

@@ -3161,8 +3161,27 @@ function CBinaryFileWriter()
     {
         oThis.WriteUChar(g_nodeAttributeStart);
 
-        if (row.Pr.Height !== undefined && row.Pr.Height != null)
-            oThis._WriteInt1(0, (row.Pr.Height.Value * 36000) >> 0);
+        if (row.Pr.Height !== undefined && row.Pr.Height != null){
+			var fMaxTopMargin = 0, fMaxBottomMargin = 0, fMaxTopBorder = 0, fMaxBottomBorder = 0;
+			for(i = 0;  i < row.Content.length; ++i){
+				var oCell = row.Content[i];
+				var oMargins = oCell.Get_Margins();
+				if(oMargins.Bottom.W > fMaxBottomMargin){
+					fMaxBottomMargin = oMargins.Bottom.W;
+				}
+				if(oMargins.Top.W > fMaxTopMargin){
+					fMaxTopMargin = oMargins.Top.W;
+				}
+				var oBorders = oCell.Get_Borders();
+				if(oBorders.Top.Size > fMaxTopBorder){
+					fMaxTopBorder = oBorders.Top.Size;
+				}
+				if(oBorders.Bottom.Size > fMaxBottomBorder){
+					fMaxBottomBorder = oBorders.Bottom.Size;
+				}
+			}
+		}
+            oThis._WriteInt1(0, ( (row.Pr.Height.Value + fMaxBottomMargin + fMaxTopMargin + fMaxTopBorder + fMaxBottomBorder) * 36000) >> 0);
         
         oThis.WriteUChar(g_nodeAttributeEnd);
 

common/apiBase.js

@@ -887,6 +887,7 @@
 	baseEditorsApi.prototype._onEndLoadSdk = function()
 	{
 		// init drag&drop
+		var t = this;
 		AscCommon.InitDragAndDrop(this.HtmlElement, function(error, files)
 		{
 			t._uploadCallback(error, files);
@@ -911,6 +912,8 @@
 		{
 			this.asc_enableKeyEvents(this.tmpFocus);
 		}
+
+		this.pluginsManager     = Asc.createPluginsManager(this);
 	};
 
 	baseEditorsApi.prototype.sendStandartTextures = function()

common/plugins.js

@@ -155,7 +155,7 @@
 
             if (true)
             {
-                this.api.asc_fireCallback("asc_onPluginClose");
+                this.api.sendEvent("asc_onPluginClose");
                 var _div = document.getElementById("plugin_iframe");
                 if (_div)
                     _div.parentNode.removeChild(_div);
@@ -176,7 +176,7 @@
 
             if (this.current.variations[this.currentVariation].isVisual && this.startData.getAttribute("resize") !== true)
             {
-                this.api.asc_fireCallback("asc_onPluginShow", this.current, this.currentVariation);
+                this.api.sendEvent("asc_onPluginShow", this.current, this.currentVariation);
             }
             else
             {
@@ -299,7 +299,7 @@
                 _pluginsInstall["pluginsData"].push(this.plugins[i].serialize());
             }
 
-            this.api.asc_fireCallback("asc_onPluginsInit", _pluginsInstall);
+            this.api.sendEvent("asc_onPluginsInit", _pluginsInstall);
         },
 
         startLongAction : function()

word/api.js

@@ -6652,7 +6652,6 @@ background-repeat: no-repeat;\
 				if (this.bInit_word_control === false)
 				{
 					this.bInit_word_control = true;
-					this.pluginsManager     = Asc.createPluginsManager(this);
 					this.asc_fireCallback("asc_onDocumentContentReady");
 				}
 			}
@@ -6751,7 +6750,6 @@ background-repeat: no-repeat;\
 		if (false === this.isSaveFonts_Images)
 		{
 			this.bInit_word_control = true;
-			this.pluginsManager     = Asc.createPluginsManager(this);
 			this.asc_fireCallback("asc_onDocumentContentReady");
 		}