Commit b23eed12 authored by Sergey.Luzyanin's avatar Sergey.Luzyanin Committed by Alexander.Trofimov

баги в текстартах

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@63700 954022d7-b5bf-4e40-9824-e11837661b57
parent 395efaf6
......@@ -4899,6 +4899,13 @@ CUniFill.prototype =
{
return false;
}
if(isRealNumber(this.transparent) !== isRealNumber(unifill.transparent)
|| isRealNumber(this.transparent) && this.transparent !== unifill.transparent)
{
return false;
}
if(this.fill == null && unifill.fill == null)
{
return true;
......@@ -4964,6 +4971,11 @@ function CompareUnifillBool(u1, u2)
if(!u1 && u2 || u1 && !u2)
return false;
if(isRealNumber(u1.transparent) !== isRealNumber(u2.transparent)
|| isRealNumber(u1.transparent) && u1.transparent !== u2.transparent)
{
return false;
}
if(!u1.fill && !u2.fill)
return true;
if(!u1.fill && u2.fill || u1.fill && !u2.fill)
......
......@@ -187,6 +187,8 @@ CShape.prototype.handleUpdateGeometry = function()
this.recalcGeometry();
this.recalcBounds();
this.recalcWrapPolygon();
this.recalcContent();
this.recalcTransformText();
this.addToRecalculate();
};
CShape.prototype.convertPixToMM = function(pix)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment