diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-01-07 15:33:16 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-01-07 15:33:16 +0000 |
| commit | 6d320ca1d9a5e99170a1d711e53ae57e66f601f6 (patch) | |
| tree | 5fa90770b73cdcdb35a4f7cd4c533ea2bb8ecc68 /sw | |
| parent | b0b720910cf3ea008d498627c612f48f1fdcd9d7 (diff) | |
INTEGRATION: CWS geordi2q12 (1.26.62); FILE MERGED
2004/01/07 12:14:48 hr 1.26.62.1: #111934#: merge CWS sw7pp2a -> SRC680
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/layout/flowfrm.cxx | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx index 66a1295ad1e7..666c0db5f190 100644 --- a/sw/source/core/layout/flowfrm.cxx +++ b/sw/source/core/layout/flowfrm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: flowfrm.cxx,v $ * - * $Revision: 1.26 $ + * $Revision: 1.27 $ * - * last change: $Author: rt $ $Date: 2003-11-24 16:05:13 $ + * last change: $Author: rt $ $Date: 2004-01-07 16:33:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -877,12 +877,19 @@ SwLayoutFrm *SwFrm::GetNextLeaf( MakePageType eMakePage ) // die Verkettung absuchen. if( IsInFly() ) eMakePage = MAKEPAGE_NONE; + //Bei Tabellen gleich den grossen Sprung wagen, ein einfaches GetNext... //wuerde die erste Zellen und in der Folge alle weiteren Zellen nacheinander //abklappern.... - SwLayoutFrm *pLayLeaf; + SwLayoutFrm *pLayLeaf = 0; if ( IsTabFrm() ) - pLayLeaf = ((SwTabFrm*)this)->FindLastCntnt()->GetUpper(); + { + SwCntntFrm* pTmp = ((SwTabFrm*)this)->FindLastCntnt(); + if ( pTmp ) + pLayLeaf = pTmp->GetUpper(); + else + pLayLeaf = GetNextLayoutLeaf(); + } else pLayLeaf = GetNextLayoutLeaf(); |