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

проверка unifill в Shd перед отправкой в интерфейс

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57776 954022d7-b5bf-4e40-9824-e11837661b57
parent d251a264
......@@ -7171,7 +7171,10 @@ CDocument.prototype =
Result_ParaPr = Item.Get_Paragraph_ParaPr();
}
}
if(Result_ParaPr.Shd && Result_ParaPr.Shd.Unifill)
{
Result_ParaPr.Shd.Unifill.check(this.theme, this.Get_ColorMap());
}
return Result_ParaPr;
}
},
......
......@@ -6365,7 +6365,10 @@ CDocumentContent.prototype =
Result_ParaPr = Pr;
Result_ParaPr.CanAddTable = ( true === Pr.Locked ? false : true );
if(Result_ParaPr.Shd && Result_ParaPr.Shd.Unifill)
{
Result_ParaPr.Shd.Unifill.check(this.Get_Theme(), this.Get_ColorMap());
}
return Result_ParaPr;
}
......@@ -6445,7 +6448,10 @@ CDocumentContent.prototype =
Result_ParaPr = Item.Get_Paragraph_ParaPr();
}
}
if(Result_ParaPr.Shd && Result_ParaPr.Shd.Unifill)
{
Result_ParaPr.Shd.Unifill.check(this.Get_Theme(), this.Get_ColorMap());
}
return Result_ParaPr;
}
},
......
......@@ -1549,6 +1549,11 @@ CGraphicObjects.prototype =
getParagraphParaPr: function()
{
var ret = DrawingObjectsController.prototype.getParagraphParaPr.call(this);
if(ret.Shd && ret.Shd.Unifill)
{
ret.Shd.Unifill.check(this.document.theme, this.document.Get_ColorMap());
}
return ret ? ret : new CParaPr();
},
......
......@@ -4825,7 +4825,7 @@ ParaDrawing.prototype =
Para.Add_ToContent( 0, DrawingRun );
var SelectedElement = new CSelectedElement(Para, false)
var SelectedElement = new CSelectedElement(Para, false);
var SelectedContent = new CSelectedContent();
SelectedContent.Add( SelectedElement );
SelectedContent.Set_MoveDrawing( true );
......
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