to bug 32783

b8859a32 · Sergey Luzyanin · a893d380 · b8859a32 · b8859a32
Commit b8859a32 authored Jul 06, 2016 by Sergey Luzyanin
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

common/Shapes/SerializeWriter.js common/Shapes/SerializeWriter.js +1 -1

slide/Editor/Format/Presentation.js slide/Editor/Format/Presentation.js +1 -1

No files found.
--- a/common/Shapes/SerializeWriter.js
+++ b/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);

--- a/slide/Editor/Format/Presentation.js
+++ b/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 );