Commit 7ccbf6d7 authored by Igor.Zotov's avatar Igor.Zotov Committed by Alexander.Trofimov

правки для вставки таблиц со стилем

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@55625 954022d7-b5bf-4e40-9824-e11837661b57
parent 46c0d201
...@@ -3330,11 +3330,19 @@ ...@@ -3330,11 +3330,19 @@
//backgroundColor //backgroundColor
var backgroundColor = null; var backgroundColor = null;
if(paragraph.Parent && paragraph.Parent.Parent && paragraph.Parent.Parent instanceof CTableCell && paragraph.Parent.Parent.CompiledPr && paragraph.Parent.Parent.CompiledPr.Pr.Shd && paragraph.Parent.Parent.CompiledPr.Pr.Shd.Color) var compiledPrCell, color;
if(paragraph.Parent && paragraph.Parent.Parent && paragraph.Parent.Parent instanceof CTableCell)
{
compiledPrCell = paragraph.Parent.Parent.Get_CompiledPr();
if(compiledPrCell)
{ {
var color = paragraph.Parent.Parent.CompiledPr.Pr.Shd.Color; var color = compiledPrCell.Shd.Color;
backgroundColor = new RgbColor(this.clipboard._getBinaryColor("rgb(" + color.r + "," + color.g + "," + color.b + ")")); backgroundColor = new RgbColor(this.clipboard._getBinaryColor("rgb(" + color.r + "," + color.g + "," + color.b + ")"));
} };
};
if(backgroundColor) if(backgroundColor)
oNewItem.bc = backgroundColor; oNewItem.bc = backgroundColor;
...@@ -3574,7 +3582,10 @@ ...@@ -3574,7 +3582,10 @@
oNewElem.height = 1; oNewElem.height = 1;
} }
else if(type_Table == elem.GetType()) else if(type_Table == elem.GetType())
{
elem.ReIndexing(0);
oNewElem = this._getTableMeasure(elem, oRes); oNewElem = this._getTableMeasure(elem, oRes);
}
if(null != oNewElem) if(null != oNewElem)
{ {
oRes.children.push(oNewElem); oRes.children.push(oNewElem);
......
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