diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-08-23 07:44:56 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-08-23 07:44:56 +0000 |
| commit | bfba3d53ae691b8b7cd284238f9a1f30114465cc (patch) | |
| tree | 0f8a8e309eac4845b7ff6b8f759bfc19c3a96f5f /sw/source | |
| parent | 49063034debc6c063997973fa0bff45872370d66 (diff) | |
INTEGRATION: CWS tune03 (1.48.6); FILE MERGED
2004/08/09 21:31:23 mhu 1.48.6.2: RESYNC: (1.48-1.49); FILE MERGED
2004/07/19 19:10:55 mhu 1.48.6.1: #i29979# Added SW_DLLPUBLIC/PRIVATE (see swdllapi.h) to exported symbols/classes.
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/core/layout/atrfrm.cxx | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index dbb3b08aaa93..4e75e6aeb373 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: atrfrm.cxx,v $ * - * $Revision: 1.50 $ + * $Revision: 1.51 $ * - * last change: $Author: rt $ $Date: 2004-08-23 08:02:24 $ + * last change: $Author: rt $ $Date: 2004-08-23 08:44:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -323,9 +323,6 @@ using namespace ::rtl; SV_IMPL_PTRARR(SwColumns,SwColumn*) -TYPEINIT1(SwFrmFmt, SwFmt ); //rtti fuer SwFrmFmt -TYPEINIT1(SwFlyFrmFmt, SwFrmFmt); -TYPEINIT1(SwDrawFrmFmt, SwFrmFmt); TYPEINIT1(SwFmtVertOrient, SfxPoolItem); TYPEINIT1(SwFmtHoriOrient, SfxPoolItem); TYPEINIT2(SwFmtHeader, SfxPoolItem, SwClient ); @@ -2617,6 +2614,9 @@ SfxPoolItem* SwHeaderAndFooterEatSpacingItem::Clone( SfxItemPool* pPool ) const // class SwFrmFmt // Implementierung teilweise inline im hxx +TYPEINIT1( SwFrmFmt, SwFmt ); +IMPL_FIXEDMEMPOOL_NEWDEL_DLL( SwFrmFmt, 20, 20 ) + void SwFrmFmt::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew ) { SwFmtHeader *pH = 0; @@ -2832,6 +2832,9 @@ void SwFrmFmt::SetPositionLayoutDir( const sal_Int16 _nPositionLayoutDir ) // class SwFlyFrmFmt // Implementierung teilweise inline im hxx +TYPEINIT1( SwFlyFrmFmt, SwFrmFmt ); +IMPL_FIXEDMEMPOOL_NEWDEL( SwFlyFrmFmt, 10, 10 ) + SwFlyFrmFmt::~SwFlyFrmFmt() { SwClientIter aIter( *this ); @@ -3095,6 +3098,9 @@ const sal_Bool SwFlyFrmFmt::IsBackgroundBrushInherited() const // class SwDrawFrmFmt // Implementierung teilweise inline im hxx +TYPEINIT1( SwDrawFrmFmt, SwFrmFmt ); +IMPL_FIXEDMEMPOOL_NEWDEL( SwDrawFrmFmt, 10, 10 ) + #pragma optimize( "e", off ) SwDrawFrmFmt::~SwDrawFrmFmt() |