You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by pe...@apache.org on 2015/09/26 00:23:26 UTC

svn commit: r1705365 - /openoffice/trunk/main/sw/source/core/layout/tabfrm.cxx

Author: pescetti
Date: Fri Sep 25 22:23:26 2015
New Revision: 1705365

URL: http://svn.apache.org/viewvc?rev=1705365&view=rev
Log:
#i107471# Fix alignment settings in CJK text.
Patch by: Mark Hung <ma...@gmail.com>

Modified:
    openoffice/trunk/main/sw/source/core/layout/tabfrm.cxx

Modified: openoffice/trunk/main/sw/source/core/layout/tabfrm.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/layout/tabfrm.cxx?rev=1705365&r1=1705364&r2=1705365&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/layout/tabfrm.cxx (original)
+++ openoffice/trunk/main/sw/source/core/layout/tabfrm.cxx Fri Sep 25 22:23:26 2015
@@ -5327,9 +5327,7 @@ void SwCellFrm::Format( const SwBorderAt
     // --> OD 2008-07-16 #158225# no vertical alignment of covered cells
          !IsCoveredCell() &&
     // <--
-    // --> FME 2004-06-29 #116532# Do not consider vertical alignment in grid mode
-         !(pPg = FindPageFrm())->HasGrid() )
-    // <--
+         (pPg = FindPageFrm())!=NULL )
 	{
         if ( !Lower()->IsCntntFrm() && !Lower()->IsSctFrm() && !Lower()->IsTabFrm() )
 		{