Commit b72006da authored by Ilya Kirillov's avatar Ilya Kirillov Committed by Alexander.Trofimov

Bug #31932 Исправлен баг с вертикальным текстом в плавающей таблице.

parent 524d90d5
...@@ -2436,7 +2436,9 @@ CTable.prototype = ...@@ -2436,7 +2436,9 @@ CTable.prototype =
var Cell = Row.Get_Cell(CurCell); var Cell = Row.Get_Cell(CurCell);
var CellPageIndex = CurPage - Cell.Content.Get_StartPage_Relative(); var CellPageIndex = CurPage - Cell.Content.Get_StartPage_Relative();
if (vmerge_Restart === Cell.Get_VMerge()) if (vmerge_Restart === Cell.Get_VMerge())
Cell.Content.Shift(CellPageIndex, Dx, Dy); {
Cell.Content_Shift(CellPageIndex, Dx, Dy);
}
} }
this.RowsInfo[CurRow].Y[CurPage] += Dy; this.RowsInfo[CurRow].Y[CurPage] += Dy;
......
...@@ -892,6 +892,28 @@ CTableCell.prototype = ...@@ -892,6 +892,28 @@ CTableCell.prototype =
return Result; return Result;
}, },
Content_Shift : function(CurPage, dX, dY)
{
if (true === this.Is_VerticalText())
{
this.Temp.X_start += dX;
this.Temp.Y_start += dY;
this.Temp.X_end += dX;
this.Temp.Y_end += dY;
this.Temp.X_cell_start += dX;
this.Temp.Y_cell_start += dY;
this.Temp.X_cell_end += dX;
this.Temp.Y_cell_end += dY;
this.Temp.Y += dY;
}
else
{
this.Content.Shift(CurPage, dX, dY);
}
},
private_GetTextDirectionTransform : function() private_GetTextDirectionTransform : function()
{ {
var Transform = null; var Transform = null;
......
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