diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-07-08 10:03:40 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-07-08 10:03:40 +0000 |
| commit | 1c08d5d7d57a94dc36ee3a669d7662a1571f022b (patch) | |
| tree | 6fb7510f85ccd28a16001487ac1380fa8d5badb5 /sw/source/core/layout/hffrm.cxx | |
| parent | 645d80c00ca8321896a071eef222b4c339b5777b (diff) | |
INTEGRATION: CWS swqbf34 (1.19.144); FILE MERGED
2005/06/28 10:05:02 od 1.19.144.1: #i46941# - assure that anchor text frame is valid before formatting
its anchored objects
Diffstat (limited to 'sw/source/core/layout/hffrm.cxx')
| -rw-r--r-- | sw/source/core/layout/hffrm.cxx | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/sw/source/core/layout/hffrm.cxx b/sw/source/core/layout/hffrm.cxx index 9f568c7a4bef..5b835360d677 100644 --- a/sw/source/core/layout/hffrm.cxx +++ b/sw/source/core/layout/hffrm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: hffrm.cxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: vg $ $Date: 2005-03-23 13:00:14 $ + * last change: $Author: obo $ $Date: 2005-07-08 11:03:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -319,7 +319,14 @@ void SwHeadFootFrm::FormatSize(SwTwips nUL, const SwBorderAttrs * pAttrs) pFrm->Calc(); // --> OD 2005-03-03 #i43771# - format also object anchored // at the frame - if ( pFrm->IsTxtFrm() ) + // --> OD 2005-05-03 #i46941# - frame has to be valid. + // Note: frame could be invalid after calling its format, + // if it's locked + ASSERT( StackHack::IsLocked() || !pFrm->IsTxtFrm() || + pFrm->IsValid() || + static_cast<SwTxtFrm*>(pFrm)->IsJoinLocked(), + "<SwHeadFootFrm::FormatSize(..)> - text frame invalid and not locked." ); + if ( pFrm->IsTxtFrm() && pFrm->IsValid() ) { if ( !SwObjectFormatter::FormatObjsAtFrm( *pFrm, *(pFrm->FindPageFrm()) ) ) |