diff options
| author | Oliver-Rainer Wittmann <orw@apache.org> | 2012-06-12 08:36:10 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-04-12 13:05:42 +0100 |
| commit | 38a3e82938de1b82fadd47d3d53d530f04db6891 (patch) | |
| tree | cf622435590fb29aace910669b3c8e1ae166986a /sw | |
| parent | eeef836f689f6461f7e60bf1a151c6a362a01e59 (diff) | |
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
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/layout/flowfrm.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx index d115bb488412..a8bc8fe7b33e 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; |