summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorMark Hung <marklh9@gmail.com>2015-08-02 01:12:24 +0800
committerNorbert Thiebaud <nthiebaud@gmail.com>2015-08-16 17:07:30 +0000
commit7e383cb50c6020b86ac7857ece8a6273b7eb1a5e (patch)
tree87731ac51885c37201e36678018a840aab227bd8 /sw
parent0d737f26833a0540ef3144c94ce603f96d4aff7c (diff)
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 <ci@libreoffice.org> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/layout/tabfrm.cxx3
1 files changed, 1 insertions, 2 deletions
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 51c0e26e2d15..9c20c2ffbb83 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() )
{