Kaydet (Commit) 7e383cb5 authored tarafından Mark Hung's avatar Mark Hung Kaydeden (comit) Norbert Thiebaud

Fix tdf#87889 and tdf#92535, vertical align issue when docgrid enable.

Change-Id: I2f1f7609e9ceed3804be76775eeebcddd9e443c6
Reviewed-on: https://gerrit.libreoffice.org/17462Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNorbert Thiebaud <nthiebaud@gmail.com>
üst 0d737f26
...@@ -4831,8 +4831,7 @@ void SwCellFrm::Format( vcl::RenderContext* /*pRenderContext*/, const SwBorderAt ...@@ -4831,8 +4831,7 @@ void SwCellFrm::Format( vcl::RenderContext* /*pRenderContext*/, const SwBorderAt
if ( !FindTabFrm()->IsRebuildLastLine() && text::VertOrientation::NONE != rOri.GetVertOrient() && if ( !FindTabFrm()->IsRebuildLastLine() && text::VertOrientation::NONE != rOri.GetVertOrient() &&
// #158225# no vertical alignment of covered cells // #158225# no vertical alignment of covered cells
!IsCoveredCell() && !IsCoveredCell() &&
// #116532# Do not consider vertical alignment in grid mode (pPg = FindPageFrm())!=NULL )
!(pPg = FindPageFrm())->HasGrid() )
{ {
if ( !Lower()->IsContentFrm() && !Lower()->IsSctFrm() && !Lower()->IsTabFrm() ) if ( !Lower()->IsContentFrm() && !Lower()->IsSctFrm() && !Lower()->IsTabFrm() )
{ {
......
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