diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-03-17 11:48:39 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-03-17 11:48:39 +0000 |
| commit | 0500dce90588a7ae8fc3e0268512ac44baf89aed (patch) | |
| tree | 9ad28656dbd35eb1b1cae75d85db2eea07360e83 /sw/source/core | |
| parent | a5b7a319baec178b522c425f9f9c4a38a2c5974e (diff) | |
INTEGRATION: CWS fmebugs01 (1.19.46); FILE MERGED
2004/03/05 15:07:56 fme 1.19.46.2: RESYNC: (1.19-1.22); FILE MERGED
2004/03/05 10:01:56 fme 1.19.46.1: #114798# Some minor fixes to prevent loops with table frames
Diffstat (limited to 'sw/source/core')
| -rw-r--r-- | sw/source/core/layout/findfrm.cxx | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sw/source/core/layout/findfrm.cxx b/sw/source/core/layout/findfrm.cxx index 0863cce4db97..5cc186d9df9f 100644 --- a/sw/source/core/layout/findfrm.cxx +++ b/sw/source/core/layout/findfrm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: findfrm.cxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: kz $ $Date: 2004-02-26 16:59:50 $ + * last change: $Author: obo $ $Date: 2004-03-17 12:48:39 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1319,6 +1319,9 @@ void SwFrm::SetDirFlags( BOOL bVert ) { SwFrm* pAsk = IsFlyFrm() ? ((SwFlyFrm*)this)->GetAnchor() : GetUpper(); + + ASSERT( pAsk != this, "Autsch! Stack overflow is about to happen" ) + if( pAsk ) { bVertical = pAsk->IsVertical() ? 1 : 0; @@ -1339,6 +1342,9 @@ void SwFrm::SetDirFlags( BOOL bVert ) { SwFrm* pAsk = IsFlyFrm() ? ((SwFlyFrm*)this)->GetAnchor() : GetUpper(); + + ASSERT( pAsk != this, "Autsch! Stack overflow is about to happen" ) + if( pAsk ) bRightToLeft = pAsk->IsRightToLeft() ? 1 : 0; if( !pAsk || pAsk->bInvalidR2L ) |