You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by or...@apache.org on 2012/06/12 11:36:11 UTC
svn commit: r1349212 -
/incubator/ooo/trunk/main/sw/source/core/layout/flowfrm.cxx
Author: orw
Date: Tue Jun 12 09:36:10 2012
New Revision: 1349212
URL: http://svn.apache.org/viewvc?rev=1349212&view=rev
Log:
#119624# - method <SwFlowFrm::GetUpperSpaceAmountConsideredForPrevFrmAndPageGrid()>
- consider upper space amount only for page grids in squared page mode
Found by: louqle <louqingle at gmail dot com>
Patch by: Oliver-Rainer Wittmann <orw at apache dot org>
Review by: zjchen <zjchencdl at gmail dot com>
Modified:
incubator/ooo/trunk/main/sw/source/core/layout/flowfrm.cxx
Modified: incubator/ooo/trunk/main/sw/source/core/layout/flowfrm.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/source/core/layout/flowfrm.cxx?rev=1349212&r1=1349211&r2=1349212&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/source/core/layout/flowfrm.cxx (original)
+++ incubator/ooo/trunk/main/sw/source/core/layout/flowfrm.cxx Tue Jun 12 09:36:10 2012
@@ -1728,7 +1728,9 @@ SwTwips SwFlowFrm::GetUpperSpaceAmountCo
{
nUpperSpaceAmountConsideredForPrevFrmAndPageGrid =
_GetUpperSpaceAmountConsideredForPrevFrm() +
- _GetUpperSpaceAmountConsideredForPageGrid( CalcUpperSpace( 0L, 0L, false ) );
+ ( rThis.GetUpper()->GetFmt()->GetDoc()->IsSquaredPageMode()
+ ? _GetUpperSpaceAmountConsideredForPageGrid( CalcUpperSpace( 0, 0, false ) )
+ : 0 );
}
return nUpperSpaceAmountConsideredForPrevFrmAndPageGrid;