diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-11-16 14:54:20 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-11-16 14:54:20 +0000 |
| commit | 4f165b8f24ca58924bc2c0012a10250f20ef0446 (patch) | |
| tree | a431b69d89103cd5f7b2ee1c805fbc99773558b0 /sw/source/core/txtnode/atrflyin.cxx | |
| parent | bcdc5ba93d728933993032e45d4a8a45ecc78ae0 (diff) | |
INTEGRATION: CWS swqbugfixes09 (1.3.172); FILE MERGED
2004/11/09 13:12:19 od 1.3.172.1: #i26945# <SwTxtFlyCnt::_GetFlyFrm(..)> - use new object formatter.
Diffstat (limited to 'sw/source/core/txtnode/atrflyin.cxx')
| -rw-r--r-- | sw/source/core/txtnode/atrflyin.cxx | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/sw/source/core/txtnode/atrflyin.cxx b/sw/source/core/txtnode/atrflyin.cxx index 08d89ec43bf3..ba5d4663bbd8 100644 --- a/sw/source/core/txtnode/atrflyin.cxx +++ b/sw/source/core/txtnode/atrflyin.cxx @@ -2,9 +2,9 @@ * * $RCSfile: atrflyin.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: hjs $ $Date: 2004-06-28 13:44:59 $ + * last change: $Author: obo $ $Date: 2004-11-16 15:54:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -82,6 +82,11 @@ #include "swfont.hxx" #include "txtfrm.hxx" #include "flyfrms.hxx" +// --> OD 2004-11-09 #i26945# +#ifndef _OBJECTFORMATTER_HXX +#include <objectformatter.hxx> +#endif +// <-- SwFmtFlyCnt::SwFmtFlyCnt( SwFrmFmt *pFrmFmt ) : SfxPoolItem( RES_TXTATR_FLYCNT ), @@ -311,12 +316,11 @@ SwFlyInCntFrm *SwTxtFlyCnt::_GetFlyFrm( const SwFrm *pCurrFrm ) // 7922: Wir muessen dafuer sorgen, dass der Inhalt des FlyInCnt // nach seiner Konstruktion stramm durchformatiert wird. - SwCntntFrm *pFrm = pFly->ContainsCntnt(); - while( pFrm ) - { - pFrm->Calc(); - pFrm = pFrm->GetNextCntntFrm(); - } + // --> OD 2004-11-09 #i26945# - Use new object formatter to format Writer + // fly frame and its content. + SwObjectFormatter::FormatObj( *pFly, const_cast<SwFrm*>(pCurrFrm), + pCurrFrm->FindPageFrm() ); + // <-- return pFly; } |