diff options
| author | Kurt Zenker <kz@openoffice.org> | 2004-08-02 13:08:25 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2004-08-02 13:08:25 +0000 |
| commit | c34227ddbf119516654a0ca2e71c477dcb78f40f (patch) | |
| tree | 1b0d66e467598b81b01271e210fd2b9a600a7fcb /sw/source/core/layout/findfrm.cxx | |
| parent | 2d9d895a556484e25d81526cce6d65d2ed2b2cdd (diff) | |
INTEGRATION: CWS swobjpos04 (1.24.24); FILE MERGED
2004/07/13 01:34:35 od 1.24.24.2: RESYNC: (1.24-1.27); FILE MERGED
resolve merge conflicts.
2004/06/30 15:04:54 od 1.24.24.1: #i28701# - merge changes of cws swdrawpositioning
- further adjustments for the new object positioning
Diffstat (limited to 'sw/source/core/layout/findfrm.cxx')
| -rw-r--r-- | sw/source/core/layout/findfrm.cxx | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/sw/source/core/layout/findfrm.cxx b/sw/source/core/layout/findfrm.cxx index 7245cdf0af..d30267e3a8 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.27 $ + * $Revision: 1.28 $ * - * last change: $Author: hjs $ $Date: 2004-06-28 13:38:25 $ + * last change: $Author: kz $ $Date: 2004-08-02 14:08:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -551,11 +551,11 @@ SwPageFrm* SwFrm::FindPageFrm() pRet = pRet->GetUpper(); else if ( pRet->IsFlyFrm() ) { - if ( ((SwFlyFrm*)pRet)->IsFlyFreeFrm() && - ((SwFlyFreeFrm*)pRet)->GetPage() ) - pRet = ((SwFlyFreeFrm*)pRet)->GetPage(); + // --> OD 2004-06-30 #i28701# - use new method <GetPageFrm()> + if ( static_cast<SwFlyFrm*>(pRet)->GetPageFrm() ) + pRet = static_cast<SwFlyFrm*>(pRet)->GetPageFrm(); else - pRet = ((SwFlyFrm*)pRet)->AnchorFrm(); + pRet = static_cast<SwFlyFrm*>(pRet)->AnchorFrm(); } else return 0; @@ -576,10 +576,11 @@ SwFtnBossFrm* SwFrm::FindFtnBossFrm( BOOL bFootnotes ) pRet = pRet->GetUpper(); else if ( pRet->IsFlyFrm() ) { - if ( ((SwFlyFrm*)pRet)->IsFlyFreeFrm() ) - pRet = ((SwFlyFreeFrm*)pRet)->GetPage(); + // --> OD 2004-06-30 #i28701# - use new method <GetPageFrm()> + if ( static_cast<SwFlyFrm*>(pRet)->GetPageFrm() ) + pRet = static_cast<SwFlyFrm*>(pRet)->GetPageFrm(); else - pRet = ((SwFlyFrm*)pRet)->AnchorFrm(); + pRet = static_cast<SwFlyFrm*>(pRet)->AnchorFrm(); } else return 0; |