Commit 3c5b8b56 authored by Igor.Zotov's avatar Igor.Zotov Committed by Alexander.Trofimov

http://bugzserver/show_bug.cgi?id=26875 - [Copy&Paste] Некорректное...

http://bugzserver/show_bug.cgi?id=26875 -  [Copy&Paste] Некорректное копирование/вставка таблицы с невидимыми границами из CDE в CSE

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@64367 954022d7-b5bf-4e40-9824-e11837661b57
parent 1e2b5432
...@@ -3971,7 +3971,7 @@ ...@@ -3971,7 +3971,7 @@
var formatBorders = oldBorders ? oldBorders : new Border(); var formatBorders = oldBorders ? oldBorders : new Border();
//top border for cell //top border for cell
if(top == cellTable.top && !formatBorders.t.s) if(top == cellTable.top && !formatBorders.t.s && borders.Top.Value !== 0/*border_None*/)
{ {
borderStyleName = this.clipboard._getBorderStyleName(defaultStyle, this.ws.objectRender.convertMetric(borders.Top.Size,3,1)); borderStyleName = this.clipboard._getBorderStyleName(defaultStyle, this.ws.objectRender.convertMetric(borders.Top.Size,3,1));
if (null !== borderStyleName) { if (null !== borderStyleName) {
...@@ -3980,7 +3980,7 @@ ...@@ -3980,7 +3980,7 @@
} }
} }
//left border for cell //left border for cell
if(left == cellTable.left && !formatBorders.l.s) if(left == cellTable.left && !formatBorders.l.s && borders.Left.Value !== 0/*border_None*/)
{ {
borderStyleName = this.clipboard._getBorderStyleName(defaultStyle, this.ws.objectRender.convertMetric(borders.Left.Size,3,1)); borderStyleName = this.clipboard._getBorderStyleName(defaultStyle, this.ws.objectRender.convertMetric(borders.Left.Size,3,1));
if (null !== borderStyleName) { if (null !== borderStyleName) {
...@@ -3989,7 +3989,7 @@ ...@@ -3989,7 +3989,7 @@
} }
} }
//bottom border for cell //bottom border for cell
if(top == cellTable.top + heigthCell - 1 && !formatBorders.b.s) if(top == cellTable.top + heigthCell - 1 && !formatBorders.b.s && borders.Bottom.Value !== 0/*border_None*/)
{ {
borderStyleName = this.clipboard._getBorderStyleName(defaultStyle, this.ws.objectRender.convertMetric(borders.Bottom.Size,3,1)); borderStyleName = this.clipboard._getBorderStyleName(defaultStyle, this.ws.objectRender.convertMetric(borders.Bottom.Size,3,1));
if (null !== borderStyleName) { if (null !== borderStyleName) {
...@@ -3998,7 +3998,7 @@ ...@@ -3998,7 +3998,7 @@
} }
} }
//right border for cell //right border for cell
if(left == cellTable.left + widthCell - 1 && !formatBorders.r.s) if(left == cellTable.left + widthCell - 1 && !formatBorders.r.s && borders.Right.Value !== 0/*border_None*/)
{ {
borderStyleName = this.clipboard._getBorderStyleName(defaultStyle, this.ws.objectRender.convertMetric(borders.Right.Size,3,1)); borderStyleName = this.clipboard._getBorderStyleName(defaultStyle, this.ws.objectRender.convertMetric(borders.Right.Size,3,1));
if (null !== borderStyleName) { if (null !== borderStyleName) {
...@@ -4207,7 +4207,7 @@ ...@@ -4207,7 +4207,7 @@
{ {
compiledPrCell = tableCell.elem.Get_CompiledPr(); compiledPrCell = tableCell.elem.Get_CompiledPr();
if(compiledPrCell) if(compiledPrCell && compiledPrCell.Shd.Value !== 1/*shd_Nil*/)
{ {
var color = compiledPrCell.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 + ")"));
......
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