sw/source/core/layout/tabfrm.cxx | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 7e383cb50c6020b86ac7857ece8a6273b7eb1a5e
Author: Mark Hung <mark...@gmail.com>
Date: Sun Aug 2 01:12:24 2015 +0800
Fix tdf#87889 and tdf#92535, vertical align issue when docgrid enable.
Change-Id: I2f1f7609e9ceed3804be76775eeebcddd9e443c6
Reviewed-on: https://gerrit.libreoffice.org/17462
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthieb...@gmail.com>
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 51c0e26..9c20c2f 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -4831,8 +4831,7 @@ void SwCellFrm::Format( vcl::RenderContext*
/*pRenderContext*/, const SwBorderAt
if ( !FindTabFrm()->IsRebuildLastLine() && text::VertOrientation::NONE !=
rOri.GetVertOrient() &&
// #158225# no vertical alignment of covered cells
!IsCoveredCell() &&
- // #116532# Do not consider vertical alignment in grid mode
- !(pPg = FindPageFrm())->HasGrid() )
+ (pPg = FindPageFrm())!=NULL )
{
if ( !Lower()->IsContentFrm() && !Lower()->IsSctFrm() &&
!Lower()->IsTabFrm() )
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
