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

правка бага 21088

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@50549 954022d7-b5bf-4e40-9824-e11837661b57
parent 3c2323e0
...@@ -640,7 +640,44 @@ CGroupShape.prototype = ...@@ -640,7 +640,44 @@ CGroupShape.prototype =
getCompiledFill: function() getCompiledFill: function()
{ {
return null; this.compiledFill = null;
if(isRealObject(this.spPr) && isRealObject(this.spPr.Fill) && isRealObject(this.spPr.Fill.fill))
{
this.compiledFill = this.spPr.Fill.createDuplicate();
}
else if(isRealObject(this.group))
{
var group_compiled_fill = this.group.getCompiledFill();
if(isRealObject(group_compiled_fill) && isRealObject(group_compiled_fill.fill))
{
this.compiledFill = group_compiled_fill.createDuplicate();
}
else
{
var hierarchy = this.getHierarchy();
for(var i = 0; i < hierarchy.length; ++i)
{
if(isRealObject(hierarchy[i]) && isRealObject(hierarchy[i].spPr) && isRealObject(hierarchy[i].spPr.Fill) && isRealObject(hierarchy[i].spPr.Fill.fill))
{
this.compiledFill = hierarchy[i].spPr.Fill.createDuplicate();
break;
}
}
}
}
else
{
var hierarchy = this.getHierarchy();
for(var i = 0; i < hierarchy.length; ++i)
{
if(isRealObject(hierarchy[i]) && isRealObject(hierarchy[i].spPr) && isRealObject(hierarchy[i].spPr.Fill) && isRealObject(hierarchy[i].spPr.Fill.fill))
{
this.compiledFill = hierarchy[i].spPr.Fill.createDuplicate();
break;
}
}
}
return this.compiledFill;
}, },
......
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