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

Bug 28522 - Сбрасывается прозрачность заливки фигур после сборки версии

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@61148 954022d7-b5bf-4e40-9824-e11837661b57
parent abc0b7c9
...@@ -358,7 +358,7 @@ function CreateAscFill(unifill) ...@@ -358,7 +358,7 @@ function CreateAscFill(unifill)
{ {
ret.type = c_oAscFill.FILL_TYPE_GRAD; ret.type = c_oAscFill.FILL_TYPE_GRAD;
ret.fill = new CAscFillGrad(); ret.fill = new CAscFillGrad();
var bCheckTransparent = true, nLastTransparent = null, nLastTempTransparent, j, aMods;
for (var i = 0; i < _fill.colors.length; i++) for (var i = 0; i < _fill.colors.length; i++)
{ {
if (0 == i) if (0 == i)
...@@ -366,10 +366,52 @@ function CreateAscFill(unifill) ...@@ -366,10 +366,52 @@ function CreateAscFill(unifill)
ret.fill.Colors = []; ret.fill.Colors = [];
ret.fill.Positions = []; ret.fill.Positions = [];
} }
if(bCheckTransparent)
{
if(_fill.colors[i].color.Mods)
{
aMods = _fill.colors[i].color.Mods.Mods;
nLastTempTransparent = null;
for(j = 0; j < aMods.length; ++j)
{
if(aMods[j].name === "alpha")
{
if(nLastTempTransparent === null)
{
nLastTempTransparent = aMods[j].val;
if(nLastTransparent === null)
{
nLastTransparent = nLastTempTransparent;
}
else
{
if(nLastTransparent !== nLastTempTransparent)
{
bCheckTransparent = false;
break;
}
}
}
else
{
bCheckTransparent = false;
break;
}
}
}
}
else
{
bCheckTransparent = false;
}
}
ret.fill.Colors.push(CreateAscColor(_fill.colors[i].color)); ret.fill.Colors.push(CreateAscColor(_fill.colors[i].color));
ret.fill.Positions.push(_fill.colors[i].pos); ret.fill.Positions.push(_fill.colors[i].pos);
} }
if(bCheckTransparent && nLastTransparent !== null)
{
ret.transparent = (nLastTransparent/100000)*255;
}
if (_fill.lin) if (_fill.lin)
{ {
...@@ -404,7 +446,10 @@ function CreateAscFill(unifill) ...@@ -404,7 +446,10 @@ function CreateAscFill(unifill)
break; break;
} }
ret.transparent = unifill.transparent; if(isRealNumber(unifill.transparent))
{
ret.transparent = unifill.transparent;
}
return ret; return ret;
} }
function CorrectUniFill(asc_fill, unifill) function CorrectUniFill(asc_fill, unifill)
......
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