Commit 7dc3e9bd authored by Ilya Kirillov's avatar Ilya Kirillov

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

parent ca2b4a48
...@@ -2460,7 +2460,9 @@ CTable.prototype = ...@@ -2460,7 +2460,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;
......
...@@ -916,6 +916,28 @@ CTableCell.prototype = ...@@ -916,6 +916,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;
......
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2016 * (c) Copyright Ascensio System Limited 2010-2016
* *
* This program is freeware. You can redistribute it and/or modify it under the terms of the GNU * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU
* General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html).
* In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that
* Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights. * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
* *
* THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
* FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html * FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
* *
* You can contact Ascensio System SIA by email at sales@onlyoffice.com * You can contact Ascensio System SIA by email at sales@onlyoffice.com
* *
* The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display
* Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3. * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
* *
* Pursuant to Section 7  3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains * Pursuant to Section 7  3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains
* relevant author attributions when distributing the software. If the display of the logo in its graphic * relevant author attributions when distributing the software. If the display of the logo in its graphic
* form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE"
* in every copy of the program you distribute. * in every copy of the program you distribute.
* Pursuant to Section 7  3(e) we decline to grant you any rights under trademark law for use of our trademarks. * Pursuant to Section 7  3(e) we decline to grant you any rights under trademark law for use of our trademarks.
* *
*/ */
"use strict"; "use strict";
/** /**
* User: Ilja.Kirillov * User: Ilja.Kirillov
......
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