flowfrm.cxx (efeef26f) | flowfrm.cxx (7a3ba306) |
---|---|
1/************************************************************** 2 * 3 * Licensed to the Apache Software Foundation (ASF) under one 4 * or more contributor license agreements. See the NOTICE file 5 * distributed with this work for additional information 6 * regarding copyright ownership. The ASF licenses this file 7 * to you under the Apache License, Version 2.0 (the 8 * "License"); you may not use this file except in compliance --- 1714 unchanged lines hidden (view full) --- 1723SwTwips SwFlowFrm::GetUpperSpaceAmountConsideredForPrevFrmAndPageGrid() const 1724{ 1725 SwTwips nUpperSpaceAmountConsideredForPrevFrmAndPageGrid = 0; 1726 1727 if ( !rThis.GetUpper()->GetFmt()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::USE_FORMER_OBJECT_POS) ) 1728 { 1729 nUpperSpaceAmountConsideredForPrevFrmAndPageGrid = 1730 _GetUpperSpaceAmountConsideredForPrevFrm() + | 1/************************************************************** 2 * 3 * Licensed to the Apache Software Foundation (ASF) under one 4 * or more contributor license agreements. See the NOTICE file 5 * distributed with this work for additional information 6 * regarding copyright ownership. The ASF licenses this file 7 * to you under the Apache License, Version 2.0 (the 8 * "License"); you may not use this file except in compliance --- 1714 unchanged lines hidden (view full) --- 1723SwTwips SwFlowFrm::GetUpperSpaceAmountConsideredForPrevFrmAndPageGrid() const 1724{ 1725 SwTwips nUpperSpaceAmountConsideredForPrevFrmAndPageGrid = 0; 1726 1727 if ( !rThis.GetUpper()->GetFmt()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::USE_FORMER_OBJECT_POS) ) 1728 { 1729 nUpperSpaceAmountConsideredForPrevFrmAndPageGrid = 1730 _GetUpperSpaceAmountConsideredForPrevFrm() + |
1731 _GetUpperSpaceAmountConsideredForPageGrid( CalcUpperSpace( 0L, 0L, false ) ); | 1731 ( rThis.GetUpper()->GetFmt()->GetDoc()->IsSquaredPageMode() 1732 ? _GetUpperSpaceAmountConsideredForPageGrid( CalcUpperSpace( 0, 0, false ) ) 1733 : 0 ); |
1732 } 1733 1734 return nUpperSpaceAmountConsideredForPrevFrmAndPageGrid; 1735} 1736 1737/** calculation of lower space 1738 1739 OD 2004-03-02 #106629# --- 982 unchanged lines hidden --- | 1734 } 1735 1736 return nUpperSpaceAmountConsideredForPrevFrmAndPageGrid; 1737} 1738 1739/** calculation of lower space 1740 1741 OD 2004-03-02 #106629# --- 982 unchanged lines hidden --- |