Return-Path: 
 <ooo-commits-return-11188-apmail-incubator-ooo-commits-archive=incubator.apache.org@incubator.apache.org>
X-Original-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org
Delivered-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 858D49EAC
	for <apmail-incubator-ooo-commits-archive@minotaur.apache.org>;
 Tue, 12 Jun 2012 09:36:32 +0000 (UTC)
Received: (qmail 42984 invoked by uid 500); 12 Jun 2012 09:36:32 -0000
Delivered-To: apmail-incubator-ooo-commits-archive@incubator.apache.org
Received: (qmail 42914 invoked by uid 500); 12 Jun 2012 09:36:32 -0000
Mailing-List: contact ooo-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:ooo-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:ooo-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:ooo-commits@incubator.apache.org>
List-Id: <ooo-commits.incubator.apache.org>
Reply-To: ooo-dev@incubator.apache.org
Delivered-To: mailing list ooo-commits@incubator.apache.org
Received: (qmail 42902 invoked by uid 99); 12 Jun 2012 09:36:32 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Jun 2012 09:36:32 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Jun 2012 09:36:31 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 17EC523889BF;
	Tue, 12 Jun 2012 09:36:11 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1349212 -
 /incubator/ooo/trunk/main/sw/source/core/layout/flowfrm.cxx
Date: Tue, 12 Jun 2012 09:36:11 -0000
To: ooo-commits@incubator.apache.org
From: orw@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120612093611.17EC523889BF@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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;