Не расчитываем размеры по нулевым процентам.

2c962e34 · Sergey Luzyanin · Alexander.Trofimov · 16377679 · 2c962e34
Commit 2c962e34 authored Apr 11, 2016 by Sergey Luzyanin Committed by Alexander.Trofimov May 19, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

common/Drawings/Format/Shape.js common/Drawings/Format/Shape.js +2 -2

No files found.
--- a/common/Drawings/Format/Shape.js
+++ b/common/Drawings/Format/Shape.js
@@ -2546,7 +2546,7 @@ CShape.prototype =
                                    var oSectPr = oParentParagraph.Get_SectPr();
                                    if(oSectPr)
                                    {
-                                        if(oParaDrawing.SizeRelH)
+                                        if(oParaDrawing.SizeRelH && oParaDrawing.SizeRelH.Percent > 0)
                                        {
                                            switch(oParaDrawing.SizeRelH.RelativeFrom)
                                            {
@@ -2579,7 +2579,7 @@ CShape.prototype =
                                            }
                                            this.extX *= oParaDrawing.SizeRelH.Percent;
                                        }
-                                        if(oParaDrawing.SizeRelV)
+                                        if(oParaDrawing.SizeRelV && oParaDrawing.SizeRelV.Percent > 0)
                                        {
                                            switch(oParaDrawing.SizeRelV.RelativeFrom)
                                            {