summaryrefslogtreecommitdiff
path: root/sw/source/core/text/widorp.hxx
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2004-03-23 10:26:17 +0000
committerKurt Zenker <kz@openoffice.org>2004-03-23 10:26:17 +0000
commit124242a8b9c548495aae09855c351c34bbeddff4 (patch)
tree92f7bbaf1069eb1f8f88cc1560acf7aa1448245b /sw/source/core/text/widorp.hxx
parent398ba8f2696b153421cc56706f64af80d33c0201 (diff)
INTEGRATION: CWS swformatcells (1.3.166); FILE MERGED
2004/03/02 15:28:30 od 1.3.166.1: #106629# <SwTxtFrmBreak::SetRstHeight(..)> - consider bottom margin
Diffstat (limited to 'sw/source/core/text/widorp.hxx')
-rw-r--r--sw/source/core/text/widorp.hxx18
1 files changed, 4 insertions, 14 deletions
diff --git a/sw/source/core/text/widorp.hxx b/sw/source/core/text/widorp.hxx
index 042c35a54cb7..f3d31d642529 100644
--- a/sw/source/core/text/widorp.hxx
+++ b/sw/source/core/text/widorp.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: widorp.hxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: hjs $ $Date: 2003-09-25 10:50:08 $
+ * last change: $Author: kz $ $Date: 2004-03-23 11:26:17 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -100,18 +100,8 @@ public:
// Es wird dabei davon ausgegangen, dass rLine auf der letzten Zeile
// steht, die nicht mehr passt.
-#ifdef VERTICAL_LAYOUT
- void SetRstHeight( const SwTxtMargin &rLine )
- {
- if ( pFrm->IsVertical() )
- nRstHeight = nOrigin - pFrm->SwitchHorizontalToVertical( rLine.Y() );
- else
- nRstHeight = rLine.Y() - nOrigin;
- }
-#else
- void SetRstHeight( const SwTxtMargin &rLine ) { nRstHeight = rLine.Y() - nOrigin; }
-#endif
-
+ // OD 2004-02-27 #106629# - no longer inline
+ void SetRstHeight( const SwTxtMargin &rLine );
SwTwips GetRstHeight() const { return nRstHeight; }
};