sw/source/core/layout/flowfrm.cxx | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 38a3e82938de1b82fadd47d3d53d530f04db6891
Author: Oliver-Rainer Wittmann <o...@apache.org>
Date: Tue Jun 12 08:36:10 2012 +0000
Related: #i119624# 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>
(cherry picked from commit 53ba60618af3977f5e5488225dcf050a517fb5b8)
Change-Id: If6592a41f0ef67cc20fa8b3ddaefa36571561f85
diff --git a/sw/source/core/layout/flowfrm.cxx
b/sw/source/core/layout/flowfrm.cxx
index d115bb4..a8bc8fe 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -1733,7 +1733,9 @@ SwTwips
SwFlowFrm::GetUpperSpaceAmountConsideredForPrevFrmAndPageGrid() const
{
nUpperSpaceAmountConsideredForPrevFrmAndPageGrid =
_GetUpperSpaceAmountConsideredForPrevFrm() +
- _GetUpperSpaceAmountConsideredForPageGrid( CalcUpperSpace( 0L, 0L,
false ) );
+ ( rThis.GetUpper()->GetFmt()->GetDoc()->IsSquaredPageMode()
+ ? _GetUpperSpaceAmountConsideredForPageGrid( CalcUpperSpace( 0,
0, false ) )
+ : 0 );
}
return nUpperSpaceAmountConsideredForPrevFrmAndPageGrid;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
