diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2007-02-28 14:46:00 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2007-02-28 14:46:00 +0000 |
commit | ae666c139b682b270b24b7f096cc9b2fee6d5f9d (patch) | |
tree | 98395f8a62c2abaae03674fc43b5ee39cc2a0286 /sw/source/core/inc/rowfrm.hxx | |
parent | 18a3036f0d53b7287748c55cde0574447c6979f8 (diff) |
INTEGRATION: CWS swnewtable (1.8.306); FILE MERGED
2006/11/08 15:44:57 fme 1.8.306.3: #i4032# New table concept
2006/11/03 15:15:55 fme 1.8.306.2: #i4032# New table concept
2006/10/31 07:18:05 fme 1.8.306.1: #i4032# New Table concept
Diffstat (limited to 'sw/source/core/inc/rowfrm.hxx')
-rw-r--r-- | sw/source/core/inc/rowfrm.hxx | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/sw/source/core/inc/rowfrm.hxx b/sw/source/core/inc/rowfrm.hxx index ef8ffab8df8a..36b4f1985aac 100644 --- a/sw/source/core/inc/rowfrm.hxx +++ b/sw/source/core/inc/rowfrm.hxx @@ -4,9 +4,9 @@ * * $RCSfile: rowfrm.hxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: rt $ $Date: 2006-03-09 14:05:58 $ + * last change: $Author: vg $ $Date: 2007-02-28 15:46:00 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -48,10 +48,8 @@ class SwRowFrm: public SwLayoutFrm { virtual void Format( const SwBorderAttrs *pAttrs = 0 ); //Aendern nur die Framesize, nicht die PrtArea-SSize - virtual SwTwips ShrinkFrm( SwTwips, SZPTR - BOOL bTst = FALSE, BOOL bInfo = FALSE ); - virtual SwTwips GrowFrm ( SwTwips, SZPTR - BOOL bTst = FALSE, BOOL bInfo = FALSE ); + virtual SwTwips ShrinkFrm( SwTwips, BOOL bTst = FALSE, BOOL bInfo = FALSE ); + virtual SwTwips GrowFrm ( SwTwips, BOOL bTst = FALSE, BOOL bInfo = FALSE ); const SwTableLine *pTabLine; SwRowFrm* pFollowRow; @@ -62,6 +60,7 @@ class SwRowFrm: public SwLayoutFrm // <-- collapsing bool bIsFollowFlowRow; bool bIsRepeatedHeadline; + bool mbIsRowSpanLine; protected: virtual void MakeAll(); @@ -112,6 +111,10 @@ public: bool ShouldRowKeepWithNext() const; // <-- + // --> FME 2006-10-30 #i4032# NEW TABLES + bool IsRowSpanLine() const { return mbIsRowSpanLine; } + void SetRowSpanLine( bool bNew ) { mbIsRowSpanLine = bNew; } + DECL_FIXEDMEMPOOL_NEWDEL(SwRowFrm) }; |