diff options
Diffstat (limited to 'sw/source/core/layout')
37 files changed, 4225 insertions, 4225 deletions
diff --git a/sw/source/core/layout/anchoreddrawobject.cxx b/sw/source/core/layout/anchoreddrawobject.cxx index 1a4e43b5debf..1de341212b8d 100644 --- a/sw/source/core/layout/anchoreddrawobject.cxx +++ b/sw/source/core/layout/anchoreddrawobject.cxx @@ -84,7 +84,7 @@ SwPosNotify::~SwPosNotify() // --> #i43255# - refine condition to avoid unneeded // invalidations: anchored object had to be on the page of its anchor // text frame. - if ( mpAnchoredDrawObj->GetAnchorFrm()->IsTxtFrm() && + if ( mpAnchoredDrawObj->GetAnchorFrm()->IsTextFrm() && mpOldPageFrm == mpAnchoredDrawObj->GetAnchorFrm()->FindPageFrm() ) { mpAnchoredDrawObj->AnchorFrm()->Prepare( PREP_FLY_LEAVE ); @@ -214,13 +214,13 @@ SwAnchoredDrawObject::~SwAnchoredDrawObject() // --> #i62875# void SwAnchoredDrawObject::UpdateLayoutDir() { - SwFrmFmt::tLayoutDir nOldLayoutDir( GetFrmFmt().GetLayoutDir() ); + SwFrameFormat::tLayoutDir nOldLayoutDir( GetFrameFormat().GetLayoutDir() ); SwAnchoredObject::UpdateLayoutDir(); if ( !NotYetPositioned() && - GetFrmFmt().GetLayoutDir() != nOldLayoutDir && - GetFrmFmt().GetDoc()->GetDocumentSettingManager().get(DocumentSettingId::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE) && + GetFrameFormat().GetLayoutDir() != nOldLayoutDir && + GetFrameFormat().GetDoc()->GetDocumentSettingManager().get(DocumentSettingId::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE) && !IsOutsidePage() ) { mbCaptureAfterLayoutDirChange = true; @@ -271,7 +271,7 @@ void SwAnchoredDrawObject::MakeObjPos() // positioned, convert its positioning attributes, if its positioning // attributes are given in horizontal left-to-right layout. // --> #i36010# - Note: horizontal left-to-right layout is made - // the default layout direction for <SwDrawFrmFmt> instances. Thus, it has + // the default layout direction for <SwDrawFrameFormat> instances. Thus, it has // to be adjusted manually, if no adjustment of the positioning attributes // have to be performed here. // --> #i35635# - additionally move drawing object to the visible layer. @@ -284,7 +284,7 @@ void SwAnchoredDrawObject::MakeObjPos() // #i44334#, #i44681# - check, if positioning // attributes already have been set. if ( !GetDrawObj()->ISA(SwDrawVirtObj) && - !static_cast<SwDrawFrmFmt&>(GetFrmFmt()).IsPosAttrSet() ) + !static_cast<SwDrawFrameFormat&>(GetFrameFormat()).IsPosAttrSet() ) { _SetPositioningAttr(); } @@ -389,7 +389,7 @@ void SwAnchoredDrawObject::_MakeObjPosAnchoredAtPara() // position. E.g., for at-character anchored object this can be the follow // frame of the anchor frame, which contains the anchor character. const bool bFormatAnchor = - !static_cast<const SwTxtFrm*>( GetAnchorFrmContainingAnchPos() )->IsAnyJoinLocked() && + !static_cast<const SwTextFrm*>( GetAnchorFrmContainingAnchPos() )->IsAnyJoinLocked() && !ConsiderObjWrapInfluenceOnObjPos() && !ConsiderObjWrapInfluenceOfOtherObjs(); @@ -415,7 +415,7 @@ void SwAnchoredDrawObject::_MakeObjPosAnchoredAtPara() SwPosNotify aPosNotify( this ); // determine and set position - objectpositioning::SwToCntntAnchoredObjectPosition + objectpositioning::SwToContentAnchoredObjectPosition aObjPositioning( *DrawObj() ); aObjPositioning.CalcPosition(); @@ -522,13 +522,13 @@ void SwAnchoredDrawObject::_SetDrawObjAnchor() */ void SwAnchoredDrawObject::_InvalidatePage( SwPageFrm* _pPageFrm ) { - if ( _pPageFrm && !_pPageFrm->GetFmt()->GetDoc()->IsInDtor() ) + if ( _pPageFrm && !_pPageFrm->GetFormat()->GetDoc()->IsInDtor() ) { if ( _pPageFrm->GetUpper() ) { // --> #i35007# - correct invalidation for as-character // anchored objects. - if ( GetFrmFmt().GetAnchor().GetAnchorId() == FLY_AS_CHAR ) + if ( GetFrameFormat().GetAnchor().GetAnchorId() == FLY_AS_CHAR ) { _pPageFrm->InvalidateFlyInCnt(); } @@ -541,7 +541,7 @@ void SwAnchoredDrawObject::_InvalidatePage( SwPageFrm* _pPageFrm ) pRootFrm->DisallowTurbo(); if ( pRootFrm->GetTurbo() ) { - const SwCntntFrm* pTmpFrm = pRootFrm->GetTurbo(); + const SwContentFrm* pTmpFrm = pRootFrm->GetTurbo(); pRootFrm->ResetTurbo(); pTmpFrm->InvalidatePage(); } @@ -567,14 +567,14 @@ void SwAnchoredDrawObject::InvalidateObjPos() // anchored object, because its positioned by the format of its anchor frame. // --> #i44559# - assure, that text hint is already // existing in the text frame - if ( GetAnchorFrm()->ISA(SwTxtFrm) && - (GetFrmFmt().GetAnchor().GetAnchorId() == FLY_AS_CHAR) ) + if ( GetAnchorFrm()->ISA(SwTextFrm) && + (GetFrameFormat().GetAnchor().GetAnchorId() == FLY_AS_CHAR) ) { - SwTxtFrm* pAnchorTxtFrm( static_cast<SwTxtFrm*>(AnchorFrm()) ); - if ( pAnchorTxtFrm->GetTxtNode()->GetpSwpHints() && - pAnchorTxtFrm->CalcFlyPos( &GetFrmFmt() ) != COMPLETE_STRING ) + SwTextFrm* pAnchorTextFrm( static_cast<SwTextFrm*>(AnchorFrm()) ); + if ( pAnchorTextFrm->GetTextNode()->GetpSwpHints() && + pAnchorTextFrm->CalcFlyPos( &GetFrameFormat() ) != COMPLETE_STRING ) { - AnchorFrm()->Prepare( PREP_FLY_ATTR_CHG, &GetFrmFmt() ); + AnchorFrm()->Prepare( PREP_FLY_ATTR_CHG, &GetFrameFormat() ); } } @@ -603,17 +603,17 @@ void SwAnchoredDrawObject::InvalidateObjPos() } } -SwFrmFmt& SwAnchoredDrawObject::GetFrmFmt() +SwFrameFormat& SwAnchoredDrawObject::GetFrameFormat() { - OSL_ENSURE( static_cast<SwDrawContact*>(GetUserCall(GetDrawObj()))->GetFmt(), - "<SwAnchoredDrawObject::GetFrmFmt()> - missing frame format -> crash." ); - return *(static_cast<SwDrawContact*>(GetUserCall(GetDrawObj()))->GetFmt()); + OSL_ENSURE( static_cast<SwDrawContact*>(GetUserCall(GetDrawObj()))->GetFormat(), + "<SwAnchoredDrawObject::GetFrameFormat()> - missing frame format -> crash." ); + return *(static_cast<SwDrawContact*>(GetUserCall(GetDrawObj()))->GetFormat()); } -const SwFrmFmt& SwAnchoredDrawObject::GetFrmFmt() const +const SwFrameFormat& SwAnchoredDrawObject::GetFrameFormat() const { - OSL_ENSURE( static_cast<SwDrawContact*>(GetUserCall(GetDrawObj()))->GetFmt(), - "<SwAnchoredDrawObject::GetFrmFmt()> - missing frame format -> crash." ); - return *(static_cast<SwDrawContact*>(GetUserCall(GetDrawObj()))->GetFmt()); + OSL_ENSURE( static_cast<SwDrawContact*>(GetUserCall(GetDrawObj()))->GetFormat(), + "<SwAnchoredDrawObject::GetFrameFormat()> - missing frame format -> crash." ); + return *(static_cast<SwDrawContact*>(GetUserCall(GetDrawObj()))->GetFormat()); } const SwRect SwAnchoredDrawObject::GetObjRect() const @@ -658,7 +658,7 @@ const SwRect SwAnchoredDrawObject::GetObjBoundRect() const if ( nTargetWidth != aCurrObjRect.GetWidth( ) || nTargetHeight != aCurrObjRect.GetHeight( ) ) { - SwDoc* pDoc = const_cast<SwDoc*>(GetPageFrm()->GetFmt()->GetDoc()); + SwDoc* pDoc = const_cast<SwDoc*>(GetPageFrm()->GetFormat()->GetDoc()); bool bModified = pDoc->getIDocumentState().IsModified(); const_cast< SdrObject* >( GetDrawObj() )->Resize( aCurrObjRect.TopLeft(), Fraction( nTargetWidth, aCurrObjRect.GetWidth() ), @@ -716,8 +716,8 @@ void SwAnchoredDrawObject::AdjustPositioningAttr( const SwFrm* _pNewAnchorFrm, nVertRelPos = aObjRect.Top() - aAnchorPos.Y(); } - GetFrmFmt().SetFmtAttr( SwFmtHoriOrient( nHoriRelPos, text::HoriOrientation::NONE, text::RelOrientation::FRAME ) ); - GetFrmFmt().SetFmtAttr( SwFmtVertOrient( nVertRelPos, text::VertOrientation::NONE, text::RelOrientation::FRAME ) ); + GetFrameFormat().SetFormatAttr( SwFormatHoriOrient( nHoriRelPos, text::HoriOrientation::NONE, text::RelOrientation::FRAME ) ); + GetFrameFormat().SetFormatAttr( SwFormatVertOrient( nVertRelPos, text::VertOrientation::NONE, text::RelOrientation::FRAME ) ); } // --> #i34748# - change return type. @@ -764,23 +764,23 @@ void SwAnchoredDrawObject::_SetPositioningAttr() SwTwips nVertPos = aObjRect.Top(); // #i44334#, #i44681# // perform conversion only if position is in horizontal-left-to-right-layout. - if ( GetFrmFmt().GetPositionLayoutDir() == + if ( GetFrameFormat().GetPositionLayoutDir() == text::PositionLayoutDir::PositionInHoriL2R ) { - SwFrmFmt::tLayoutDir eLayoutDir = GetFrmFmt().GetLayoutDir(); + SwFrameFormat::tLayoutDir eLayoutDir = GetFrameFormat().GetLayoutDir(); switch ( eLayoutDir ) { - case SwFrmFmt::HORI_L2R: + case SwFrameFormat::HORI_L2R: { // nothing to do } break; - case SwFrmFmt::HORI_R2L: + case SwFrameFormat::HORI_R2L: { nHoriPos = -aObjRect.Left() - aObjRect.Width(); } break; - case SwFrmFmt::VERT_R2L: + case SwFrameFormat::VERT_R2L: { nHoriPos = aObjRect.Top(); nVertPos = -aObjRect.Left() - aObjRect.Width(); @@ -796,28 +796,28 @@ void SwAnchoredDrawObject::_SetPositioningAttr() // --> #i71182# // only change position - do not lose other attributes - SwFmtHoriOrient aHori( GetFrmFmt().GetHoriOrient() ); + SwFormatHoriOrient aHori( GetFrameFormat().GetHoriOrient() ); if (nHoriPos != aHori.GetPos()) { aHori.SetPos( nHoriPos ); InvalidateObjRectWithSpaces(); - GetFrmFmt().SetFmtAttr( aHori ); + GetFrameFormat().SetFormatAttr( aHori ); } - SwFmtVertOrient aVert( GetFrmFmt().GetVertOrient() ); + SwFormatVertOrient aVert( GetFrameFormat().GetVertOrient() ); if (nVertPos != aVert.GetPos()) { aVert.SetPos( nVertPos ); InvalidateObjRectWithSpaces(); - GetFrmFmt().SetFmtAttr( aVert ); + GetFrameFormat().SetFormatAttr( aVert ); } // --> #i36010# - set layout direction of the position - GetFrmFmt().SetPositionLayoutDir( + GetFrameFormat().SetPositionLayoutDir( text::PositionLayoutDir::PositionInLayoutDirOfAnchor ); } // --> #i65798# - also for as-character anchored objects // --> #i45952# - indicate that position // attributes are set now. - static_cast<SwDrawFrmFmt&>(GetFrmFmt()).PosAttrSet(); + static_cast<SwDrawFrameFormat&>(GetFrameFormat()).PosAttrSet(); } void SwAnchoredDrawObject::NotifyBackground( SwPageFrm* _pPageFrm, diff --git a/sw/source/core/layout/anchoredobject.cxx b/sw/source/core/layout/anchoredobject.cxx index de786af98d26..e446d24c3ea8 100644 --- a/sw/source/core/layout/anchoredobject.cxx +++ b/sw/source/core/layout/anchoredobject.cxx @@ -220,11 +220,11 @@ void SwAnchoredObject::CheckCharRectAndTopOfLine( const bool _bCheckForParaPorInf ) { if ( GetAnchorFrm() && - GetAnchorFrm()->IsTxtFrm() ) + GetAnchorFrm()->IsTextFrm() ) { - const SwFmtAnchor& rAnch = GetFrmFmt().GetAnchor(); + const SwFormatAnchor& rAnch = GetFrameFormat().GetAnchor(); if ( (rAnch.GetAnchorId() == FLY_AT_CHAR) && - rAnch.GetCntntAnchor() ) + rAnch.GetContentAnchor() ) { // --> if requested, assure that anchor frame, // which contains the anchor character, has a paragraph portion information. @@ -233,7 +233,7 @@ void SwAnchoredObject::CheckCharRectAndTopOfLine( // Thus, a format of this frame is avoided to determine the // paragraph portion information. // --> #i26945# - use new method <FindAnchorCharFrm()> - const SwTxtFrm& aAnchorCharFrm = *(FindAnchorCharFrm()); + const SwTextFrm& aAnchorCharFrm = *(FindAnchorCharFrm()); if ( !_bCheckForParaPorInf || aAnchorCharFrm.HasPara() ) { _CheckCharRect( rAnch, aAnchorCharFrm ); @@ -253,12 +253,12 @@ void SwAnchoredObject::CheckCharRectAndTopOfLine( improvement - add second parameter <_rAnchorCharFrm> */ -void SwAnchoredObject::_CheckCharRect( const SwFmtAnchor& _rAnch, - const SwTxtFrm& _rAnchorCharFrm ) +void SwAnchoredObject::_CheckCharRect( const SwFormatAnchor& _rAnch, + const SwTextFrm& _rAnchorCharFrm ) { // determine rectangle of anchor character. If not exist, abort operation SwRect aCharRect; - if ( !_rAnchorCharFrm.GetAutoPos( aCharRect, *_rAnch.GetCntntAnchor() ) ) + if ( !_rAnchorCharFrm.GetAutoPos( aCharRect, *_rAnch.GetContentAnchor() ) ) { return; } @@ -269,8 +269,8 @@ void SwAnchoredObject::_CheckCharRect( const SwFmtAnchor& _rAnch, { SWRECTFN( (&_rAnchorCharFrm) ); // determine positioning and alignment - SwFmtVertOrient aVert( GetFrmFmt().GetVertOrient() ); - SwFmtHoriOrient aHori( GetFrmFmt().GetHoriOrient() ); + SwFormatVertOrient aVert( GetFrameFormat().GetVertOrient() ); + SwFormatHoriOrient aHori( GetFrameFormat().GetHoriOrient() ); // check for anchor character rectangle changes for certain // positionings and alignments // add condition to invalidate position, @@ -317,16 +317,16 @@ void SwAnchoredObject::_CheckCharRect( const SwFmtAnchor& _rAnch, improvement - add second parameter <_rAnchorCharFrm> */ -void SwAnchoredObject::_CheckTopOfLine( const SwFmtAnchor& _rAnch, - const SwTxtFrm& _rAnchorCharFrm ) +void SwAnchoredObject::_CheckTopOfLine( const SwFormatAnchor& _rAnch, + const SwTextFrm& _rAnchorCharFrm ) { SwTwips nTopOfLine = 0L; - if ( _rAnchorCharFrm.GetTopOfLine( nTopOfLine, *_rAnch.GetCntntAnchor() ) ) + if ( _rAnchorCharFrm.GetTopOfLine( nTopOfLine, *_rAnch.GetContentAnchor() ) ) { if ( nTopOfLine != mnLastTopOfLine ) { // check alignment for invalidation of position - if ( GetFrmFmt().GetVertOrient().GetRelationOrient() == text::RelOrientation::TEXT_LINE ) + if ( GetFrameFormat().GetVertOrient().GetRelationOrient() == text::RelOrientation::TEXT_LINE ) { // #i26945#, #i35911# - unlock position of // anchored object, if it isn't registered at the page, @@ -370,7 +370,7 @@ void SwAnchoredObject::ObjectAttachedToAnchorFrame() */ void SwAnchoredObject::UpdateLayoutDir() { - SwFrmFmt::tLayoutDir nLayoutDir = SwFrmFmt::HORI_L2R; + SwFrameFormat::tLayoutDir nLayoutDir = SwFrameFormat::HORI_L2R; const SwFrm* pAnchorFrm = GetAnchorFrm(); if ( pAnchorFrm ) { @@ -378,14 +378,14 @@ void SwAnchoredObject::UpdateLayoutDir() const bool bR2L = pAnchorFrm->IsRightToLeft(); if ( bVert ) { - nLayoutDir = SwFrmFmt::VERT_R2L; + nLayoutDir = SwFrameFormat::VERT_R2L; } else if ( bR2L ) { - nLayoutDir = SwFrmFmt::HORI_R2L; + nLayoutDir = SwFrameFormat::HORI_R2L; } } - GetFrmFmt().SetLayoutDir( nLayoutDir ); + GetFrameFormat().SetLayoutDir( nLayoutDir ); } /** method to perform necessary invalidations for the positioning of @@ -424,7 +424,7 @@ bool SwAnchoredObject::ConsiderObjWrapInfluenceOnObjPos() const { bool bRet( false ); - const SwFrmFmt& rObjFmt = GetFrmFmt(); + const SwFrameFormat& rObjFormat = GetFrameFormat(); // --> #i3317# - add condition <IsTmpConsiderWrapInfluence()> // --> #i55204# @@ -435,12 +435,12 @@ bool SwAnchoredObject::ConsiderObjWrapInfluenceOnObjPos() const { bRet = true; } - else if ( rObjFmt.getIDocumentSettingAccess()->get(DocumentSettingId::CONSIDER_WRAP_ON_OBJECT_POSITION) ) + else if ( rObjFormat.getIDocumentSettingAccess()->get(DocumentSettingId::CONSIDER_WRAP_ON_OBJECT_POSITION) ) { - const SwFmtAnchor& rAnchor = rObjFmt.GetAnchor(); + const SwFormatAnchor& rAnchor = rObjFormat.GetAnchor(); if ( ((rAnchor.GetAnchorId() == FLY_AT_CHAR) || (rAnchor.GetAnchorId() == FLY_AT_PARA)) && - rObjFmt.GetSurround().GetSurround() != SURROUND_THROUGHT ) + rObjFormat.GetSurround().GetSurround() != SURROUND_THROUGHT ) { // --> #i34520# - text also wraps around anchored // objects in the layer Hell - see the text formatting. @@ -539,9 +539,9 @@ bool SwAnchoredObject::HasClearedEnvironment() const OSL_ENSURE( GetVertPosOrientFrm(), "<SwAnchoredObject::HasClearedEnvironment()> - layout frame missing, at which the vertical position is oriented at." ); if ( GetVertPosOrientFrm() && - GetAnchorFrm()->IsTxtFrm() && - !static_cast<const SwTxtFrm*>(GetAnchorFrm())->IsFollow() && - static_cast<const SwTxtFrm*>(GetAnchorFrm())->FindPageFrm()->GetPhyPageNum() >= + GetAnchorFrm()->IsTextFrm() && + !static_cast<const SwTextFrm*>(GetAnchorFrm())->IsFollow() && + static_cast<const SwTextFrm*>(GetAnchorFrm())->FindPageFrm()->GetPhyPageNum() >= GetPageFrm()->GetPhyPageNum() ) { const SwFrm* pTmpFrm = GetVertPosOrientFrm()->Lower(); @@ -553,12 +553,12 @@ bool SwAnchoredObject::HasClearedEnvironment() const { bHasClearedEnvironment = true; } - else if ( pTmpFrm->IsTxtFrm() && !pTmpFrm->GetNext() ) + else if ( pTmpFrm->IsTextFrm() && !pTmpFrm->GetNext() ) { - const SwTxtFrm* pTmpTxtFrm = static_cast<const SwTxtFrm*>(pTmpFrm); - if ( pTmpTxtFrm->IsUndersized() || - ( pTmpTxtFrm->GetFollow() && - pTmpTxtFrm->GetFollow()->GetOfst() == 0 ) ) + const SwTextFrm* pTmpTextFrm = static_cast<const SwTextFrm*>(pTmpFrm); + if ( pTmpTextFrm->IsUndersized() || + ( pTmpTextFrm->GetFollow() && + pTmpTextFrm->GetFollow()->GetOfst() == 0 ) ) { bHasClearedEnvironment = true; } @@ -584,9 +584,9 @@ const SwRect& SwAnchoredObject::GetObjRectWithSpaces() const if ( !mbObjRectWithSpacesValid ) { maObjRectWithSpaces = GetObjBoundRect(); - const SwFrmFmt& rFmt = GetFrmFmt(); - const SvxULSpaceItem& rUL = rFmt.GetULSpace(); - const SvxLRSpaceItem& rLR = rFmt.GetLRSpace(); + const SwFrameFormat& rFormat = GetFrameFormat(); + const SvxULSpaceItem& rUL = rFormat.GetULSpace(); + const SvxLRSpaceItem& rLR = rFormat.GetLRSpace(); { maObjRectWithSpaces.Top ( std::max( maObjRectWithSpaces.Top() - long(rUL.GetUpper()), 0L )); maObjRectWithSpaces.Left( std::max( maObjRectWithSpaces.Left()- long(rLR.GetLeft()), 0L )); @@ -632,7 +632,7 @@ void SwAnchoredObject::UpdateObjInSortedList() { if ( GetAnchorFrm() ) { - if ( GetFrmFmt().getIDocumentSettingAccess()->get(DocumentSettingId::CONSIDER_WRAP_ON_OBJECT_POSITION) ) + if ( GetFrameFormat().getIDocumentSettingAccess()->get(DocumentSettingId::CONSIDER_WRAP_ON_OBJECT_POSITION) ) { // invalidate position of all anchored objects at anchor frame if ( GetAnchorFrm()->GetDrawObjs() ) @@ -667,7 +667,7 @@ void SwAnchoredObject::UpdateObjInSortedList() AnchorFrm()->GetDrawObjs()->Update( *this ); // update its position in the sorted object list of its page frame // note: as-character anchored object aren't registered at a page frame - if ( GetFrmFmt().GetAnchor().GetAnchorId() != FLY_AS_CHAR ) + if ( GetFrameFormat().GetAnchor().GetAnchorId() != FLY_AS_CHAR ) { GetPageFrm()->GetSortedObjs()->Update( *this ); } @@ -714,23 +714,23 @@ SwPageFrm* SwAnchoredObject::FindPageFrmOfAnchor() #i26945# - @return SwTxtFrm* + @return SwTextFrm* text frame containing the anchor character. It's NULL, if the object isn't anchored at-character resp. as-character. */ -SwTxtFrm* SwAnchoredObject::FindAnchorCharFrm() +SwTextFrm* SwAnchoredObject::FindAnchorCharFrm() { - SwTxtFrm* pAnchorCharFrm( 0L ); + SwTextFrm* pAnchorCharFrm( 0L ); // --> #i44339# - check, if anchor frame exists. if ( mpAnchorFrm ) { - const SwFmtAnchor& rAnch = GetFrmFmt().GetAnchor(); + const SwFormatAnchor& rAnch = GetFrameFormat().GetAnchor(); if ((rAnch.GetAnchorId() == FLY_AT_CHAR) || (rAnch.GetAnchorId() == FLY_AS_CHAR)) { - pAnchorCharFrm = &(static_cast<SwTxtFrm*>(AnchorFrm())-> - GetFrmAtOfst( rAnch.GetCntntAnchor()->nContent.GetIndex() )); + pAnchorCharFrm = &(static_cast<SwTextFrm*>(AnchorFrm())-> + GetFrmAtOfst( rAnch.GetContentAnchor()->nContent.GetIndex() )); } } @@ -745,7 +745,7 @@ SwTxtFrm* SwAnchoredObject::FindAnchorCharFrm() */ bool SwAnchoredObject::IsFormatPossible() const { - return GetFrmFmt().GetDoc()->getIDocumentDrawModelAccess().IsVisibleLayerId( GetDrawObj()->GetLayer() ); + return GetFrameFormat().GetDoc()->getIDocumentDrawModelAccess().IsVisibleLayerId( GetDrawObj()->GetLayer() ); } // --> #i3317# @@ -755,7 +755,7 @@ void SwAnchoredObject::SetTmpConsiderWrapInfluence( const bool _bTmpConsiderWrap // --> #i35911# if ( mbTmpConsiderWrapInfluence ) { - SwLayouter::InsertObjForTmpConsiderWrapInfluence( *(GetFrmFmt().GetDoc()), + SwLayouter::InsertObjForTmpConsiderWrapInfluence( *(GetFrameFormat().GetDoc()), *this ); } } @@ -790,7 +790,7 @@ bool SwAnchoredObject::OverlapsPrevColumn() const { bool bOverlapsPrevColumn( false ); - if ( mpAnchorFrm && mpAnchorFrm->IsTxtFrm() ) + if ( mpAnchorFrm && mpAnchorFrm->IsTextFrm() ) { const SwFrm* pColFrm = mpAnchorFrm->FindColFrm(); if ( pColFrm && pColFrm->GetPrev() ) diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index 2a885f54c28a..d0005711da16 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -87,12 +87,12 @@ using namespace ::com::sun::star; -TYPEINIT1(SwFmtVertOrient, SfxPoolItem); -TYPEINIT1(SwFmtHoriOrient, SfxPoolItem); -TYPEINIT2(SwFmtHeader, SfxPoolItem, SwClient ); -TYPEINIT2(SwFmtFooter, SfxPoolItem, SwClient ); -TYPEINIT2(SwFmtPageDesc, SfxPoolItem, SwClient ); -TYPEINIT1_AUTOFACTORY(SwFmtLineNumber, SfxPoolItem); +TYPEINIT1(SwFormatVertOrient, SfxPoolItem); +TYPEINIT1(SwFormatHoriOrient, SfxPoolItem); +TYPEINIT2(SwFormatHeader, SfxPoolItem, SwClient ); +TYPEINIT2(SwFormatFooter, SfxPoolItem, SwClient ); +TYPEINIT2(SwFormatPageDesc, SfxPoolItem, SwClient ); +TYPEINIT1_AUTOFACTORY(SwFormatLineNumber, SfxPoolItem); static sal_Int16 lcl_IntToRelation(const uno::Any& rVal) { @@ -102,15 +102,15 @@ static sal_Int16 lcl_IntToRelation(const uno::Any& rVal) return nVal; } -void DelHFFormat( SwClient *pToRemove, SwFrmFmt *pFmt ) +void DelHFFormat( SwClient *pToRemove, SwFrameFormat *pFormat ) { //If the client is the last one who uses this format, then we have to delete //it - before this is done, we may need to delete the content-section. - SwDoc* pDoc = pFmt->GetDoc(); - pFmt->Remove( pToRemove ); + SwDoc* pDoc = pFormat->GetDoc(); + pFormat->Remove( pToRemove ); if( pDoc->IsInDtor() ) { - delete pFmt; + delete pFormat; return; } @@ -119,7 +119,7 @@ void DelHFFormat( SwClient *pToRemove, SwFrmFmt *pFmt ) { // nested scope because DTOR of SwClientIter resets the flag bTreeChg. // It's suboptimal if the format is deleted beforehand. - SwIterator<SwClient,SwFrmFmt> aIter(*pFmt); + SwIterator<SwClient,SwFrameFormat> aIter(*pFormat); for(SwClient* pLast = aIter.First(); bDel && pLast; pLast = aIter.Next()) if(!pLast->IsA(TYPE(SwFrm)) || !SwXHeadFootText::IsXHeadFootText(pLast)) bDel = false; @@ -129,8 +129,8 @@ void DelHFFormat( SwClient *pToRemove, SwFrmFmt *pFmt ) { // If there is a Crsr registered in one of the nodes, we need to call the // ParkCrsr in an (arbitrary) shell. - SwFmtCntnt& rCnt = (SwFmtCntnt&)pFmt->GetCntnt(); - if ( rCnt.GetCntntIdx() ) + SwFormatContent& rCnt = (SwFormatContent&)pFormat->GetContent(); + if ( rCnt.GetContentIdx() ) { SwNode *pNode = 0; { @@ -138,17 +138,17 @@ void DelHFFormat( SwClient *pToRemove, SwFrmFmt *pFmt ) // Begin with start node of page header/footer to assure that // complete content is checked for cursors and the complete content // is deleted on below made method call <pDoc->getIDocumentContentOperations().DeleteSection(pNode)> - SwNodeIndex aIdx( *rCnt.GetCntntIdx(), 0 ); + SwNodeIndex aIdx( *rCnt.GetContentIdx(), 0 ); // If there is a Crsr registered in one of the nodes, we need to call the // ParkCrsr in an (arbitrary) shell. pNode = & aIdx.GetNode(); sal_uInt32 nEnd = pNode->EndOfSectionIndex(); while ( aIdx < nEnd ) { - if ( pNode->IsCntntNode() && - static_cast<SwCntntNode*>(pNode)->HasWriterListeners() ) + if ( pNode->IsContentNode() && + static_cast<SwContentNode*>(pNode)->HasWriterListeners() ) { - SwCrsrShell *pShell = SwIterator<SwCrsrShell,SwCntntNode>( *static_cast<SwCntntNode*>(pNode) ).First(); + SwCrsrShell *pShell = SwIterator<SwCrsrShell,SwContentNode>( *static_cast<SwContentNode*>(pNode) ).First(); if( pShell ) { pShell->ParkCrsr( aIdx ); @@ -159,7 +159,7 @@ void DelHFFormat( SwClient *pToRemove, SwFrmFmt *pFmt ) pNode = & aIdx.GetNode(); } } - rCnt.SetNewCntntIdx( (const SwNodeIndex*)0 ); + rCnt.SetNewContentIdx( (const SwNodeIndex*)0 ); // When deleting a header/footer-format, we ALWAYS need to disable // the undo function (Bug 31069) @@ -168,12 +168,12 @@ void DelHFFormat( SwClient *pToRemove, SwFrmFmt *pFmt ) OSL_ENSURE( pNode, "A big problem." ); pDoc->getIDocumentContentOperations().DeleteSection( pNode ); } - delete pFmt; + delete pFormat; } } // Partially implemented inline in hxx -SwFmtFrmSize::SwFmtFrmSize( SwFrmSize eSize, SwTwips nWidth, SwTwips nHeight ) +SwFormatFrmSize::SwFormatFrmSize( SwFrmSize eSize, SwTwips nWidth, SwTwips nHeight ) : SfxPoolItem( RES_FRM_SIZE ), m_aSize( nWidth, nHeight ), m_eFrmHeightType( eSize ), @@ -182,7 +182,7 @@ SwFmtFrmSize::SwFmtFrmSize( SwFrmSize eSize, SwTwips nWidth, SwTwips nHeight ) m_nWidthPercent = m_eWidthPercentRelation = m_nHeightPercent = m_eHeightPercentRelation = 0; } -SwFmtFrmSize& SwFmtFrmSize::operator=( const SwFmtFrmSize& rCpy ) +SwFormatFrmSize& SwFormatFrmSize::operator=( const SwFormatFrmSize& rCpy ) { m_aSize = rCpy.GetSize(); m_eFrmHeightType = rCpy.GetHeightSizeType(); @@ -194,24 +194,24 @@ SwFmtFrmSize& SwFmtFrmSize::operator=( const SwFmtFrmSize& rCpy ) return *this; } -bool SwFmtFrmSize::operator==( const SfxPoolItem& rAttr ) const +bool SwFormatFrmSize::operator==( const SfxPoolItem& rAttr ) const { assert(SfxPoolItem::operator==(rAttr)); - return( m_eFrmHeightType == static_cast<const SwFmtFrmSize&>(rAttr).m_eFrmHeightType && - m_eFrmWidthType == static_cast<const SwFmtFrmSize&>(rAttr).m_eFrmWidthType && - m_aSize == static_cast<const SwFmtFrmSize&>(rAttr).GetSize()&& - m_nWidthPercent == static_cast<const SwFmtFrmSize&>(rAttr).GetWidthPercent() && - m_eWidthPercentRelation == static_cast<const SwFmtFrmSize&>(rAttr).GetWidthPercentRelation() && - m_nHeightPercent == static_cast<const SwFmtFrmSize&>(rAttr).GetHeightPercent() && - m_eHeightPercentRelation == static_cast<const SwFmtFrmSize&>(rAttr).GetHeightPercentRelation() ); + return( m_eFrmHeightType == static_cast<const SwFormatFrmSize&>(rAttr).m_eFrmHeightType && + m_eFrmWidthType == static_cast<const SwFormatFrmSize&>(rAttr).m_eFrmWidthType && + m_aSize == static_cast<const SwFormatFrmSize&>(rAttr).GetSize()&& + m_nWidthPercent == static_cast<const SwFormatFrmSize&>(rAttr).GetWidthPercent() && + m_eWidthPercentRelation == static_cast<const SwFormatFrmSize&>(rAttr).GetWidthPercentRelation() && + m_nHeightPercent == static_cast<const SwFormatFrmSize&>(rAttr).GetHeightPercent() && + m_eHeightPercentRelation == static_cast<const SwFormatFrmSize&>(rAttr).GetHeightPercentRelation() ); } -SfxPoolItem* SwFmtFrmSize::Clone( SfxItemPool* ) const +SfxPoolItem* SwFormatFrmSize::Clone( SfxItemPool* ) const { - return new SwFmtFrmSize( *this ); + return new SwFormatFrmSize( *this ); } -bool SwFmtFrmSize::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const +bool SwFormatFrmSize::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { // here we convert always! nMemberId &= ~CONVERT_TWIPS; @@ -266,7 +266,7 @@ bool SwFmtFrmSize::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const return true; } -bool SwFmtFrmSize::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) +bool SwFormatFrmSize::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { bool bConvert = 0 != (nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -409,9 +409,9 @@ bool SwFmtFrmSize::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) return bRet; } -void SwFmtFrmSize::dumpAsXml(xmlTextWriterPtr pWriter) const +void SwFormatFrmSize::dumpAsXml(xmlTextWriterPtr pWriter) const { - xmlTextWriterStartElement(pWriter, BAD_CAST("swFmtFrmSize")); + xmlTextWriterStartElement(pWriter, BAD_CAST("swFormatFrmSize")); xmlTextWriterWriteAttribute(pWriter, BAD_CAST("whichId"), BAD_CAST(OString::number(Which()).getStr())); std::stringstream aSize; @@ -429,159 +429,159 @@ void SwFmtFrmSize::dumpAsXml(xmlTextWriterPtr pWriter) const } // Partially implemented inline in hxx -SwFmtFillOrder::SwFmtFillOrder( SwFillOrder nFO ) +SwFormatFillOrder::SwFormatFillOrder( SwFillOrder nFO ) : SfxEnumItem( RES_FILL_ORDER, sal_uInt16(nFO) ) {} -SfxPoolItem* SwFmtFillOrder::Clone( SfxItemPool* ) const +SfxPoolItem* SwFormatFillOrder::Clone( SfxItemPool* ) const { - return new SwFmtFillOrder( GetFillOrder() ); + return new SwFormatFillOrder( GetFillOrder() ); } -sal_uInt16 SwFmtFillOrder::GetValueCount() const +sal_uInt16 SwFormatFillOrder::GetValueCount() const { return SW_FILL_ORDER_END - SW_FILL_ORDER_BEGIN; } // Partially implemented inline in hxx -SwFmtHeader::SwFmtHeader( SwFrmFmt *pHeaderFmt ) +SwFormatHeader::SwFormatHeader( SwFrameFormat *pHeaderFormat ) : SfxPoolItem( RES_HEADER ), - SwClient( pHeaderFmt ), - bActive( pHeaderFmt ) + SwClient( pHeaderFormat ), + bActive( pHeaderFormat ) { } -SwFmtHeader::SwFmtHeader( const SwFmtHeader &rCpy ) +SwFormatHeader::SwFormatHeader( const SwFormatHeader &rCpy ) : SfxPoolItem( RES_HEADER ), SwClient( const_cast<SwModify*>(rCpy.GetRegisteredIn()) ), bActive( rCpy.IsActive() ) { } -SwFmtHeader::SwFmtHeader( bool bOn ) +SwFormatHeader::SwFormatHeader( bool bOn ) : SfxPoolItem( RES_HEADER ), SwClient( 0 ), bActive( bOn ) { } - SwFmtHeader::~SwFmtHeader() + SwFormatHeader::~SwFormatHeader() { - if ( GetHeaderFmt() ) - DelHFFormat( this, GetHeaderFmt() ); + if ( GetHeaderFormat() ) + DelHFFormat( this, GetHeaderFormat() ); } -bool SwFmtHeader::operator==( const SfxPoolItem& rAttr ) const +bool SwFormatHeader::operator==( const SfxPoolItem& rAttr ) const { assert(SfxPoolItem::operator==(rAttr)); - return ( GetRegisteredIn() == static_cast<const SwFmtHeader&>(rAttr).GetRegisteredIn() && - bActive == static_cast<const SwFmtHeader&>(rAttr).IsActive() ); + return ( GetRegisteredIn() == static_cast<const SwFormatHeader&>(rAttr).GetRegisteredIn() && + bActive == static_cast<const SwFormatHeader&>(rAttr).IsActive() ); } -SfxPoolItem* SwFmtHeader::Clone( SfxItemPool* ) const +SfxPoolItem* SwFormatHeader::Clone( SfxItemPool* ) const { - return new SwFmtHeader( *this ); + return new SwFormatHeader( *this ); } -void SwFmtHeader::RegisterToFormat( SwFmt& rFmt ) +void SwFormatHeader::RegisterToFormat( SwFormat& rFormat ) { - rFmt.Add(this); + rFormat.Add(this); } // Partially implemented inline in hxx -SwFmtFooter::SwFmtFooter( SwFrmFmt *pFooterFmt ) +SwFormatFooter::SwFormatFooter( SwFrameFormat *pFooterFormat ) : SfxPoolItem( RES_FOOTER ), - SwClient( pFooterFmt ), - bActive( pFooterFmt ) + SwClient( pFooterFormat ), + bActive( pFooterFormat ) { } -SwFmtFooter::SwFmtFooter( const SwFmtFooter &rCpy ) +SwFormatFooter::SwFormatFooter( const SwFormatFooter &rCpy ) : SfxPoolItem( RES_FOOTER ), SwClient( const_cast<SwModify*>(rCpy.GetRegisteredIn()) ), bActive( rCpy.IsActive() ) { } -SwFmtFooter::SwFmtFooter( bool bOn ) +SwFormatFooter::SwFormatFooter( bool bOn ) : SfxPoolItem( RES_FOOTER ), SwClient( 0 ), bActive( bOn ) { } - SwFmtFooter::~SwFmtFooter() + SwFormatFooter::~SwFormatFooter() { - if ( GetFooterFmt() ) - DelHFFormat( this, GetFooterFmt() ); + if ( GetFooterFormat() ) + DelHFFormat( this, GetFooterFormat() ); } -void SwFmtFooter::RegisterToFormat( SwFmt& rFmt ) +void SwFormatFooter::RegisterToFormat( SwFormat& rFormat ) { - rFmt.Add(this); + rFormat.Add(this); } -bool SwFmtFooter::operator==( const SfxPoolItem& rAttr ) const +bool SwFormatFooter::operator==( const SfxPoolItem& rAttr ) const { assert(SfxPoolItem::operator==(rAttr)); - return ( GetRegisteredIn() == static_cast<const SwFmtFooter&>(rAttr).GetRegisteredIn() && - bActive == static_cast<const SwFmtFooter&>(rAttr).IsActive() ); + return ( GetRegisteredIn() == static_cast<const SwFormatFooter&>(rAttr).GetRegisteredIn() && + bActive == static_cast<const SwFormatFooter&>(rAttr).IsActive() ); } -SfxPoolItem* SwFmtFooter::Clone( SfxItemPool* ) const +SfxPoolItem* SwFormatFooter::Clone( SfxItemPool* ) const { - return new SwFmtFooter( *this ); + return new SwFormatFooter( *this ); } // Partially implemented inline in hxx -SwFmtCntnt::SwFmtCntnt( const SwFmtCntnt &rCpy ) +SwFormatContent::SwFormatContent( const SwFormatContent &rCpy ) : SfxPoolItem( RES_CNTNT ) { - pStartNode = rCpy.GetCntntIdx() ? - new SwNodeIndex( *rCpy.GetCntntIdx() ) : 0; + pStartNode = rCpy.GetContentIdx() ? + new SwNodeIndex( *rCpy.GetContentIdx() ) : 0; } -SwFmtCntnt::SwFmtCntnt( const SwStartNode *pStartNd ) +SwFormatContent::SwFormatContent( const SwStartNode *pStartNd ) : SfxPoolItem( RES_CNTNT ) { pStartNode = pStartNd ? new SwNodeIndex( *pStartNd ) : 0; } - SwFmtCntnt::~SwFmtCntnt() + SwFormatContent::~SwFormatContent() { delete pStartNode; } -void SwFmtCntnt::SetNewCntntIdx( const SwNodeIndex *pIdx ) +void SwFormatContent::SetNewContentIdx( const SwNodeIndex *pIdx ) { delete pStartNode; pStartNode = pIdx ? new SwNodeIndex( *pIdx ) : 0; } -bool SwFmtCntnt::operator==( const SfxPoolItem& rAttr ) const +bool SwFormatContent::operator==( const SfxPoolItem& rAttr ) const { assert(SfxPoolItem::operator==(rAttr)); - if( (bool)pStartNode != (bool)static_cast<const SwFmtCntnt&>(rAttr).pStartNode ) + if( (bool)pStartNode != (bool)static_cast<const SwFormatContent&>(rAttr).pStartNode ) return false; if( pStartNode ) - return ( *pStartNode == *static_cast<const SwFmtCntnt&>(rAttr).GetCntntIdx() ); + return ( *pStartNode == *static_cast<const SwFormatContent&>(rAttr).GetContentIdx() ); return true; } -SfxPoolItem* SwFmtCntnt::Clone( SfxItemPool* ) const +SfxPoolItem* SwFormatContent::Clone( SfxItemPool* ) const { - return new SwFmtCntnt( *this ); + return new SwFormatContent( *this ); } -void SwFmtCntnt::dumpAsXml(xmlTextWriterPtr pWriter) const +void SwFormatContent::dumpAsXml(xmlTextWriterPtr pWriter) const { - xmlTextWriterStartElement(pWriter, BAD_CAST("swFmtCntnt")); + xmlTextWriterStartElement(pWriter, BAD_CAST("swFormatContent")); xmlTextWriterWriteAttribute(pWriter, BAD_CAST("whichId"), BAD_CAST(OString::number(Which()).getStr())); xmlTextWriterWriteAttribute(pWriter, BAD_CAST("startNode"), BAD_CAST(OString::number(pStartNode->GetNode().GetIndex()).getStr())); xmlTextWriterEndElement(pWriter); } // Partially implemented inline in hxx -SwFmtPageDesc::SwFmtPageDesc( const SwFmtPageDesc &rCpy ) +SwFormatPageDesc::SwFormatPageDesc( const SwFormatPageDesc &rCpy ) : SfxPoolItem( RES_PAGEDESC ), SwClient( const_cast<SwPageDesc*>(rCpy.GetPageDesc()) ), oNumOffset( rCpy.oNumOffset ), @@ -590,7 +590,7 @@ SwFmtPageDesc::SwFmtPageDesc( const SwFmtPageDesc &rCpy ) { } -SwFmtPageDesc::SwFmtPageDesc( const SwPageDesc *pDesc ) +SwFormatPageDesc::SwFormatPageDesc( const SwPageDesc *pDesc ) : SfxPoolItem( RES_PAGEDESC ), SwClient( const_cast<SwPageDesc*>(pDesc) ), nDescNameIdx( 0xFFFF ), // IDX_NO_VALUE @@ -598,7 +598,7 @@ SwFmtPageDesc::SwFmtPageDesc( const SwPageDesc *pDesc ) { } -SwFmtPageDesc &SwFmtPageDesc::operator=(const SwFmtPageDesc &rCpy) +SwFormatPageDesc &SwFormatPageDesc::operator=(const SwFormatPageDesc &rCpy) { if (rCpy.GetPageDesc()) RegisterToPageDesc(*const_cast<SwPageDesc*>(rCpy.GetPageDesc())); @@ -609,42 +609,42 @@ SwFmtPageDesc &SwFmtPageDesc::operator=(const SwFmtPageDesc &rCpy) return *this; } - SwFmtPageDesc::~SwFmtPageDesc() {} + SwFormatPageDesc::~SwFormatPageDesc() {} -bool SwFmtPageDesc::KnowsPageDesc() const +bool SwFormatPageDesc::KnowsPageDesc() const { return (GetRegisteredIn() != 0); } -bool SwFmtPageDesc::operator==( const SfxPoolItem& rAttr ) const +bool SwFormatPageDesc::operator==( const SfxPoolItem& rAttr ) const { assert(SfxPoolItem::operator==(rAttr)); - return ( pDefinedIn == static_cast<const SwFmtPageDesc&>(rAttr).pDefinedIn ) && - ( oNumOffset == static_cast<const SwFmtPageDesc&>(rAttr).oNumOffset ) && - ( GetPageDesc() == static_cast<const SwFmtPageDesc&>(rAttr).GetPageDesc() ); + return ( pDefinedIn == static_cast<const SwFormatPageDesc&>(rAttr).pDefinedIn ) && + ( oNumOffset == static_cast<const SwFormatPageDesc&>(rAttr).oNumOffset ) && + ( GetPageDesc() == static_cast<const SwFormatPageDesc&>(rAttr).GetPageDesc() ); } -SfxPoolItem* SwFmtPageDesc::Clone( SfxItemPool* ) const +SfxPoolItem* SwFormatPageDesc::Clone( SfxItemPool* ) const { - return new SwFmtPageDesc( *this ); + return new SwFormatPageDesc( *this ); } -void SwFmtPageDesc::SwClientNotify( const SwModify& rModify, const SfxHint& rHint ) +void SwFormatPageDesc::SwClientNotify( const SwModify& rModify, const SfxHint& rHint ) { SwClient::SwClientNotify(rModify, rHint); const SwPageDescHint* pHint = dynamic_cast<const SwPageDescHint*>(&rHint); if ( pHint ) { // mba: shouldn't that be broadcasted also? - SwFmtPageDesc aDfltDesc( pHint->GetPageDesc() ); + SwFormatPageDesc aDfltDesc( pHint->GetPageDesc() ); SwPageDesc* pDesc = pHint->GetPageDesc(); const SwModify* pMod = GetDefinedIn(); if ( pMod ) { - if( pMod->ISA( SwCntntNode ) ) - const_cast<SwCntntNode*>(static_cast<const SwCntntNode*>(pMod))->SetAttr( aDfltDesc ); - else if( pMod->ISA( SwFmt )) - const_cast<SwFmt*>(static_cast<const SwFmt*>(pMod))->SetFmtAttr( aDfltDesc ); + if( pMod->ISA( SwContentNode ) ) + const_cast<SwContentNode*>(static_cast<const SwContentNode*>(pMod))->SetAttr( aDfltDesc ); + else if( pMod->ISA( SwFormat )) + const_cast<SwFormat*>(static_cast<const SwFormat*>(pMod))->SetFormatAttr( aDfltDesc ); else { OSL_FAIL( "What kind of SwModify is this?" ); @@ -657,12 +657,12 @@ void SwFmtPageDesc::SwClientNotify( const SwModify& rModify, const SfxHint& rHin } } -void SwFmtPageDesc::RegisterToPageDesc( SwPageDesc& rDesc ) +void SwFormatPageDesc::RegisterToPageDesc( SwPageDesc& rDesc ) { rDesc.Add( this ); } -void SwFmtPageDesc::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) +void SwFormatPageDesc::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) { if( !pDefinedIn ) return; @@ -673,18 +673,18 @@ void SwFmtPageDesc::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) case RES_OBJECTDYING: //The Pagedesc where I'm registered dies, therefore I unregister //from that format. During this I get deleted! - if( IS_TYPE( SwFmt, pDefinedIn )) + if( IS_TYPE( SwFormat, pDefinedIn )) { bool const bResult = - static_cast<SwFmt*>(pDefinedIn)->ResetFmtAttr(RES_PAGEDESC); - OSL_ENSURE( bResult, "FmtPageDesc not deleted" ); + static_cast<SwFormat*>(pDefinedIn)->ResetFormatAttr(RES_PAGEDESC); + OSL_ENSURE( bResult, "FormatPageDesc not deleted" ); (void) bResult; // unused in non-debug } - else if( IS_TYPE( SwCntntNode, pDefinedIn )) + else if( IS_TYPE( SwContentNode, pDefinedIn )) { - bool const bResult = static_cast<SwCntntNode*>(pDefinedIn) + bool const bResult = static_cast<SwContentNode*>(pDefinedIn) ->ResetAttr(RES_PAGEDESC); - OSL_ENSURE( bResult, "FmtPageDesc not deleted" ); + OSL_ENSURE( bResult, "FormatPageDesc not deleted" ); (void) bResult; // unused in non-debug } break; @@ -694,7 +694,7 @@ void SwFmtPageDesc::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) } } -bool SwFmtPageDesc::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const +bool SwFormatPageDesc::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { // here we convert always! nMemberId &= ~CONVERT_TWIPS; @@ -735,7 +735,7 @@ bool SwFmtPageDesc::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const return bRet; } -bool SwFmtPageDesc::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) +bool SwFormatPageDesc::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { // here we convert always! nMemberId &= ~CONVERT_TWIPS; @@ -768,9 +768,9 @@ bool SwFmtPageDesc::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) return bRet; } -void SwFmtPageDesc::dumpAsXml(xmlTextWriterPtr pWriter) const +void SwFormatPageDesc::dumpAsXml(xmlTextWriterPtr pWriter) const { - xmlTextWriterStartElement(pWriter, BAD_CAST("swFmtPageDesc")); + xmlTextWriterStartElement(pWriter, BAD_CAST("swFormatPageDesc")); xmlTextWriterWriteAttribute(pWriter, BAD_CAST("whichId"), BAD_CAST(OString::number(Which()).getStr())); if (oNumOffset) xmlTextWriterWriteAttribute(pWriter, BAD_CAST("oNumOffset"), BAD_CAST(OString::number(*oNumOffset).getStr())); @@ -782,7 +782,7 @@ void SwFmtPageDesc::dumpAsXml(xmlTextWriterPtr pWriter) const xmlTextWriterEndElement(pWriter); } -// class SwFmtCol +// class SwFormatCol // Partially implemented inline in hxx SwColumn::SwColumn() : @@ -814,7 +814,7 @@ void SwColumn::dumpAsXml(xmlTextWriterPtr pWriter) const xmlTextWriterEndElement(pWriter); } -SwFmtCol::SwFmtCol( const SwFmtCol& rCpy ) +SwFormatCol::SwFormatCol( const SwFormatCol& rCpy ) : SfxPoolItem( RES_COL ), m_eLineStyle( rCpy.m_eLineStyle ), m_nLineWidth( rCpy.m_nLineWidth), @@ -833,9 +833,9 @@ SwFmtCol::SwFmtCol( const SwFmtCol& rCpy ) } } -SwFmtCol::~SwFmtCol() {} +SwFormatCol::~SwFormatCol() {} -SwFmtCol& SwFmtCol::operator=( const SwFmtCol& rCpy ) +SwFormatCol& SwFormatCol::operator=( const SwFormatCol& rCpy ) { m_eLineStyle = rCpy.m_eLineStyle; m_nLineWidth = rCpy.m_nLineWidth; @@ -856,7 +856,7 @@ SwFmtCol& SwFmtCol::operator=( const SwFmtCol& rCpy ) return *this; } -SwFmtCol::SwFmtCol() +SwFormatCol::SwFormatCol() : SfxPoolItem( RES_COL ) , m_eLineStyle( table::BorderLineStyle::NONE) , @@ -869,10 +869,10 @@ SwFmtCol::SwFmtCol() { } -bool SwFmtCol::operator==( const SfxPoolItem& rAttr ) const +bool SwFormatCol::operator==( const SfxPoolItem& rAttr ) const { assert(SfxPoolItem::operator==(rAttr)); - const SwFmtCol &rCmp = static_cast<const SwFmtCol&>(rAttr); + const SwFormatCol &rCmp = static_cast<const SwFormatCol&>(rAttr); if( !(m_eLineStyle == rCmp.m_eLineStyle && m_nLineWidth == rCmp.m_nLineWidth && m_aLineColor == rCmp.m_aLineColor && @@ -892,12 +892,12 @@ bool SwFmtCol::operator==( const SfxPoolItem& rAttr ) const return true; } -SfxPoolItem* SwFmtCol::Clone( SfxItemPool* ) const +SfxPoolItem* SwFormatCol::Clone( SfxItemPool* ) const { - return new SwFmtCol( *this ); + return new SwFormatCol( *this ); } -sal_uInt16 SwFmtCol::GetGutterWidth( bool bMin ) const +sal_uInt16 SwFormatCol::GetGutterWidth( bool bMin ) const { sal_uInt16 nRet = 0; if ( m_aColumns.size() == 2 ) @@ -928,7 +928,7 @@ sal_uInt16 SwFmtCol::GetGutterWidth( bool bMin ) const return nRet; } -void SwFmtCol::SetGutterWidth( sal_uInt16 nNew, sal_uInt16 nAct ) +void SwFormatCol::SetGutterWidth( sal_uInt16 nNew, sal_uInt16 nAct ) { if ( m_bOrtho ) Calc( nNew, nAct ); @@ -948,7 +948,7 @@ void SwFmtCol::SetGutterWidth( sal_uInt16 nNew, sal_uInt16 nAct ) } } -void SwFmtCol::Init( sal_uInt16 nNumCols, sal_uInt16 nGutterWidth, sal_uInt16 nAct ) +void SwFormatCol::Init( sal_uInt16 nNumCols, sal_uInt16 nGutterWidth, sal_uInt16 nAct ) { // Deleting seems to be a bit radical on the first sight; but otherwise we // have to initialize all values of the remaining SwCloumns. @@ -965,14 +965,14 @@ void SwFmtCol::Init( sal_uInt16 nNumCols, sal_uInt16 nGutterWidth, sal_uInt16 nA Calc( nGutterWidth, nAct ); } -void SwFmtCol::SetOrtho( bool bNew, sal_uInt16 nGutterWidth, sal_uInt16 nAct ) +void SwFormatCol::SetOrtho( bool bNew, sal_uInt16 nGutterWidth, sal_uInt16 nAct ) { m_bOrtho = bNew; if ( bNew && !m_aColumns.empty() ) Calc( nGutterWidth, nAct ); } -sal_uInt16 SwFmtCol::CalcColWidth( sal_uInt16 nCol, sal_uInt16 nAct ) const +sal_uInt16 SwFormatCol::CalcColWidth( sal_uInt16 nCol, sal_uInt16 nAct ) const { assert(nCol < m_aColumns.size()); if ( m_nWidth != nAct ) @@ -986,7 +986,7 @@ sal_uInt16 SwFmtCol::CalcColWidth( sal_uInt16 nCol, sal_uInt16 nAct ) const return m_aColumns[nCol].GetWishWidth(); } -sal_uInt16 SwFmtCol::CalcPrtColWidth( sal_uInt16 nCol, sal_uInt16 nAct ) const +sal_uInt16 SwFormatCol::CalcPrtColWidth( sal_uInt16 nCol, sal_uInt16 nAct ) const { assert(nCol < m_aColumns.size()); sal_uInt16 nRet = CalcColWidth( nCol, nAct ); @@ -996,7 +996,7 @@ sal_uInt16 SwFmtCol::CalcPrtColWidth( sal_uInt16 nCol, sal_uInt16 nAct ) const return nRet; } -void SwFmtCol::Calc( sal_uInt16 nGutterWidth, sal_uInt16 nAct ) +void SwFormatCol::Calc( sal_uInt16 nGutterWidth, sal_uInt16 nAct ) { if(!GetNumCols()) return; @@ -1049,7 +1049,7 @@ void SwFmtCol::Calc( sal_uInt16 nGutterWidth, sal_uInt16 nAct ) } } -bool SwFmtCol::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const +bool SwFormatCol::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { // here we convert always! nMemberId &= ~CONVERT_TWIPS; @@ -1065,7 +1065,7 @@ bool SwFmtCol::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const return true; } -bool SwFmtCol::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) +bool SwFormatCol::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { // here we convert always! nMemberId &= ~CONVERT_TWIPS; @@ -1140,9 +1140,9 @@ bool SwFmtCol::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) return bRet; } -void SwFmtCol::dumpAsXml(xmlTextWriterPtr pWriter) const +void SwFormatCol::dumpAsXml(xmlTextWriterPtr pWriter) const { - xmlTextWriterStartElement(pWriter, BAD_CAST("swFmtCol")); + xmlTextWriterStartElement(pWriter, BAD_CAST("swFormatCol")); xmlTextWriterWriteAttribute(pWriter, BAD_CAST("whichId"), BAD_CAST(OString::number(Which()).getStr())); xmlTextWriterWriteAttribute(pWriter, BAD_CAST("eLineStyle"), BAD_CAST(OString::number(m_eLineStyle).getStr())); xmlTextWriterWriteAttribute(pWriter, BAD_CAST("nLineWidth"), BAD_CAST(OString::number(m_nLineWidth).getStr())); @@ -1162,13 +1162,13 @@ void SwFmtCol::dumpAsXml(xmlTextWriterPtr pWriter) const } // Partially implemented inline in hxx -SwFmtSurround::SwFmtSurround( SwSurround eFly ) : +SwFormatSurround::SwFormatSurround( SwSurround eFly ) : SfxEnumItem( RES_SURROUND, sal_uInt16( eFly ) ) { bAnchorOnly = bContour = bOutside = false; } -SwFmtSurround::SwFmtSurround( const SwFmtSurround &rCpy ) : +SwFormatSurround::SwFormatSurround( const SwFormatSurround &rCpy ) : SfxEnumItem( RES_SURROUND, rCpy.GetValue() ) { bAnchorOnly = rCpy.bAnchorOnly; @@ -1176,21 +1176,21 @@ SwFmtSurround::SwFmtSurround( const SwFmtSurround &rCpy ) : bOutside = rCpy.bOutside; } -bool SwFmtSurround::operator==( const SfxPoolItem& rAttr ) const +bool SwFormatSurround::operator==( const SfxPoolItem& rAttr ) const { assert(SfxPoolItem::operator==(rAttr)); - return ( GetValue() == static_cast<const SwFmtSurround&>(rAttr).GetValue() && - bAnchorOnly== static_cast<const SwFmtSurround&>(rAttr).bAnchorOnly && - bContour== static_cast<const SwFmtSurround&>(rAttr).bContour && - bOutside== static_cast<const SwFmtSurround&>(rAttr).bOutside ); + return ( GetValue() == static_cast<const SwFormatSurround&>(rAttr).GetValue() && + bAnchorOnly== static_cast<const SwFormatSurround&>(rAttr).bAnchorOnly && + bContour== static_cast<const SwFormatSurround&>(rAttr).bContour && + bOutside== static_cast<const SwFormatSurround&>(rAttr).bOutside ); } -SfxPoolItem* SwFmtSurround::Clone( SfxItemPool* ) const +SfxPoolItem* SwFormatSurround::Clone( SfxItemPool* ) const { - return new SwFmtSurround( *this ); + return new SwFormatSurround( *this ); } -sal_uInt16 SwFmtSurround::GetValueCount() const +sal_uInt16 SwFormatSurround::GetValueCount() const { return SURROUND_END - SURROUND_BEGIN; } @@ -1225,7 +1225,7 @@ namespace } } -bool SwFmtSurround::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const +bool SwFormatSurround::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { // here we convert always! nMemberId &= ~CONVERT_TWIPS; @@ -1251,7 +1251,7 @@ bool SwFmtSurround::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const return bRet; } -bool SwFmtSurround::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) +bool SwFormatSurround::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { // here we convert always! nMemberId &= ~CONVERT_TWIPS; @@ -1286,9 +1286,9 @@ bool SwFmtSurround::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) return bRet; } -void SwFmtSurround::dumpAsXml(xmlTextWriterPtr pWriter) const +void SwFormatSurround::dumpAsXml(xmlTextWriterPtr pWriter) const { - xmlTextWriterStartElement(pWriter, BAD_CAST("swFmtSurround")); + xmlTextWriterStartElement(pWriter, BAD_CAST("swFormatSurround")); xmlTextWriterWriteAttribute(pWriter, BAD_CAST("whichId"), BAD_CAST(OString::number(Which()).getStr())); xmlTextWriterWriteAttribute(pWriter, BAD_CAST("value"), BAD_CAST(OString::number(GetValue()).getStr())); @@ -1303,7 +1303,7 @@ void SwFmtSurround::dumpAsXml(xmlTextWriterPtr pWriter) const xmlTextWriterEndElement(pWriter); } -SvStream& SwFmtVertOrient::Store(SvStream &rStream, sal_uInt16 /*version*/) const +SvStream& SwFormatVertOrient::Store(SvStream &rStream, sal_uInt16 /*version*/) const { #if SAL_TYPES_SIZEOFLONG == 8 rStream.WriteInt64(m_nYPos); @@ -1314,7 +1314,7 @@ SvStream& SwFmtVertOrient::Store(SvStream &rStream, sal_uInt16 /*version*/) cons return rStream; } -SfxPoolItem* SwFmtVertOrient::Create(SvStream &rStream, sal_uInt16 /*itemVersion*/) const +SfxPoolItem* SwFormatVertOrient::Create(SvStream &rStream, sal_uInt16 /*itemVersion*/) const { SwTwips yPos(0); sal_Int16 orient(0); @@ -1330,11 +1330,11 @@ SfxPoolItem* SwFmtVertOrient::Create(SvStream &rStream, sal_uInt16 /*itemVersion #endif rStream.ReadInt16( orient ).ReadInt16( relation ); - return new SwFmtVertOrient(yPos, orient, relation); + return new SwFormatVertOrient(yPos, orient, relation); } // Partially implemented inline in hxx -SwFmtVertOrient::SwFmtVertOrient( SwTwips nY, sal_Int16 eVert, +SwFormatVertOrient::SwFormatVertOrient( SwTwips nY, sal_Int16 eVert, sal_Int16 eRel ) : SfxPoolItem( RES_VERT_ORIENT ), m_nYPos( nY ), @@ -1342,20 +1342,20 @@ SwFmtVertOrient::SwFmtVertOrient( SwTwips nY, sal_Int16 eVert, m_eRelation( eRel ) {} -bool SwFmtVertOrient::operator==( const SfxPoolItem& rAttr ) const +bool SwFormatVertOrient::operator==( const SfxPoolItem& rAttr ) const { assert(SfxPoolItem::operator==(rAttr)); - return ( m_nYPos == static_cast<const SwFmtVertOrient&>(rAttr).m_nYPos && - m_eOrient == static_cast<const SwFmtVertOrient&>(rAttr).m_eOrient && - m_eRelation == static_cast<const SwFmtVertOrient&>(rAttr).m_eRelation ); + return ( m_nYPos == static_cast<const SwFormatVertOrient&>(rAttr).m_nYPos && + m_eOrient == static_cast<const SwFormatVertOrient&>(rAttr).m_eOrient && + m_eRelation == static_cast<const SwFormatVertOrient&>(rAttr).m_eRelation ); } -SfxPoolItem* SwFmtVertOrient::Clone( SfxItemPool* ) const +SfxPoolItem* SwFormatVertOrient::Clone( SfxItemPool* ) const { - return new SwFmtVertOrient( m_nYPos, m_eOrient, m_eRelation ); + return new SwFormatVertOrient( m_nYPos, m_eOrient, m_eRelation ); } -bool SwFmtVertOrient::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const +bool SwFormatVertOrient::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { // here we convert always! nMemberId &= ~CONVERT_TWIPS; @@ -1380,7 +1380,7 @@ bool SwFmtVertOrient::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const return bRet; } -bool SwFmtVertOrient::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) +bool SwFormatVertOrient::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { bool bConvert = 0 != (nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -1415,9 +1415,9 @@ bool SwFmtVertOrient::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) return bRet; } -void SwFmtVertOrient::dumpAsXml(xmlTextWriterPtr pWriter) const +void SwFormatVertOrient::dumpAsXml(xmlTextWriterPtr pWriter) const { - xmlTextWriterStartElement(pWriter, BAD_CAST("swFmtVertOrient")); + xmlTextWriterStartElement(pWriter, BAD_CAST("swFormatVertOrient")); xmlTextWriterWriteAttribute(pWriter, BAD_CAST("whichId"), BAD_CAST(OString::number(Which()).getStr())); xmlTextWriterWriteAttribute(pWriter, BAD_CAST("nYPos"), BAD_CAST(OString::number(m_nYPos).getStr())); xmlTextWriterWriteAttribute(pWriter, BAD_CAST("eOrient"), BAD_CAST(OString::number(m_eOrient).getStr())); @@ -1426,7 +1426,7 @@ void SwFmtVertOrient::dumpAsXml(xmlTextWriterPtr pWriter) const } // Partially implemented inline in hxx -SwFmtHoriOrient::SwFmtHoriOrient( SwTwips nX, sal_Int16 eHori, +SwFormatHoriOrient::SwFormatHoriOrient( SwTwips nX, sal_Int16 eHori, sal_Int16 eRel, bool bPos ) : SfxPoolItem( RES_HORI_ORIENT ), m_nXPos( nX ), @@ -1435,21 +1435,21 @@ SwFmtHoriOrient::SwFmtHoriOrient( SwTwips nX, sal_Int16 eHori, m_bPosToggle( bPos ) {} -bool SwFmtHoriOrient::operator==( const SfxPoolItem& rAttr ) const +bool SwFormatHoriOrient::operator==( const SfxPoolItem& rAttr ) const { assert(SfxPoolItem::operator==(rAttr)); - return ( m_nXPos == static_cast<const SwFmtHoriOrient&>(rAttr).m_nXPos && - m_eOrient == static_cast<const SwFmtHoriOrient&>(rAttr).m_eOrient && - m_eRelation == static_cast<const SwFmtHoriOrient&>(rAttr).m_eRelation && - m_bPosToggle == static_cast<const SwFmtHoriOrient&>(rAttr).m_bPosToggle ); + return ( m_nXPos == static_cast<const SwFormatHoriOrient&>(rAttr).m_nXPos && + m_eOrient == static_cast<const SwFormatHoriOrient&>(rAttr).m_eOrient && + m_eRelation == static_cast<const SwFormatHoriOrient&>(rAttr).m_eRelation && + m_bPosToggle == static_cast<const SwFormatHoriOrient&>(rAttr).m_bPosToggle ); } -SfxPoolItem* SwFmtHoriOrient::Clone( SfxItemPool* ) const +SfxPoolItem* SwFormatHoriOrient::Clone( SfxItemPool* ) const { - return new SwFmtHoriOrient( m_nXPos, m_eOrient, m_eRelation, m_bPosToggle ); + return new SwFormatHoriOrient( m_nXPos, m_eOrient, m_eRelation, m_bPosToggle ); } -bool SwFmtHoriOrient::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const +bool SwFormatHoriOrient::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { // here we convert always! nMemberId &= ~CONVERT_TWIPS; @@ -1477,7 +1477,7 @@ bool SwFmtHoriOrient::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const return bRet; } -bool SwFmtHoriOrient::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) +bool SwFormatHoriOrient::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { bool bConvert = 0 != (nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -1516,9 +1516,9 @@ bool SwFmtHoriOrient::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) return bRet; } -void SwFmtHoriOrient::dumpAsXml(xmlTextWriterPtr pWriter) const +void SwFormatHoriOrient::dumpAsXml(xmlTextWriterPtr pWriter) const { - xmlTextWriterStartElement(pWriter, BAD_CAST("swFmtHoriOrient")); + xmlTextWriterStartElement(pWriter, BAD_CAST("swFormatHoriOrient")); xmlTextWriterWriteAttribute(pWriter, BAD_CAST("whichId"), BAD_CAST(OString::number(Which()).getStr())); xmlTextWriterWriteAttribute(pWriter, BAD_CAST("nXPos"), BAD_CAST(OString::number(m_nXPos).getStr())); xmlTextWriterWriteAttribute(pWriter, BAD_CAST("eOrient"), BAD_CAST(OString::number(m_eOrient).getStr())); @@ -1528,7 +1528,7 @@ void SwFmtHoriOrient::dumpAsXml(xmlTextWriterPtr pWriter) const } // Partially implemented inline in hxx -SwFmtAnchor::SwFmtAnchor( RndStdIds nRnd, sal_uInt16 nPage ) +SwFormatAnchor::SwFormatAnchor( RndStdIds nRnd, sal_uInt16 nPage ) : SfxPoolItem( RES_ANCHOR ), nAnchorId( nRnd ), nPageNum( nPage ), @@ -1536,10 +1536,10 @@ SwFmtAnchor::SwFmtAnchor( RndStdIds nRnd, sal_uInt16 nPage ) mnOrder( ++mnOrderCounter ) {} -SwFmtAnchor::SwFmtAnchor( const SwFmtAnchor &rCpy ) +SwFormatAnchor::SwFormatAnchor( const SwFormatAnchor &rCpy ) : SfxPoolItem( RES_ANCHOR ) - , m_pCntntAnchor( (rCpy.GetCntntAnchor()) - ? new SwPosition( *rCpy.GetCntntAnchor() ) : 0 ) + , m_pContentAnchor( (rCpy.GetContentAnchor()) + ? new SwPosition( *rCpy.GetContentAnchor() ) : 0 ) , nAnchorId( rCpy.GetAnchorId() ) , nPageNum( rCpy.GetPageNum() ) // OD 2004-05-05 #i28701# - get always new increased order number @@ -1547,11 +1547,11 @@ SwFmtAnchor::SwFmtAnchor( const SwFmtAnchor &rCpy ) { } -SwFmtAnchor::~SwFmtAnchor() +SwFormatAnchor::~SwFormatAnchor() { } -void SwFmtAnchor::SetAnchor( const SwPosition *pPos ) +void SwFormatAnchor::SetAnchor( const SwPosition *pPos ) { // anchor only to paragraphs, or start nodes in case of FLY_AT_FLY // also allow table node, this is used when a table is selected and is converted to a frame by the UI @@ -1559,54 +1559,54 @@ void SwFmtAnchor::SetAnchor( const SwPosition *pPos ) || ((FLY_AT_FLY == nAnchorId) && dynamic_cast<SwStartNode*>(&pPos->nNode.GetNode())) || (FLY_AT_PARA == nAnchorId && dynamic_cast<SwTableNode*>(&pPos->nNode.GetNode())) - || dynamic_cast<SwTxtNode*>(&pPos->nNode.GetNode())); - m_pCntntAnchor .reset( (pPos) ? new SwPosition( *pPos ) : 0 ); + || dynamic_cast<SwTextNode*>(&pPos->nNode.GetNode())); + m_pContentAnchor .reset( (pPos) ? new SwPosition( *pPos ) : 0 ); // Flys anchored AT paragraph should not point into the paragraph content - if (m_pCntntAnchor && + if (m_pContentAnchor && ((FLY_AT_PARA == nAnchorId) || (FLY_AT_FLY == nAnchorId))) { - m_pCntntAnchor->nContent.Assign( 0, 0 ); + m_pContentAnchor->nContent.Assign( 0, 0 ); } } -SwFmtAnchor& SwFmtAnchor::operator=(const SwFmtAnchor& rAnchor) +SwFormatAnchor& SwFormatAnchor::operator=(const SwFormatAnchor& rAnchor) { nAnchorId = rAnchor.GetAnchorId(); nPageNum = rAnchor.GetPageNum(); // OD 2004-05-05 #i28701# - get always new increased order number mnOrder = ++mnOrderCounter; - m_pCntntAnchor.reset( (rAnchor.GetCntntAnchor()) - ? new SwPosition(*(rAnchor.GetCntntAnchor())) + m_pContentAnchor.reset( (rAnchor.GetContentAnchor()) + ? new SwPosition(*(rAnchor.GetContentAnchor())) : 0 ); return *this; } -bool SwFmtAnchor::operator==( const SfxPoolItem& rAttr ) const +bool SwFormatAnchor::operator==( const SfxPoolItem& rAttr ) const { assert(SfxPoolItem::operator==(rAttr)); - SwFmtAnchor const& rFmtAnchor(static_cast<SwFmtAnchor const&>(rAttr)); + SwFormatAnchor const& rFormatAnchor(static_cast<SwFormatAnchor const&>(rAttr)); // OD 2004-05-05 #i28701# - Note: <mnOrder> hasn't to be considered. - return ( nAnchorId == rFmtAnchor.GetAnchorId() && - nPageNum == rFmtAnchor.GetPageNum() && + return ( nAnchorId == rFormatAnchor.GetAnchorId() && + nPageNum == rFormatAnchor.GetPageNum() && // compare anchor: either both do not point into a textnode or - // both do (valid m_pCntntAnchor) and the positions are equal - ((m_pCntntAnchor.get() == rFmtAnchor.m_pCntntAnchor.get()) || - (m_pCntntAnchor && rFmtAnchor.GetCntntAnchor() && - (*m_pCntntAnchor == *rFmtAnchor.GetCntntAnchor())))); + // both do (valid m_pContentAnchor) and the positions are equal + ((m_pContentAnchor.get() == rFormatAnchor.m_pContentAnchor.get()) || + (m_pContentAnchor && rFormatAnchor.GetContentAnchor() && + (*m_pContentAnchor == *rFormatAnchor.GetContentAnchor())))); } -SfxPoolItem* SwFmtAnchor::Clone( SfxItemPool* ) const +SfxPoolItem* SwFormatAnchor::Clone( SfxItemPool* ) const { - return new SwFmtAnchor( *this ); + return new SwFormatAnchor( *this ); } // OD 2004-05-05 #i28701# -sal_uInt32 SwFmtAnchor::mnOrderCounter = 0; +sal_uInt32 SwFormatAnchor::mnOrderCounter = 0; // OD 2004-05-05 #i28701# -bool SwFmtAnchor::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const +bool SwFormatAnchor::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { // here we convert always! nMemberId &= ~CONVERT_TWIPS; @@ -1641,13 +1641,13 @@ bool SwFmtAnchor::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const break; case MID_ANCHOR_ANCHORFRAME: { - if (m_pCntntAnchor && FLY_AT_FLY == nAnchorId) + if (m_pContentAnchor && FLY_AT_FLY == nAnchorId) { - SwFrmFmt* pFmt = m_pCntntAnchor->nNode.GetNode().GetFlyFmt(); - if(pFmt) + SwFrameFormat* pFormat = m_pContentAnchor->nNode.GetNode().GetFlyFormat(); + if(pFormat) { uno::Reference<text::XTextFrame> const xRet( - SwXTextFrame::CreateXTextFrame(*pFmt->GetDoc(), pFmt)); + SwXTextFrame::CreateXTextFrame(*pFormat->GetDoc(), pFormat)); rVal <<= xRet; } } @@ -1660,7 +1660,7 @@ bool SwFmtAnchor::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const return bRet; } -bool SwFmtAnchor::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) +bool SwFormatAnchor::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { // here we convert always! nMemberId &= ~CONVERT_TWIPS; @@ -1682,7 +1682,7 @@ bool SwFmtAnchor::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) // If the anchor type is page and a valid page number // has been set, the content position isn't required // any longer. - m_pCntntAnchor.reset(); + m_pContentAnchor.reset(); } break; case text::TextContentAnchorType_AT_FRAME: @@ -1712,7 +1712,7 @@ bool SwFmtAnchor::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) // confuse the layout (frmtool.cxx). However, if the // anchor type is not page, any content position will // be kept. - m_pCntntAnchor.reset(); + m_pContentAnchor.reset(); } } else @@ -1728,19 +1728,19 @@ bool SwFmtAnchor::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) return bRet; } -void SwFmtAnchor::dumpAsXml(xmlTextWriterPtr pWriter) const +void SwFormatAnchor::dumpAsXml(xmlTextWriterPtr pWriter) const { - xmlTextWriterStartElement(pWriter, BAD_CAST("swFmtAnchor")); + xmlTextWriterStartElement(pWriter, BAD_CAST("swFormatAnchor")); xmlTextWriterWriteAttribute(pWriter, BAD_CAST("whichId"), BAD_CAST(OString::number(Which()).getStr())); - if (m_pCntntAnchor) + if (m_pContentAnchor) { - std::stringstream aCntntAnchor; - aCntntAnchor << *m_pCntntAnchor; - xmlTextWriterWriteAttribute(pWriter, BAD_CAST("pCntntAnchor"), BAD_CAST(aCntntAnchor.str().c_str())); + std::stringstream aContentAnchor; + aContentAnchor << *m_pContentAnchor; + xmlTextWriterWriteAttribute(pWriter, BAD_CAST("pContentAnchor"), BAD_CAST(aContentAnchor.str().c_str())); } else - xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("pCntntAnchor"), "%p", m_pCntntAnchor.get()); + xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("pContentAnchor"), "%p", m_pContentAnchor.get()); xmlTextWriterWriteAttribute(pWriter, BAD_CAST("nAnchorType"), BAD_CAST(OString::number(nAnchorId).getStr())); xmlTextWriterWriteAttribute(pWriter, BAD_CAST("nPageNum"), BAD_CAST(OString::number(nPageNum).getStr())); xmlTextWriterWriteAttribute(pWriter, BAD_CAST("nOrder"), BAD_CAST(OString::number(mnOrder).getStr())); @@ -1753,14 +1753,14 @@ void SwFmtAnchor::dumpAsXml(xmlTextWriterPtr pWriter) const } // Partially implemented inline in hxx -SwFmtURL::SwFmtURL() : +SwFormatURL::SwFormatURL() : SfxPoolItem( RES_URL ), pMap( 0 ), bIsServerMap( false ) { } -SwFmtURL::SwFmtURL( const SwFmtURL &rURL) : +SwFormatURL::SwFormatURL( const SwFormatURL &rURL) : SfxPoolItem( RES_URL ), sTargetFrameName( rURL.GetTargetFrameName() ), sURL( rURL.GetURL() ), @@ -1770,15 +1770,15 @@ SwFmtURL::SwFmtURL( const SwFmtURL &rURL) : pMap = rURL.GetMap() ? new ImageMap( *rURL.GetMap() ) : 0; } -SwFmtURL::~SwFmtURL() +SwFormatURL::~SwFormatURL() { delete pMap; } -bool SwFmtURL::operator==( const SfxPoolItem &rAttr ) const +bool SwFormatURL::operator==( const SfxPoolItem &rAttr ) const { assert(SfxPoolItem::operator==(rAttr)); - const SwFmtURL &rCmp = static_cast<const SwFmtURL&>(rAttr); + const SwFormatURL &rCmp = static_cast<const SwFormatURL&>(rAttr); bool bRet = bIsServerMap == rCmp.IsServerMap() && sURL == rCmp.GetURL() && sTargetFrameName == rCmp.GetTargetFrameName() && @@ -1793,24 +1793,24 @@ bool SwFmtURL::operator==( const SfxPoolItem &rAttr ) const return bRet; } -SfxPoolItem* SwFmtURL::Clone( SfxItemPool* ) const +SfxPoolItem* SwFormatURL::Clone( SfxItemPool* ) const { - return new SwFmtURL( *this ); + return new SwFormatURL( *this ); } -void SwFmtURL::SetURL(const OUString &rURL, bool bServerMap) +void SwFormatURL::SetURL(const OUString &rURL, bool bServerMap) { sURL = rURL; bIsServerMap = bServerMap; } -void SwFmtURL::SetMap( const ImageMap *pM ) +void SwFormatURL::SetMap( const ImageMap *pM ) { delete pMap; pMap = pM ? new ImageMap( *pM ) : 0; } -bool SwFmtURL::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const +bool SwFormatURL::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { // here we convert always! nMemberId &= ~CONVERT_TWIPS; @@ -1852,7 +1852,7 @@ bool SwFmtURL::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const return bRet; } -bool SwFmtURL::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) +bool SwFormatURL::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { // here we convert always! nMemberId &= ~CONVERT_TWIPS; @@ -1905,63 +1905,63 @@ bool SwFmtURL::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) return bRet; } -SfxPoolItem* SwFmtEditInReadonly::Clone( SfxItemPool* ) const +SfxPoolItem* SwFormatEditInReadonly::Clone( SfxItemPool* ) const { - return new SwFmtEditInReadonly( Which(), GetValue() ); + return new SwFormatEditInReadonly( Which(), GetValue() ); } -SfxPoolItem* SwFmtLayoutSplit::Clone( SfxItemPool* ) const +SfxPoolItem* SwFormatLayoutSplit::Clone( SfxItemPool* ) const { - return new SwFmtLayoutSplit( GetValue() ); + return new SwFormatLayoutSplit( GetValue() ); } -SfxPoolItem* SwFmtRowSplit::Clone( SfxItemPool* ) const +SfxPoolItem* SwFormatRowSplit::Clone( SfxItemPool* ) const { - return new SwFmtRowSplit( GetValue() ); + return new SwFormatRowSplit( GetValue() ); } -SfxPoolItem* SwFmtNoBalancedColumns::Clone( SfxItemPool* ) const +SfxPoolItem* SwFormatNoBalancedColumns::Clone( SfxItemPool* ) const { - return new SwFmtNoBalancedColumns( GetValue() ); + return new SwFormatNoBalancedColumns( GetValue() ); } -void SwFmtNoBalancedColumns::dumpAsXml(xmlTextWriterPtr pWriter) const +void SwFormatNoBalancedColumns::dumpAsXml(xmlTextWriterPtr pWriter) const { - xmlTextWriterStartElement(pWriter, BAD_CAST("swFmtNoBalancedColumns")); + xmlTextWriterStartElement(pWriter, BAD_CAST("swFormatNoBalancedColumns")); xmlTextWriterWriteAttribute(pWriter, BAD_CAST("whichId"), BAD_CAST(OString::number(Which()).getStr())); xmlTextWriterWriteAttribute(pWriter, BAD_CAST("value"), BAD_CAST(OString::boolean(GetValue()).getStr())); xmlTextWriterEndElement(pWriter); } -// class SwFmtFtnEndAtTxtEnd +// class SwFormatFootnoteEndAtTextEnd -sal_uInt16 SwFmtFtnEndAtTxtEnd::GetValueCount() const +sal_uInt16 SwFormatFootnoteEndAtTextEnd::GetValueCount() const { return sal_uInt16( FTNEND_ATTXTEND_END ); } -SwFmtFtnEndAtTxtEnd& SwFmtFtnEndAtTxtEnd::operator=( - const SwFmtFtnEndAtTxtEnd& rAttr ) +SwFormatFootnoteEndAtTextEnd& SwFormatFootnoteEndAtTextEnd::operator=( + const SwFormatFootnoteEndAtTextEnd& rAttr ) { SfxEnumItem::SetValue( rAttr.GetValue() ); - aFmt = rAttr.aFmt; + aFormat = rAttr.aFormat; nOffset = rAttr.nOffset; sPrefix = rAttr.sPrefix; sSuffix = rAttr.sSuffix; return *this; } -bool SwFmtFtnEndAtTxtEnd::operator==( const SfxPoolItem& rItem ) const +bool SwFormatFootnoteEndAtTextEnd::operator==( const SfxPoolItem& rItem ) const { - const SwFmtFtnEndAtTxtEnd& rAttr = static_cast<const SwFmtFtnEndAtTxtEnd&>(rItem); + const SwFormatFootnoteEndAtTextEnd& rAttr = static_cast<const SwFormatFootnoteEndAtTextEnd&>(rItem); return SfxEnumItem::operator==( rAttr ) && - aFmt.GetNumberingType() == rAttr.aFmt.GetNumberingType() && + aFormat.GetNumberingType() == rAttr.aFormat.GetNumberingType() && nOffset == rAttr.nOffset && sPrefix == rAttr.sPrefix && sSuffix == rAttr.sSuffix; } -bool SwFmtFtnEndAtTxtEnd::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const +bool SwFormatFootnoteEndAtTextEnd::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { nMemberId &= ~CONVERT_TWIPS; switch(nMemberId) @@ -1976,7 +1976,7 @@ bool SwFmtFtnEndAtTxtEnd::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) cons case MID_OWN_NUM : rVal <<= GetValue() >= FTNEND_ATTXTEND_OWNNUMANDFMT; break; - case MID_NUM_TYPE : rVal <<= aFmt.GetNumberingType(); break; + case MID_NUM_TYPE : rVal <<= aFormat.GetNumberingType(); break; case MID_PREFIX : rVal <<= OUString(sPrefix); break; case MID_SUFFIX : rVal <<= OUString(sSuffix); break; default: return false; @@ -1984,7 +1984,7 @@ bool SwFmtFtnEndAtTxtEnd::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) cons return true; } -bool SwFmtFtnEndAtTxtEnd::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) +bool SwFormatFootnoteEndAtTextEnd::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { bool bRet = true; nMemberId &= ~CONVERT_TWIPS; @@ -2035,7 +2035,7 @@ bool SwFmtFtnEndAtTxtEnd::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) (nVal <= SVX_NUM_ARABIC || SVX_NUM_CHARS_UPPER_LETTER_N == nVal || SVX_NUM_CHARS_LOWER_LETTER_N == nVal )) - aFmt.SetNumberingType(nVal); + aFormat.SetNumberingType(nVal); else bRet = false; } @@ -2057,66 +2057,66 @@ bool SwFmtFtnEndAtTxtEnd::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) return bRet; } -// class SwFmtFtnAtTxtEnd +// class SwFormatFootnoteAtTextEnd -SfxPoolItem* SwFmtFtnAtTxtEnd::Clone( SfxItemPool* ) const +SfxPoolItem* SwFormatFootnoteAtTextEnd::Clone( SfxItemPool* ) const { - SwFmtFtnAtTxtEnd* pNew = new SwFmtFtnAtTxtEnd; + SwFormatFootnoteAtTextEnd* pNew = new SwFormatFootnoteAtTextEnd; *pNew = *this; return pNew; } -// class SwFmtEndAtTxtEnd +// class SwFormatEndAtTextEnd -SfxPoolItem* SwFmtEndAtTxtEnd::Clone( SfxItemPool* ) const +SfxPoolItem* SwFormatEndAtTextEnd::Clone( SfxItemPool* ) const { - SwFmtEndAtTxtEnd* pNew = new SwFmtEndAtTxtEnd; + SwFormatEndAtTextEnd* pNew = new SwFormatEndAtTextEnd; *pNew = *this; return pNew; } -//class SwFmtChain +//class SwFormatChain -bool SwFmtChain::operator==( const SfxPoolItem &rAttr ) const +bool SwFormatChain::operator==( const SfxPoolItem &rAttr ) const { assert(SfxPoolItem::operator==(rAttr)); - return GetPrev() == static_cast<const SwFmtChain&>(rAttr).GetPrev() && - GetNext() == static_cast<const SwFmtChain&>(rAttr).GetNext(); + return GetPrev() == static_cast<const SwFormatChain&>(rAttr).GetPrev() && + GetNext() == static_cast<const SwFormatChain&>(rAttr).GetNext(); } -SwFmtChain::SwFmtChain( const SwFmtChain &rCpy ) : +SwFormatChain::SwFormatChain( const SwFormatChain &rCpy ) : SfxPoolItem( RES_CHAIN ) { SetPrev( rCpy.GetPrev() ); SetNext( rCpy.GetNext() ); } -SfxPoolItem* SwFmtChain::Clone( SfxItemPool* ) const +SfxPoolItem* SwFormatChain::Clone( SfxItemPool* ) const { - SwFmtChain *pRet = new SwFmtChain; + SwFormatChain *pRet = new SwFormatChain; pRet->SetPrev( GetPrev() ); pRet->SetNext( GetNext() ); return pRet; } -void SwFmtChain::SetPrev( SwFlyFrmFmt *pFmt ) +void SwFormatChain::SetPrev( SwFlyFrameFormat *pFormat ) { - if ( pFmt ) - pFmt->Add( &aPrev ); + if ( pFormat ) + pFormat->Add( &aPrev ); else if ( aPrev.GetRegisteredIn() ) static_cast<SwModify*>(aPrev.GetRegisteredIn())->Remove( &aPrev ); } -void SwFmtChain::SetNext( SwFlyFrmFmt *pFmt ) +void SwFormatChain::SetNext( SwFlyFrameFormat *pFormat ) { - if ( pFmt ) - pFmt->Add( &aNext ); + if ( pFormat ) + pFormat->Add( &aNext ); else if ( aNext.GetRegisteredIn() ) static_cast<SwModify*>(aNext.GetRegisteredIn())->Remove( &aNext ); } -bool SwFmtChain::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const +bool SwFormatChain::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { // here we convert always! nMemberId &= ~CONVERT_TWIPS; @@ -2140,31 +2140,31 @@ bool SwFmtChain::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const return bRet; } -SwFmtLineNumber::SwFmtLineNumber() : +SwFormatLineNumber::SwFormatLineNumber() : SfxPoolItem( RES_LINENUMBER ) { nStartValue = 0; bCountLines = true; } -SwFmtLineNumber::~SwFmtLineNumber() +SwFormatLineNumber::~SwFormatLineNumber() { } -bool SwFmtLineNumber::operator==( const SfxPoolItem &rAttr ) const +bool SwFormatLineNumber::operator==( const SfxPoolItem &rAttr ) const { assert(SfxPoolItem::operator==(rAttr)); - return nStartValue == static_cast<const SwFmtLineNumber&>(rAttr).GetStartValue() && - bCountLines == static_cast<const SwFmtLineNumber&>(rAttr).IsCount(); + return nStartValue == static_cast<const SwFormatLineNumber&>(rAttr).GetStartValue() && + bCountLines == static_cast<const SwFormatLineNumber&>(rAttr).IsCount(); } -SfxPoolItem* SwFmtLineNumber::Clone( SfxItemPool* ) const +SfxPoolItem* SwFormatLineNumber::Clone( SfxItemPool* ) const { - return new SwFmtLineNumber( *this ); + return new SwFormatLineNumber( *this ); } -bool SwFmtLineNumber::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const +bool SwFormatLineNumber::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { // here we convert always! nMemberId &= ~CONVERT_TWIPS; @@ -2184,7 +2184,7 @@ bool SwFmtLineNumber::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const return bRet; } -bool SwFmtLineNumber::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) +bool SwFormatLineNumber::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { // here we convert always! nMemberId &= ~CONVERT_TWIPS; @@ -2502,54 +2502,54 @@ SfxPoolItem* SwHeaderAndFooterEatSpacingItem::Clone( SfxItemPool* ) const } // Partially implemented inline in hxx -TYPEINIT1( SwFrmFmt, SwFmt ); -IMPL_FIXEDMEMPOOL_NEWDEL_DLL( SwFrmFmt ) +TYPEINIT1( SwFrameFormat, SwFormat ); +IMPL_FIXEDMEMPOOL_NEWDEL_DLL( SwFrameFormat ) -SwFrmFmt::SwFrmFmt( +SwFrameFormat::SwFrameFormat( SwAttrPool& rPool, - const sal_Char* pFmtNm, - SwFrmFmt *pDrvdFrm, - sal_uInt16 nFmtWhich, + const sal_Char* pFormatNm, + SwFrameFormat *pDrvdFrm, + sal_uInt16 nFormatWhich, const sal_uInt16* pWhichRange) -: SwFmt(rPool, pFmtNm, (pWhichRange ? pWhichRange : aFrmFmtSetRange), pDrvdFrm, nFmtWhich), +: SwFormat(rPool, pFormatNm, (pWhichRange ? pWhichRange : aFrameFormatSetRange), pDrvdFrm, nFormatWhich), m_wXObject(), maFillAttributes() { } -SwFrmFmt::SwFrmFmt( +SwFrameFormat::SwFrameFormat( SwAttrPool& rPool, - const OUString &rFmtNm, - SwFrmFmt *pDrvdFrm, - sal_uInt16 nFmtWhich, + const OUString &rFormatNm, + SwFrameFormat *pDrvdFrm, + sal_uInt16 nFormatWhich, const sal_uInt16* pWhichRange) -: SwFmt(rPool, rFmtNm, (pWhichRange ? pWhichRange : aFrmFmtSetRange), pDrvdFrm, nFmtWhich), +: SwFormat(rPool, rFormatNm, (pWhichRange ? pWhichRange : aFrameFormatSetRange), pDrvdFrm, nFormatWhich), m_wXObject(), maFillAttributes() { } -SwFrmFmt::~SwFrmFmt() +SwFrameFormat::~SwFrameFormat() { if( !GetDoc()->IsInDtor()) { - const SwFmtAnchor& rAnchor = GetAnchor(); - if (rAnchor.GetCntntAnchor() != nullptr) + const SwFormatAnchor& rAnchor = GetAnchor(); + if (rAnchor.GetContentAnchor() != nullptr) { - rAnchor.GetCntntAnchor()->nNode.GetNode().RemoveAnchoredFly(this); + rAnchor.GetContentAnchor()->nNode.GetNode().RemoveAnchoredFly(this); } } } -bool SwFrmFmt::supportsFullDrawingLayerFillAttributeSet() const +bool SwFrameFormat::supportsFullDrawingLayerFillAttributeSet() const { return true; } -void SwFrmFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) +void SwFrameFormat::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) { - SwFmtHeader const *pH = 0; - SwFmtFooter const *pF = 0; + SwFormatHeader const *pH = 0; + SwFormatFooter const *pF = 0; const sal_uInt16 nWhich = pNew ? pNew->Which() : 0; @@ -2586,23 +2586,23 @@ void SwFrmFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) } } else if( RES_HEADER == nWhich ) - pH = static_cast<const SwFmtHeader*>(pNew); + pH = static_cast<const SwFormatHeader*>(pNew); else if( RES_FOOTER == nWhich ) - pF = static_cast<const SwFmtFooter*>(pNew); + pF = static_cast<const SwFormatFooter*>(pNew); - if( pH && pH->IsActive() && !pH->GetHeaderFmt() ) + if( pH && pH->IsActive() && !pH->GetHeaderFormat() ) { //If he doesn't have one, I'll add one - SwFrmFmt *pFmt = GetDoc()->getIDocumentLayoutAccess().MakeLayoutFmt( RND_STD_HEADER, 0 ); - const_cast<SwFmtHeader *>(pH)->RegisterToFormat( *pFmt ); + SwFrameFormat *pFormat = GetDoc()->getIDocumentLayoutAccess().MakeLayoutFormat( RND_STD_HEADER, 0 ); + const_cast<SwFormatHeader *>(pH)->RegisterToFormat( *pFormat ); } - if( pF && pF->IsActive() && !pF->GetFooterFmt() ) + if( pF && pF->IsActive() && !pF->GetFooterFormat() ) { //If he doesn't have one, I'll add one - SwFrmFmt *pFmt = GetDoc()->getIDocumentLayoutAccess().MakeLayoutFmt( RND_STD_FOOTER, 0 ); - const_cast<SwFmtFooter *>(pF)->RegisterToFormat( *pFmt ); + SwFrameFormat *pFormat = GetDoc()->getIDocumentLayoutAccess().MakeLayoutFormat( RND_STD_FOOTER, 0 ); + const_cast<SwFormatFooter *>(pF)->RegisterToFormat( *pFormat ); } - SwFmt::Modify( pOld, pNew ); + SwFormat::Modify( pOld, pNew ); if (pOld && (RES_REMOVE_UNO_OBJECT == pOld->Which())) { // invalidate cached uno object @@ -2616,19 +2616,19 @@ void SwFrmFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) const SfxPoolItem* tmp = NULL; static_cast< const SwAttrSetChg* >(pNew)->GetChgSet()->GetItemState( RES_ANCHOR, false, &tmp ); if( tmp ) - newAnchorPosition = static_cast< const SwFmtAnchor* >( tmp )->GetCntntAnchor(); + newAnchorPosition = static_cast< const SwFormatAnchor* >( tmp )->GetContentAnchor(); } if( pNew && pNew->Which() == RES_ANCHOR ) - newAnchorPosition = static_cast< const SwFmtAnchor* >( pNew )->GetCntntAnchor(); + newAnchorPosition = static_cast< const SwFormatAnchor* >( pNew )->GetContentAnchor(); if( pOld && pOld->Which() == RES_ATTRSET_CHG ) { const SfxPoolItem* tmp = NULL; static_cast< const SwAttrSetChg* >(pOld)->GetChgSet()->GetItemState( RES_ANCHOR, false, &tmp ); if( tmp ) - oldAnchorPosition = static_cast< const SwFmtAnchor* >( tmp )->GetCntntAnchor(); + oldAnchorPosition = static_cast< const SwFormatAnchor* >( tmp )->GetContentAnchor(); } if( pOld && pOld->Which() == RES_ANCHOR ) - oldAnchorPosition = static_cast< const SwFmtAnchor* >( pOld )->GetCntntAnchor(); + oldAnchorPosition = static_cast< const SwFormatAnchor* >( pOld )->GetContentAnchor(); if( oldAnchorPosition != NULL && ( newAnchorPosition == NULL || oldAnchorPosition->nNode.GetIndex() != newAnchorPosition->nNode.GetIndex())) { oldAnchorPosition->nNode.GetNode().RemoveAnchoredFly(this); @@ -2639,15 +2639,15 @@ void SwFrmFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) } } -void SwFrmFmt::RegisterToFormat( SwFmt& rFmt ) +void SwFrameFormat::RegisterToFormat( SwFormat& rFormat ) { - rFmt.Add( this ); + rFormat.Add( this ); } /// Delete all Frms that are registered in aDepend. -void SwFrmFmt::DelFrms() +void SwFrameFormat::DelFrms() { - SwIterator<SwFrm,SwFmt> aIter( *this ); + SwIterator<SwFrm,SwFormat> aIter( *this ); SwFrm * pLast = aIter.First(); if( pLast ) do { @@ -2656,20 +2656,20 @@ void SwFrmFmt::DelFrms() } while( 0 != ( pLast = aIter.Next() )); } -void SwFrmFmt::MakeFrms() +void SwFrameFormat::MakeFrms() { OSL_ENSURE( false, "Sorry not implemented." ); } -SwRect SwFrmFmt::FindLayoutRect( const bool bPrtArea, const Point* pPoint, +SwRect SwFrameFormat::FindLayoutRect( const bool bPrtArea, const Point* pPoint, const bool bCalcFrm ) const { SwRect aRet; SwFrm *pFrm = 0; - if( ISA( SwSectionFmt ) ) + if( ISA( SwSectionFormat ) ) { // get the Frame using Node2Layout - const SwSectionNode* pSectNd = static_cast<const SwSectionFmt*>(this)->GetSectionNode(); + const SwSectionNode* pSectNd = static_cast<const SwSectionFormat*>(this)->GetSectionNode(); if( pSectNd ) { SwNode2Layout aTmp( *pSectNd, pSectNd->GetIndex() - 1 ); @@ -2710,12 +2710,12 @@ SwRect SwFrmFmt::FindLayoutRect( const bool bPrtArea, const Point* pPoint, return aRet; } -SwContact* SwFrmFmt::FindContactObj() +SwContact* SwFrameFormat::FindContactObj() { - return SwIterator<SwContact,SwFmt>( *this ).First(); + return SwIterator<SwContact,SwFormat>( *this ).First(); } -SdrObject* SwFrmFmt::FindSdrObject() +SdrObject* SwFrameFormat::FindSdrObject() { // #i30669# - use method <FindContactObj()> instead of // duplicated code. @@ -2723,7 +2723,7 @@ SdrObject* SwFrmFmt::FindSdrObject() return pFoundContact ? pFoundContact->GetMaster() : 0; } -SdrObject* SwFrmFmt::FindRealSdrObject() +SdrObject* SwFrameFormat::FindRealSdrObject() { if( RES_FLYFRMFMT == Which() ) { @@ -2735,51 +2735,51 @@ SdrObject* SwFrmFmt::FindRealSdrObject() return FindSdrObject(); } -bool SwFrmFmt::IsLowerOf( const SwFrmFmt& rFmt ) const +bool SwFrameFormat::IsLowerOf( const SwFrameFormat& rFormat ) const { //Also linking from inside to outside or from outside to inside is not //allowed. - SwFlyFrm *pSFly = SwIterator<SwFlyFrm,SwFmt>(*this).First(); + SwFlyFrm *pSFly = SwIterator<SwFlyFrm,SwFormat>(*this).First(); if( pSFly ) { - SwFlyFrm *pAskFly = SwIterator<SwFlyFrm,SwFmt>(rFmt).First(); + SwFlyFrm *pAskFly = SwIterator<SwFlyFrm,SwFormat>(rFormat).First(); if( pAskFly ) return pSFly->IsLowerOf( pAskFly ); } // let's try it using the node positions - const SwFmtAnchor* pAnchor = &rFmt.GetAnchor(); - if ((FLY_AT_PAGE != pAnchor->GetAnchorId()) && pAnchor->GetCntntAnchor()) + const SwFormatAnchor* pAnchor = &rFormat.GetAnchor(); + if ((FLY_AT_PAGE != pAnchor->GetAnchorId()) && pAnchor->GetContentAnchor()) { - const SwFrmFmts& rFmts = *GetDoc()->GetSpzFrmFmts(); - const SwNode* pFlyNd = pAnchor->GetCntntAnchor()->nNode.GetNode(). + const SwFrameFormats& rFormats = *GetDoc()->GetSpzFrameFormats(); + const SwNode* pFlyNd = pAnchor->GetContentAnchor()->nNode.GetNode(). FindFlyStartNode(); while( pFlyNd ) { // then we walk up using the anchor size_t n; - for( n = 0; n < rFmts.size(); ++n ) + for( n = 0; n < rFormats.size(); ++n ) { - const SwFrmFmt* pFmt = rFmts[ n ]; - const SwNodeIndex* pIdx = pFmt->GetCntnt().GetCntntIdx(); + const SwFrameFormat* pFormat = rFormats[ n ]; + const SwNodeIndex* pIdx = pFormat->GetContent().GetContentIdx(); if( pIdx && pFlyNd == &pIdx->GetNode() ) { - if( pFmt == this ) + if( pFormat == this ) return true; - pAnchor = &pFmt->GetAnchor(); + pAnchor = &pFormat->GetAnchor(); if ((FLY_AT_PAGE == pAnchor->GetAnchorId()) || - !pAnchor->GetCntntAnchor() ) + !pAnchor->GetContentAnchor() ) { return false; } - pFlyNd = pAnchor->GetCntntAnchor()->nNode.GetNode(). + pFlyNd = pAnchor->GetContentAnchor()->nNode.GetNode(). FindFlyStartNode(); break; } } - if( n >= rFmts.size() ) + if( n >= rFormats.size() ) { OSL_ENSURE( false, "Fly section but no format found" ); return false; @@ -2790,34 +2790,34 @@ bool SwFrmFmt::IsLowerOf( const SwFrmFmt& rFmt ) const } // #i31698# -SwFrmFmt::tLayoutDir SwFrmFmt::GetLayoutDir() const +SwFrameFormat::tLayoutDir SwFrameFormat::GetLayoutDir() const { - return SwFrmFmt::HORI_L2R; + return SwFrameFormat::HORI_L2R; } -void SwFrmFmt::SetLayoutDir( const SwFrmFmt::tLayoutDir ) +void SwFrameFormat::SetLayoutDir( const SwFrameFormat::tLayoutDir ) { // empty body, because default implementation does nothing } // #i28749# -sal_Int16 SwFrmFmt::GetPositionLayoutDir() const +sal_Int16 SwFrameFormat::GetPositionLayoutDir() const { return text::PositionLayoutDir::PositionInLayoutDirOfAnchor; } -void SwFrmFmt::SetPositionLayoutDir( const sal_Int16 ) +void SwFrameFormat::SetPositionLayoutDir( const sal_Int16 ) { // empty body, because default implementation does nothing } -OUString SwFrmFmt::GetDescription() const +OUString SwFrameFormat::GetDescription() const { return SW_RES(STR_FRAME); } -void SwFrmFmt::dumpAsXml(xmlTextWriterPtr pWriter) const +void SwFrameFormat::dumpAsXml(xmlTextWriterPtr pWriter) const { - xmlTextWriterStartElement(pWriter, BAD_CAST("swFrmFmt")); + xmlTextWriterStartElement(pWriter, BAD_CAST("swFrameFormat")); xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("ptr"), "%p", this); xmlTextWriterWriteAttribute(pWriter, BAD_CAST("name"), BAD_CAST(GetName().toUtf8().getStr())); xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("whichId"), "%d", Which()); @@ -2840,23 +2840,23 @@ void SwFrmFmt::dumpAsXml(xmlTextWriterPtr pWriter) const xmlTextWriterEndElement(pWriter); } -void SwFrmFmts::dumpAsXml(xmlTextWriterPtr pWriter, const char* pName) const +void SwFrameFormats::dumpAsXml(xmlTextWriterPtr pWriter, const char* pName) const { xmlTextWriterStartElement(pWriter, BAD_CAST(pName)); for (size_t i = 0; i < size(); ++i) - GetFmt(i)->dumpAsXml(pWriter); + GetFormat(i)->dumpAsXml(pWriter); xmlTextWriterEndElement(pWriter); } -// class SwFlyFrmFmt +// class SwFlyFrameFormat // Partially implemented inline in hxx -TYPEINIT1( SwFlyFrmFmt, SwFrmFmt ); -IMPL_FIXEDMEMPOOL_NEWDEL( SwFlyFrmFmt ) +TYPEINIT1( SwFlyFrameFormat, SwFrameFormat ); +IMPL_FIXEDMEMPOOL_NEWDEL( SwFlyFrameFormat ) -SwFlyFrmFmt::~SwFlyFrmFmt() +SwFlyFrameFormat::~SwFlyFrameFormat() { - SwIterator<SwFlyFrm,SwFmt> aIter( *this ); + SwIterator<SwFlyFrm,SwFormat> aIter( *this ); SwFlyFrm * pLast = aIter.First(); if( pLast ) do @@ -2864,7 +2864,7 @@ SwFlyFrmFmt::~SwFlyFrmFmt() SwFrm::DestroyFrm(pLast); } while( 0 != ( pLast = aIter.Next() )); - SwIterator<SwFlyDrawContact,SwFmt> a2ndIter( *this ); + SwIterator<SwFlyDrawContact,SwFormat> a2ndIter( *this ); SwFlyDrawContact* pC = a2ndIter.First(); if( pC ) do { @@ -2875,7 +2875,7 @@ SwFlyFrmFmt::~SwFlyFrmFmt() /// Creates the Frms if the format describes a paragraph-bound frame. /// MA: 1994-02-14: creates the Frms also for frames anchored at page. -void SwFlyFrmFmt::MakeFrms() +void SwFlyFrameFormat::MakeFrms() { // is there a layout? if( !GetDoc()->getIDocumentLayoutAccess().GetCurrentViewShell() ) @@ -2883,36 +2883,36 @@ void SwFlyFrmFmt::MakeFrms() SwModify *pModify = 0; // OD 24.07.2003 #111032# - create local copy of anchor attribute for possible changes. - SwFmtAnchor aAnchorAttr( GetAnchor() ); + SwFormatAnchor aAnchorAttr( GetAnchor() ); switch( aAnchorAttr.GetAnchorId() ) { case FLY_AS_CHAR: case FLY_AT_PARA: case FLY_AT_CHAR: - if( aAnchorAttr.GetCntntAnchor() ) + if( aAnchorAttr.GetContentAnchor() ) { - pModify = aAnchorAttr.GetCntntAnchor()->nNode.GetNode().GetCntntNode(); + pModify = aAnchorAttr.GetContentAnchor()->nNode.GetNode().GetContentNode(); } break; case FLY_AT_FLY: - if( aAnchorAttr.GetCntntAnchor() ) + if( aAnchorAttr.GetContentAnchor() ) { //First search in the content because this is O(1) //This can go wrong for linked frames because in this case it's //possible, that no Frame exists for this content. //In such a situation we also need to search from StartNode to //FrameFormat. - SwNodeIndex aIdx( aAnchorAttr.GetCntntAnchor()->nNode ); - SwCntntNode *pCNd = GetDoc()->GetNodes().GoNext( &aIdx ); + SwNodeIndex aIdx( aAnchorAttr.GetContentAnchor()->nNode ); + SwContentNode *pCNd = GetDoc()->GetNodes().GoNext( &aIdx ); // #i105535# if ( pCNd == 0 ) { - pCNd = aAnchorAttr.GetCntntAnchor()->nNode.GetNode().GetCntntNode(); + pCNd = aAnchorAttr.GetContentAnchor()->nNode.GetNode().GetContentNode(); } if ( pCNd ) { - if( SwIterator<SwFrm,SwCntntNode>( *pCNd ).First() ) + if( SwIterator<SwFrm,SwContentNode>( *pCNd ).First() ) { pModify = pCNd; } @@ -2920,15 +2920,15 @@ void SwFlyFrmFmt::MakeFrms() // #i105535# if ( pModify == 0 ) { - const SwNodeIndex &rIdx = aAnchorAttr.GetCntntAnchor()->nNode; - SwFrmFmts& rFmts = *GetDoc()->GetSpzFrmFmts(); - for( size_t i = 0; i < rFmts.size(); ++i ) + const SwNodeIndex &rIdx = aAnchorAttr.GetContentAnchor()->nNode; + SwFrameFormats& rFormats = *GetDoc()->GetSpzFrameFormats(); + for( size_t i = 0; i < rFormats.size(); ++i ) { - SwFrmFmt* pFlyFmt = rFmts[i]; - if( pFlyFmt->GetCntnt().GetCntntIdx() && - rIdx == *pFlyFmt->GetCntnt().GetCntntIdx() ) + SwFrameFormat* pFlyFormat = rFormats[i]; + if( pFlyFormat->GetContent().GetContentIdx() && + rIdx == *pFlyFormat->GetContent().GetContentIdx() ) { - pModify = pFlyFmt; + pModify = pFlyFormat; break; } } @@ -2940,10 +2940,10 @@ void SwFlyFrmFmt::MakeFrms() { sal_uInt16 nPgNum = aAnchorAttr.GetPageNum(); SwPageFrm *pPage = static_cast<SwPageFrm*>(GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout()->Lower()); - if( nPgNum == 0 && aAnchorAttr.GetCntntAnchor() ) + if( nPgNum == 0 && aAnchorAttr.GetContentAnchor() ) { - SwCntntNode *pCNd = aAnchorAttr.GetCntntAnchor()->nNode.GetNode().GetCntntNode(); - SwIterator<SwFrm,SwCntntNode> aIter( *pCNd ); + SwContentNode *pCNd = aAnchorAttr.GetContentAnchor()->nNode.GetNode().GetContentNode(); + SwIterator<SwFrm,SwContentNode> aIter( *pCNd ); for ( SwFrm* pFrm = aIter.First(); pFrm != NULL; pFrm = aIter.Next() ) { pPage = pFrm->FindPageFrm(); @@ -2952,7 +2952,7 @@ void SwFlyFrmFmt::MakeFrms() nPgNum = pPage->GetPhyPageNum(); aAnchorAttr.SetPageNum( nPgNum ); aAnchorAttr.SetAnchor( 0 ); - SetFmtAttr( aAnchorAttr ); + SetFormatAttr( aAnchorAttr ); break; } } @@ -2978,8 +2978,8 @@ void SwFlyFrmFmt::MakeFrms() SwIterator<SwFrm,SwModify> aIter( *pModify ); for( SwFrm *pFrm = aIter.First(); pFrm; pFrm = aIter.Next() ) { - bool bAdd = !pFrm->IsCntntFrm() || - !static_cast<SwCntntFrm*>(pFrm)->IsFollow(); + bool bAdd = !pFrm->IsContentFrm() || + !static_cast<SwContentFrm*>(pFrm)->IsFollow(); if ( FLY_AT_FLY == aAnchorAttr.GetAnchorId() && !pFrm->IsFlyFrm() ) { @@ -2991,7 +2991,7 @@ void SwFlyFrmFmt::MakeFrms() else { aAnchorAttr.SetType( FLY_AT_PARA ); - SetFmtAttr( aAnchorAttr ); + SetFormatAttr( aAnchorAttr ); MakeFrms(); return; } @@ -3007,7 +3007,7 @@ void SwFlyFrmFmt::MakeFrms() // <SwSortedObjs> entries. SwAnchoredObject* pObj = rObjs[i]; if( pObj->ISA(SwFlyFrm) && - (&pObj->GetFrmFmt()) == this ) + (&pObj->GetFrameFormat()) == this ) { bAdd = false; break; @@ -3037,8 +3037,8 @@ void SwFlyFrmFmt::MakeFrms() break; } pFrm->AppendFly( pFly ); - pFly->GetFmt()->SetObjTitle(GetObjTitle()); - pFly->GetFmt()->SetObjDescription(GetObjDescription()); + pFly->GetFormat()->SetObjTitle(GetObjTitle()); + pFly->GetFormat()->SetObjDescription(GetObjDescription()); SwPageFrm *pPage = pFly->FindPageFrm(); if( pPage ) ::RegistFlys( pPage, pFly ); @@ -3047,13 +3047,13 @@ void SwFlyFrmFmt::MakeFrms() } } -SwFlyFrm* SwFlyFrmFmt::GetFrm( const Point* pPoint, const bool bCalcFrm ) const +SwFlyFrm* SwFlyFrameFormat::GetFrm( const Point* pPoint, const bool bCalcFrm ) const { return static_cast<SwFlyFrm*>(::GetFrmOfModify( 0, *(SwModify*)this, FRM_FLY, pPoint, 0, bCalcFrm )); } -SwAnchoredObject* SwFlyFrmFmt::GetAnchoredObj( const Point* pPoint, const bool bCalcFrm ) const +SwAnchoredObject* SwFlyFrameFormat::GetAnchoredObj( const Point* pPoint, const bool bCalcFrm ) const { SwFlyFrm* pFlyFrm( GetFrm( pPoint, bCalcFrm ) ); if ( pFlyFrm ) @@ -3066,30 +3066,30 @@ SwAnchoredObject* SwFlyFrmFmt::GetAnchoredObj( const Point* pPoint, const bool b } } -bool SwFlyFrmFmt::GetInfo( SfxPoolItem& rInfo ) const +bool SwFlyFrameFormat::GetInfo( SfxPoolItem& rInfo ) const { bool bRet = true; switch( rInfo.Which() ) { case RES_CONTENT_VISIBLE: { - static_cast<SwPtrMsgPoolItem&>(rInfo).pObject = SwIterator<SwFrm,SwFmt>( *this ).First(); + static_cast<SwPtrMsgPoolItem&>(rInfo).pObject = SwIterator<SwFrm,SwFormat>( *this ).First(); } bRet = false; break; default: - bRet = SwFrmFmt::GetInfo( rInfo ); + bRet = SwFrameFormat::GetInfo( rInfo ); break; } return bRet; } // #i73249# -void SwFlyFrmFmt::SetObjTitle( const OUString& rTitle, bool bBroadcast ) +void SwFlyFrameFormat::SetObjTitle( const OUString& rTitle, bool bBroadcast ) { SdrObject* pMasterObject = FindSdrObject(); - OSL_ENSURE( pMasterObject, "<SwFlyFrmFmt::SetObjTitle(..)> - missing <SdrObject> instance" ); + OSL_ENSURE( pMasterObject, "<SwFlyFrameFormat::SetObjTitle(..)> - missing <SdrObject> instance" ); msTitle = rTitle; if ( !pMasterObject ) { @@ -3109,10 +3109,10 @@ void SwFlyFrmFmt::SetObjTitle( const OUString& rTitle, bool bBroadcast ) } } -OUString SwFlyFrmFmt::GetObjTitle() const +OUString SwFlyFrameFormat::GetObjTitle() const { const SdrObject* pMasterObject = FindSdrObject(); - OSL_ENSURE( pMasterObject, "<SwFlyFrmFmt::GetObjTitle(..)> - missing <SdrObject> instance" ); + OSL_ENSURE( pMasterObject, "<SwFlyFrameFormat::GetObjTitle(..)> - missing <SdrObject> instance" ); if ( !pMasterObject ) { return msTitle; @@ -3123,10 +3123,10 @@ OUString SwFlyFrmFmt::GetObjTitle() const return msTitle; } -void SwFlyFrmFmt::SetObjDescription( const OUString& rDescription, bool bBroadcast ) +void SwFlyFrameFormat::SetObjDescription( const OUString& rDescription, bool bBroadcast ) { SdrObject* pMasterObject = FindSdrObject(); - OSL_ENSURE( pMasterObject, "<SwFlyFrmFmt::SetDescription(..)> - missing <SdrObject> instance" ); + OSL_ENSURE( pMasterObject, "<SwFlyFrameFormat::SetDescription(..)> - missing <SdrObject> instance" ); msDesc = rDescription; if ( !pMasterObject ) { @@ -3146,10 +3146,10 @@ void SwFlyFrmFmt::SetObjDescription( const OUString& rDescription, bool bBroadca } } -OUString SwFlyFrmFmt::GetObjDescription() const +OUString SwFlyFrameFormat::GetObjDescription() const { const SdrObject* pMasterObject = FindSdrObject(); - OSL_ENSURE( pMasterObject, "<SwFlyFrmFmt::GetDescription(..)> - missing <SdrObject> instance" ); + OSL_ENSURE( pMasterObject, "<SwFlyFrameFormat::GetDescription(..)> - missing <SdrObject> instance" ); if ( !pMasterObject ) { return msDesc; @@ -3160,7 +3160,7 @@ OUString SwFlyFrmFmt::GetObjDescription() const return msDesc; } -/** SwFlyFrmFmt::IsBackgroundTransparent - for #99657# +/** SwFlyFrameFormat::IsBackgroundTransparent - for #99657# OD 22.08.2002 - overriding virtual method and its default implementation, because format of fly frame provides transparent backgrounds. @@ -3169,7 +3169,7 @@ OUString SwFlyFrmFmt::GetObjDescription() const @return true, if background color is transparent, but not "no fill" or the transparency of a existing background graphic is set. */ -bool SwFlyFrmFmt::IsBackgroundTransparent() const +bool SwFlyFrameFormat::IsBackgroundTransparent() const { //UUUU if (supportsFullDrawingLayerFillAttributeSet() && getSdrAllFillAttributesHelper()) @@ -3202,7 +3202,7 @@ bool SwFlyFrmFmt::IsBackgroundTransparent() const return false; } -/** SwFlyFrmFmt::IsBackgroundBrushInherited - for #103898# +/** SwFlyFrameFormat::IsBackgroundBrushInherited - for #103898# OD 08.10.2002 - method to determine, if the brush for drawing the background is "inherited" from its parent/grandparent. @@ -3212,7 +3212,7 @@ bool SwFlyFrmFmt::IsBackgroundTransparent() const @return true, if background brush is "inherited" from parent/grandparent */ -bool SwFlyFrmFmt::IsBackgroundBrushInherited() const +bool SwFlyFrameFormat::IsBackgroundBrushInherited() const { //UUUU if (supportsFullDrawingLayerFillAttributeSet() && getSdrAllFillAttributesHelper()) @@ -3233,35 +3233,35 @@ bool SwFlyFrmFmt::IsBackgroundBrushInherited() const } // #125892# -SwHandleAnchorNodeChg::SwHandleAnchorNodeChg( SwFlyFrmFmt& _rFlyFrmFmt, - const SwFmtAnchor& _rNewAnchorFmt, +SwHandleAnchorNodeChg::SwHandleAnchorNodeChg( SwFlyFrameFormat& _rFlyFrameFormat, + const SwFormatAnchor& _rNewAnchorFormat, SwFlyFrm* _pKeepThisFlyFrm ) - : mrFlyFrmFmt( _rFlyFrmFmt ), + : mrFlyFrameFormat( _rFlyFrameFormat ), mbAnchorNodeChanged( false ) { - const RndStdIds nNewAnchorType( _rNewAnchorFmt.GetAnchorId() ); + const RndStdIds nNewAnchorType( _rNewAnchorFormat.GetAnchorId() ); if ( ((nNewAnchorType == FLY_AT_PARA) || (nNewAnchorType == FLY_AT_CHAR)) && - _rNewAnchorFmt.GetCntntAnchor() && - _rNewAnchorFmt.GetCntntAnchor()->nNode.GetNode().GetCntntNode() ) + _rNewAnchorFormat.GetContentAnchor() && + _rNewAnchorFormat.GetContentAnchor()->nNode.GetNode().GetContentNode() ) { - const SwFmtAnchor& aOldAnchorFmt( _rFlyFrmFmt.GetAnchor() ); - if ( aOldAnchorFmt.GetAnchorId() == nNewAnchorType && - aOldAnchorFmt.GetCntntAnchor() && - aOldAnchorFmt.GetCntntAnchor()->nNode.GetNode().GetCntntNode() && - aOldAnchorFmt.GetCntntAnchor()->nNode != - _rNewAnchorFmt.GetCntntAnchor()->nNode ) + const SwFormatAnchor& aOldAnchorFormat( _rFlyFrameFormat.GetAnchor() ); + if ( aOldAnchorFormat.GetAnchorId() == nNewAnchorType && + aOldAnchorFormat.GetContentAnchor() && + aOldAnchorFormat.GetContentAnchor()->nNode.GetNode().GetContentNode() && + aOldAnchorFormat.GetContentAnchor()->nNode != + _rNewAnchorFormat.GetContentAnchor()->nNode ) { // determine 'old' number of anchor frames sal_uInt32 nOldNumOfAnchFrm( 0L ); - SwIterator<SwFrm,SwCntntNode> aOldIter( *(aOldAnchorFmt.GetCntntAnchor()->nNode.GetNode().GetCntntNode()) ); + SwIterator<SwFrm,SwContentNode> aOldIter( *(aOldAnchorFormat.GetContentAnchor()->nNode.GetNode().GetContentNode()) ); for( SwFrm* pOld = aOldIter.First(); pOld; pOld = aOldIter.Next() ) { ++nOldNumOfAnchFrm; } // determine 'new' number of anchor frames sal_uInt32 nNewNumOfAnchFrm( 0L ); - SwIterator<SwFrm,SwCntntNode> aNewIter( *(_rNewAnchorFmt.GetCntntAnchor()->nNode.GetNode().GetCntntNode()) ); + SwIterator<SwFrm,SwContentNode> aNewIter( *(_rNewAnchorFormat.GetContentAnchor()->nNode.GetNode().GetContentNode()) ); for( SwFrm* pNew = aNewIter.First(); pNew; pNew = aNewIter.Next() ) { ++nNewNumOfAnchFrm; @@ -3269,7 +3269,7 @@ SwHandleAnchorNodeChg::SwHandleAnchorNodeChg( SwFlyFrmFmt& _rFlyFrmFmt, if ( nOldNumOfAnchFrm != nNewNumOfAnchFrm ) { // delete existing fly frames except <_pKeepThisFlyFrm> - SwIterator<SwFrm,SwFmt> aIter( mrFlyFrmFmt ); + SwIterator<SwFrm,SwFormat> aIter( mrFlyFrameFormat ); SwFrm* pFrm = aIter.First(); if ( pFrm ) { @@ -3292,30 +3292,30 @@ SwHandleAnchorNodeChg::~SwHandleAnchorNodeChg() { if ( mbAnchorNodeChanged ) { - mrFlyFrmFmt.MakeFrms(); + mrFlyFrameFormat.MakeFrms(); } } -// class SwDrawFrmFmt +// class SwDrawFrameFormat // Partially implemented inline in hxx -TYPEINIT1( SwDrawFrmFmt, SwFrmFmt ); -IMPL_FIXEDMEMPOOL_NEWDEL( SwDrawFrmFmt ) +TYPEINIT1( SwDrawFrameFormat, SwFrameFormat ); +IMPL_FIXEDMEMPOOL_NEWDEL( SwDrawFrameFormat ) -SwDrawFrmFmt::~SwDrawFrmFmt() +SwDrawFrameFormat::~SwDrawFrameFormat() { SwContact *pContact = FindContactObj(); delete pContact; } -void SwDrawFrmFmt::MakeFrms() +void SwDrawFrameFormat::MakeFrms() { SwDrawContact *pContact = static_cast<SwDrawContact*>(FindContactObj()); if ( pContact ) pContact->ConnectToLayout(); } -void SwDrawFrmFmt::DelFrms() +void SwDrawFrameFormat::DelFrms() { SwDrawContact *pContact = static_cast<SwDrawContact *>(FindContactObj()); if ( pContact ) //for the reader and other unpredictable things. @@ -3323,22 +3323,22 @@ void SwDrawFrmFmt::DelFrms() } // #i31698# -SwFrmFmt::tLayoutDir SwDrawFrmFmt::GetLayoutDir() const +SwFrameFormat::tLayoutDir SwDrawFrameFormat::GetLayoutDir() const { return meLayoutDir; } -void SwDrawFrmFmt::SetLayoutDir( const SwFrmFmt::tLayoutDir _eLayoutDir ) +void SwDrawFrameFormat::SetLayoutDir( const SwFrameFormat::tLayoutDir _eLayoutDir ) { meLayoutDir = _eLayoutDir; } // #i28749# -sal_Int16 SwDrawFrmFmt::GetPositionLayoutDir() const +sal_Int16 SwDrawFrameFormat::GetPositionLayoutDir() const { return mnPositionLayoutDir; } -void SwDrawFrmFmt::SetPositionLayoutDir( const sal_Int16 _nPositionLayoutDir ) +void SwDrawFrameFormat::SetPositionLayoutDir( const sal_Int16 _nPositionLayoutDir ) { switch ( _nPositionLayoutDir ) { @@ -3350,12 +3350,12 @@ void SwDrawFrmFmt::SetPositionLayoutDir( const sal_Int16 _nPositionLayoutDir ) break; default: { - OSL_FAIL( "<SwDrawFrmFmt::SetPositionLayoutDir(..)> - invalid attribute value." ); + OSL_FAIL( "<SwDrawFrameFormat::SetPositionLayoutDir(..)> - invalid attribute value." ); } } } -OUString SwDrawFrmFmt::GetDescription() const +OUString SwDrawFrameFormat::GetDescription() const { OUString aResult; const SdrObject * pSdrObj = FindSdrObject(); @@ -3381,35 +3381,35 @@ OUString SwDrawFrmFmt::GetDescription() const return aResult; } -IMapObject* SwFrmFmt::GetIMapObject( const Point& rPoint, +IMapObject* SwFrameFormat::GetIMapObject( const Point& rPoint, const SwFlyFrm *pFly ) const { - const SwFmtURL &rURL = GetURL(); + const SwFormatURL &rURL = GetURL(); if( !rURL.GetMap() ) return 0; if( !pFly ) { - pFly = SwIterator<SwFlyFrm,SwFmt>( *this ).First(); + pFly = SwIterator<SwFlyFrm,SwFormat>( *this ).First(); if( !pFly ) return 0; } //Original size for OLE and graphic is TwipSize, otherwise the size of - //FrmFmt of the Fly. + //FrameFormat of the Fly. const SwFrm *pRef; - const SwNoTxtNode *pNd = 0; + const SwNoTextNode *pNd = 0; Size aOrigSz; - if( pFly->Lower() && pFly->Lower()->IsNoTxtFrm() ) + if( pFly->Lower() && pFly->Lower()->IsNoTextFrm() ) { pRef = pFly->Lower(); - pNd = static_cast<const SwCntntFrm*>(pRef)->GetNode()->GetNoTxtNode(); + pNd = static_cast<const SwContentFrm*>(pRef)->GetNode()->GetNoTextNode(); aOrigSz = pNd->GetTwipSize(); } else { pRef = pFly; - aOrigSz = pFly->GetFmt()->GetFrmSize().GetSize(); + aOrigSz = pFly->GetFormat()->GetFrmSize().GetSize(); } if( aOrigSz.Width() != 0 && aOrigSz.Height() != 0 ) @@ -3444,14 +3444,14 @@ IMapObject* SwFrmFmt::GetIMapObject( const Point& rPoint, } //UUUU -drawinglayer::attribute::SdrAllFillAttributesHelperPtr SwFrmFmt::getSdrAllFillAttributesHelper() const +drawinglayer::attribute::SdrAllFillAttributesHelperPtr SwFrameFormat::getSdrAllFillAttributesHelper() const { if (supportsFullDrawingLayerFillAttributeSet()) { // create FillAttributes on demand if(!maFillAttributes.get()) { - const_cast< SwFrmFmt* >(this)->maFillAttributes.reset(new drawinglayer::attribute::SdrAllFillAttributesHelper(GetAttrSet())); + const_cast< SwFrameFormat* >(this)->maFillAttributes.reset(new drawinglayer::attribute::SdrAllFillAttributesHelper(GetAttrSet())); } } else @@ -3463,12 +3463,12 @@ drawinglayer::attribute::SdrAllFillAttributesHelperPtr SwFrmFmt::getSdrAllFillAt return maFillAttributes; } -bool IsFlyFrmFmtInHeader(const SwFrmFmt& rFmt) +bool IsFlyFrameFormatInHeader(const SwFrameFormat& rFormat) { - const SwFlyFrmFmt* pFlyFrmFmt = dynamic_cast<const SwFlyFrmFmt*>(&rFmt); - if (!pFlyFrmFmt) + const SwFlyFrameFormat* pFlyFrameFormat = dynamic_cast<const SwFlyFrameFormat*>(&rFormat); + if (!pFlyFrameFormat) return false; - SwFlyFrm* pFlyFrm = const_cast<SwFlyFrm*>(pFlyFrmFmt->GetFrm()); + SwFlyFrm* pFlyFrm = const_cast<SwFlyFrm*>(pFlyFrameFormat->GetFrm()); if (!pFlyFrm) // fdo#54648: "hidden" drawing object has no layout frame { return false; @@ -3498,33 +3498,33 @@ void CheckAnchoredFlyConsistency(SwDoc const& rDoc) for (sal_uLong i = 0; i != count; ++i) { SwNode const*const pNode(rNodes[i]); - std::vector<SwFrmFmt*> const*const pFlys(pNode->GetAnchoredFlys()); + std::vector<SwFrameFormat*> const*const pFlys(pNode->GetAnchoredFlys()); if (pFlys) { for (auto it = pFlys->begin(); it != pFlys->end(); ++it) { - SwFmtAnchor const& rAnchor((**it).GetAnchor(false)); - assert(&rAnchor.GetCntntAnchor()->nNode.GetNode() == pNode); + SwFormatAnchor const& rAnchor((**it).GetAnchor(false)); + assert(&rAnchor.GetContentAnchor()->nNode.GetNode() == pNode); } } } - SwFrmFmts const*const pSpzFrmFmts(rDoc.GetSpzFrmFmts()); - if (pSpzFrmFmts) + SwFrameFormats const*const pSpzFrameFormats(rDoc.GetSpzFrameFormats()); + if (pSpzFrameFormats) { - for (auto it = pSpzFrmFmts->begin(); it != pSpzFrmFmts->end(); ++it) + for (auto it = pSpzFrameFormats->begin(); it != pSpzFrameFormats->end(); ++it) { - SwFmtAnchor const& rAnchor((**it).GetAnchor(false)); + SwFormatAnchor const& rAnchor((**it).GetAnchor(false)); if (FLY_AT_PAGE == rAnchor.GetAnchorId()) { - assert(!rAnchor.GetCntntAnchor() + assert(!rAnchor.GetContentAnchor() // for invalid documents that lack text:anchor-page-number // it may have an anchor before MakeFrms() is called - || (!SwIterator<SwFrm, SwFrmFmt>(**it).First())); + || (!SwIterator<SwFrm, SwFrameFormat>(**it).First())); } else { - SwNode & rNode(rAnchor.GetCntntAnchor()->nNode.GetNode()); - std::vector<SwFrmFmt*> const*const pFlys(rNode.GetAnchoredFlys()); + SwNode & rNode(rAnchor.GetContentAnchor()->nNode.GetNode()); + std::vector<SwFrameFormat*> const*const pFlys(rNode.GetAnchoredFlys()); assert(std::find(pFlys->begin(), pFlys->end(), *it) != pFlys->end()); switch (rAnchor.GetAnchorId()) { @@ -3532,11 +3532,11 @@ void CheckAnchoredFlyConsistency(SwDoc const& rDoc) assert(rNode.IsStartNode()); break; case FLY_AT_PARA: - assert(rNode.IsTxtNode() || rNode.IsTableNode()); + assert(rNode.IsTextNode() || rNode.IsTableNode()); break; case FLY_AS_CHAR: case FLY_AT_CHAR: - assert(rNode.IsTxtNode()); + assert(rNode.IsTextNode()); break; default: assert(false); diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx index 8e101e79b9e9..ec2da7d8f385 100644 --- a/sw/source/core/layout/calcmove.cxx +++ b/sw/source/core/layout/calcmove.cxx @@ -47,7 +47,7 @@ // Move methods /// Return value tells whether the Frm should be moved. -bool SwCntntFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool, bool & ) +bool SwContentFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool, bool & ) { if ( (SwFlowFrm::IsMoveBwdJump() || !IsPrevObjMove())) { @@ -64,7 +64,7 @@ bool SwCntntFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool, bool & ) // and we have to move the Frm just to see what happens - if there's // some space available to do it, that is. - // The FixSize of the containers of Cntnts is always the width. + // The FixSize of the containers of Contents is always the width. // If we moved more than one sheet back (for example jumping over empty // pages), we have to move either way. Otherwise, if the Frm doesn't fit @@ -76,14 +76,14 @@ bool SwCntntFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool, bool & ) if ( SwFlowFrm::IsMoveBwdJump() ) return true; - if( IsInFtn() && IsInSct() ) + if( IsInFootnote() && IsInSct() ) { - SwFtnFrm* pFtn = FindFtnFrm(); - SwSectionFrm* pMySect = pFtn->FindSctFrm(); - if( pMySect && pMySect->IsFtnLock() ) + SwFootnoteFrm* pFootnote = FindFootnoteFrm(); + SwSectionFrm* pMySect = pFootnote->FindSctFrm(); + if( pMySect && pMySect->IsFootnoteLock() ) { SwSectionFrm *pSect = pNewUpper->FindSctFrm(); - while( pSect && pSect->IsInFtn() ) + while( pSect && pSect->IsInFootnote() ) pSect = pSect->GetUpper()->FindSctFrm(); OSL_ENSURE( pSect, "Escaping footnote" ); if( pSect != pMySect ) @@ -102,7 +102,7 @@ bool SwCntntFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool, bool & ) // if <nMoveAnyway> equals 3 and no space is left in new upper. nMoveAnyway |= BwdMoveNecessary( pOldPage, Frm() ); { - const IDocumentSettingAccess* pIDSA = pNewPage->GetFmt()->getIDocumentSettingAccess(); + const IDocumentSettingAccess* pIDSA = pNewPage->GetFormat()->getIDocumentSettingAccess(); SwTwips nSpace = 0; SwRect aRect( pNewUpper->Prt() ); aRect.Pos() += pNewUpper->Frm().Pos(); @@ -122,7 +122,7 @@ bool SwCntntFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool, bool & ) // if last frame is a section, take its last content if ( pPrevFrm->IsSctFrm() ) { - pLastFrm = static_cast<const SwSectionFrm*>(pPrevFrm)->FindLastCntnt(); + pLastFrm = static_cast<const SwSectionFrm*>(pPrevFrm)->FindLastContent(); if ( pLastFrm && pLastFrm->FindTabFrm() != pPrevFrm->FindTabFrm() ) { @@ -148,7 +148,7 @@ bool SwCntntFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool, bool & ) //determine space left in new upper frame nSpace = (aRect.*fnRectX->fnGetHeight)(); const SwViewShell *pSh = pNewUpper->getRootFrm()->GetCurrShell(); - if ( IsInFtn() || + if ( IsInFootnote() || (pSh && pSh->GetViewOptions()->getBrowseMode()) || pNewUpper->IsCellFrm() || ( pNewUpper->IsInSct() && ( pNewUpper->IsSctFrm() || @@ -249,11 +249,11 @@ void SwFrm::PrepareMake() if ( !GetUpper() ) return; - const bool bCnt = IsCntntFrm(); + const bool bCnt = IsContentFrm(); const bool bTab = IsTabFrm(); bool bNoSect = IsInSct(); bool bOldTabLock = false, bFoll = false; - SwFlowFrm* pThis = bCnt ? static_cast<SwCntntFrm*>(this) : NULL; + SwFlowFrm* pThis = bCnt ? static_cast<SwContentFrm*>(this) : NULL; if ( bTab ) { @@ -271,7 +271,7 @@ void SwFrm::PrepareMake() else if ( bCnt && (bFoll = pThis->IsFollow()) && GetPrev() ) { //Do not follow the chain when we need only one instance - const SwTxtFrm* pMaster = static_cast<SwCntntFrm*>(this)->FindMaster(); + const SwTextFrm* pMaster = static_cast<SwContentFrm*>(this)->FindMaster(); if ( pMaster && pMaster->IsLocked() ) { MakeAll(); @@ -307,7 +307,7 @@ void SwFrm::PrepareMake() if( IsSctFrm() && !static_cast<SwSectionFrm*>(this)->GetSection() ) break; } - // With CntntFrms, the chain may be broken while walking through + // With ContentFrms, the chain may be broken while walking through // it. Therefore we have to figure out the follower in a bit more // complicated way. However, I'll HAVE to get back to myself // sometime again. @@ -374,12 +374,12 @@ void SwFrm::PrepareCrsr() if ( !GetUpper() ) return; - const bool bCnt = IsCntntFrm(); + const bool bCnt = IsContentFrm(); const bool bTab = IsTabFrm(); bool bNoSect = IsInSct(); bool bOldTabLock = false, bFoll; - SwFlowFrm* pThis = bCnt ? static_cast<SwCntntFrm*>(this) : NULL; + SwFlowFrm* pThis = bCnt ? static_cast<SwContentFrm*>(this) : NULL; if ( bTab ) { @@ -413,7 +413,7 @@ void SwFrm::PrepareCrsr() pFrm->MakeAll(); } - // With CntntFrms, the chain may be broken while walking through + // With ContentFrms, the chain may be broken while walking through // it. Therefore we have to figure out the follower in a bit more // complicated way. However, I'll HAVE to get back to myself // sometime again. @@ -458,7 +458,7 @@ static SwFrm* lcl_NotHiddenPrev( SwFrm* pFrm ) do { pRet = lcl_Prev( pRet ); - } while ( pRet && pRet->IsTxtFrm() && static_cast<SwTxtFrm*>(pRet)->IsHiddenNow() ); + } while ( pRet && pRet->IsTextFrm() && static_cast<SwTextFrm*>(pRet)->IsHiddenNow() ); return pRet; } @@ -470,8 +470,8 @@ void SwFrm::MakePos() bool bUseUpper = false; SwFrm* pPrv = lcl_Prev( this ); if ( pPrv && - ( !pPrv->IsCntntFrm() || - ( static_cast<SwCntntFrm*>(pPrv)->GetFollow() != this ) ) + ( !pPrv->IsContentFrm() || + ( static_cast<SwContentFrm*>(pPrv)->GetFollow() != this ) ) ) { if ( !StackHack::IsLocked() && @@ -623,7 +623,7 @@ static void lcl_CheckObjects( SwSortedObjs* pSortedObjs, SwFrm* pFrm, long& rBot ( pFrm->IsPageFrm() ? pFly->IsFlyLayFrm() : ( pFly->IsFlyAtCntFrm() && ( pFrm->IsBodyFrm() ? pFly->GetAnchorFrm()->IsInDocBody() : - pFly->GetAnchorFrm()->IsInFtn() ) ) ) ) + pFly->GetAnchorFrm()->IsInFootnote() ) ) ) ) { nTmp = pFly->Frm().Bottom(); } @@ -703,9 +703,9 @@ void SwPageFrm::MakeAll() static_cast<SwLayoutFrm*>(pFrm)->IsAnLower( pCnt ))) { nTmp += pCnt->Frm().Height(); - if( pCnt->IsTxtFrm() && - static_cast<SwTxtFrm*>(pCnt)->IsUndersized() ) - nTmp += static_cast<SwTxtFrm*>(pCnt)->GetParHeight() + if( pCnt->IsTextFrm() && + static_cast<SwTextFrm*>(pCnt)->IsUndersized() ) + nTmp += static_cast<SwTextFrm*>(pCnt)->GetParHeight() - pCnt->Prt().Height(); else if( pCnt->IsSctFrm() && static_cast<SwSectionFrm*>(pCnt)->IsUndersized() ) @@ -732,7 +732,7 @@ void SwPageFrm::MakeAll() nTmp = std::min( nTmp, pFrm->Frm().Height() ); nBot += nTmp; // Here we check whether paragraph anchored objects - // protrude outside the Body/FtnCont. + // protrude outside the Body/FootnoteCont. if( pSortedObjs && !pFrm->IsHeaderFrm() && !pFrm->IsFooterFrm() ) lcl_CheckObjects( pSortedObjs, pFrm, nBot ); @@ -813,7 +813,7 @@ void SwLayoutFrm::MakeAll() mbValidPrtArea = false; SwTwips nPrtWidth = (GetUpper()->Prt().*fnRect->fnGetWidth)(); - if( bVert && ( IsBodyFrm() || IsFtnContFrm() ) ) + if( bVert && ( IsBodyFrm() || IsFootnoteContFrm() ) ) { SwFrm* pNxt = GetPrev(); while( pNxt && !pNxt->IsHeaderFrm() ) @@ -856,10 +856,10 @@ void SwLayoutFrm::MakeAll() delete pAccess; } -bool SwTxtNode::IsCollapse() const +bool SwTextNode::IsCollapse() const { if (GetDoc()->GetDocumentSettingManager().get( DocumentSettingId::COLLAPSE_EMPTY_CELL_PARA ) - && GetTxt().isEmpty()) + && GetText().isEmpty()) { sal_uLong nIdx=GetIndex(); const SwEndNode *pNdBefore=GetNodes()[nIdx-1]->GetEndNode(); @@ -879,15 +879,15 @@ bool SwTxtNode::IsCollapse() const bool SwFrm::IsCollapse() const { - if (!IsTxtFrm()) + if (!IsTextFrm()) return false; - const SwTxtFrm *pTxtFrm = static_cast<const SwTxtFrm*>(this); - const SwTxtNode *pTxtNode = pTxtFrm->GetTxtNode(); - return pTxtNode && pTxtNode->IsCollapse(); + const SwTextFrm *pTextFrm = static_cast<const SwTextFrm*>(this); + const SwTextNode *pTextNode = pTextFrm->GetTextNode(); + return pTextNode && pTextNode->IsCollapse(); } -bool SwCntntFrm::MakePrtArea( const SwBorderAttrs &rAttrs ) +bool SwContentFrm::MakePrtArea( const SwBorderAttrs &rAttrs ) { bool bSizeChgd = false; @@ -896,15 +896,15 @@ bool SwCntntFrm::MakePrtArea( const SwBorderAttrs &rAttrs ) mbValidPrtArea = true; SWRECTFN( this ) - const bool bTxtFrm = IsTxtFrm(); + const bool bTextFrm = IsTextFrm(); SwTwips nUpper = 0; - if ( bTxtFrm && static_cast<SwTxtFrm*>(this)->IsHiddenNow() ) + if ( bTextFrm && static_cast<SwTextFrm*>(this)->IsHiddenNow() ) { - if ( static_cast<SwTxtFrm*>(this)->HasFollow() ) - static_cast<SwTxtFrm*>(this)->JoinFrm(); + if ( static_cast<SwTextFrm*>(this)->HasFollow() ) + static_cast<SwTextFrm*>(this)->JoinFrm(); if( (Prt().*fnRect->fnGetHeight)() ) - static_cast<SwTxtFrm*>(this)->HideHidden(); + static_cast<SwTextFrm*>(this)->HideHidden(); Prt().Pos().setX(0); Prt().Pos().setY(0); (Prt().*fnRect->fnSetWidth)( (Frm().*fnRect->fnGetWidth)() ); @@ -913,7 +913,7 @@ bool SwCntntFrm::MakePrtArea( const SwBorderAttrs &rAttrs ) } else { - // Simplification: CntntFrms are always variable in height! + // Simplification: ContentFrms are always variable in height! // At the FixSize, the surrounding Frame enforces the size; // the borders are simply subtracted. @@ -937,18 +937,18 @@ bool SwCntntFrm::MakePrtArea( const SwBorderAttrs &rAttrs ) // #i28701# - consider changed type of // <SwSortedObjs> entries SwAnchoredObject* pObj = (*GetDrawObjs())[i]; - const SwFrmFmt& rFmt = pObj->GetFrmFmt(); + const SwFrameFormat& rFormat = pObj->GetFrameFormat(); const bool bFly = pObj->ISA(SwFlyFrm); if ((bFly && (FAR_AWAY == pObj->GetObjRect().Width())) - || rFmt.GetFrmSize().GetWidthPercent()) + || rFormat.GetFrmSize().GetWidthPercent()) { continue; } - if ( FLY_AS_CHAR == rFmt.GetAnchor().GetAnchorId() ) + if ( FLY_AS_CHAR == rFormat.GetAnchor().GetAnchorId() ) { nMinWidth = std::max( nMinWidth, - bFly ? rFmt.GetFrmSize().GetWidth() + bFly ? rFormat.GetFrmSize().GetWidth() : pObj->GetObjRect().Width() ); } } @@ -1026,10 +1026,10 @@ inline void ValidateSz( SwFrm *pFrm ) } } -void SwCntntFrm::MakeAll() +void SwContentFrm::MakeAll() { OSL_ENSURE( GetUpper(), "no Upper?" ); - OSL_ENSURE( IsTxtFrm(), "MakeAll(), NoTxt" ); + OSL_ENSURE( IsTextFrm(), "MakeAll(), NoText" ); if ( !IsFollow() && StackHack::IsLocked() ) return; @@ -1037,13 +1037,13 @@ void SwCntntFrm::MakeAll() if ( IsJoinLocked() ) return; - OSL_ENSURE( !static_cast<SwTxtFrm*>(this)->IsSwapped(), "Calculation of a swapped frame" ); + OSL_ENSURE( !static_cast<SwTextFrm*>(this)->IsSwapped(), "Calculation of a swapped frame" ); StackHack aHack; - if ( static_cast<SwTxtFrm*>(this)->IsLocked() ) + if ( static_cast<SwTextFrm*>(this)->IsLocked() ) { - OSL_FAIL( "Format for locked TxtFrm." ); + OSL_FAIL( "Format for locked TextFrm." ); return; } @@ -1071,7 +1071,7 @@ void SwCntntFrm::MakeAll() #endif // takes care of the notification in the dtor - SwCntntNotify *pNotify = new SwCntntNotify( this ); + SwContentNotify *pNotify = new SwContentNotify( this ); // as long as bMakePage is true, a new page can be created (exactly once) bool bMakePage = true; @@ -1081,7 +1081,7 @@ void SwCntntFrm::MakeAll() // it has been moved forward once) bool bMovedFwd = false; sal_Bool bFormatted = sal_False; // For the widow/orphan rules, we encourage the - // last CntntFrm of a chain to format. This only + // last ContentFrm of a chain to format. This only // needs to happen once. Every time the Frm is // moved, the flag will have to be reset. bool bMustFit = false; // Once the emergency brake is pulled, @@ -1094,7 +1094,7 @@ void SwCntntFrm::MakeAll() bool bMoveable; const bool bFly = IsInFly(); const bool bTab = IsInTab(); - const bool bFtn = IsInFtn(); + const bool bFootnote = IsInFootnote(); const bool bSct = IsInSct(); Point aOldFrmPos; // This is so we can compare with the last pos Point aOldPrtPos; // and determine whether it makes sense to Prepare @@ -1110,18 +1110,18 @@ void SwCntntFrm::MakeAll() const bool bKeep = IsKeep( rAttrs.GetAttrSet() ); - SwSaveFtnHeight *pSaveFtn = 0; - if ( bFtn ) + SwSaveFootnoteHeight *pSaveFootnote = 0; + if ( bFootnote ) { - SwFtnFrm *pFtn = FindFtnFrm(); - SwSectionFrm* pSct = pFtn->FindSctFrm(); - if ( !static_cast<SwTxtFrm*>(pFtn->GetRef())->IsLocked() ) + SwFootnoteFrm *pFootnote = FindFootnoteFrm(); + SwSectionFrm* pSct = pFootnote->FindSctFrm(); + if ( !static_cast<SwTextFrm*>(pFootnote->GetRef())->IsLocked() ) { - SwFtnBossFrm* pBoss = pFtn->GetRef()->FindFtnBossFrm( - pFtn->GetAttr()->GetFtn().IsEndNote() ); + SwFootnoteBossFrm* pBoss = pFootnote->GetRef()->FindFootnoteBossFrm( + pFootnote->GetAttr()->GetFootnote().IsEndNote() ); if( !pSct || pSct->IsColLocked() || !pSct->Growable() ) - pSaveFtn = new SwSaveFtnHeight( pBoss, - static_cast<SwTxtFrm*>(pFtn->GetRef())->GetFtnLine( pFtn->GetAttr() ) ); + pSaveFootnote = new SwSaveFootnoteHeight( pBoss, + static_cast<SwTextFrm*>(pFootnote->GetRef())->GetFootnoteLine( pFootnote->GetAttr() ) ); } } @@ -1129,17 +1129,17 @@ void SwCntntFrm::MakeAll() HasFollow() && &GetFollow()->GetFrm() == GetNext() ) { - dynamic_cast<SwTxtFrm&>(*this).JoinFrm(); + dynamic_cast<SwTextFrm&>(*this).JoinFrm(); } // #i28701# - move master forward, if it has to move, // because of its object positioning. - if ( !static_cast<SwTxtFrm*>(this)->IsFollow() ) + if ( !static_cast<SwTextFrm*>(this)->IsFollow() ) { sal_uInt32 nToPageNum = 0L; const bool bMoveFwdByObjPos = SwLayouter::FrmMovedFwdByObjPos( *(GetAttrSet()->GetDoc()), - *(static_cast<SwTxtFrm*>(this)), + *(static_cast<SwTextFrm*>(this)), nToPageNum ); // #i58182# // Also move a paragraph forward, which is the first one inside a table cell. @@ -1158,7 +1158,7 @@ void SwCntntFrm::MakeAll() // If a Follow sits next to it's Master and doesn't fit, we know it can // be moved right now. - if ( lcl_Prev( this ) && static_cast<SwTxtFrm*>(this)->IsFollow() && IsMoveable() ) + if ( lcl_Prev( this ) && static_cast<SwTextFrm*>(this)->IsFollow() && IsMoveable() ) { bMovedFwd = true; // OD 2004-03-02 #106629# - If follow frame is in table, it's master @@ -1174,18 +1174,18 @@ void SwCntntFrm::MakeAll() // OD 08.11.2002 #104840# - check footnote content for forward move. // If a content of a footnote is on a prior page/column as its invalid // reference, it can be moved forward. - if ( bFtn && !mbValidPos ) + if ( bFootnote && !mbValidPos ) { - SwFtnFrm* pFtn = FindFtnFrm(); - SwCntntFrm* pRefCnt = pFtn ? pFtn->GetRef() : 0; + SwFootnoteFrm* pFootnote = FindFootnoteFrm(); + SwContentFrm* pRefCnt = pFootnote ? pFootnote->GetRef() : 0; if ( pRefCnt && !pRefCnt->IsValid() ) { - SwFtnBossFrm* pFtnBossOfFtn = pFtn->FindFtnBossFrm(); - SwFtnBossFrm* pFtnBossOfRef = pRefCnt->FindFtnBossFrm(); + SwFootnoteBossFrm* pFootnoteBossOfFootnote = pFootnote->FindFootnoteBossFrm(); + SwFootnoteBossFrm* pFootnoteBossOfRef = pRefCnt->FindFootnoteBossFrm(); //<loop of movefwd until condition held or no move> - if ( pFtnBossOfFtn && pFtnBossOfRef && - pFtnBossOfFtn != pFtnBossOfRef && - pFtnBossOfFtn->IsBefore( pFtnBossOfRef ) ) + if ( pFootnoteBossOfFootnote && pFootnoteBossOfRef && + pFootnoteBossOfFootnote != pFootnoteBossOfRef && + pFootnoteBossOfFootnote->IsBefore( pFootnoteBossOfRef ) ) { bMovedFwd = true; MoveFwd( bMakePage, false ); @@ -1255,7 +1255,7 @@ void SwCntntFrm::MakeAll() // When a lower of a vertically aligned fly frame changes its size we need to recalculate content pos. if( GetUpper() && GetUpper()->IsFlyFrm() && - GetUpper()->GetFmt()->GetTextVertAdjust().GetValue() != SDRTEXTVERTADJUST_TOP ) + GetUpper()->GetFormat()->GetTextVertAdjust().GetValue() != SDRTEXTVERTADJUST_TOP ) { static_cast<SwFlyFrm*>(GetUpper())->InvalidateContentPos(); GetUpper()->SetCompletePaint(); @@ -1272,7 +1272,7 @@ void SwCntntFrm::MakeAll() // #i34730# - check, if frame height has changed. // If yes, send a PREP_ADJUST_FRM and invalidate the size flag to // force a format. The format will check in its method - // <SwTxtFrm::CalcPreps()>, if the already formatted lines still + // <SwTextFrm::CalcPreps()>, if the already formatted lines still // fit and if not, performs necessary actions. // #i40150# - no check, if frame is undersized. if ( mbValidSize && !IsUndersized() && @@ -1285,7 +1285,7 @@ void SwCntntFrm::MakeAll() const SwTwips nHDiff = nOldH - (Frm().*fnRect->fnGetHeight)(); const bool bNoPrepAdjustFrm = nHDiff > 0 && IsInTab() && GetFollow() && - ( 1 == static_cast<SwTxtFrm*>(GetFollow())->GetLineCount( COMPLETE_STRING ) || (static_cast<SwTxtFrm*>(GetFollow())->Frm().*fnRect->fnGetWidth)() < 0 ) && + ( 1 == static_cast<SwTextFrm*>(GetFollow())->GetLineCount( COMPLETE_STRING ) || (static_cast<SwTextFrm*>(GetFollow())->Frm().*fnRect->fnGetWidth)() < 0 ) && GetFollow()->CalcAddLowerSpaceAsLastInTableCell() == nHDiff; if ( !bNoPrepAdjustFrm ) { @@ -1295,7 +1295,7 @@ void SwCntntFrm::MakeAll() } } - // To make the widow and orphan rules work, we need to notify the CntntFrm. + // To make the widow and orphan rules work, we need to notify the ContentFrm. // Criteria: // - It needs to be movable (otherwise, splitting doesn't make sense) // - It needs to overlap with the lower edge of the PrtArea of the Upper @@ -1339,7 +1339,7 @@ void SwCntntFrm::MakeAll() #if OSL_DEBUG_LEVEL > 0 else { - OSL_FAIL( "debug assertion: <SwCntntFrm::MakeAll()> - format of text frame suppressed by fix b6448963" ); + OSL_FAIL( "debug assertion: <SwContentFrm::MakeAll()> - format of text frame suppressed by fix b6448963" ); } #endif } @@ -1352,7 +1352,7 @@ void SwCntntFrm::MakeAll() if ( !lcl_Prev( this ) && !bMovedFwd && ( bMoveable || ( bFly && !bTab ) ) && - ( !bFtn || !GetUpper()->FindFtnFrm()->GetPrev() ) + ( !bFootnote || !GetUpper()->FindFootnoteFrm()->GetPrev() ) && MoveBwd( bDummy ) ) { SWREFRESHFN( this ) @@ -1422,7 +1422,7 @@ void SwCntntFrm::MakeAll() } } - // In footnotes, the TxtFrm may validate itself, which can lead to the + // In footnotes, the TextFrm may validate itself, which can lead to the // situation that it's position is wrong despite being "valid". if ( mbValidPos ) { @@ -1433,7 +1433,7 @@ void SwCntntFrm::MakeAll() // has anchored objects. // Thus, the anchored objects get the possibility to format itself // and this probably solve the layout loop. - if ( bFtn && + if ( bFootnote && nFormatCount <= STOP_FLY_FORMAT && !GetDrawObjs() ) { @@ -1496,7 +1496,7 @@ void SwCntntFrm::MakeAll() const bool bMoveFwdInvalid = 0 != GetIndNext(); const bool bNxtNew = ( 0 == (pNxt->Prt().*fnRect->fnGetHeight)() ) && - (!pNxt->IsTxtFrm() ||!static_cast<SwTxtFrm*>(pNxt)->IsHiddenNow()); + (!pNxt->IsTextFrm() ||!static_cast<SwTextFrm*>(pNxt)->IsHiddenNow()); pNxt->Calc(); @@ -1539,13 +1539,13 @@ void SwCntntFrm::MakeAll() // as well. // If I'm unable to split (WouldFit()) and can't be fitted, I'm going - // to tell my TxtFrm part that, if possible, we still need to split despite + // to tell my TextFrm part that, if possible, we still need to split despite // the "don't split" attribute. bool bMoveOrFit = false; bool bDontMoveMe = !GetIndPrev(); if( bDontMoveMe && IsInSct() ) { - SwFtnBossFrm* pBoss = FindFtnBossFrm(); + SwFootnoteBossFrm* pBoss = FindFootnoteBossFrm(); bDontMoveMe = !pBoss->IsInSct() || ( !pBoss->Lower()->GetNext() && !pBoss->GetPrev() ); } @@ -1580,7 +1580,7 @@ void SwCntntFrm::MakeAll() * Exception: If we sit in FormatWidthCols, we must not ignore * the attributes. */ - else if ( !bFtn && bMoveable && + else if ( !bFootnote && bMoveable && ( !bFly || !FindFlyFrm()->IsColLocked() ) && ( !bSct || !FindSctFrm()->IsColLocked() ) ) bMoveOrFit = true; @@ -1588,13 +1588,13 @@ void SwCntntFrm::MakeAll() #if OSL_DEBUG_LEVEL > 0 else { - OSL_FAIL( "+TxtFrm didn't respect WouldFit promise." ); + OSL_FAIL( "+TextFrm didn't respect WouldFit promise." ); } #endif } // Let's see if I can find some space somewhere... - // footnotes in the neighbourhood are moved into _MoveFtnCntFwd + // footnotes in the neighbourhood are moved into _MoveFootnoteCntFwd SwFrm *pPre = GetIndPrev(); SwFrm *pOldUp = GetUpper(); @@ -1647,7 +1647,7 @@ void SwCntntFrm::MakeAll() } #if OSL_DEBUG_LEVEL > 0 - OSL_FAIL( "LoopControl in SwCntntFrm::MakeAll" ); + OSL_FAIL( "LoopControl in SwContentFrm::MakeAll" ); #endif } if ( bMovedBwd && GetUpper() ) @@ -1665,7 +1665,7 @@ void SwCntntFrm::MakeAll() ( // #118572# - ( bFtn && !FindFtnFrm()->GetRef()->IsInSct() ) || + ( bFootnote && !FindFootnoteFrm()->GetRef()->IsInSct() ) || // #i33887# ( IsInSct() && bKeep ) @@ -1673,9 +1673,9 @@ void SwCntntFrm::MakeAll() // ... add your conditions here ... ), - static_cast<SwTxtFrm&>(*this) ); + static_cast<SwTextFrm&>(*this) ); - delete pSaveFtn; + delete pSaveFootnote; UnlockJoin(); if (!bDeleteForbidden) @@ -1703,9 +1703,9 @@ void MakeNxt( SwFrm *pFrm, SwFrm *pNxt ) // fix(29272): Don't call MakeAll - there, pFrm might be invalidated again, and // we recursively end up in here again. - if ( pNxt->IsCntntFrm() ) + if ( pNxt->IsContentFrm() ) { - SwCntntNotify aNotify( static_cast<SwCntntFrm*>(pNxt) ); + SwContentNotify aNotify( static_cast<SwContentFrm*>(pNxt) ); SwBorderAttrAccess aAccess( SwFrm::GetCache(), pNxt ); const SwBorderAttrs &rAttrs = *aAccess.Get(); if ( !pNxt->GetValidSizeFlag() ) @@ -1715,7 +1715,7 @@ void MakeNxt( SwFrm *pFrm, SwFrm *pNxt ) else pNxt->Frm().Width( pNxt->GetUpper()->Prt().Width() ); } - static_cast<SwCntntFrm*>(pNxt)->MakePrtArea( rAttrs ); + static_cast<SwContentFrm*>(pNxt)->MakePrtArea( rAttrs ); pNxt->Format( &rAttrs ); } else @@ -1738,24 +1738,24 @@ void MakeNxt( SwFrm *pFrm, SwFrm *pNxt ) pFrm->mbValidPrtArea = bOldPrt; } -/// This routine checks whether there are no other FtnBosses -/// between the pFrm's FtnBoss and the pNxt's FtnBoss. -static bool lcl_IsNextFtnBoss( const SwFrm *pFrm, const SwFrm* pNxt ) +/// This routine checks whether there are no other FootnoteBosses +/// between the pFrm's FootnoteBoss and the pNxt's FootnoteBoss. +static bool lcl_IsNextFootnoteBoss( const SwFrm *pFrm, const SwFrm* pNxt ) { - assert(pFrm && pNxt && "lcl_IsNextFtnBoss: No Frames?"); - pFrm = pFrm->FindFtnBossFrm(); - pNxt = pNxt->FindFtnBossFrm(); + assert(pFrm && pNxt && "lcl_IsNextFootnoteBoss: No Frames?"); + pFrm = pFrm->FindFootnoteBossFrm(); + pNxt = pNxt->FindFootnoteBossFrm(); // If pFrm is a last column, we use the page instead. while( pFrm && pFrm->IsColumnFrm() && !pFrm->GetNext() ) - pFrm = pFrm->GetUpper()->FindFtnBossFrm(); + pFrm = pFrm->GetUpper()->FindFootnoteBossFrm(); // If pNxt is a first column, we use the page instead. while( pNxt && pNxt->IsColumnFrm() && !pNxt->GetPrev() ) - pNxt = pNxt->GetUpper()->FindFtnBossFrm(); + pNxt = pNxt->GetUpper()->FindFootnoteBossFrm(); // So.. now pFrm and pNxt are either two adjacent pages or columns. return pFrm && pNxt && pFrm->GetNext() == pNxt; } -bool SwCntntFrm::_WouldFit( SwTwips nSpace, +bool SwContentFrm::_WouldFit( SwTwips nSpace, SwLayoutFrm *pNewUpper, bool bTstMove, const bool bObjsInNewUpper ) @@ -1763,20 +1763,20 @@ bool SwCntntFrm::_WouldFit( SwTwips nSpace, // To have the footnote select it's place carefully, it needs // to be moved in any case if there is at least one page/column // between the footnote and the new Upper. - SwFtnFrm* pFtnFrm = 0; - if ( IsInFtn() ) + SwFootnoteFrm* pFootnoteFrm = 0; + if ( IsInFootnote() ) { - if( !lcl_IsNextFtnBoss( pNewUpper, this ) ) + if( !lcl_IsNextFootnoteBoss( pNewUpper, this ) ) return true; - pFtnFrm = FindFtnFrm(); + pFootnoteFrm = FindFootnoteFrm(); } bool bRet; bool bSplit = !pNewUpper->Lower(); - SwCntntFrm *pFrm = this; + SwContentFrm *pFrm = this; const SwFrm *pTmpPrev = pNewUpper->Lower(); - if( pTmpPrev && pTmpPrev->IsFtnFrm() ) - pTmpPrev = static_cast<const SwFtnFrm*>(pTmpPrev)->Lower(); + if( pTmpPrev && pTmpPrev->IsFootnoteFrm() ) + pTmpPrev = static_cast<const SwFootnoteFrm*>(pTmpPrev)->Lower(); while ( pTmpPrev && pTmpPrev->GetNext() ) pTmpPrev = pTmpPrev->GetNext(); do @@ -1787,36 +1787,36 @@ bool SwCntntFrm::_WouldFit( SwTwips nSpace, bool bOldSplit = bSplit; if ( bTstMove || IsInFly() || ( IsInSct() && - ( pFrm->GetUpper()->IsColBodyFrm() || ( pFtnFrm && - pFtnFrm->GetUpper()->GetUpper()->IsColumnFrm() ) ) ) ) + ( pFrm->GetUpper()->IsColBodyFrm() || ( pFootnoteFrm && + pFootnoteFrm->GetUpper()->GetUpper()->IsColumnFrm() ) ) ) ) { // This is going to get a bit insidious now. If you're faint of heart, - // you'd better look away here. If a Fly contains columns, then the Cntnts + // you'd better look away here. If a Fly contains columns, then the Contents // are movable, except ones in the last column (see SwFrm::IsMoveable()). // Of course they're allowed to float back. WouldFit() only returns a usable // value if the Frm is movable. To fool WouldFit() into believing there's // a movable Frm, I'm just going to hang it somewhere else for the time. // The same procedure applies for column sections to make SwSectionFrm::Growable() // return the proper value. - // Within footnotes, we may even need to put the SwFtnFrm somewhere else, if - // there's no SwFtnFrm there. - SwFrm* pTmpFrm = pFrm->IsInFtn() && !pNewUpper->FindFtnFrm() ? - (SwFrm*)pFrm->FindFtnFrm() : pFrm; + // Within footnotes, we may even need to put the SwFootnoteFrm somewhere else, if + // there's no SwFootnoteFrm there. + SwFrm* pTmpFrm = pFrm->IsInFootnote() && !pNewUpper->FindFootnoteFrm() ? + (SwFrm*)pFrm->FindFootnoteFrm() : pFrm; SwLayoutFrm *pUp = pTmpFrm->GetUpper(); SwFrm *pOldNext = pTmpFrm->GetNext(); pTmpFrm->RemoveFromLayout(); pTmpFrm->InsertBefore( pNewUpper, 0 ); - if ( pFrm->IsTxtFrm() && + if ( pFrm->IsTextFrm() && ( bTstMove || - static_cast<SwTxtFrm*>(pFrm)->HasFollow() || - ( !static_cast<SwTxtFrm*>(pFrm)->HasPara() && - !static_cast<SwTxtFrm*>(pFrm)->IsEmpty() + static_cast<SwTextFrm*>(pFrm)->HasFollow() || + ( !static_cast<SwTextFrm*>(pFrm)->HasPara() && + !static_cast<SwTextFrm*>(pFrm)->IsEmpty() ) ) ) { bTstMove = true; - bRet = static_cast<SwTxtFrm*>(pFrm)->TestFormat( pTmpPrev, nSpace, bSplit ); + bRet = static_cast<SwTextFrm*>(pFrm)->TestFormat( pTmpPrev, nSpace, bSplit ); } else bRet = pFrm->WouldFit( nSpace, bSplit, false ); @@ -1849,15 +1849,15 @@ bool SwCntntFrm::_WouldFit( SwTwips nSpace, if ( pFrm->IsInSct() && pFrm->GetUpper()->IsColBodyFrm() ) { const SwSectionFrm* pSct = pFrm->FindSctFrm(); - bCommonBorder = pSct->GetFmt()->GetBalancedColumns().GetValue(); + bCommonBorder = pSct->GetFormat()->GetBalancedColumns().GetValue(); } // #i46181# nSecondCheck = ( 1 == nSecondCheck && pFrm == this && - IsTxtFrm() && + IsTextFrm() && bCommonBorder && - !static_cast<const SwTxtFrm*>(this)->IsEmpty() ) ? + !static_cast<const SwTextFrm*>(this)->IsEmpty() ) ? nUpper : 0; @@ -1888,7 +1888,7 @@ bool SwCntntFrm::_WouldFit( SwTwips nSpace, { // The following code is intended to solve a (rare) problem // causing some frames not to move backward: - // SwTxtFrm::WouldFit() claims that the whole paragraph + // SwTextFrm::WouldFit() claims that the whole paragraph // fits into the given space and subtracts the height of // all lines from nSpace. nSpace - nUpper is not a valid // indicator if the frame should be allowed to move backward. @@ -1907,7 +1907,7 @@ bool SwCntntFrm::_WouldFit( SwTwips nSpace, // OD 2004-03-01 #106629# - also consider lower spacing in table cells if ( bRet && IsInTab() && - pNewUpper->GetFmt()->getIDocumentSettingAccess()->get(DocumentSettingId::ADD_PARA_SPACING_TO_TABLE_CELLS) ) + pNewUpper->GetFormat()->getIDocumentSettingAccess()->get(DocumentSettingId::ADD_PARA_SPACING_TO_TABLE_CELLS) ) { nSpace -= rAttrs.GetULSpace().GetLower(); if ( nSpace < 0 ) @@ -1920,23 +1920,23 @@ bool SwCntntFrm::_WouldFit( SwTwips nSpace, { if( bTstMove ) { - while( pFrm->IsTxtFrm() && static_cast<SwTxtFrm*>(pFrm)->HasFollow() ) + while( pFrm->IsTextFrm() && static_cast<SwTextFrm*>(pFrm)->HasFollow() ) { - pFrm = static_cast<SwTxtFrm*>(pFrm)->GetFollow(); + pFrm = static_cast<SwTextFrm*>(pFrm)->GetFollow(); } // OD 11.04.2003 #108824# - If last follow frame of <this> text // frame isn't valid, a formatting of the next content frame // doesn't makes sense. Thus, return true. if ( IsAnFollow( pFrm ) && !pFrm->IsValid() ) { - OSL_FAIL( "Only a warning for task 108824:/n<SwCntntFrm::_WouldFit(..) - follow not valid!" ); + OSL_FAIL( "Only a warning for task 108824:/n<SwContentFrm::_WouldFit(..) - follow not valid!" ); return true; } } SwFrm *pNxt; - if( 0 != (pNxt = pFrm->FindNext()) && pNxt->IsCntntFrm() && - ( !pFtnFrm || ( pNxt->IsInFtn() && - pNxt->FindFtnFrm()->GetAttr() == pFtnFrm->GetAttr() ) ) ) + if( 0 != (pNxt = pFrm->FindNext()) && pNxt->IsContentFrm() && + ( !pFootnoteFrm || ( pNxt->IsInFootnote() && + pNxt->FindFootnoteFrm()->GetAttr() == pFootnoteFrm->GetAttr() ) ) ) { // TestFormat(?) does not like paragraph- or character anchored objects. @@ -1958,12 +1958,12 @@ bool SwCntntFrm::_WouldFit( SwTwips nSpace, pTmpPrev = 0; else { - if( pFrm->IsTxtFrm() && static_cast<SwTxtFrm*>(pFrm)->IsHiddenNow() ) + if( pFrm->IsTextFrm() && static_cast<SwTextFrm*>(pFrm)->IsHiddenNow() ) pTmpPrev = lcl_NotHiddenPrev( pFrm ); else pTmpPrev = pFrm; } - pFrm = static_cast<SwCntntFrm*>(pNxt); + pFrm = static_cast<SwContentFrm*>(pNxt); } else pFrm = 0; diff --git a/sw/source/core/layout/colfrm.cxx b/sw/source/core/layout/colfrm.cxx index 23ef755e299a..89d169aec197 100644 --- a/sw/source/core/layout/colfrm.cxx +++ b/sw/source/core/layout/colfrm.cxx @@ -32,28 +32,28 @@ #include <IDocumentState.hxx> #include <IDocumentLayoutAccess.hxx> -SwColumnFrm::SwColumnFrm( SwFrmFmt *pFmt, SwFrm* pSib ): - SwFtnBossFrm( pFmt, pSib ) +SwColumnFrm::SwColumnFrm( SwFrameFormat *pFormat, SwFrm* pSib ): + SwFootnoteBossFrm( pFormat, pSib ) { mnFrmType = FRM_COLUMN; - SwBodyFrm* pColBody = new SwBodyFrm( pFmt->GetDoc()->GetDfltFrmFmt(), pSib ); + SwBodyFrm* pColBody = new SwBodyFrm( pFormat->GetDoc()->GetDfltFrameFormat(), pSib ); pColBody->InsertBehind( this, 0 ); // ColumnFrms now with BodyFrm - SetMaxFtnHeight( LONG_MAX ); + SetMaxFootnoteHeight( LONG_MAX ); } void SwColumnFrm::DestroyImpl() { - SwFrmFmt *pFmt = GetFmt(); + SwFrameFormat *pFormat = GetFormat(); SwDoc *pDoc; - if ( !(pDoc = pFmt->GetDoc())->IsInDtor() && pFmt->HasOnlyOneListener() ) + if ( !(pDoc = pFormat->GetDoc())->IsInDtor() && pFormat->HasOnlyOneListener() ) { //I'm the only one, delete the format. //Get default format before, so the base class can cope with it. - pDoc->GetDfltFrmFmt()->Add( this ); - pDoc->DelFrmFmt( pFmt ); + pDoc->GetDfltFrameFormat()->Add( this ); + pDoc->DelFrameFormat( pFormat ); } - SwFtnBossFrm::DestroyImpl(); + SwFootnoteBossFrm::DestroyImpl(); } SwColumnFrm::~SwColumnFrm() @@ -66,7 +66,7 @@ static void lcl_RemoveColumns( SwLayoutFrm *pCont, sal_uInt16 nCnt ) "no columns to remove." ); SwColumnFrm *pColumn = static_cast<SwColumnFrm*>(pCont->Lower()); - sw_RemoveFtns( pColumn, true, true ); + sw_RemoveFootnotes( pColumn, true, true ); while ( pColumn->GetNext() ) { OSL_ENSURE( pColumn->GetNext()->IsColumnFrm(), @@ -101,7 +101,7 @@ static SwLayoutFrm * lcl_FindColumns( SwLayoutFrm *pLay, sal_uInt16 nCount ) static bool lcl_AddColumns( SwLayoutFrm *pCont, sal_uInt16 nCount ) { - SwDoc *pDoc = pCont->GetFmt()->GetDoc(); + SwDoc *pDoc = pCont->GetFormat()->GetDoc(); const bool bMod = pDoc->getIDocumentState().IsModified(); //Formats should be shared whenever possible. If a neighbour already has @@ -112,7 +112,7 @@ static bool lcl_AddColumns( SwLayoutFrm *pCont, sal_uInt16 nCount ) if ( pCont->IsBodyFrm() ) pAttrOwner = pCont->FindPageFrm(); SwLayoutFrm *pNeighbourCol = 0; - SwIterator<SwLayoutFrm,SwFmt> aIter( *pAttrOwner->GetFmt() ); + SwIterator<SwLayoutFrm,SwFormat> aIter( *pAttrOwner->GetFormat() ); SwLayoutFrm *pNeighbour = aIter.First(); sal_uInt16 nAdd = 0; @@ -131,7 +131,7 @@ static bool lcl_AddColumns( SwLayoutFrm *pCont, sal_uInt16 nCount ) bool bRet; SwTwips nMax = pCont->IsPageBodyFrm() ? - pCont->FindPageFrm()->GetMaxFtnHeight() : LONG_MAX; + pCont->FindPageFrm()->GetMaxFootnoteHeight() : LONG_MAX; if ( pNeighbourCol ) { bRet = false; @@ -143,8 +143,8 @@ static bool lcl_AddColumns( SwLayoutFrm *pCont, sal_uInt16 nCount ) } for ( sal_uInt16 i = 0; i < nCount; ++i ) { - SwColumnFrm *pTmpCol = new SwColumnFrm( pNeighbourCol->GetFmt(), pCont ); - pTmpCol->SetMaxFtnHeight( nMax ); + SwColumnFrm *pTmpCol = new SwColumnFrm( pNeighbourCol->GetFormat(), pCont ); + pTmpCol->SetMaxFootnoteHeight( nMax ); pTmpCol->InsertBefore( pCont, NULL ); pNeighbourCol = static_cast<SwLayoutFrm*>(pNeighbourCol->GetNext()); } @@ -154,9 +154,9 @@ static bool lcl_AddColumns( SwLayoutFrm *pCont, sal_uInt16 nCount ) bRet = true; for ( sal_uInt16 i = 0; i < nCount; ++i ) { - SwFrmFmt *pFmt = pDoc->MakeFrmFmt( aEmptyOUStr, pDoc->GetDfltFrmFmt()); - SwColumnFrm *pTmp = new SwColumnFrm( pFmt, pCont ); - pTmp->SetMaxFtnHeight( nMax ); + SwFrameFormat *pFormat = pDoc->MakeFrameFormat( aEmptyOUStr, pDoc->GetDfltFrameFormat()); + SwColumnFrm *pTmp = new SwColumnFrm( pFormat, pCont ); + pTmp->SetMaxFootnoteHeight( nMax ); pTmp->Paste( pCont ); } } @@ -174,16 +174,16 @@ static bool lcl_AddColumns( SwLayoutFrm *pCont, sal_uInt16 nCount ) * * @param rOld * @param rNew - * @param bChgFtn if true, the columnframe will be inserted or removed, if necessary. + * @param bChgFootnote if true, the columnframe will be inserted or removed, if necessary. */ -void SwLayoutFrm::ChgColumns( const SwFmtCol &rOld, const SwFmtCol &rNew, - const bool bChgFtn ) +void SwLayoutFrm::ChgColumns( const SwFormatCol &rOld, const SwFormatCol &rNew, + const bool bChgFootnote ) { - if ( rOld.GetNumCols() <= 1 && rNew.GetNumCols() <= 1 && !bChgFtn ) + if ( rOld.GetNumCols() <= 1 && rNew.GetNumCols() <= 1 && !bChgFootnote ) return; // #i97379# // If current lower is a no text frame, then columns are not allowed - if ( Lower() && Lower()->IsNoTxtFrm() && + if ( Lower() && Lower()->IsNoTextFrm() && rNew.GetNumCols() > 1 ) { return; @@ -210,34 +210,34 @@ void SwLayoutFrm::ChgColumns( const SwFmtCol &rOld, const SwFmtCol &rNew, //The content is saved and restored if the column count is different. SwFrm *pSave = 0; - if( nOldNum != nNewNum || bChgFtn ) + if( nOldNum != nNewNum || bChgFootnote ) { - SwDoc *pDoc = GetFmt()->GetDoc(); - OSL_ENSURE( pDoc, "FrmFmt doesn't return a document." ); - // SaveCntnt would also suck up the content of the footnote container + SwDoc *pDoc = GetFormat()->GetDoc(); + OSL_ENSURE( pDoc, "FrameFormat doesn't return a document." ); + // SaveContent would also suck up the content of the footnote container // and store it within the normal text flow. if( IsPageBodyFrm() ) - pDoc->getIDocumentLayoutAccess().GetCurrentLayout()->RemoveFtns( static_cast<SwPageFrm*>(GetUpper()), true, false ); - pSave = ::SaveCntnt( this ); + pDoc->getIDocumentLayoutAccess().GetCurrentLayout()->RemoveFootnotes( static_cast<SwPageFrm*>(GetUpper()), true, false ); + pSave = ::SaveContent( this ); //If columns exist, they get deleted if a column count of 0 or 1 is requested. if ( nNewNum == 1 && !bAtEnd ) { ::lcl_RemoveColumns( this, nOldNum ); if ( IsBodyFrm() ) - SetFrmFmt( pDoc->GetDfltFrmFmt() ); + SetFrameFormat( pDoc->GetDfltFrameFormat() ); else - GetFmt()->SetFmtAttr( SwFmtFillOrder() ); + GetFormat()->SetFormatAttr( SwFormatFillOrder() ); if ( pSave ) - ::RestoreCntnt( pSave, this, 0, true ); + ::RestoreContent( pSave, this, 0, true ); return; } if ( nOldNum == 1 ) { if ( IsBodyFrm() ) - SetFrmFmt( pDoc->GetColumnContFmt() ); + SetFrameFormat( pDoc->GetColumnContFormat() ); else - GetFmt()->SetFmtAttr( SwFmtFillOrder( ATT_LEFT_TO_RIGHT ) ); + GetFormat()->SetFormatAttr( SwFormatFillOrder( ATT_LEFT_TO_RIGHT ) ); if( !Lower() || !Lower()->IsColumnFrm() ) --nOldNum; } @@ -282,11 +282,11 @@ void SwLayoutFrm::ChgColumns( const SwFmtCol &rOld, const SwFmtCol &rNew, static_cast<SwLayoutFrm*>(Lower())->Lower() && static_cast<SwLayoutFrm*>(Lower())->Lower()->IsLayoutFrm(), "no column body." ); // ColumnFrms contain BodyFrms - ::RestoreCntnt( pSave, static_cast<SwLayoutFrm*>(static_cast<SwLayoutFrm*>(Lower())->Lower()), 0, true ); + ::RestoreContent( pSave, static_cast<SwLayoutFrm*>(static_cast<SwLayoutFrm*>(Lower())->Lower()), 0, true ); } } -void SwLayoutFrm::AdjustColumns( const SwFmtCol *pAttr, bool bAdjustAttributes ) +void SwLayoutFrm::AdjustColumns( const SwFormatCol *pAttr, bool bAdjustAttributes ) { if( !Lower()->GetNext() ) { @@ -302,7 +302,7 @@ void SwLayoutFrm::AdjustColumns( const SwFmtCol *pAttr, bool bAdjustAttributes ) //column widths in any case. Otherwise we check if a configuration is needed. if ( !pAttr ) { - pAttr = &GetFmt()->GetCol(); + pAttr = &GetFormat()->GetCol(); if ( !bAdjustAttributes ) { long nAvail = (Prt().*fnRect->fnGetWidth)(); @@ -393,8 +393,8 @@ void SwLayoutFrm::AdjustColumns( const SwFmtCol *pAttr, bool bAdjustAttributes ) aUL.SetUpper( pC->GetUpper()); aUL.SetLower( pC->GetLower()); - static_cast<SwLayoutFrm*>(pCol)->GetFmt()->SetFmtAttr( aLR ); - static_cast<SwLayoutFrm*>(pCol)->GetFmt()->SetFmtAttr( aUL ); + static_cast<SwLayoutFrm*>(pCol)->GetFormat()->SetFormatAttr( aLR ); + static_cast<SwLayoutFrm*>(pCol)->GetFormat()->SetFormatAttr( aUL ); } nGutter += aLR.GetLeft() + aLR.GetRight(); diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx index 73da3a1c8fd9..c49e13b02b39 100644 --- a/sw/source/core/layout/dbg_lay.cxx +++ b/sw/source/core/layout/dbg_lay.cxx @@ -76,7 +76,7 @@ * In the [frmtype] section, the frame types which should be logged are * listed; default is USHRT_MAX which means that all types are logged. * It's possible to remove types from the list using '!' in front of a - * value. The value !0xC000 would for example exclude SwCntntFrms from + * value. The value !0xC000 would for example exclude SwContentFrms from * logging. * In the [record] section the functions group which should be logged are * listed; default is 0 which means that none are logged. It's also @@ -113,8 +113,8 @@ static sal_uLong lcl_GetFrameId( const SwFrm* pFrm ) if( bFrameId ) return pFrm->GetFrmId(); #endif - if( pFrm && pFrm->IsTxtFrm() ) - return static_cast<const SwTxtFrm*>(pFrm)->GetTxtNode()->GetIndex(); + if( pFrm && pFrm->IsTextFrm() ) + return static_cast<const SwTextFrm*>(pFrm)->GetTextNode()->GetIndex(); return 0; } @@ -224,7 +224,7 @@ void SwProtocol::Record( const SwFrm* pFrm, sal_uLong nFunction, sal_uLong nAct, } // The following function gets called when pulling in the writer DLL through -// TxtInit(..) and gives the possibility to release functions +// TextInit(..) and gives the possibility to release functions // and/or FrmIds to the debugger void SwProtocol::Init() @@ -449,8 +449,8 @@ static void lcl_Flags(OStringBuffer& rOut, const SwFrm* pFrm) /// output the type of the frame as plain text. static void lcl_FrameType( OStringBuffer& rOut, const SwFrm* pFrm ) { - if( pFrm->IsTxtFrm() ) - rOut.append("Txt "); + if( pFrm->IsTextFrm() ) + rOut.append("Text "); else if( pFrm->IsLayoutFrm() ) { if( pFrm->IsPageFrm() ) @@ -477,17 +477,17 @@ static void lcl_FrameType( OStringBuffer& rOut, const SwFrm* pFrm ) rOut.append("Header "); else if( pFrm->IsFooterFrm() ) rOut.append("Footer "); - else if( pFrm->IsFtnFrm() ) - rOut.append("Ftn "); - else if( pFrm->IsFtnContFrm() ) - rOut.append("FtnCont "); + else if( pFrm->IsFootnoteFrm() ) + rOut.append("Footnote "); + else if( pFrm->IsFootnoteContFrm() ) + rOut.append("FootnoteCont "); else if( pFrm->IsFlyFrm() ) rOut.append("Fly "); else rOut.append("Layout "); } - else if( pFrm->IsNoTxtFrm() ) - rOut.append("NoTxt "); + else if( pFrm->IsNoTextFrm() ) + rOut.append("NoText "); else rOut.append("Not impl. "); } diff --git a/sw/source/core/layout/dumpfilter.cxx b/sw/source/core/layout/dumpfilter.cxx index 9060836952c7..60d73c5c58ed 100644 --- a/sw/source/core/layout/dumpfilter.cxx +++ b/sw/source/core/layout/dumpfilter.cxx @@ -99,7 +99,7 @@ namespace sw pXDoc->GetDocShell()->GetWrtShell()->StartAction(); Rectangle aRect( 0, 0, 26000, 21000 ); pXDoc->GetDocShell()->SetVisArea( aRect ); - pLayout->InvalidateAllCntnt( ); + pLayout->InvalidateAllContent( ); pXDoc->GetDocShell()->GetWrtShell()->EndAction(); // Dump the layout XML into the XOutputStream diff --git a/sw/source/core/layout/findfrm.cxx b/sw/source/core/layout/findfrm.cxx index afd6b1293233..18189ba9ad95 100644 --- a/sw/source/core/layout/findfrm.cxx +++ b/sw/source/core/layout/findfrm.cxx @@ -32,8 +32,8 @@ #include <txtfrm.hxx> #include <calbck.hxx> -/// Searches the first CntntFrm in BodyText below the page. -SwLayoutFrm *SwFtnBossFrm::FindBodyCont() +/// Searches the first ContentFrm in BodyText below the page. +SwLayoutFrm *SwFootnoteBossFrm::FindBodyCont() { SwFrm *pLay = Lower(); while ( pLay && !pLay->IsBodyFrm() ) @@ -41,11 +41,11 @@ SwLayoutFrm *SwFtnBossFrm::FindBodyCont() return static_cast<SwLayoutFrm*>(pLay); } -/// Searches the last CntntFrm in BodyText below the page. -SwCntntFrm *SwPageFrm::FindLastBodyCntnt() +/// Searches the last ContentFrm in BodyText below the page. +SwContentFrm *SwPageFrm::FindLastBodyContent() { - SwCntntFrm *pRet = FindFirstBodyCntnt(); - SwCntntFrm *pNxt = pRet; + SwContentFrm *pRet = FindFirstBodyContent(); + SwContentFrm *pNxt = pRet; while ( pNxt && pNxt->IsInDocBody() && IsAnLower( pNxt ) ) { pRet = pNxt; pNxt = pNxt->FindNextCnt(); @@ -54,15 +54,15 @@ SwCntntFrm *SwPageFrm::FindLastBodyCntnt() } /** - * Checks if the frame contains one or more CntntFrm's anywhere in his - * subsidiary structure; if so the first found CntntFrm is returned. + * Checks if the frame contains one or more ContentFrm's anywhere in his + * subsidiary structure; if so the first found ContentFrm is returned. */ -const SwCntntFrm *SwLayoutFrm::ContainsCntnt() const +const SwContentFrm *SwLayoutFrm::ContainsContent() const { //Search downwards the layout leaf and if there is no content, jump to the //next leaf until content is found or we leave "this". - //Sections: Cntnt next to sections would not be found this way (empty - //sections directly next to CntntFrm) therefore we need to recursively + //Sections: Content next to sections would not be found this way (empty + //sections directly next to ContentFrm) therefore we need to recursively //search for them even if it's more complex. const SwLayoutFrm *pLayLeaf = this; @@ -74,7 +74,7 @@ const SwCntntFrm *SwLayoutFrm::ContainsCntnt() const if( pLayLeaf->IsSctFrm() && pLayLeaf != this ) { - const SwCntntFrm *pCnt = pLayLeaf->ContainsCntnt(); + const SwContentFrm *pCnt = pLayLeaf->ContainsContent(); if( pCnt ) return pCnt; if( pLayLeaf->GetNext() ) @@ -85,11 +85,11 @@ const SwCntntFrm *SwLayoutFrm::ContainsCntnt() const continue; } else - return static_cast<const SwCntntFrm*>(pLayLeaf->GetNext()); + return static_cast<const SwContentFrm*>(pLayLeaf->GetNext()); } } else if ( pLayLeaf->Lower() ) - return static_cast<const SwCntntFrm*>(pLayLeaf->Lower()); + return static_cast<const SwContentFrm*>(pLayLeaf->Lower()); pLayLeaf = pLayLeaf->GetNextLayoutLeaf(); if( !IsAnLower( pLayLeaf) ) @@ -100,7 +100,7 @@ const SwCntntFrm *SwLayoutFrm::ContainsCntnt() const /** * Calls ContainsAny first to reach the innermost cell. From there we walk back - * up to the first SwCellFrm. Since we use SectionFrms, ContainsCntnt()->GetUpper() + * up to the first SwCellFrm. Since we use SectionFrms, ContainsContent()->GetUpper() * is not enough anymore. */ const SwCellFrm *SwLayoutFrm::FirstCell() const @@ -111,12 +111,12 @@ const SwCellFrm *SwLayoutFrm::FirstCell() const return static_cast<const SwCellFrm*>(pCnt); } -/** return CntntFrms, sections, and tables. +/** return ContentFrms, sections, and tables. * - * @param _bInvestigateFtnForSections controls investigation of content of footnotes for sections. - * @see ContainsCntnt + * @param _bInvestigateFootnoteForSections controls investigation of content of footnotes for sections. + * @see ContainsContent */ -const SwFrm *SwLayoutFrm::ContainsAny( const bool _bInvestigateFtnForSections ) const +const SwFrm *SwLayoutFrm::ContainsAny( const bool _bInvestigateFootnoteForSections ) const { //Search downwards the layout leaf and if there is no content, jump to the //next leaf until content is found, we leave "this" or until we found @@ -124,7 +124,7 @@ const SwFrm *SwLayoutFrm::ContainsAny( const bool _bInvestigateFtnForSections ) const SwLayoutFrm *pLayLeaf = this; // #130797# - const bool bNoFtn = IsSctFrm() && !_bInvestigateFtnForSections; + const bool bNoFootnote = IsSctFrm() && !_bInvestigateFootnoteForSections; do { while ( ( (!pLayLeaf->IsSctFrm() && !pLayLeaf->IsTabFrm()) @@ -136,19 +136,19 @@ const SwFrm *SwLayoutFrm::ContainsAny( const bool _bInvestigateFtnForSections ) && pLayLeaf != this ) { // Now we also return "deleted" SectionFrms so they can be - // maintained on SaveCntnt and RestoreCntnt + // maintained on SaveContent and RestoreContent return pLayLeaf; } else if ( pLayLeaf->Lower() ) - return static_cast<const SwCntntFrm*>(pLayLeaf->Lower()); + return static_cast<const SwContentFrm*>(pLayLeaf->Lower()); pLayLeaf = pLayLeaf->GetNextLayoutLeaf(); - if( bNoFtn && pLayLeaf && pLayLeaf->IsInFtn() ) + if( bNoFootnote && pLayLeaf && pLayLeaf->IsInFootnote() ) { do { pLayLeaf = pLayLeaf->GetNextLayoutLeaf(); - } while( pLayLeaf && pLayLeaf->IsInFtn() ); + } while( pLayLeaf && pLayLeaf->IsInFootnote() ); } if( !IsAnLower( pLayLeaf) ) return 0; @@ -166,36 +166,36 @@ SwFrm* SwFrm::GetLower() return IsLayoutFrm() ? static_cast<SwLayoutFrm*>(this)->Lower() : 0; } -SwCntntFrm* SwFrm::FindPrevCnt( const bool _bInSameFtn ) +SwContentFrm* SwFrm::FindPrevCnt( const bool _bInSameFootnote ) { - if ( GetPrev() && GetPrev()->IsCntntFrm() ) - return static_cast<SwCntntFrm*>(GetPrev()); + if ( GetPrev() && GetPrev()->IsContentFrm() ) + return static_cast<SwContentFrm*>(GetPrev()); else - return _FindPrevCnt( _bInSameFtn ); + return _FindPrevCnt( _bInSameFootnote ); } -const SwCntntFrm* SwFrm::FindPrevCnt( const bool _bInSameFtn ) const +const SwContentFrm* SwFrm::FindPrevCnt( const bool _bInSameFootnote ) const { - if ( GetPrev() && GetPrev()->IsCntntFrm() ) - return static_cast<const SwCntntFrm*>(GetPrev()); + if ( GetPrev() && GetPrev()->IsContentFrm() ) + return static_cast<const SwContentFrm*>(GetPrev()); else - return const_cast<SwFrm*>(this)->_FindPrevCnt( _bInSameFtn ); + return const_cast<SwFrm*>(this)->_FindPrevCnt( _bInSameFootnote ); } -SwCntntFrm *SwFrm::FindNextCnt( const bool _bInSameFtn ) +SwContentFrm *SwFrm::FindNextCnt( const bool _bInSameFootnote ) { - if ( mpNext && mpNext->IsCntntFrm() ) - return static_cast<SwCntntFrm*>(mpNext); + if ( mpNext && mpNext->IsContentFrm() ) + return static_cast<SwContentFrm*>(mpNext); else - return _FindNextCnt( _bInSameFtn ); + return _FindNextCnt( _bInSameFootnote ); } -const SwCntntFrm *SwFrm::FindNextCnt( const bool _bInSameFtn ) const +const SwContentFrm *SwFrm::FindNextCnt( const bool _bInSameFootnote ) const { - if ( mpNext && mpNext->IsCntntFrm() ) - return static_cast<SwCntntFrm*>(mpNext); + if ( mpNext && mpNext->IsContentFrm() ) + return static_cast<SwContentFrm*>(mpNext); else - return const_cast<SwFrm*>(this)->_FindNextCnt( _bInSameFtn ); + return const_cast<SwFrm*>(this)->_FindNextCnt( _bInSameFootnote ); } bool SwLayoutFrm::IsAnLower( const SwFrm *pAssumed ) const @@ -355,11 +355,11 @@ const SwLayoutFrm *SwFrm::ImplGetNextLayoutLeaf( bool bFwd ) const * * @warning fixes here may also need to be applied to the @{lcl_NextFrm} method above */ -const SwCntntFrm* SwCntntFrm::ImplGetNextCntntFrm( bool bFwd ) const +const SwContentFrm* SwContentFrm::ImplGetNextContentFrm( bool bFwd ) const { const SwFrm *pFrm = this; // #100926# - const SwCntntFrm *pCntntFrm = 0; + const SwContentFrm *pContentFrm = 0; bool bGoingUp = false; do { const SwFrm *p = 0; @@ -389,9 +389,9 @@ const SwCntntFrm* SwCntntFrm::ImplGetNextCntntFrm( bool bFwd ) const } pFrm = p; - } while ( 0 == (pCntntFrm = (pFrm->IsCntntFrm() ? static_cast<const SwCntntFrm*>(pFrm) : 0) )); + } while ( 0 == (pContentFrm = (pFrm->IsContentFrm() ? static_cast<const SwContentFrm*>(pFrm) : 0) )); - return pCntntFrm; + return pContentFrm; } SwPageFrm* SwFrm::FindPageFrm() @@ -415,14 +415,14 @@ SwPageFrm* SwFrm::FindPageFrm() return static_cast<SwPageFrm*>(pRet); } -SwFtnBossFrm* SwFrm::FindFtnBossFrm( bool bFootnotes ) +SwFootnoteBossFrm* SwFrm::FindFootnoteBossFrm( bool bFootnotes ) { SwFrm *pRet = this; // Footnote bosses can't exist inside a table; also sections with columns // don't contain footnote texts there if( pRet->IsInTab() ) pRet = pRet->FindTabFrm(); - while ( pRet && !pRet->IsFtnBossFrm() ) + while ( pRet && !pRet->IsFootnoteBossFrm() ) { if ( pRet->GetUpper() ) pRet = pRet->GetUpper(); @@ -441,11 +441,11 @@ SwFtnBossFrm* SwFrm::FindFtnBossFrm( bool bFootnotes ) !pRet->GetNext() && !pRet->GetPrev() ) { SwSectionFrm* pSct = pRet->FindSctFrm(); - OSL_ENSURE( pSct, "FindFtnBossFrm: Single column outside section?" ); - if( !pSct->IsFtnAtEnd() ) - return pSct->FindFtnBossFrm( true ); + OSL_ENSURE( pSct, "FindFootnoteBossFrm: Single column outside section?" ); + if( !pSct->IsFootnoteAtEnd() ) + return pSct->FindFootnoteBossFrm( true ); } - return static_cast<SwFtnBossFrm*>(pRet); + return static_cast<SwFootnoteBossFrm*>(pRet); } SwTabFrm* SwFrm::ImplFindTabFrm() @@ -472,16 +472,16 @@ SwSectionFrm* SwFrm::ImplFindSctFrm() return static_cast<SwSectionFrm*>(pRet); } -SwFtnFrm *SwFrm::ImplFindFtnFrm() +SwFootnoteFrm *SwFrm::ImplFindFootnoteFrm() { SwFrm *pRet = this; - while ( !pRet->IsFtnFrm() ) + while ( !pRet->IsFootnoteFrm() ) { pRet = pRet->GetUpper(); if ( !pRet ) return 0; } - return static_cast<SwFtnFrm*>(pRet); + return static_cast<SwFootnoteFrm*>(pRet); } SwFlyFrm *SwFrm::ImplFindFlyFrm() @@ -532,10 +532,10 @@ SwFrm* SwFrm::FindFooterOrHeader() return pRet; } -const SwFtnFrm* SwFtnContFrm::FindFootNote() const +const SwFootnoteFrm* SwFootnoteContFrm::FindFootNote() const { - const SwFtnFrm* pRet = static_cast<const SwFtnFrm*>(Lower()); - if( pRet && !pRet->GetAttr()->GetFtn().IsEndNote() ) + const SwFootnoteFrm* pRet = static_cast<const SwFootnoteFrm*>(Lower()); + if( pRet && !pRet->GetAttr()->GetFootnote().IsEndNote() ) return pRet; return NULL; } @@ -584,54 +584,54 @@ const SwPageFrm* SwRootFrm::GetPageAtPos( const Point& rPt, const Size* pSize, b const SwAttrSet* SwFrm::GetAttrSet() const { - if ( IsCntntFrm() ) - return &static_cast<const SwCntntFrm*>(this)->GetNode()->GetSwAttrSet(); + if ( IsContentFrm() ) + return &static_cast<const SwContentFrm*>(this)->GetNode()->GetSwAttrSet(); else - return &static_cast<const SwLayoutFrm*>(this)->GetFmt()->GetAttrSet(); + return &static_cast<const SwLayoutFrm*>(this)->GetFormat()->GetAttrSet(); } //UUUU drawinglayer::attribute::SdrAllFillAttributesHelperPtr SwFrm::getSdrAllFillAttributesHelper() const { - if(IsCntntFrm()) + if(IsContentFrm()) { - return static_cast< const SwCntntFrm* >(this)->GetNode()->getSdrAllFillAttributesHelper(); + return static_cast< const SwContentFrm* >(this)->GetNode()->getSdrAllFillAttributesHelper(); } else { - return static_cast< const SwLayoutFrm* >(this)->GetFmt()->getSdrAllFillAttributesHelper(); + return static_cast< const SwLayoutFrm* >(this)->GetFormat()->getSdrAllFillAttributesHelper(); } } bool SwFrm::supportsFullDrawingLayerFillAttributeSet() const { - if (IsCntntFrm()) + if (IsContentFrm()) { return true; } else { - return static_cast< const SwLayoutFrm* >(this)->GetFmt()->supportsFullDrawingLayerFillAttributeSet(); + return static_cast< const SwLayoutFrm* >(this)->GetFormat()->supportsFullDrawingLayerFillAttributeSet(); } } /* * SwFrm::_FindNext(), _FindPrev(), InvalidateNextPos() - * _FindNextCnt() visits tables and sections and only returns SwCntntFrms. + * _FindNextCnt() visits tables and sections and only returns SwContentFrms. * * Description Invalidates the position of the next frame. - * This is the direct successor or in case of CntntFrms the next - * CntntFrm which sits in the same flow as I do: + * This is the direct successor or in case of ContentFrms the next + * ContentFrm which sits in the same flow as I do: * - body, * - footnote, * - in headers/footers the notification only needs to be forwarded * inside the section * - same for Flys - * - Cntnts in tabs remain only inside their cell - * - in principle tables behave exactly like the Cntnts + * - Contents in tabs remain only inside their cell + * - in principle tables behave exactly like the Contents * - sections also */ -// This helper function is an equivalent to the ImplGetNextCntntFrm() method, +// This helper function is an equivalent to the ImplGetNextContentFrm() method, // besides ContentFrames this function also returns TabFrms and SectionFrms. static SwFrm* lcl_NextFrm( SwFrm* pFrm ) { @@ -657,7 +657,7 @@ static SwFrm* lcl_NextFrm( SwFrm* pFrm ) } bGoingUp = !(bGoingFwd || bGoingDown); pFrm = p; - } while ( 0 == (pRet = ( ( pFrm->IsCntntFrm() || ( !bGoingUp && + } while ( 0 == (pRet = ( ( pFrm->IsContentFrm() || ( !bGoingUp && ( pFrm->IsTabFrm() || pFrm->IsSctFrm() ) ) )? pFrm : 0 ) ) ); return pRet; } @@ -669,31 +669,31 @@ SwFrm *SwFrm::_FindNext() if ( IsTabFrm() ) { - //The last Cntnt of the table gets picked up and his follower is + //The last Content of the table gets picked up and his follower is //returned. To be able to deactivate the special case for tables //(see below) bIgnoreTab will be set. if ( static_cast<SwTabFrm*>(this)->GetFollow() ) return static_cast<SwTabFrm*>(this)->GetFollow(); - pThis = static_cast<SwTabFrm*>(this)->FindLastCntnt(); + pThis = static_cast<SwTabFrm*>(this)->FindLastContent(); if ( !pThis ) pThis = this; bIgnoreTab = true; } else if ( IsSctFrm() ) { - //The last Cntnt of the section gets picked and his follower is returned. + //The last Content of the section gets picked and his follower is returned. if ( static_cast<SwSectionFrm*>(this)->GetFollow() ) return static_cast<SwSectionFrm*>(this)->GetFollow(); - pThis = static_cast<SwSectionFrm*>(this)->FindLastCntnt(); + pThis = static_cast<SwSectionFrm*>(this)->FindLastContent(); if ( !pThis ) pThis = this; } - else if ( IsCntntFrm() ) + else if ( IsContentFrm() ) { - if( static_cast<SwCntntFrm*>(this)->GetFollow() ) - return static_cast<SwCntntFrm*>(this)->GetFollow(); + if( static_cast<SwContentFrm*>(this)->GetFollow() ) + return static_cast<SwContentFrm*>(this)->GetFollow(); } else if ( IsRowFrm() ) { @@ -706,16 +706,16 @@ SwFrm *SwFrm::_FindNext() return NULL; SwFrm* pRet = NULL; - const bool bFtn = pThis->IsInFtn(); + const bool bFootnote = pThis->IsInFootnote(); if ( !bIgnoreTab && pThis->IsInTab() ) { SwLayoutFrm *pUp = pThis->GetUpper(); while (pUp && !pUp->IsCellFrm()) pUp = pUp->GetUpper(); - SAL_WARN_IF(!pUp, "sw.core", "Cntnt in table but not in cell."); + SAL_WARN_IF(!pUp, "sw.core", "Content in table but not in cell."); SwFrm* pNxt = pUp ? static_cast<SwCellFrm*>(pUp)->GetFollowCell() : NULL; if ( pNxt ) - pNxt = static_cast<SwCellFrm*>(pNxt)->ContainsCntnt(); + pNxt = static_cast<SwCellFrm*>(pNxt)->ContainsContent(); if ( !pNxt ) { pNxt = lcl_NextFrm( pThis ); @@ -731,7 +731,7 @@ SwFrm *SwFrm::_FindNext() SwFrm *pNxtCnt = lcl_NextFrm( pThis ); if ( pNxtCnt ) { - if ( bBody || bFtn ) + if ( bBody || bFootnote ) { while ( pNxtCnt ) { @@ -743,9 +743,9 @@ SwFrm *SwFrm::_FindNext() !pNxtCnt->FindSctFrm()->IsEndnAtEnd() ); if ( ( bBody && pNxtCnt->IsInDocBody() ) || - ( pNxtCnt->IsInFtn() && - ( bFtn || - ( bEndn && pNxtCnt->FindFtnFrm()->GetAttr()->GetFtn().IsEndNote() ) + ( pNxtCnt->IsInFootnote() && + ( bFootnote || + ( bEndn && pNxtCnt->FindFootnoteFrm()->GetAttr()->GetFootnote().IsEndNote() ) ) ) ) @@ -786,14 +786,14 @@ SwFrm *SwFrm::_FindNext() //Footnotes in frames with columns must not return the section which //contains the footnote if( !pSct->IsAnLower( this ) && - (!bFtn || pSct->IsInFtn() ) ) + (!bFootnote || pSct->IsInFootnote() ) ) return pSct; } return pRet; } -// #i27138# - add parameter <_bInSameFtn> -SwCntntFrm *SwFrm::_FindNextCnt( const bool _bInSameFtn ) +// #i27138# - add parameter <_bInSameFootnote> +SwContentFrm *SwFrm::_FindNextCnt( const bool _bInSameFootnote ) { SwFrm *pThis = this; @@ -801,11 +801,11 @@ SwCntntFrm *SwFrm::_FindNextCnt( const bool _bInSameFtn ) { if ( static_cast<SwTabFrm*>(this)->GetFollow() ) { - pThis = static_cast<SwTabFrm*>(this)->GetFollow()->ContainsCntnt(); + pThis = static_cast<SwTabFrm*>(this)->GetFollow()->ContainsContent(); if( pThis ) - return static_cast<SwCntntFrm*>(pThis); + return static_cast<SwContentFrm*>(pThis); } - pThis = static_cast<SwTabFrm*>(this)->FindLastCntnt(); + pThis = static_cast<SwTabFrm*>(this)->FindLastContent(); if ( !pThis ) return 0; } @@ -813,60 +813,60 @@ SwCntntFrm *SwFrm::_FindNextCnt( const bool _bInSameFtn ) { if ( static_cast<SwSectionFrm*>(this)->GetFollow() ) { - pThis = static_cast<SwSectionFrm*>(this)->GetFollow()->ContainsCntnt(); + pThis = static_cast<SwSectionFrm*>(this)->GetFollow()->ContainsContent(); if( pThis ) - return static_cast<SwCntntFrm*>(pThis); + return static_cast<SwContentFrm*>(pThis); } - pThis = static_cast<SwSectionFrm*>(this)->FindLastCntnt(); + pThis = static_cast<SwSectionFrm*>(this)->FindLastContent(); if ( !pThis ) return 0; } - else if ( IsCntntFrm() && static_cast<SwCntntFrm*>(this)->GetFollow() ) - return static_cast<SwCntntFrm*>(this)->GetFollow(); + else if ( IsContentFrm() && static_cast<SwContentFrm*>(this)->GetFollow() ) + return static_cast<SwContentFrm*>(this)->GetFollow(); - if ( pThis->IsCntntFrm() ) + if ( pThis->IsContentFrm() ) { const bool bBody = pThis->IsInDocBody(); - const bool bFtn = pThis->IsInFtn(); - SwCntntFrm *pNxtCnt = static_cast<SwCntntFrm*>(pThis)->GetNextCntntFrm(); + const bool bFootnote = pThis->IsInFootnote(); + SwContentFrm *pNxtCnt = static_cast<SwContentFrm*>(pThis)->GetNextContentFrm(); if ( pNxtCnt ) { // #i27138# - if ( bBody || ( bFtn && !_bInSameFtn ) ) + if ( bBody || ( bFootnote && !_bInSameFootnote ) ) { // handling for environments 'footnotes' and 'document body frames': while ( pNxtCnt ) { if ( (bBody && pNxtCnt->IsInDocBody()) || - (bFtn && pNxtCnt->IsInFtn()) ) + (bFootnote && pNxtCnt->IsInFootnote()) ) return pNxtCnt; - pNxtCnt = pNxtCnt->GetNextCntntFrm(); + pNxtCnt = pNxtCnt->GetNextContentFrm(); } } // #i27138# - else if ( bFtn && _bInSameFtn ) + else if ( bFootnote && _bInSameFootnote ) { // handling for environments 'each footnote': // Assure that found next content frame belongs to the same footnotes - const SwFtnFrm* pFtnFrmOfNext( pNxtCnt->FindFtnFrm() ); - const SwFtnFrm* pFtnFrmOfCurr( pThis->FindFtnFrm() ); - OSL_ENSURE( pFtnFrmOfCurr, + const SwFootnoteFrm* pFootnoteFrmOfNext( pNxtCnt->FindFootnoteFrm() ); + const SwFootnoteFrm* pFootnoteFrmOfCurr( pThis->FindFootnoteFrm() ); + OSL_ENSURE( pFootnoteFrmOfCurr, "<SwFrm::_FindNextCnt() - unknown layout situation: current frame has to have an upper footnote frame." ); - if ( pFtnFrmOfNext == pFtnFrmOfCurr ) + if ( pFootnoteFrmOfNext == pFootnoteFrmOfCurr ) { return pNxtCnt; } - else if ( pFtnFrmOfCurr->GetFollow() ) + else if ( pFootnoteFrmOfCurr->GetFollow() ) { // next content frame has to be the first content frame // in the follow footnote, which contains a content frame. - SwFtnFrm* pFollowFtnFrmOfCurr( - const_cast<SwFtnFrm*>(pFtnFrmOfCurr) ); + SwFootnoteFrm* pFollowFootnoteFrmOfCurr( + const_cast<SwFootnoteFrm*>(pFootnoteFrmOfCurr) ); pNxtCnt = 0L; do { - pFollowFtnFrmOfCurr = pFollowFtnFrmOfCurr->GetFollow(); - pNxtCnt = pFollowFtnFrmOfCurr->ContainsCntnt(); - } while ( !pNxtCnt && pFollowFtnFrmOfCurr->GetFollow() ); + pFollowFootnoteFrmOfCurr = pFollowFootnoteFrmOfCurr->GetFollow(); + pNxtCnt = pFollowFootnoteFrmOfCurr->ContainsContent(); + } while ( !pNxtCnt && pFollowFootnoteFrmOfCurr->GetFollow() ); return pNxtCnt; } else @@ -904,7 +904,7 @@ SwCntntFrm *SwFrm::_FindNextCnt( const bool _bInSameFtn ) OD 2005-11-30 #i27138# */ -SwCntntFrm* SwFrm::_FindPrevCnt( const bool _bInSameFtn ) +SwContentFrm* SwFrm::_FindPrevCnt( const bool _bInSameFootnote ) { if ( !IsFlowFrm() ) { @@ -912,18 +912,18 @@ SwCntntFrm* SwFrm::_FindPrevCnt( const bool _bInSameFtn ) return 0L; } - SwCntntFrm* pPrevCntntFrm( 0L ); + SwContentFrm* pPrevContentFrm( 0L ); - // Because method <SwCntntFrm::GetPrevCntntFrm()> is used to travel + // Because method <SwContentFrm::GetPrevContentFrm()> is used to travel // through the layout, a content frame, at which the travel starts, is needed. - SwCntntFrm* pCurrCntntFrm = dynamic_cast<SwCntntFrm*>(this); + SwContentFrm* pCurrContentFrm = dynamic_cast<SwContentFrm*>(this); // perform shortcut, if current frame is a follow, and - // determine <pCurrCntntFrm>, if current frame is a table or section frame - if ( pCurrCntntFrm && pCurrCntntFrm->IsFollow() ) + // determine <pCurrContentFrm>, if current frame is a table or section frame + if ( pCurrContentFrm && pCurrContentFrm->IsFollow() ) { // previous content frame is its master content frame - pPrevCntntFrm = pCurrCntntFrm->FindMaster(); + pPrevContentFrm = pCurrContentFrm->FindMaster(); } else if ( IsTabFrm() ) { @@ -931,13 +931,13 @@ SwCntntFrm* SwFrm::_FindPrevCnt( const bool _bInSameFtn ) if ( pTabFrm->IsFollow() ) { // previous content frame is the last content of its master table frame - pPrevCntntFrm = pTabFrm->FindMaster()->FindLastCntnt(); + pPrevContentFrm = pTabFrm->FindMaster()->FindLastContent(); } else { // start content frame for the search is the first content frame of // the table frame. - pCurrCntntFrm = pTabFrm->ContainsCntnt(); + pCurrContentFrm = pTabFrm->ContainsContent(); } } else if ( IsSctFrm() ) @@ -946,74 +946,74 @@ SwCntntFrm* SwFrm::_FindPrevCnt( const bool _bInSameFtn ) if ( pSectFrm->IsFollow() ) { // previous content frame is the last content of its master section frame - pPrevCntntFrm = pSectFrm->FindMaster()->FindLastCntnt(); + pPrevContentFrm = pSectFrm->FindMaster()->FindLastContent(); } else { // start content frame for the search is the first content frame of // the section frame. - pCurrCntntFrm = pSectFrm->ContainsCntnt(); + pCurrContentFrm = pSectFrm->ContainsContent(); } } // search for next content frame, depending on the environment, in which // the current frame is in. - if ( !pPrevCntntFrm && pCurrCntntFrm ) + if ( !pPrevContentFrm && pCurrContentFrm ) { - pPrevCntntFrm = pCurrCntntFrm->GetPrevCntntFrm(); - if ( pPrevCntntFrm ) + pPrevContentFrm = pCurrContentFrm->GetPrevContentFrm(); + if ( pPrevContentFrm ) { - if ( pCurrCntntFrm->IsInFly() ) + if ( pCurrContentFrm->IsInFly() ) { // handling for environments 'unlinked fly frame' and // 'group of linked fly frames': - // Nothing to do, <pPrevCntntFrm> is the one + // Nothing to do, <pPrevContentFrm> is the one } else { - const bool bInDocBody = pCurrCntntFrm->IsInDocBody(); - const bool bInFtn = pCurrCntntFrm->IsInFtn(); - if ( bInDocBody || ( bInFtn && !_bInSameFtn ) ) + const bool bInDocBody = pCurrContentFrm->IsInDocBody(); + const bool bInFootnote = pCurrContentFrm->IsInFootnote(); + if ( bInDocBody || ( bInFootnote && !_bInSameFootnote ) ) { // handling for environments 'footnotes' and 'document body frames': // Assure that found previous frame is also in one of these // environments. Otherwise, travel further - while ( pPrevCntntFrm ) + while ( pPrevContentFrm ) { - if ( ( bInDocBody && pPrevCntntFrm->IsInDocBody() ) || - ( bInFtn && pPrevCntntFrm->IsInFtn() ) ) + if ( ( bInDocBody && pPrevContentFrm->IsInDocBody() ) || + ( bInFootnote && pPrevContentFrm->IsInFootnote() ) ) { break; } - pPrevCntntFrm = pPrevCntntFrm->GetPrevCntntFrm(); + pPrevContentFrm = pPrevContentFrm->GetPrevContentFrm(); } } - else if ( bInFtn && _bInSameFtn ) + else if ( bInFootnote && _bInSameFootnote ) { // handling for environments 'each footnote': // Assure that found next content frame belongs to the same footnotes - const SwFtnFrm* pFtnFrmOfPrev( pPrevCntntFrm->FindFtnFrm() ); - const SwFtnFrm* pFtnFrmOfCurr( pCurrCntntFrm->FindFtnFrm() ); - if ( pFtnFrmOfPrev != pFtnFrmOfCurr ) + const SwFootnoteFrm* pFootnoteFrmOfPrev( pPrevContentFrm->FindFootnoteFrm() ); + const SwFootnoteFrm* pFootnoteFrmOfCurr( pCurrContentFrm->FindFootnoteFrm() ); + if ( pFootnoteFrmOfPrev != pFootnoteFrmOfCurr ) { - if ( pFtnFrmOfCurr->GetMaster() ) + if ( pFootnoteFrmOfCurr->GetMaster() ) { - SwFtnFrm* pMasterFtnFrmOfCurr( - const_cast<SwFtnFrm*>(pFtnFrmOfCurr) ); - pPrevCntntFrm = 0L; + SwFootnoteFrm* pMasterFootnoteFrmOfCurr( + const_cast<SwFootnoteFrm*>(pFootnoteFrmOfCurr) ); + pPrevContentFrm = 0L; // #146872# // correct wrong loop-condition do { - pMasterFtnFrmOfCurr = pMasterFtnFrmOfCurr->GetMaster(); - pPrevCntntFrm = pMasterFtnFrmOfCurr->FindLastCntnt(); - } while ( !pPrevCntntFrm && - pMasterFtnFrmOfCurr->GetMaster() ); + pMasterFootnoteFrmOfCurr = pMasterFootnoteFrmOfCurr->GetMaster(); + pPrevContentFrm = pMasterFootnoteFrmOfCurr->FindLastContent(); + } while ( !pPrevContentFrm && + pMasterFootnoteFrmOfCurr->GetMaster() ); } else { // current content frame is the first content in the // footnote - no previous content exists. - pPrevCntntFrm = 0L; + pPrevContentFrm = 0L; } } } @@ -1021,27 +1021,27 @@ SwCntntFrm* SwFrm::_FindPrevCnt( const bool _bInSameFtn ) { // handling for environments 'page header' and 'page footer': // Assure that found previous frame is also in the same - // page header respectively page footer as <pCurrCntntFrm> - // Note: At this point its clear, that <pCurrCntntFrm> has + // page header respectively page footer as <pCurrContentFrm> + // Note: At this point its clear, that <pCurrContentFrm> has // to be inside a page header or page footer and that - // neither <pCurrCntntFrm> nor <pPrevCntntFrm> are + // neither <pCurrContentFrm> nor <pPrevContentFrm> are // inside a fly frame. // Thus, method <FindFooterOrHeader()> can be used. - OSL_ENSURE( pCurrCntntFrm->FindFooterOrHeader(), + OSL_ENSURE( pCurrContentFrm->FindFooterOrHeader(), "<SwFrm::_FindPrevCnt()> - unknown layout situation: current frame should be in page header or page footer" ); - OSL_ENSURE( !pPrevCntntFrm->IsInFly(), + OSL_ENSURE( !pPrevContentFrm->IsInFly(), "<SwFrm::_FindPrevCnt()> - unknown layout situation: found previous frame should *not* be inside a fly frame." ); - if ( pPrevCntntFrm->FindFooterOrHeader() != - pCurrCntntFrm->FindFooterOrHeader() ) + if ( pPrevContentFrm->FindFooterOrHeader() != + pCurrContentFrm->FindFooterOrHeader() ) { - pPrevCntntFrm = 0L; + pPrevContentFrm = 0L; } } } } } - return pPrevCntntFrm; + return pPrevContentFrm; } SwFrm *SwFrm::_FindPrev() @@ -1051,19 +1051,19 @@ SwFrm *SwFrm::_FindPrev() if ( IsTabFrm() ) { - //The first Cntnt of the table gets picked up and his predecessor is + //The first Content of the table gets picked up and his predecessor is //returned. To be able to deactivate the special case for tables //(see below) bIgnoreTab will be set. if ( static_cast<SwTabFrm*>(this)->IsFollow() ) return static_cast<SwTabFrm*>(this)->FindMaster(); else - pThis = static_cast<SwTabFrm*>(this)->ContainsCntnt(); + pThis = static_cast<SwTabFrm*>(this)->ContainsContent(); bIgnoreTab = true; } - if ( pThis && pThis->IsCntntFrm() ) + if ( pThis && pThis->IsContentFrm() ) { - SwCntntFrm *pPrvCnt = static_cast<SwCntntFrm*>(pThis)->GetPrevCntntFrm(); + SwContentFrm *pPrvCnt = static_cast<SwContentFrm*>(pThis)->GetPrevContentFrm(); if( !pPrvCnt ) return 0; if ( !bIgnoreTab && pThis->IsInTab() ) @@ -1071,7 +1071,7 @@ SwFrm *SwFrm::_FindPrev() SwLayoutFrm *pUp = pThis->GetUpper(); while (pUp && !pUp->IsCellFrm()) pUp = pUp->GetUpper(); - SAL_WARN_IF(!pUp, "sw.core", "Cntnt in table but not in cell."); + SAL_WARN_IF(!pUp, "sw.core", "Content in table but not in cell."); if (pUp && pUp->IsAnLower(pPrvCnt)) return pPrvCnt; } @@ -1079,19 +1079,19 @@ SwFrm *SwFrm::_FindPrev() { SwFrm* pRet; const bool bBody = pThis->IsInDocBody(); - const bool bFtn = !bBody && pThis->IsInFtn(); - if ( bBody || bFtn ) + const bool bFootnote = !bBody && pThis->IsInFootnote(); + if ( bBody || bFootnote ) { while ( pPrvCnt ) { if ( (bBody && pPrvCnt->IsInDocBody()) || - (bFtn && pPrvCnt->IsInFtn()) ) + (bFootnote && pPrvCnt->IsInFootnote()) ) { pRet = pPrvCnt->IsInTab() ? pPrvCnt->FindTabFrm() : (SwFrm*)pPrvCnt; return pRet; } - pPrvCnt = pPrvCnt->GetPrevCntntFrm(); + pPrvCnt = pPrvCnt->GetPrevContentFrm(); } } else if ( pThis->IsInFly() ) @@ -1121,7 +1121,7 @@ SwFrm *SwFrm::_FindPrev() return 0; } -void SwFrm::ImplInvalidateNextPos( bool bNoFtn ) +void SwFrm::ImplInvalidateNextPos( bool bNoFootnote ) { SwFrm *pFrm; if ( 0 != (pFrm = _FindNext()) ) @@ -1135,8 +1135,8 @@ void SwFrm::ImplInvalidateNextPos( bool bNoFtn ) SwFrm* pTmp = static_cast<SwSectionFrm*>(pFrm)->ContainsAny(); if( pTmp ) pTmp->InvalidatePos(); - else if( !bNoFtn ) - static_cast<SwSectionFrm*>(pFrm)->InvalidateFtnPos(); + else if( !bNoFootnote ) + static_cast<SwSectionFrm*>(pFrm)->InvalidateFootnotePos(); if( !IsInSct() || FindSctFrm()->GetFollow() != pFrm ) pFrm->InvalidatePos(); return; @@ -1168,7 +1168,7 @@ void SwFrm::ImplInvalidateNextPos( bool bNoFtn ) OD 09.01.2004 #i11859# - FME 2004-04-19 #i27145# Moved function from SwTxtFrm to SwFrm + FME 2004-04-19 #i27145# Moved function from SwTextFrm to SwFrm */ void SwFrm::InvalidateNextPrtArea() { @@ -1179,8 +1179,8 @@ void SwFrm::InvalidateNextPrtArea() while ( pNextFrm && ( ( pNextFrm->IsSctFrm() && !static_cast<SwSectionFrm*>(pNextFrm)->GetSection() ) || - ( pNextFrm->IsTxtFrm() && - static_cast<SwTxtFrm*>(pNextFrm)->IsHiddenNow() ) ) ) + ( pNextFrm->IsTextFrm() && + static_cast<SwTextFrm*>(pNextFrm)->IsHiddenNow() ) ) ) { pNextFrm = pNextFrm->FindNext(); } @@ -1201,11 +1201,11 @@ void SwFrm::InvalidateNextPrtArea() } // Invalidate printing area of first content in found section. - SwFrm* pFstCntntOfSctFrm = + SwFrm* pFstContentOfSctFrm = static_cast<SwSectionFrm*>(pNextFrm)->ContainsAny(); - if ( pFstCntntOfSctFrm ) + if ( pFstContentOfSctFrm ) { - pFstCntntOfSctFrm->InvalidatePrt(); + pFstContentOfSctFrm->InvalidatePrt(); } } else @@ -1258,10 +1258,10 @@ bool SwFrm::IsMoveable( const SwLayoutFrm* _pLayoutFrm ) const } else if ( _pLayoutFrm->IsInFly() || _pLayoutFrm->IsInDocBody() || - _pLayoutFrm->IsInFtn() ) + _pLayoutFrm->IsInFootnote() ) { if ( _pLayoutFrm->IsInTab() && !IsTabFrm() && - ( !IsCntntFrm() || !const_cast<SwFrm*>(this)->GetNextCellLeaf( MAKEPAGE_NONE ) ) ) + ( !IsContentFrm() || !const_cast<SwFrm*>(this)->GetNextCellLeaf( MAKEPAGE_NONE ) ) ) { bRetVal = false; } @@ -1308,15 +1308,15 @@ void SwFrm::SetInfFlags() if ( !IsFlyFrm() && !GetUpper() ) //not yet pasted, no information available return; - mbInfInvalid = mbInfBody = mbInfTab = mbInfFly = mbInfFtn = mbInfSct = false; + mbInfInvalid = mbInfBody = mbInfTab = mbInfFly = mbInfFootnote = mbInfSct = false; SwFrm *pFrm = this; - if( IsFtnContFrm() ) - mbInfFtn = true; + if( IsFootnoteContFrm() ) + mbInfFootnote = true; do { // mbInfBody is only set in the page body, but not in the column body - if ( pFrm->IsBodyFrm() && !mbInfFtn && pFrm->GetUpper() + if ( pFrm->IsBodyFrm() && !mbInfFootnote && pFrm->GetUpper() && pFrm->GetUpper()->IsPageFrm() ) mbInfBody = true; else if ( pFrm->IsTabFrm() || pFrm->IsCellFrm() ) @@ -1327,8 +1327,8 @@ void SwFrm::SetInfFlags() mbInfFly = true; else if ( pFrm->IsSctFrm() ) mbInfSct = true; - else if ( pFrm->IsFtnFrm() ) - mbInfFtn = true; + else if ( pFrm->IsFootnoteFrm() ) + mbInfFootnote = true; pFrm = pFrm->GetUpper(); @@ -1600,7 +1600,7 @@ const SwCellFrm& SwCellFrm::FindStartEndOfRowSpanCell( bool bStart, bool bCurren GetTabBox()->FindStartOfRowSpan( *pTable, nMax ) : GetTabBox()->FindEndOfRowSpan( *pTable, nMax ); - SwIterator<SwCellFrm,SwFmt> aIter( *rMasterBox.GetFrmFmt() ); + SwIterator<SwCellFrm,SwFormat> aIter( *rMasterBox.GetFrameFormat() ); for ( SwCellFrm* pMasterCell = aIter.First(); pMasterCell; pMasterCell = aIter.Next() ) { diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx index 4af6708d16dc..41cac22cbd5f 100644 --- a/sw/source/core/layout/flowfrm.cxx +++ b/sw/source/core/layout/flowfrm.cxx @@ -117,7 +117,7 @@ bool SwFlowFrm::IsKeepFwdMoveAllowed() // the 'keep' attribute set, and the first of the chain's // IsFwdMoveAllowed returns false, then we're not allowed to move. SwFrm *pFrm = &m_rThis; - if ( !pFrm->IsInFtn() ) + if ( !pFrm->IsInFootnote() ) do { if ( pFrm->GetAttrSet()->GetKeep().GetValue() ) pFrm = pFrm->GetIndPrev(); @@ -139,7 +139,7 @@ void SwFlowFrm::CheckKeep() SwFrm *pPre = m_rThis.GetIndPrev(); if( pPre->IsSctFrm() ) { - SwFrm *pLast = static_cast<SwSectionFrm*>(pPre)->FindLastCntnt(); + SwFrm *pLast = static_cast<SwSectionFrm*>(pPre)->FindLastContent(); if( pLast && pLast->FindSctFrm() == pPre ) pPre = pLast; else @@ -152,7 +152,7 @@ void SwFlowFrm::CheckKeep() { if( pTmp->IsSctFrm() ) { - SwFrm *pLast = static_cast<SwSectionFrm*>(pTmp)->FindLastCntnt(); + SwFrm *pLast = static_cast<SwSectionFrm*>(pTmp)->FindLastContent(); if( pLast && pLast->FindSctFrm() == pTmp ) pTmp = pLast; else @@ -173,7 +173,7 @@ bool SwFlowFrm::IsKeep( const SwAttrSet& rAttrs, bool bCheckIfLastRowShouldKeep // if there are any break after attributes set at rAttrs // or break before attributes set for the next content (or next table) bool bKeep = bCheckIfLastRowShouldKeep || - ( !m_rThis.IsInFtn() && + ( !m_rThis.IsInFootnote() && ( !m_rThis.IsInTab() || m_rThis.IsTabFrm() ) && rAttrs.GetKeep().GetValue() ); @@ -228,7 +228,7 @@ bool SwFlowFrm::IsKeep( const SwAttrSet& rAttrs, bool bCheckIfLastRowShouldKeep { SwTabFrm* pTab = pNxt->FindTabFrm(); if ( ! m_rThis.IsInTab() || m_rThis.FindTabFrm() != pTab ) - pSet = &pTab->GetFmt()->GetAttrSet(); + pSet = &pTab->GetFormat()->GetAttrSet(); } if ( ! pSet ) @@ -295,10 +295,10 @@ sal_uInt8 SwFlowFrm::BwdMoveNecessary( const SwPageFrm *pPage, const SwRect &rRe // #i28701# - consider changed type of // <SwSortedObjs> entries. SwAnchoredObject* pObj = rObjs[i]; - const SwFrmFmt& rFmt = pObj->GetFrmFmt(); + const SwFrameFormat& rFormat = pObj->GetFrameFormat(); const SwRect aRect( pObj->GetObjRect() ); if ( aRect.IsOver( rRect ) && - rFmt.GetSurround().GetSurround() != SURROUND_THROUGHT ) + rFormat.GetSurround().GetSurround() != SURROUND_THROUGHT ) { if( m_rThis.IsLayoutFrm() && //Fly Lower of This? Is_Lower_Of( &m_rThis, pObj->GetDrawObj() ) ) @@ -321,23 +321,23 @@ sal_uInt8 SwFlowFrm::BwdMoveNecessary( const SwPageFrm *pPage, const SwRect &rRe // flow, because then I wouldn't evade it. if ( ::IsFrmInSameKontext( pAnchor, &m_rThis ) ) { - if ( rFmt.GetAnchor().GetAnchorId() == FLY_AT_PARA ) + if ( rFormat.GetAnchor().GetAnchorId() == FLY_AT_PARA ) { // The index of the other one can be retrieved using the anchor attribute. - sal_uLong nTmpIndex = rFmt.GetAnchor().GetCntntAnchor()->nNode.GetIndex(); + sal_uLong nTmpIndex = rFormat.GetAnchor().GetContentAnchor()->nNode.GetIndex(); // Now we're going to check whether the current paragraph before // the anchor of the displacing object sits in the text. If this // is the case, we don't try to evade it. - // The index is being determined via SwFmtAnchor, because it's + // The index is being determined via SwFormatAnchor, because it's // getting quite expensive otherwise. if( ULONG_MAX == nIndex ) { const SwNode *pNode; - if ( m_rThis.IsCntntFrm() ) - pNode = static_cast<SwCntntFrm&>(m_rThis).GetNode(); + if ( m_rThis.IsContentFrm() ) + pNode = static_cast<SwContentFrm&>(m_rThis).GetNode(); else if( m_rThis.IsSctFrm() ) - pNode = static_cast<SwSectionFmt*>(static_cast<SwSectionFrm&>(m_rThis). - GetFmt())->GetSectionNode(); + pNode = static_cast<SwSectionFormat*>(static_cast<SwSectionFrm&>(m_rThis). + GetFormat())->GetSectionNode(); else { OSL_ENSURE( m_rThis.IsTabFrm(), "new FowFrm?" ); @@ -369,12 +369,12 @@ SwLayoutFrm *SwFlowFrm::CutTree( SwFrm *pStart ) // as appropriate. SwLayoutFrm *pLay = pStart->GetUpper(); - if ( pLay->IsInFtn() ) - pLay = pLay->FindFtnFrm(); + if ( pLay->IsInFootnote() ) + pLay = pLay->FindFootnoteFrm(); // #i58846# // <pPrepare( PREP_QUOVADIS )> only for frames in footnotes - if( pStart->IsInFtn() ) + if( pStart->IsInFootnote() ) { SwFrm* pTmp = pStart->GetIndPrev(); if( pTmp ) @@ -391,35 +391,35 @@ SwLayoutFrm *SwFlowFrm::CutTree( SwFrm *pStart ) pStart->mpPrev = 0; } - if ( pLay->IsFtnFrm() ) + if ( pLay->IsFootnoteFrm() ) { if ( !pLay->Lower() && !pLay->IsColLocked() && - !static_cast<SwFtnFrm*>(pLay)->IsBackMoveLocked() ) + !static_cast<SwFootnoteFrm*>(pLay)->IsBackMoveLocked() ) { pLay->Cut(); SwFrm::DestroyFrm(pLay); } else { - bool bUnlock = !static_cast<SwFtnFrm*>(pLay)->IsBackMoveLocked(); - static_cast<SwFtnFrm*>(pLay)->LockBackMove(); + bool bUnlock = !static_cast<SwFootnoteFrm*>(pLay)->IsBackMoveLocked(); + static_cast<SwFootnoteFrm*>(pLay)->LockBackMove(); pLay->InvalidateSize(); pLay->Calc(); - SwCntntFrm *pCnt = pLay->ContainsCntnt(); + SwContentFrm *pCnt = pLay->ContainsContent(); while ( pCnt && pLay->IsAnLower( pCnt ) ) { // It's possible for the CntFrm to be locked, and we don't want // to end up in an endless page migration, so we're not even // going to call Calc! - OSL_ENSURE( pCnt->IsTxtFrm(), "The Graphic has landed." ); - if ( static_cast<SwTxtFrm*>(pCnt)->IsLocked() || - static_cast<SwTxtFrm*>(pCnt)->GetFollow() == pStart ) + OSL_ENSURE( pCnt->IsTextFrm(), "The Graphic has landed." ); + if ( static_cast<SwTextFrm*>(pCnt)->IsLocked() || + static_cast<SwTextFrm*>(pCnt)->GetFollow() == pStart ) break; pCnt->Calc(); - pCnt = pCnt->GetNextCntntFrm(); + pCnt = pCnt->GetNextContentFrm(); } if( bUnlock ) - static_cast<SwFtnFrm*>(pLay)->UnlockBackMove(); + static_cast<SwFootnoteFrm*>(pLay)->UnlockBackMove(); } pLay = 0; } @@ -497,12 +497,12 @@ bool SwFlowFrm::PasteTree( SwFrm *pStart, SwLayoutFrm *pParent, SwFrm *pSibling, pFloat->_InvalidateAll(); pFloat->CheckDirChange(); - // I'm a friend of the TxtFrm and thus am allowed to do many things. + // I'm a friend of the TextFrm and thus am allowed to do many things. // The CacheIdx idea seems to be a bit risky! - if ( pFloat->IsTxtFrm() ) + if ( pFloat->IsTextFrm() ) { - if ( static_cast<SwTxtFrm*>(pFloat)->GetCacheIdx() != USHRT_MAX ) - static_cast<SwTxtFrm*>(pFloat)->Init(); // I'm his friend. + if ( static_cast<SwTextFrm*>(pFloat)->GetCacheIdx() != USHRT_MAX ) + static_cast<SwTextFrm*>(pFloat)->Init(); // I'm his friend. } else bRet = true; @@ -521,7 +521,7 @@ bool SwFlowFrm::PasteTree( SwFrm *pStart, SwLayoutFrm *pParent, SwFrm *pSibling, { pLst->mpNext = pSibling; pSibling->mpPrev = pLst; - if( pSibling->IsInFtn() ) + if( pSibling->IsInFootnote() ) { if( pSibling->IsSctFrm() ) pSibling = static_cast<SwSectionFrm*>(pSibling)->ContainsAny(); @@ -536,8 +536,8 @@ bool SwFlowFrm::PasteTree( SwFrm *pStart, SwLayoutFrm *pParent, SwFrm *pSibling, pParent->Grow( nGrowVal ); } - if ( pParent->IsFtnFrm() ) - static_cast<SwFtnFrm*>(pParent)->InvalidateNxtFtnCnts( pParent->FindPageFrm() ); + if ( pParent->IsFootnoteFrm() ) + static_cast<SwFootnoteFrm*>(pParent)->InvalidateNxtFootnoteCnts( pParent->FindPageFrm() ); return bRet; } @@ -593,7 +593,7 @@ void SwFlowFrm::MoveSubTree( SwLayoutFrm* pParent, SwFrm* pSibling ) // #130797# - correct fix #126020# if ( pOldParent && !pOldParent->Lower() && ( pOldParent->IsInSct() && - !(pSct = pOldParent->FindSctFrm())->ContainsCntnt() && + !(pSct = pOldParent->FindSctFrm())->ContainsContent() && !pSct->ContainsAny( true ) ) ) { pSct->DelEmpty( false ); @@ -606,11 +606,11 @@ void SwFlowFrm::MoveSubTree( SwLayoutFrm* pParent, SwFrm* pSibling ) else if( m_rThis.GetUpper()->IsSctFrm() ) { SwSectionFrm* pTmpSct = static_cast<SwSectionFrm*>(m_rThis.GetUpper()); - bool bOld = pTmpSct->IsCntntLocked(); - pTmpSct->SetCntntLock( true ); + bool bOld = pTmpSct->IsContentLocked(); + pTmpSct->SetContentLock( true ); pTmpSct->Calc(); if( !bOld ) - pTmpSct->SetCntntLock( false ); + pTmpSct->SetContentLock( false ); } SwPageFrm *pPage = m_rThis.FindPageFrm(); @@ -619,12 +619,12 @@ void SwFlowFrm::MoveSubTree( SwLayoutFrm* pParent, SwFrm* pSibling ) m_rThis.InvalidatePage( pPage ); if ( m_rThis.IsLayoutFrm() ) { - SwCntntFrm *pCnt = static_cast<SwLayoutFrm*>(&m_rThis)->ContainsCntnt(); + SwContentFrm *pCnt = static_cast<SwLayoutFrm*>(&m_rThis)->ContainsContent(); if ( pCnt ) pCnt->InvalidatePage( pPage ); } else if ( pSh && pSh->GetDoc()->GetLineNumberInfo().IsRestartEachPage() - && pPage->FindFirstBodyCntnt() == &m_rThis ) + && pPage->FindFirstBodyContent() == &m_rThis ) { m_rThis._InvalidateLineNum(); } @@ -644,16 +644,16 @@ bool SwFlowFrm::IsAnFollow( const SwFlowFrm *pAssumed ) const return false; } -SwTxtFrm* SwCntntFrm::FindMaster() const +SwTextFrm* SwContentFrm::FindMaster() const { - OSL_ENSURE( IsFollow(), "SwCntntFrm::FindMaster(): !IsFollow" ); + OSL_ENSURE( IsFollow(), "SwContentFrm::FindMaster(): !IsFollow" ); - const SwCntntFrm* pPrec = GetPrecede(); + const SwContentFrm* pPrec = GetPrecede(); if ( pPrec && pPrec->HasFollow() && pPrec->GetFollow() == this ) { - OSL_ENSURE( pPrec->IsTxtFrm(), "NoTxtFrm with follow found" ); - return const_cast<SwTxtFrm*>(static_cast< const SwTxtFrm* >(pPrec)); + OSL_ENSURE( pPrec->IsTextFrm(), "NoTextFrm with follow found" ); + return const_cast<SwTextFrm*>(static_cast< const SwTextFrm* >(pPrec)); } OSL_FAIL( "Follow ist lost in Space." ); @@ -664,7 +664,7 @@ SwSectionFrm* SwSectionFrm::FindMaster() const { OSL_ENSURE( IsFollow(), "SwSectionFrm::FindMaster(): !IsFollow" ); - SwIterator<SwSectionFrm,SwFmt> aIter( *pSection->GetFmt() ); + SwIterator<SwSectionFrm,SwFormat> aIter( *pSection->GetFormat() ); SwSectionFrm* pSect = aIter.First(); while ( pSect ) { @@ -681,7 +681,7 @@ SwTabFrm* SwTabFrm::FindMaster( bool bFirstMaster ) const { OSL_ENSURE( IsFollow(), "SwTabFrm::FindMaster(): !IsFollow" ); - SwIterator<SwTabFrm,SwFmt> aIter( *GetTable()->GetFrmFmt() ); + SwIterator<SwTabFrm,SwFormat> aIter( *GetTable()->GetFrameFormat() ); SwTabFrm* pTab = aIter.First(); while ( pTab ) { @@ -717,13 +717,13 @@ SwTabFrm* SwTabFrm::FindMaster( bool bFirstMaster ) const /** * Returns the next/previous Layout leaf that's NOT below this (or even is this itself). - * Also, that leaf must be in the same text flow as the pAnch origin frame (Body, Ftn) + * Also, that leaf must be in the same text flow as the pAnch origin frame (Body, Footnote) */ const SwLayoutFrm *SwFrm::GetLeaf( MakePageType eMakePage, bool bFwd, const SwFrm *pAnch ) const { // No flow, no joy... - if ( !(IsInDocBody() || IsInFtn() || IsInFly()) ) + if ( !(IsInDocBody() || IsInFootnote() || IsInFly()) ) return 0; const SwFrm *pLeaf = this; @@ -736,7 +736,7 @@ const SwLayoutFrm *SwFrm::GetLeaf( MakePageType eMakePage, bool bFwd, (!IsLayoutFrm() || !static_cast<const SwLayoutFrm*>(this)->IsAnLower( pLeaf ))) { if ( pAnch->IsInDocBody() == pLeaf->IsInDocBody() && - pAnch->IsInFtn() == pLeaf->IsInFtn() ) + pAnch->IsInFootnote() == pLeaf->IsInFootnote() ) { bFound = true; } @@ -748,8 +748,8 @@ const SwLayoutFrm *SwFrm::GetLeaf( MakePageType eMakePage, bool bFwd, SwLayoutFrm *SwFrm::GetLeaf( MakePageType eMakePage, bool bFwd ) { - if ( IsInFtn() ) - return bFwd ? GetNextFtnLeaf( eMakePage ) : GetPrevFtnLeaf( eMakePage ); + if ( IsInFootnote() ) + return bFwd ? GetNextFootnoteLeaf( eMakePage ) : GetPrevFootnoteLeaf( eMakePage ); // #i53323# // A frame could be inside a table AND inside a section. @@ -799,7 +799,7 @@ bool SwFrm::WrongPageDesc( SwPageFrm* pNew ) // is wrong, I can happily exchange it. // If the page however thinks that it's pagedesc is correct, // this doesn't mean it's useful to me: - // If the first BodyCntnt asks for a PageDesc or a PageBreak, + // If the first BodyContent asks for a PageDesc or a PageBreak, // I'll have to insert a new page - except the desired page is // the correct one. // If I inserted a new page, the problems only get started: @@ -810,7 +810,7 @@ bool SwFrm::WrongPageDesc( SwPageFrm* pNew ) // Way out of the situation: Try to preliminarily insert a // new page once (empty pages are already inserted by InsertPage() // if required) - const SwFmtPageDesc &rFmtDesc = GetAttrSet()->GetPageDesc(); + const SwFormatPageDesc &rFormatDesc = GetAttrSet()->GetPageDesc(); //My Pagedesc doesn't count if I'm a follow! SwPageDesc *pDesc = 0; @@ -818,19 +818,19 @@ bool SwFrm::WrongPageDesc( SwPageFrm* pNew ) SwFlowFrm *pFlow = SwFlowFrm::CastFlowFrm( this ); if ( !pFlow || !pFlow->IsFollow() ) { - pDesc = const_cast<SwPageDesc*>(rFmtDesc.GetPageDesc()); + pDesc = const_cast<SwPageDesc*>(rFormatDesc.GetPageDesc()); if( pDesc ) { - if( !pDesc->GetRightFmt() ) + if( !pDesc->GetRightFormat() ) nTmp = 2; - else if( !pDesc->GetLeftFmt() ) + else if( !pDesc->GetLeftFormat() ) nTmp = 1; - else if( rFmtDesc.GetNumOffset() ) - nTmp = rFmtDesc.GetNumOffset().get(); + else if( rFormatDesc.GetNumOffset() ) + nTmp = rFormatDesc.GetNumOffset().get(); } } - // Does the Cntnt bring a Pagedesc or do we need the + // Does the Content bring a Pagedesc or do we need the // virtual page number of the new layout leaf? // PageDesc isn't allowed with Follows const bool bOdd = nTmp ? (nTmp % 2) !=0 : pNew->OnRightPage(); @@ -839,7 +839,7 @@ bool SwFrm::WrongPageDesc( SwPageFrm* pNew ) bool bFirst = pNew->OnFirstPage(); - const SwFlowFrm *pNewFlow = pNew->FindFirstBodyCntnt(); + const SwFlowFrm *pNewFlow = pNew->FindFirstBodyContent(); // Did we find ourselves? if( pNewFlow == pFlow ) pNewFlow = NULL; @@ -849,15 +849,15 @@ bool SwFrm::WrongPageDesc( SwPageFrm* pNew ) ? pNewFlow->GetFrm().GetAttrSet()->GetPageDesc().GetPageDesc() : 0; return (pNew->GetPageDesc() != pDesc) // own desc ? - || (pNew->GetFmt() != - (bOdd ? pDesc->GetRightFmt(bFirst) : pDesc->GetLeftFmt(bFirst))) + || (pNew->GetFormat() != + (bOdd ? pDesc->GetRightFormat(bFirst) : pDesc->GetLeftFormat(bFirst))) || (pNewDesc && pNewDesc == pDesc); } /// Returns the next layout leaf in which we can move the frame. SwLayoutFrm *SwFrm::GetNextLeaf( MakePageType eMakePage ) { - OSL_ENSURE( !IsInFtn(), "GetNextLeaf(), don't call me for Ftn." ); + OSL_ENSURE( !IsInFootnote(), "GetNextLeaf(), don't call me for Footnote." ); OSL_ENSURE( !IsInSct(), "GetNextLeaf(), don't call me for Sections." ); const bool bBody = IsInDocBody(); // If I'm coming from the DocBody, @@ -873,7 +873,7 @@ SwLayoutFrm *SwFrm::GetNextLeaf( MakePageType eMakePage ) SwLayoutFrm *pLayLeaf = 0; if ( IsTabFrm() ) { - SwCntntFrm* pTmp = static_cast<SwTabFrm*>(this)->FindLastCntnt(); + SwContentFrm* pTmp = static_cast<SwTabFrm*>(this)->FindLastContent(); if ( pTmp ) pLayLeaf = pTmp->GetUpper(); } @@ -893,7 +893,7 @@ SwLayoutFrm *SwFrm::GetNextLeaf( MakePageType eMakePage ) // me as well. // It only needs to be of the same kind like my starting point // (DocBody or Footnote respectively) - if ( pLayLeaf->FindPageFrm()->IsFtnPage() ) + if ( pLayLeaf->FindPageFrm()->IsFootnotePage() ) { // If I ended up at the end note pages, we're done. pLayLeaf = 0; continue; @@ -926,17 +926,17 @@ SwLayoutFrm *SwFrm::GetNextLeaf( MakePageType eMakePage ) { if( WrongPageDesc( pNew ) ) { - SwFtnContFrm *pCont = pNew->FindFtnCont(); + SwFootnoteContFrm *pCont = pNew->FindFootnoteCont(); if( pCont ) { // If the reference of the first footnote of this page // lies before the page, we'd rather not insert a new page. // (Bug #55620#) - SwFtnFrm *pFtn = static_cast<SwFtnFrm*>(pCont->Lower()); - if( pFtn && pFtn->GetRef() ) + SwFootnoteFrm *pFootnote = static_cast<SwFootnoteFrm*>(pCont->Lower()); + if( pFootnote && pFootnote->GetRef() ) { const sal_uInt16 nRefNum = pNew->GetPhyPageNum(); - if( pFtn->GetRef()->GetPhyPageNum() < nRefNum ) + if( pFootnote->GetRef()->GetPhyPageNum() < nRefNum ) break; } } @@ -989,7 +989,7 @@ SwLayoutFrm *SwFrm::GetNextLeaf( MakePageType eMakePage ) /// Returns the previous layout leaf where we can move the frame. SwLayoutFrm *SwFrm::GetPrevLeaf( MakePageType ) { - OSL_ENSURE( !IsInFtn(), "GetPrevLeaf(), don't call me for Ftn." ); + OSL_ENSURE( !IsInFootnote(), "GetPrevLeaf(), don't call me for Footnote." ); const bool bBody = IsInDocBody(); // If I'm coming from the DocBody, // I want to end up in the body. @@ -1013,7 +1013,7 @@ SwLayoutFrm *SwFrm::GetPrevLeaf( MakePageType ) SwFlowFrm::SetMoveBwdJump( true ); } else if ( bFly ) - break; //Cntnts in Flys should accept any layout leaf. + break; //Contents in Flys should accept any layout leaf. else pLayLeaf = pLayLeaf->GetPrevLayoutLeaf(); } @@ -1060,9 +1060,9 @@ bool SwFlowFrm::IsPrevObjMove() const // OD 2004-01-20 #110582# - do not consider hidden objects // #i26945# - do not consider object, which // doesn't follow the text flow. - if ( pObj->GetFrmFmt().GetDoc()->getIDocumentDrawModelAccess().IsVisibleLayerId( + if ( pObj->GetFrameFormat().GetDoc()->getIDocumentDrawModelAccess().IsVisibleLayerId( pObj->GetDrawObj()->GetLayer() ) && - pObj->GetFrmFmt().GetFollowTextFlow().GetValue() ) + pObj->GetFrameFormat().GetFollowTextFlow().GetValue() ) { const SwLayoutFrm* pVertPosOrientFrm = pObj->GetVertPosOrientFrm(); if ( pVertPosOrientFrm && @@ -1084,12 +1084,12 @@ bool SwFlowFrm::IsPrevObjMove() const |* If bAct is set to true, this function returns true if |* there's a PageBreak. |* Of course, we don't evaluate the hard page break for follows. -|* The page break is in it's own FrmFmt (BEFORE) or in the FrmFmt of the +|* The page break is in it's own FrameFormat (BEFORE) or in the FrameFormat of the |* predecessor (AFTER). If there's no predecessor on the page, we don't |* need to think further. |* Also, a page break (or the need for one) is also present if -|* the FrmFmt contains a PageDesc. -|* The implementation works only on CntntFrms! - the definition +|* the FrameFormat contains a PageDesc. +|* The implementation works only on ContentFrms! - the definition |* of the predecessor is not clear for LayoutFrms. |*/ bool SwFlowFrm::IsPageBreak( bool bAct ) const @@ -1105,7 +1105,7 @@ bool SwFlowFrm::IsPageBreak( bool bAct ) const // Determine predecessor const SwFrm *pPrev = m_rThis.FindPrev(); while ( pPrev && ( !pPrev->IsInDocBody() || - ( pPrev->IsTxtFrm() && static_cast<const SwTxtFrm*>(pPrev)->IsHiddenNow() ) ) ) + ( pPrev->IsTextFrm() && static_cast<const SwTextFrm*>(pPrev)->IsHiddenNow() ) ) ) pPrev = pPrev->FindPrev(); if ( pPrev ) @@ -1143,10 +1143,10 @@ bool SwFlowFrm::IsPageBreak( bool bAct ) const |* If bAct is set to true, we return true if there's a ColBreak. |* Of course, we don't evaluate the hard column break for follows. |* -|* The column break is in it's own FrmFmt (BEFORE) or in the FrmFmt of the +|* The column break is in it's own FrameFormat (BEFORE) or in the FrameFormat of the |* predecessor (AFTER). If there's no predecessor in the column, we don't |* need to think further. -|* The implementation works only on CntntFrms! - the definition +|* The implementation works only on ContentFrms! - the definition |* of the predecessor is not clear for LayoutFrms. |*/ bool SwFlowFrm::IsColBreak( bool bAct ) const @@ -1159,7 +1159,7 @@ bool SwFlowFrm::IsColBreak( bool bAct ) const // Determine predecessor const SwFrm *pPrev = m_rThis.FindPrev(); while( pPrev && ( ( !pPrev->IsInDocBody() && !m_rThis.IsInFly() ) || - ( pPrev->IsTxtFrm() && static_cast<const SwTxtFrm*>(pPrev)->IsHiddenNow() ) ) ) + ( pPrev->IsTextFrm() && static_cast<const SwTextFrm*>(pPrev)->IsHiddenNow() ) ) ) pPrev = pPrev->FindPrev(); if ( pPrev ) @@ -1199,7 +1199,7 @@ bool SwFlowFrm::HasParaSpaceAtPages( bool bSct ) const { if( pTmp->IsCellFrm() || pTmp->IsFlyFrm() || pTmp->IsFooterFrm() || pTmp->IsHeaderFrm() || - ( pTmp->IsFtnFrm() && !static_cast<const SwFtnFrm*>(pTmp)->GetMaster() ) ) + ( pTmp->IsFootnoteFrm() && !static_cast<const SwFootnoteFrm*>(pTmp)->GetMaster() ) ) return true; if( pTmp->IsPageFrm() ) return !( pTmp->GetPrev() && !IsPageBreak(true) ); @@ -1240,8 +1240,8 @@ const SwFrm* SwFlowFrm::_GetPrevFrmForUpperSpaceCalc( const SwFrm* _pProposedPre // Skip hidden paragraphs and empty sections while ( pPrevFrm && - ( ( pPrevFrm->IsTxtFrm() && - static_cast<const SwTxtFrm*>(pPrevFrm)->IsHiddenNow() ) || + ( ( pPrevFrm->IsTextFrm() && + static_cast<const SwTextFrm*>(pPrevFrm)->IsHiddenNow() ) || ( pPrevFrm->IsSctFrm() && !static_cast<const SwSectionFrm*>(pPrevFrm)->GetSection() ) ) ) { @@ -1251,20 +1251,20 @@ const SwFrm* SwFlowFrm::_GetPrevFrmForUpperSpaceCalc( const SwFrm* _pProposedPre // Special case: no direct previous frame is found but frame is in footnote // Search for a previous frame in previous footnote, // if frame isn't in a section, which is also in the footnote - if ( !pPrevFrm && m_rThis.IsInFtn() && + if ( !pPrevFrm && m_rThis.IsInFootnote() && ( m_rThis.IsSctFrm() || - !m_rThis.IsInSct() || !m_rThis.FindSctFrm()->IsInFtn() ) ) + !m_rThis.IsInSct() || !m_rThis.FindSctFrm()->IsInFootnote() ) ) { - const SwFtnFrm* pPrevFtnFrm = - static_cast<const SwFtnFrm*>(m_rThis.FindFtnFrm()->GetPrev()); - if ( pPrevFtnFrm ) + const SwFootnoteFrm* pPrevFootnoteFrm = + static_cast<const SwFootnoteFrm*>(m_rThis.FindFootnoteFrm()->GetPrev()); + if ( pPrevFootnoteFrm ) { - pPrevFrm = pPrevFtnFrm->GetLastLower(); + pPrevFrm = pPrevFootnoteFrm->GetLastLower(); // Skip hidden paragraphs and empty sections while ( pPrevFrm && - ( ( pPrevFrm->IsTxtFrm() && - static_cast<const SwTxtFrm*>(pPrevFrm)->IsHiddenNow() ) || + ( ( pPrevFrm->IsTextFrm() && + static_cast<const SwTextFrm*>(pPrevFrm)->IsHiddenNow() ) || ( pPrevFrm->IsSctFrm() && !static_cast<const SwSectionFrm*>(pPrevFrm)->GetSection() ) ) ) { @@ -1278,7 +1278,7 @@ const SwFrm* SwFlowFrm::_GetPrevFrmForUpperSpaceCalc( const SwFrm* _pProposedPre { const SwSectionFrm* pPrevSectFrm = static_cast<const SwSectionFrm*>(pPrevFrm); - pPrevFrm = pPrevSectFrm->FindLastCntnt(); + pPrevFrm = pPrevSectFrm->FindLastContent(); // If the last content is in a table _inside_ the section, // take the table herself. // OD 2004-02-18 #106629# - correction: @@ -1294,8 +1294,8 @@ const SwFrm* SwFlowFrm::_GetPrevFrmForUpperSpaceCalc( const SwFrm* _pProposedPre } // OD 2004-02-18 #106629# correction: skip hidden text frames while ( pPrevFrm && - pPrevFrm->IsTxtFrm() && - static_cast<const SwTxtFrm*>(pPrevFrm)->IsHiddenNow() ) + pPrevFrm->IsTextFrm() && + static_cast<const SwTextFrm*>(pPrevFrm)->IsHiddenNow() ) { pPrevFrm = pPrevFrm->GetPrev(); } @@ -1307,19 +1307,19 @@ const SwFrm* SwFlowFrm::_GetPrevFrmForUpperSpaceCalc( const SwFrm* _pProposedPre /// Compare styles attached to these text frames. static bool lcl_IdenticalStyles(const SwFrm* pPrevFrm, const SwFrm* pFrm) { - SwTxtFmtColl *pPrevFmtColl = 0; - if (pPrevFrm && pPrevFrm->IsTxtFrm()) + SwTextFormatColl *pPrevFormatColl = 0; + if (pPrevFrm && pPrevFrm->IsTextFrm()) { - const SwTxtFrm *pTxtFrm = static_cast< const SwTxtFrm * >( pPrevFrm ); - pPrevFmtColl = dynamic_cast<SwTxtFmtColl*>(pTxtFrm->GetTxtNode()->GetFmtColl()); + const SwTextFrm *pTextFrm = static_cast< const SwTextFrm * >( pPrevFrm ); + pPrevFormatColl = dynamic_cast<SwTextFormatColl*>(pTextFrm->GetTextNode()->GetFormatColl()); } bool bIdenticalStyles = false; - if (pFrm && pFrm->IsTxtFrm()) + if (pFrm && pFrm->IsTextFrm()) { - const SwTxtFrm *pTxtFrm = static_cast< const SwTxtFrm * >( pFrm ); - SwTxtFmtColl *pFmtColl = dynamic_cast<SwTxtFmtColl*>(pTxtFrm->GetTxtNode()->GetFmtColl()); - bIdenticalStyles = pPrevFmtColl == pFmtColl; + const SwTextFrm *pTextFrm = static_cast< const SwTextFrm * >( pFrm ); + SwTextFormatColl *pFormatColl = dynamic_cast<SwTextFormatColl*>(pTextFrm->GetTextNode()->GetFormatColl()); + bIdenticalStyles = pPrevFormatColl == pFormatColl; } return bIdenticalStyles; } @@ -1370,7 +1370,7 @@ SwTwips SwFlowFrm::CalcUpperSpace( const SwBorderAttrs *pAttrs, SwTwips nUpper = 0; // OD 06.01.2004 #i11859# { - const IDocumentSettingAccess* pIDSA = m_rThis.GetUpper()->GetFmt()->getIDocumentSettingAccess(); + const IDocumentSettingAccess* pIDSA = m_rThis.GetUpper()->GetFormat()->getIDocumentSettingAccess(); const bool bUseFormerLineSpacing = pIDSA->get(DocumentSettingId::OLD_LINE_SPACING); if( pPrevFrm ) { @@ -1392,9 +1392,9 @@ SwTwips SwFlowFrm::CalcUpperSpace( const SwBorderAttrs *pAttrs, if ( bUseFormerLineSpacing ) { // former consideration - if ( pOwn->IsTxtFrm() ) + if ( pOwn->IsTextFrm() ) { - nAdd = std::max( nAdd, static_cast<SwTxtFrm*>(pOwn)->GetLineSpace() ); + nAdd = std::max( nAdd, static_cast<SwTextFrm*>(pOwn)->GetLineSpace() ); } nUpper += nAdd; } @@ -1405,7 +1405,7 @@ SwTwips SwFlowFrm::CalcUpperSpace( const SwBorderAttrs *pAttrs, // text frame is considered for the upper spacing and // the line spacing values are add up instead of // building its maximum. - if ( pOwn->IsTxtFrm() ) + if ( pOwn->IsTextFrm() ) { // #i102458# // Correction: @@ -1416,11 +1416,11 @@ SwTwips SwFlowFrm::CalcUpperSpace( const SwBorderAttrs *pAttrs, // spacing is built. if ( bPrevLineSpacingPorportional ) { - nAdd += static_cast<SwTxtFrm*>(pOwn)->GetLineSpace( true ); + nAdd += static_cast<SwTextFrm*>(pOwn)->GetLineSpace( true ); } else { - nAdd = std::max( nAdd, static_cast<SwTxtFrm*>(pOwn)->GetLineSpace( true ) ); + nAdd = std::max( nAdd, static_cast<SwTextFrm*>(pOwn)->GetLineSpace( true ) ); } } nUpper += nAdd; @@ -1435,8 +1435,8 @@ SwTwips SwFlowFrm::CalcUpperSpace( const SwBorderAttrs *pAttrs, if ( bUseFormerLineSpacing ) { // former consideration - if ( pOwn->IsTxtFrm() ) - nUpper = std::max( nUpper, static_cast<SwTxtFrm*>(pOwn)->GetLineSpace() ); + if ( pOwn->IsTextFrm() ) + nUpper = std::max( nUpper, static_cast<SwTextFrm*>(pOwn)->GetLineSpace() ); if ( nPrevLineSpacing != 0 ) { nUpper = std::max( nUpper, nPrevLineSpacing ); @@ -1451,7 +1451,7 @@ SwTwips SwFlowFrm::CalcUpperSpace( const SwBorderAttrs *pAttrs, // the paragraph spacing instead of building the // maximum of the line spacings and the paragraph spacing. SwTwips nAdd = nPrevLineSpacing; - if ( pOwn->IsTxtFrm() ) + if ( pOwn->IsTextFrm() ) { // #i102458# // Correction: @@ -1462,11 +1462,11 @@ SwTwips SwFlowFrm::CalcUpperSpace( const SwBorderAttrs *pAttrs, // spacing is built. if ( bPrevLineSpacingPorportional ) { - nAdd += static_cast<SwTxtFrm*>(pOwn)->GetLineSpace( true ); + nAdd += static_cast<SwTextFrm*>(pOwn)->GetLineSpace( true ); } else { - nAdd = std::max( nAdd, static_cast<SwTxtFrm*>(pOwn)->GetLineSpace( true ) ); + nAdd = std::max( nAdd, static_cast<SwTextFrm*>(pOwn)->GetLineSpace( true ) ); } } nUpper += nAdd; @@ -1482,14 +1482,14 @@ SwTwips SwFlowFrm::CalcUpperSpace( const SwBorderAttrs *pAttrs, // OD 2004-02-26 #i25029# - pass previous frame <pPrevFrm> // to method <GetTopLine(..)>, if parameter <pPr> is set. - // Note: parameter <pPr> is set, if method is called from <SwTxtFrm::WouldFit(..)> + // Note: parameter <pPr> is set, if method is called from <SwTextFrm::WouldFit(..)> nUpper += pAttrs->GetTopLine( m_rThis, (pPr ? pPrevFrm : 0L) ); // OD 2004-03-12 #i11860# - consider value of new parameter <_bConsiderGrid> // and use new method <GetUpperSpaceAmountConsideredForPageGrid(..)> //consider grid in square page mode - if ( _bConsiderGrid && m_rThis.GetUpper()->GetFmt()->GetDoc()->IsSquaredPageMode() ) + if ( _bConsiderGrid && m_rThis.GetUpper()->GetFormat()->GetDoc()->IsSquaredPageMode() ) { nUpper += _GetUpperSpaceAmountConsideredForPageGrid( nUpper ); } @@ -1580,7 +1580,7 @@ SwTwips SwFlowFrm::_GetUpperSpaceAmountConsideredForPrevFrm() const GetSpacingValuesOfFrm( (*pPrevFrm), nPrevLowerSpace, nPrevLineSpacing, bDummy ); if ( nPrevLowerSpace > 0 || nPrevLineSpacing > 0 ) { - const IDocumentSettingAccess* pIDSA = m_rThis.GetUpper()->GetFmt()->getIDocumentSettingAccess(); + const IDocumentSettingAccess* pIDSA = m_rThis.GetUpper()->GetFormat()->getIDocumentSettingAccess(); if ( pIDSA->get(DocumentSettingId::PARA_SPACE_MAX) || !pIDSA->get(DocumentSettingId::OLD_LINE_SPACING) ) { @@ -1606,11 +1606,11 @@ SwTwips SwFlowFrm::GetUpperSpaceAmountConsideredForPrevFrmAndPageGrid() const { SwTwips nUpperSpaceAmountConsideredForPrevFrmAndPageGrid = 0; - if ( !m_rThis.GetUpper()->GetFmt()->getIDocumentSettingAccess()->get(DocumentSettingId::USE_FORMER_OBJECT_POS) ) + if ( !m_rThis.GetUpper()->GetFormat()->getIDocumentSettingAccess()->get(DocumentSettingId::USE_FORMER_OBJECT_POS) ) { nUpperSpaceAmountConsideredForPrevFrmAndPageGrid = _GetUpperSpaceAmountConsideredForPrevFrm() + - ( m_rThis.GetUpper()->GetFmt()->GetDoc()->IsSquaredPageMode() + ( m_rThis.GetUpper()->GetFormat()->GetDoc()->IsSquaredPageMode() ? _GetUpperSpaceAmountConsideredForPageGrid( CalcUpperSpace( 0, 0, false ) ) : 0 ); } @@ -1637,7 +1637,7 @@ SwTwips SwFlowFrm::CalcLowerSpace( const SwBorderAttrs* _pAttrs ) const if ( m_rThis.IsInSct() && m_rThis.GetUpper()->IsColBodyFrm() ) { const SwSectionFrm* pSectFrm = m_rThis.FindSctFrm(); - bCommonBorder = pSectFrm->GetFmt()->GetBalancedColumns().GetValue(); + bCommonBorder = pSectFrm->GetFormat()->GetBalancedColumns().GetValue(); } nLowerSpace = bCommonBorder ? _pAttrs->GetBottomLine( m_rThis ) : @@ -1669,13 +1669,13 @@ SwTwips SwFlowFrm::CalcAddLowerSpaceAsLastInTableCell( { SwTwips nAdditionalLowerSpace = 0; - if ( m_rThis.GetUpper()->GetFmt()->getIDocumentSettingAccess()->get(DocumentSettingId::ADD_PARA_SPACING_TO_TABLE_CELLS) ) + if ( m_rThis.GetUpper()->GetFormat()->getIDocumentSettingAccess()->get(DocumentSettingId::ADD_PARA_SPACING_TO_TABLE_CELLS) ) { const SwFrm* pFrm = &m_rThis; if ( pFrm->IsSctFrm() ) { const SwSectionFrm* pSectFrm = static_cast<const SwSectionFrm*>(pFrm); - pFrm = pSectFrm->FindLastCntnt(); + pFrm = pSectFrm->FindLastContent(); if ( pFrm && pFrm->IsInTab() ) { const SwTabFrm* pTableFrm = pFrm->FindTabFrm(); @@ -1708,7 +1708,7 @@ bool SwFlowFrm::CheckMoveFwd( bool& rbMakePage, bool bKeep, bool ) const SwFrm* pNxt = m_rThis.GetIndNext(); if ( bKeep && //!bMovedBwd && - ( !pNxt || ( pNxt->IsTxtFrm() && static_cast<const SwTxtFrm*>(pNxt)->IsEmptyMaster() ) ) && + ( !pNxt || ( pNxt->IsTextFrm() && static_cast<const SwTextFrm*>(pNxt)->IsEmptyMaster() ) ) && ( 0 != (pNxt = m_rThis.FindNext()) ) && IsKeepFwdMoveAllowed() ) { if( pNxt->IsSctFrm() ) @@ -1790,16 +1790,16 @@ bool SwFlowFrm::CheckMoveFwd( bool& rbMakePage, bool bKeep, bool ) /// Return value tells us whether the Frm has changed the page. bool SwFlowFrm::MoveFwd( bool bMakePage, bool bPageBreak, bool bMoveAlways ) { -//!!!!MoveFtnCntFwd might need to be updated as well. - SwFtnBossFrm *pOldBoss = m_rThis.FindFtnBossFrm(); - if (m_rThis.IsInFtn()) +//!!!!MoveFootnoteCntFwd might need to be updated as well. + SwFootnoteBossFrm *pOldBoss = m_rThis.FindFootnoteBossFrm(); + if (m_rThis.IsInFootnote()) { - if (!m_rThis.IsCntntFrm()) + if (!m_rThis.IsContentFrm()) { SAL_WARN("sw.core", "Tables in footnotes are not truly supported"); return false; } - return static_cast<SwCntntFrm&>(m_rThis).MoveFtnCntFwd( bMakePage, pOldBoss ); + return static_cast<SwContentFrm&>(m_rThis).MoveFootnoteCntFwd( bMakePage, pOldBoss ); } if( !IsFwdMoveAllowed() && !bMoveAlways ) @@ -1807,7 +1807,7 @@ bool SwFlowFrm::MoveFwd( bool bMakePage, bool bPageBreak, bool bMoveAlways ) bool bNoFwd = true; if( m_rThis.IsInSct() ) { - SwFtnBossFrm* pBoss = m_rThis.FindFtnBossFrm(); + SwFootnoteBossFrm* pBoss = m_rThis.FindFootnoteBossFrm(); bNoFwd = !pBoss->IsInSct() || ( !pBoss->Lower()->GetNext() && !pBoss->GetPrev() ); } @@ -1844,7 +1844,7 @@ bool SwFlowFrm::MoveFwd( bool bMakePage, bool bPageBreak, bool bMoveAlways ) PROTOCOL_ENTER( &m_rThis, PROT_MOVE_FWD, 0, 0 ); SwPageFrm *pOldPage = pOldBoss->FindPageFrm(); // We move ourself and all the direct successors before the - // first CntntFrm below the new Upper. + // first ContentFrm below the new Upper. // If our NewUpper lies in a SectionFrm, we need to make sure // that it won't destroy itself in Calc. @@ -1867,14 +1867,14 @@ bool SwFlowFrm::MoveFwd( bool bMakePage, bool bPageBreak, bool bMoveAlways ) else if ( !pNewUpper->IsCellFrm() || static_cast<SwLayoutFrm*>(pNewUpper)->Lower() ) pNewUpper->Calc(); - SwFtnBossFrm *pNewBoss = pNewUpper->FindFtnBossFrm(); + SwFootnoteBossFrm *pNewBoss = pNewUpper->FindFootnoteBossFrm(); bool bBossChg = pNewBoss != pOldBoss; - pNewBoss = pNewBoss->FindFtnBossFrm( true ); - pOldBoss = pOldBoss->FindFtnBossFrm( true ); + pNewBoss = pNewBoss->FindFootnoteBossFrm( true ); + pOldBoss = pOldBoss->FindFootnoteBossFrm( true ); SwPageFrm* pNewPage = pOldPage; // First, we move the footnotes. - bool bFtnMoved = false; + bool bFootnoteMoved = false; // #i26831# // If pSect has just been created, the printing area of pSect has @@ -1893,16 +1893,16 @@ bool SwFlowFrm::MoveFwd( bool bMakePage, bool bPageBreak, bool bMoveAlways ) // Set deadline, so the footnotes don't think up // silly things... SWRECTFN( pOldBoss ) - SwSaveFtnHeight aHeight( pOldBoss, + SwSaveFootnoteHeight aHeight( pOldBoss, (pOldBoss->Frm().*fnRect->fnGetBottom)() ); - SwCntntFrm* pStart = m_rThis.IsCntntFrm() ? - static_cast<SwCntntFrm*>(&m_rThis) : static_cast<SwLayoutFrm&>(m_rThis).ContainsCntnt(); + SwContentFrm* pStart = m_rThis.IsContentFrm() ? + static_cast<SwContentFrm*>(&m_rThis) : static_cast<SwLayoutFrm&>(m_rThis).ContainsContent(); OSL_ENSURE( pStart || ( m_rThis.IsTabFrm() && !static_cast<SwTabFrm&>(m_rThis).Lower() ), "MoveFwd: Missing Content" ); - SwLayoutFrm* pBody = pStart ? ( pStart->IsTxtFrm() ? - const_cast<SwBodyFrm *>(static_cast<SwTxtFrm*>(pStart)->FindBodyFrm()) : 0 ) : 0; + SwLayoutFrm* pBody = pStart ? ( pStart->IsTextFrm() ? + const_cast<SwBodyFrm *>(static_cast<SwTextFrm*>(pStart)->FindBodyFrm()) : 0 ) : 0; if( pBody ) - bFtnMoved = pBody->MoveLowerFtns( pStart, pOldBoss, pNewBoss, + bFootnoteMoved = pBody->MoveLowerFootnotes( pStart, pOldBoss, pNewBoss, false); } // It's possible when dealing with SectionFrms that we have been moved @@ -1941,10 +1941,10 @@ bool SwFlowFrm::MoveFwd( bool bMakePage, bool bPageBreak, bool bMoveAlways ) pSect->SimpleFormat(); } - if ( bFtnMoved && !bSamePage ) + if ( bFootnoteMoved && !bSamePage ) { - pOldPage->UpdateFtnNum(); - pNewPage->UpdateFtnNum(); + pOldPage->UpdateFootnoteNum(); + pNewPage->UpdateFootnoteNum(); } if( bBossChg ) @@ -1953,8 +1953,8 @@ bool SwFlowFrm::MoveFwd( bool bMakePage, bool bPageBreak, bool bMoveAlways ) if( !bSamePage ) { SwViewShell *pSh = m_rThis.getRootFrm()->GetCurrShell(); - if ( pSh && !pSh->Imp()->IsUpdateExpFlds() ) - pSh->GetDoc()->getIDocumentFieldsAccess().SetNewFldLst(true); // Will be done by CalcLayout() later on! + if ( pSh && !pSh->Imp()->IsUpdateExpFields() ) + pSh->GetDoc()->getIDocumentFieldsAccess().SetNewFieldLst(true); // Will be done by CalcLayout() later on! pNewPage->InvalidateSpelling(); pNewPage->InvalidateSmartTags(); @@ -1990,13 +1990,13 @@ bool SwFlowFrm::MoveBwd( bool &rbReformat ) { SwFlowFrm::SetMoveBwdJump( false ); - SwFtnFrm* pFtn = m_rThis.FindFtnFrm(); - if ( pFtn && pFtn->IsBackMoveLocked() ) + SwFootnoteFrm* pFootnote = m_rThis.FindFootnoteFrm(); + if ( pFootnote && pFootnote->IsBackMoveLocked() ) return false; // #115759# - text frames, which are directly inside // tables aren't allowed to move backward. - if ( m_rThis.IsTxtFrm() && m_rThis.IsInTab() ) + if ( m_rThis.IsTextFrm() && m_rThis.IsInTab() ) { const SwLayoutFrm* pUpperFrm = m_rThis.GetUpper(); while ( pUpperFrm ) @@ -2013,35 +2013,35 @@ bool SwFlowFrm::MoveBwd( bool &rbReformat ) } } - SwFtnBossFrm * pOldBoss = m_rThis.FindFtnBossFrm(); + SwFootnoteBossFrm * pOldBoss = m_rThis.FindFootnoteBossFrm(); SwPageFrm * const pOldPage = pOldBoss->FindPageFrm(); SwLayoutFrm *pNewUpper = 0; bool bCheckPageDescs = false; bool bCheckPageDescOfNextPage = false; - if ( pFtn ) + if ( pFootnote ) { // If the footnote already sits on the same page/column as the reference, // we can't flow back. The breaks don't need to be checked for footnotes. - // #i37084# FindLastCntnt does not necessarily + // #i37084# FindLastContent does not necessarily // have to have a result != 0 SwFrm* pRef = 0; - const bool bEndnote = pFtn->GetAttr()->GetFtn().IsEndNote(); - if( bEndnote && pFtn->IsInSct() ) + const bool bEndnote = pFootnote->GetAttr()->GetFootnote().IsEndNote(); + if( bEndnote && pFootnote->IsInSct() ) { - SwSectionFrm* pSect = pFtn->FindSctFrm(); + SwSectionFrm* pSect = pFootnote->FindSctFrm(); if( pSect->IsEndnAtEnd() ) - pRef = pSect->FindLastCntnt( FINDMODE_LASTCNT ); + pRef = pSect->FindLastContent( FINDMODE_LASTCNT ); } if( !pRef ) - pRef = pFtn->GetRef(); + pRef = pFootnote->GetRef(); OSL_ENSURE( pRef, "MoveBwd: Endnote for an empty section?" ); if( !bEndnote ) - pOldBoss = pOldBoss->FindFtnBossFrm( true ); - SwFtnBossFrm *pRefBoss = pRef->FindFtnBossFrm( !bEndnote ); + pOldBoss = pOldBoss->FindFootnoteBossFrm( true ); + SwFootnoteBossFrm *pRefBoss = pRef->FindFootnoteBossFrm( !bEndnote ); if ( pOldBoss != pRefBoss && // OD 08.11.2002 #104840# - use <SwLayoutFrm::IsBefore(..)> ( !bEndnote || @@ -2101,7 +2101,7 @@ bool SwFlowFrm::MoveBwd( bool &rbReformat ) pNewNextUpper != m_rThis.GetUpper() && pNewNextUpper->GetType() == pNewUpper->GetType() && pNewNextUpper->IsInDocBody() == pNewUpper->IsInDocBody() && - pNewNextUpper->IsInFtn() == pNewUpper->IsInFtn() && + pNewNextUpper->IsInFootnote() == pNewUpper->IsInFootnote() && pNewNextUpper->IsInTab() == pNewUpper->IsInTab() && pNewNextUpper->IsInSct() == pNewUpper->IsInSct() && !m_rThis.WrongPageDesc( pNewNextUpper->FindPageFrm() ) ) @@ -2118,14 +2118,14 @@ bool SwFlowFrm::MoveBwd( bool &rbReformat ) } else if ( IsColBreak( true ) ) { - // If the previous column doesn't contain a CntntFrm, flowing back + // If the previous column doesn't contain a ContentFrm, flowing back // makes sense despite the ColumnBreak, as otherwise we'd get // an empty column. if( m_rThis.IsInSct() ) { pNewUpper = m_rThis.GetLeaf( MAKEPAGE_NONE, false ); if( pNewUpper && !SwFlowFrm::IsMoveBwdJump() && - ( pNewUpper->ContainsCntnt() || + ( pNewUpper->ContainsContent() || ( ( !pNewUpper->IsColBodyFrm() || !pNewUpper->GetUpper()->GetPrev() ) && !pNewUpper->FindSctFrm()->GetPrev() ) ) ) @@ -2151,7 +2151,7 @@ bool SwFlowFrm::MoveBwd( bool &rbReformat ) if ( pNewNextUpper && pNewNextUpper->GetType() == pNewUpper->GetType() && pNewNextUpper->IsInDocBody() == pNewUpper->IsInDocBody() && - pNewNextUpper->IsInFtn() == pNewUpper->IsInFtn() && + pNewNextUpper->IsInFootnote() == pNewUpper->IsInFootnote() && pNewNextUpper->IsInTab() == pNewUpper->IsInTab() && pNewNextUpper->IsInSct() == pNewUpper->IsInSct() && !m_rThis.WrongPageDesc( pNewNextUpper->FindPageFrm() ) ) @@ -2180,7 +2180,7 @@ bool SwFlowFrm::MoveBwd( bool &rbReformat ) SwLayoutFrm* pColBody = pCol->IsColumnFrm() ? const_cast<SwLayoutFrm*>(static_cast<const SwLayoutFrm*>(static_cast<const SwLayoutFrm*>(pCol)->Lower())) : const_cast<SwLayoutFrm*>(static_cast<const SwLayoutFrm*>(pCol)); - if ( pColBody->ContainsCntnt() ) + if ( pColBody->ContainsContent() ) { bGoOn = false; // We have content here! we accept this // only if GetLeaf() has set the MoveBwdJump. @@ -2206,7 +2206,7 @@ bool SwFlowFrm::MoveBwd( bool &rbReformat ) pNewNextUpper != m_rThis.GetUpper() && pNewNextUpper->GetType() == pNewUpper->GetType() && pNewNextUpper->IsInDocBody() == pNewUpper->IsInDocBody() && - pNewNextUpper->IsInFtn() == pNewUpper->IsInFtn() && + pNewNextUpper->IsInFootnote() == pNewUpper->IsInFootnote() && pNewNextUpper->IsInTab() == pNewUpper->IsInTab() && pNewNextUpper->IsInSct() == pNewUpper->IsInSct() && !m_rThis.WrongPageDesc( pNewNextUpper->FindPageFrm() ) ) @@ -2240,12 +2240,12 @@ bool SwFlowFrm::MoveBwd( bool &rbReformat ) // - allow move backward as long as the anchored object is only temporarily // positions considering its wrapping style. if ( pNewUpper && - m_rThis.IsTxtFrm() && !IsFollow() ) + m_rThis.IsTextFrm() && !IsFollow() ) { sal_uInt32 nToPageNum( 0L ); const bool bMoveFwdByObjPos = SwLayouter::FrmMovedFwdByObjPos( - *(pOldPage->GetFmt()->GetDoc()), - static_cast<SwTxtFrm&>(m_rThis), + *(pOldPage->GetFormat()->GetDoc()), + static_cast<SwTextFrm&>(m_rThis), nToPageNum ); if ( bMoveFwdByObjPos && pNewUpper->FindPageFrm()->GetPhyPageNum() < nToPageNum ) @@ -2315,7 +2315,7 @@ bool SwFlowFrm::MoveBwd( bool &rbReformat ) { if( !pNewUpper->Lower() ) { - if( pNewUpper->IsFtnContFrm() ) + if( pNewUpper->IsFootnoteContFrm() ) { pNewUpper->Cut(); SwFrm::DestroyFrm(pNewUpper); @@ -2326,7 +2326,7 @@ bool SwFlowFrm::MoveBwd( bool &rbReformat ) // #126020# - adjust check for empty section // #130797# - correct fix #126020# if ( pSectFrm && !pSectFrm->IsColLocked() && - !pSectFrm->ContainsCntnt() && !pSectFrm->ContainsAny( true ) ) + !pSectFrm->ContainsContent() && !pSectFrm->ContainsAny( true ) ) { pSectFrm->DelEmpty( true ); SwFrm::DestroyFrm(pSectFrm); @@ -2362,7 +2362,7 @@ bool SwFlowFrm::MoveBwd( bool &rbReformat ) } pIndNext = pIndNext->GetIndNext(); } - OSL_ENSURE( !pIndNext || pIndNext->ISA(SwTxtFrm), + OSL_ENSURE( !pIndNext || pIndNext->ISA(SwTextFrm), "<SwFlowFrm::MovedBwd(..)> - incorrect next found." ); if ( pIndNext && pIndNext->IsFlowFrm() && SwFlowFrm::CastFlowFrm(pIndNext)->IsJoinLocked() ) @@ -2377,7 +2377,7 @@ bool SwFlowFrm::MoveBwd( bool &rbReformat ) // backward under the same layout condition. if ( pNewUpper && !IsFollow() && pNewUpper != m_rThis.GetUpper() && - SwLayouter::MoveBwdSuppressed( *(pOldPage->GetFmt()->GetDoc()), + SwLayouter::MoveBwdSuppressed( *(pOldPage->GetFormat()->GetDoc()), *this, *pNewUpper ) ) { SwLayoutFrm* pNextNewUpper = pNewUpper->GetLeaf( @@ -2401,11 +2401,11 @@ bool SwFlowFrm::MoveBwd( bool &rbReformat ) if ( pNewUpper ) { PROTOCOL_ENTER( &m_rThis, PROT_MOVE_BWD, 0, 0 ); - if ( pNewUpper->IsFtnContFrm() ) + if ( pNewUpper->IsFootnoteContFrm() ) { // I may have gotten a Container - SwFtnFrm *pOld = m_rThis.FindFtnFrm(); - SwFtnFrm *pNew = new SwFtnFrm( pOld->GetFmt(), pOld, + SwFootnoteFrm *pOld = m_rThis.FindFootnoteFrm(); + SwFootnoteFrm *pNew = new SwFootnoteFrm( pOld->GetFormat(), pOld, pOld->GetRef(), pOld->GetAttr() ); if ( pOld->GetMaster() ) { @@ -2417,12 +2417,12 @@ bool SwFlowFrm::MoveBwd( bool &rbReformat ) pNew->Paste( pNewUpper ); pNewUpper = pNew; } - if( pNewUpper->IsFtnFrm() && m_rThis.IsInSct() ) + if( pNewUpper->IsFootnoteFrm() && m_rThis.IsInSct() ) { SwSectionFrm* pSct = m_rThis.FindSctFrm(); // If we're in a section of a footnote, we may need to create // a SwSectionFrm in the new upper - if( pSct->IsInFtn() ) + if( pSct->IsInFootnote() ) { SwFrm* pTmp = pNewUpper->Lower(); if( pTmp ) @@ -2447,7 +2447,7 @@ bool SwFlowFrm::MoveBwd( bool &rbReformat ) } bool bUnlock = false; bool bFollow = false; - // Lock section. Otherwise, it could get destroyed if the only Cntnt + // Lock section. Otherwise, it could get destroyed if the only Content // moves e.g. from the second into the first column. SwSectionFrm* pSect = pNewUpper->FindSctFrm(); if( pSect ) @@ -2484,8 +2484,8 @@ bool SwFlowFrm::MoveBwd( bool &rbReformat ) { m_rThis.Prepare( PREP_BOSS_CHGD, (const void*)pOldPage, false ); SwViewShell *pSh = m_rThis.getRootFrm()->GetCurrShell(); - if ( pSh && !pSh->Imp()->IsUpdateExpFlds() ) - pSh->GetDoc()->getIDocumentFieldsAccess().SetNewFldLst(true); // Will be done by CalcLayout() later on + if ( pSh && !pSh->Imp()->IsUpdateExpFields() ) + pSh->GetDoc()->getIDocumentFieldsAccess().SetNewFieldLst(true); // Will be done by CalcLayout() later on pNewPage->InvalidateSpelling(); pNewPage->InvalidateSmartTags(); @@ -2516,8 +2516,8 @@ bool SwFlowFrm::MoveBwd( bool &rbReformat ) SwFlowFrm *SwFlowFrm::CastFlowFrm( SwFrm *pFrm ) { - if ( pFrm->IsCntntFrm() ) - return static_cast<SwCntntFrm*>(pFrm); + if ( pFrm->IsContentFrm() ) + return static_cast<SwContentFrm*>(pFrm); if ( pFrm->IsTabFrm() ) return static_cast<SwTabFrm*>(pFrm); if ( pFrm->IsSctFrm() ) @@ -2527,8 +2527,8 @@ SwFlowFrm *SwFlowFrm::CastFlowFrm( SwFrm *pFrm ) const SwFlowFrm *SwFlowFrm::CastFlowFrm( const SwFrm *pFrm ) { - if ( pFrm->IsCntntFrm() ) - return static_cast<const SwCntntFrm*>(pFrm); + if ( pFrm->IsContentFrm() ) + return static_cast<const SwContentFrm*>(pFrm); if ( pFrm->IsTabFrm() ) return static_cast<const SwTabFrm*>(pFrm); if ( pFrm->IsSctFrm() ) diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx index c183d747d351..4d7c3d81ecb6 100644 --- a/sw/source/core/layout/fly.cxx +++ b/sw/source/core/layout/fly.cxx @@ -68,8 +68,8 @@ using namespace ::com::sun::star; TYPEINIT2(SwFlyFrm,SwLayoutFrm,SwAnchoredObject); -SwFlyFrm::SwFlyFrm( SwFlyFrmFmt *pFmt, SwFrm* pSib, SwFrm *pAnch ) : - SwLayoutFrm( pFmt, pSib ), +SwFlyFrm::SwFlyFrm( SwFlyFrameFormat *pFormat, SwFrm* pSib, SwFrm *pAnch ) : + SwLayoutFrm( pFormat, pSib ), SwAnchoredObject(), // #i26791# pPrevLink( 0 ), pNextLink( 0 ), @@ -88,9 +88,9 @@ SwFlyFrm::SwFlyFrm( SwFlyFrmFmt *pFmt, SwFrm* pSib, SwFrm *pAnch ) : bHeightClipped = bWidthClipped = bFormatHeightOnly = false; // Size setting: Fixed size is always the width - const SwFmtFrmSize &rFrmSize = pFmt->GetFrmSize(); + const SwFormatFrmSize &rFrmSize = pFormat->GetFrmSize(); const sal_uInt16 nDir = - static_cast<const SvxFrameDirectionItem&>(pFmt->GetFmtAttr( RES_FRAMEDIR )).GetValue(); + static_cast<const SvxFrameDirectionItem&>(pFormat->GetFormatAttr( RES_FRAMEDIR )).GetValue(); if( FRMDIR_ENVIRONMENT == nDir ) { mbDerivedVert = true; @@ -163,7 +163,7 @@ void SwFlyFrm::Chain( SwFrm* _pAnch ) // Connect to chain neighboors. // No problem, if a neighboor doesn't exist - the construction of the // neighboor will make the connection - const SwFmtChain& rChain = GetFmt()->GetChain(); + const SwFormatChain& rChain = GetFormat()->GetChain(); if ( rChain.GetPrev() || rChain.GetNext() ) { if ( rChain.GetNext() ) @@ -193,15 +193,15 @@ void SwFlyFrm::InsertCnt() { if ( !GetPrevLink() ) { - const SwFmtCntnt& rCntnt = GetFmt()->GetCntnt(); - OSL_ENSURE( rCntnt.GetCntntIdx(), ":-( no content prepared." ); - sal_uLong nIndex = rCntnt.GetCntntIdx()->GetIndex(); + const SwFormatContent& rContent = GetFormat()->GetContent(); + OSL_ENSURE( rContent.GetContentIdx(), ":-( no content prepared." ); + sal_uLong nIndex = rContent.GetContentIdx()->GetIndex(); // Lower() means SwColumnFrm; the Content then needs to be inserted into the (Column)BodyFrm ::_InsertCnt( Lower() ? static_cast<SwLayoutFrm*>(static_cast<SwLayoutFrm*>(Lower())->Lower()) : (SwLayoutFrm*)this, - GetFmt()->GetDoc(), nIndex ); + GetFormat()->GetDoc(), nIndex ); - // NoTxt always have a fixed height. - if ( Lower() && Lower()->IsNoTxtFrm() ) + // NoText always have a fixed height. + if ( Lower() && Lower()->IsNoTextFrm() ) { mbFixSize = true; bMinHeight = false; @@ -214,22 +214,22 @@ void SwFlyFrm::InsertColumns() // #i97379# // Check, if column are allowed. // Columns are not allowed for fly frames, which represent graphics or embedded objects. - const SwFmtCntnt& rCntnt = GetFmt()->GetCntnt(); - OSL_ENSURE( rCntnt.GetCntntIdx(), "<SwFlyFrm::InsertColumns()> - no content prepared." ); - SwNodeIndex aFirstCntnt( *(rCntnt.GetCntntIdx()), 1 ); - if ( aFirstCntnt.GetNode().IsNoTxtNode() ) + const SwFormatContent& rContent = GetFormat()->GetContent(); + OSL_ENSURE( rContent.GetContentIdx(), "<SwFlyFrm::InsertColumns()> - no content prepared." ); + SwNodeIndex aFirstContent( *(rContent.GetContentIdx()), 1 ); + if ( aFirstContent.GetNode().IsNoTextNode() ) { return; } - const SwFmtCol &rCol = GetFmt()->GetCol(); + const SwFormatCol &rCol = GetFormat()->GetCol(); if ( rCol.GetNumCols() > 1 ) { // Start off PrtArea to be as large as Frm, so that we can put in the columns // properly. It'll adjust later on. Prt().Width( Frm().Width() ); Prt().Height( Frm().Height() ); - const SwFmtCol aOld; // ChgColumns() also needs an old value passed + const SwFormatCol aOld; // ChgColumns() also needs an old value passed ChgColumns( aOld, rCol ); } } @@ -240,7 +240,7 @@ void SwFlyFrm::DestroyImpl() // For frames bound as char or frames that don't have an anchor we have // to do that ourselves. For any other frame the call RemoveFly at the // anchor will do that. - if( IsAccessibleFrm() && GetFmt() && (IsFlyInCntFrm() || !GetAnchorFrm()) ) + if( IsAccessibleFrm() && GetFormat() && (IsFlyInCntFrm() || !GetAnchorFrm()) ) { SwRootFrm *pRootFrm = getRootFrm(); if( pRootFrm && pRootFrm->IsAnyShellAccessible() ) @@ -255,7 +255,7 @@ void SwFlyFrm::DestroyImpl() } } - if( GetFmt() && !GetFmt()->GetDoc()->IsInDtor() ) + if( GetFormat() && !GetFormat()->GetDoc()->IsInDtor() ) { // OD 2004-01-19 #110582# Unchain(); @@ -278,7 +278,7 @@ SwFlyFrm::~SwFlyFrm() const IDocumentDrawModelAccess* SwFlyFrm::getIDocumentDrawModelAccess() { - return GetFmt()->getIDocumentDrawModelAccess(); + return GetFormat()->getIDocumentDrawModelAccess(); } // OD 2004-01-19 #110582# @@ -342,7 +342,7 @@ sal_uInt32 SwFlyFrm::_GetOrdNumForNewRef( const SwFlyDrawContact* pContact ) sal_uInt32 nOrdNum( 0L ); // search for another Writer fly frame registered at same frame format - SwIterator<SwFlyFrm,SwFmt> aIter( *pContact->GetFmt() ); + SwIterator<SwFlyFrm,SwFormat> aIter( *pContact->GetFormat() ); const SwFlyFrm* pFlyFrm( 0L ); for ( pFlyFrm = aIter.First(); pFlyFrm; pFlyFrm = aIter.Next() ) { @@ -389,7 +389,7 @@ SwVirtFlyDrawObj* SwFlyFrm::CreateNewRef( SwFlyDrawContact *pContact ) // into drawing page with correct order number else { - pContact->GetFmt()->getIDocumentDrawModelAccess()->GetDrawModel()->GetPage( 0 )-> + pContact->GetFormat()->getIDocumentDrawModelAccess()->GetDrawModel()->GetPage( 0 )-> InsertObject( pDrawObj, _GetOrdNumForNewRef( pContact ) ); } // #i38889# - assure, that new <SwVirtFlyDrawObj> instance @@ -403,12 +403,12 @@ void SwFlyFrm::InitDrawObj( bool bNotify ) // Find ContactObject from the Format. If there's already one, we just // need to create a new Ref, else we create the Contact now. - IDocumentDrawModelAccess* pIDDMA = GetFmt()->getIDocumentDrawModelAccess(); - SwFlyDrawContact *pContact = SwIterator<SwFlyDrawContact,SwFmt>( *GetFmt() ).First(); + IDocumentDrawModelAccess* pIDDMA = GetFormat()->getIDocumentDrawModelAccess(); + SwFlyDrawContact *pContact = SwIterator<SwFlyDrawContact,SwFormat>( *GetFormat() ).First(); if ( !pContact ) { // #i52858# - method name changed - pContact = new SwFlyDrawContact( GetFmt(), + pContact = new SwFlyDrawContact( GetFormat(), pIDDMA->GetOrCreateDrawModel() ); } OSL_ENSURE( pContact, "InitDrawObj failed" ); @@ -420,7 +420,7 @@ void SwFlyFrm::InitDrawObj( bool bNotify ) SdrLayerID nHeavenId = pIDDMA->GetHeavenId(); SdrLayerID nHellId = pIDDMA->GetHellId(); // OD 2004-03-22 #i26791# - GetVirtDrawObj()->SetLayer( GetFmt()->GetOpaque().GetValue() + GetVirtDrawObj()->SetLayer( GetFormat()->GetOpaque().GetValue() ? nHeavenId : nHellId ); if ( bNotify ) @@ -433,7 +433,7 @@ void SwFlyFrm::FinitDrawObj() return; // Deregister from SdrPageViews if the Objects is still selected there. - if ( !GetFmt()->GetDoc()->IsInDtor() ) + if ( !GetFormat()->GetDoc()->IsInDtor() ) { SwViewShell *p1St = getRootFrm()->GetCurrShell(); if ( p1St ) @@ -451,10 +451,10 @@ void SwFlyFrm::FinitDrawObj() // If the last VirtObject is destroyed, the DrawObject and the DrawContact // also need to be destroyed. SwFlyDrawContact *pMyContact = 0; - if ( GetFmt() ) + if ( GetFormat() ) { bool bContinue = true; - SwIterator<SwFrm,SwFmt> aFrmIter( *GetFmt() ); + SwIterator<SwFrm,SwFormat> aFrmIter( *GetFormat() ); for ( SwFrm* pFrm = aFrmIter.First(); pFrm; pFrm = aFrmIter.Next() ) if ( pFrm != this ) { @@ -465,7 +465,7 @@ void SwFlyFrm::FinitDrawObj() if ( bContinue ) // no Frm left, find Contact object to destroy - pMyContact = SwIterator<SwFlyDrawContact,SwFmt>( *GetFmt() ).First(); + pMyContact = SwIterator<SwFlyDrawContact,SwFormat>( *GetFormat() ).First(); } // OD, OS 2004-03-31 #116203# - clear user call of Writer fly frame 'master' @@ -489,7 +489,7 @@ void SwFlyFrm::ChainFrames( SwFlyFrm *pMaster, SwFlyFrm *pFollow ) pMaster->pNextLink = pFollow; pFollow->pPrevLink = pMaster; - if ( pMaster->ContainsCntnt() ) + if ( pMaster->ContainsContent() ) { // To get a text flow we need to invalidate SwFrm *pInva = pMaster->FindLastLower(); @@ -508,11 +508,11 @@ void SwFlyFrm::ChainFrames( SwFlyFrm *pMaster, SwFlyFrm *pFollow ) } } - if ( pFollow->ContainsCntnt() ) + if ( pFollow->ContainsContent() ) { // There's only the content from the Masters left; the content from the Follow - // does not have any Frames left (should always be exactly one empty TxtNode). - SwFrm *pFrm = pFollow->ContainsCntnt(); + // does not have any Frames left (should always be exactly one empty TextNode). + SwFrm *pFrm = pFollow->ContainsContent(); OSL_ENSURE( !pFrm->IsTabFrm() && !pFrm->FindNext(), "follow in chain contains content" ); pFrm->Cut(); SwFrm::DestroyFrm(pFrm); @@ -533,7 +533,7 @@ void SwFlyFrm::UnchainFrames( SwFlyFrm *pMaster, SwFlyFrm *pFollow ) pMaster->pNextLink = 0; pFollow->pPrevLink = 0; - if ( pFollow->ContainsCntnt() ) + if ( pFollow->ContainsContent() ) { // The Master sucks up the content of the Follow SwLayoutFrm *pUpper = pMaster; @@ -546,9 +546,9 @@ void SwFlyFrm::UnchainFrames( SwFlyFrm *pMaster, SwFlyFrm *pFollow ) SwFlyFrm *pFoll = pFollow; while ( pFoll ) { - SwFrm *pTmp = ::SaveCntnt( pFoll ); + SwFrm *pTmp = ::SaveContent( pFoll ); if ( pTmp ) - ::RestoreCntnt( pTmp, pUpper, pMaster->FindLastLower(), true ); + ::RestoreContent( pTmp, pUpper, pMaster->FindLastLower(), true ); pFoll->SetCompletePaint(); pFoll->InvalidateSize(); pFoll = pFoll->GetNextLink(); @@ -556,13 +556,13 @@ void SwFlyFrm::UnchainFrames( SwFlyFrm *pMaster, SwFlyFrm *pFollow ) } // The Follow needs his own content to be served - const SwFmtCntnt &rCntnt = pFollow->GetFmt()->GetCntnt(); - OSL_ENSURE( rCntnt.GetCntntIdx(), ":-( No content prepared." ); - sal_uLong nIndex = rCntnt.GetCntntIdx()->GetIndex(); + const SwFormatContent &rContent = pFollow->GetFormat()->GetContent(); + OSL_ENSURE( rContent.GetContentIdx(), ":-( No content prepared." ); + sal_uLong nIndex = rContent.GetContentIdx()->GetIndex(); // Lower() means SwColumnFrm: this one contains another SwBodyFrm ::_InsertCnt( pFollow->Lower() ? const_cast<SwLayoutFrm*>(static_cast<const SwLayoutFrm*>(static_cast<const SwLayoutFrm*>(pFollow->Lower())->Lower())) : static_cast<SwLayoutFrm*>(pFollow), - pFollow->GetFmt()->GetDoc(), ++nIndex ); + pFollow->GetFormat()->GetDoc(), ++nIndex ); // invalidate accessible relation set (accessibility wrapper) SwViewShell* pSh = pMaster->getRootFrm()->GetCurrShell(); @@ -574,7 +574,7 @@ void SwFlyFrm::UnchainFrames( SwFlyFrm *pMaster, SwFlyFrm *pFollow ) } } -SwFlyFrm *SwFlyFrm::FindChainNeighbour( SwFrmFmt &rChain, SwFrm *pAnch ) +SwFlyFrm *SwFlyFrm::FindChainNeighbour( SwFrameFormat &rChain, SwFrm *pAnch ) { // We look for the Fly that's in the same Area. // Areas can for now only be Head/Footer or Flys. @@ -594,7 +594,7 @@ SwFlyFrm *SwFlyFrm::FindChainNeighbour( SwFrmFmt &rChain, SwFrm *pAnch ) pLay = pLay->GetUpper(); } - SwIterator<SwFlyFrm,SwFmt> aIter( rChain ); + SwIterator<SwFlyFrm,SwFormat> aIter( rChain ); SwFlyFrm *pFly = aIter.First(); if ( pLay ) { @@ -633,7 +633,7 @@ SwFrm *SwFlyFrm::FindLastLower() return pRet; } -bool SwFlyFrm::FrmSizeChg( const SwFmtFrmSize &rFrmSize ) +bool SwFlyFrm::FrmSizeChg( const SwFormatFrmSize &rFrmSize ) { bool bRet = false; SwTwips nDiffHeight = Frm().Height(); @@ -673,7 +673,7 @@ bool SwFlyFrm::FrmSizeChg( const SwFmtFrmSize &rFrmSize ) mbValidPos = false; bRet = true; } - else if ( Lower()->IsNoTxtFrm() ) + else if ( Lower()->IsNoTextFrm() ) { mbFixSize = true; bMinHeight = false; @@ -729,7 +729,7 @@ void SwFlyFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew ) SetNotifyBack(); if ( nInvFlags & 0x10 ) SetCompletePaint(); - if ( ( nInvFlags & 0x40 ) && Lower() && Lower()->IsNoTxtFrm() ) + if ( ( nInvFlags & 0x40 ) && Lower() && Lower()->IsNoTextFrm() ) ClrContourCache( GetVirtDrawObj() ); SwRootFrm *pRoot; if ( nInvFlags & 0x20 && 0 != (pRoot = getRootFrm()) ) @@ -782,14 +782,14 @@ void SwFlyFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew, // By changing the flow of frame-bound Frames, a vertical alignment // can be activated/deactivated => MakeFlyPos - if( FLY_AT_FLY == GetFmt()->GetAnchor().GetAnchorId() ) + if( FLY_AT_FLY == GetFormat()->GetAnchor().GetAnchorId() ) rInvFlags |= 0x09; // Delete contour in the Node if necessary - if ( Lower() && Lower()->IsNoTxtFrm() && - !GetFmt()->GetSurround().IsContour() ) + if ( Lower() && Lower()->IsNoTextFrm() && + !GetFormat()->GetSurround().IsContour() ) { - SwNoTxtNode *pNd = static_cast<SwNoTxtNode*>(static_cast<SwCntntFrm*>(Lower())->GetNode()); + SwNoTextNode *pNd = static_cast<SwNoTextNode*>(static_cast<SwContentFrm*>(Lower())->GetNode()); if ( pNd->HasContour() ) pNd->SetContour( 0 ); } @@ -816,8 +816,8 @@ void SwFlyFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew, case RES_COL: if (pOld && pNew) { - ChgColumns( *static_cast<const SwFmtCol*>(pOld), *static_cast<const SwFmtCol*>(pNew) ); - const SwFmtFrmSize &rNew = GetFmt()->GetFrmSize(); + ChgColumns( *static_cast<const SwFormatCol*>(pOld), *static_cast<const SwFormatCol*>(pNew) ); + const SwFormatFrmSize &rNew = GetFormat()->GetFrmSize(); if ( FrmSizeChg( rNew ) ) NotifyDrawObj(); rInvFlags |= 0x1A; @@ -827,7 +827,7 @@ void SwFlyFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew, case RES_FRM_SIZE: case RES_FMT_CHG: { - const SwFmtFrmSize &rNew = GetFmt()->GetFrmSize(); + const SwFormatFrmSize &rNew = GetFormat()->GetFrmSize(); if ( FrmSizeChg( rNew ) ) NotifyDrawObj(); rInvFlags |= 0x7F; @@ -835,10 +835,10 @@ void SwFlyFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew, { SwRect aNew( GetObjRectWithSpaces() ); SwRect aOld( maFrm ); - const SvxULSpaceItem &rUL = static_cast<const SwFmtChg*>(pOld)->pChangedFmt->GetULSpace(); + const SvxULSpaceItem &rUL = static_cast<const SwFormatChg*>(pOld)->pChangedFormat->GetULSpace(); aOld.Top( std::max( aOld.Top() - long(rUL.GetUpper()), 0L ) ); aOld.SSize().Height()+= rUL.GetLower(); - const SvxLRSpaceItem &rLR = static_cast<const SwFmtChg*>(pOld)->pChangedFmt->GetLRSpace(); + const SvxLRSpaceItem &rLR = static_cast<const SwFormatChg*>(pOld)->pChangedFormat->GetLRSpace(); aOld.Left ( std::max( aOld.Left() - long(rLR.GetLeft()), 0L ) ); aOld.SSize().Width() += rLR.GetRight(); aNew.Union( aOld ); @@ -848,7 +848,7 @@ void SwFlyFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew, // When assigning a template we cannot rely on the old column // attribute. As there need to be at least enough for ChgColumns, // we need to create a temporary attribute. - SwFmtCol aCol; + SwFormatCol aCol; if ( Lower() && Lower()->IsColumnFrm() ) { sal_uInt16 nCol = 0; @@ -859,23 +859,23 @@ void SwFlyFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew, } while ( pTmp ); aCol.Init( nCol, 0, 1000 ); } - ChgColumns( aCol, GetFmt()->GetCol() ); + ChgColumns( aCol, GetFormat()->GetCol() ); } - SwFmtURL aURL( GetFmt()->GetURL() ); + SwFormatURL aURL( GetFormat()->GetURL() ); - SwFmtFrmSize *pNewFmtFrmSize = NULL; - SwFmtChg *pOldFmtChg = NULL; + SwFormatFrmSize *pNewFormatFrmSize = NULL; + SwFormatChg *pOldFormatChg = NULL; if (nWhich == RES_FRM_SIZE) - pNewFmtFrmSize = const_cast<SwFmtFrmSize*>(static_cast<const SwFmtFrmSize*>(pNew)); + pNewFormatFrmSize = const_cast<SwFormatFrmSize*>(static_cast<const SwFormatFrmSize*>(pNew)); else - pOldFmtChg = const_cast<SwFmtChg*>(static_cast<const SwFmtChg*>(pOld)); + pOldFormatChg = const_cast<SwFormatChg*>(static_cast<const SwFormatChg*>(pOld)); - if (aURL.GetMap() && (pNewFmtFrmSize || pOldFmtChg)) + if (aURL.GetMap() && (pNewFormatFrmSize || pOldFormatChg)) { - const SwFmtFrmSize &rOld = pNewFmtFrmSize ? - *pNewFmtFrmSize : - pOldFmtChg->pChangedFmt->GetFrmSize(); + const SwFormatFrmSize &rOld = pNewFormatFrmSize ? + *pNewFormatFrmSize : + pOldFormatChg->pChangedFormat->GetFrmSize(); //#35091# Can be "times zero", when loading the template if ( rOld.GetWidth() && rOld.GetHeight() ) { @@ -883,20 +883,20 @@ void SwFlyFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew, Fraction aScaleX( rOld.GetWidth(), rNew.GetWidth() ); Fraction aScaleY( rOld.GetHeight(), rOld.GetHeight() ); aURL.GetMap()->Scale( aScaleX, aScaleY ); - SwFrmFmt *pFmt = GetFmt(); - pFmt->LockModify(); - pFmt->SetFmtAttr( aURL ); - pFmt->UnlockModify(); + SwFrameFormat *pFormat = GetFormat(); + pFormat->LockModify(); + pFormat->SetFormatAttr( aURL ); + pFormat->UnlockModify(); } } - const SvxProtectItem &rP = GetFmt()->GetProtect(); + const SvxProtectItem &rP = GetFormat()->GetProtect(); GetVirtDrawObj()->SetMoveProtect( rP.IsPosProtected() ); GetVirtDrawObj()->SetResizeProtect( rP.IsSizeProtected() ); if ( pSh ) pSh->InvalidateWindows( Frm() ); - const IDocumentDrawModelAccess* pIDDMA = GetFmt()->getIDocumentDrawModelAccess(); - const sal_uInt8 nId = GetFmt()->GetOpaque().GetValue() ? + const IDocumentDrawModelAccess* pIDDMA = GetFormat()->getIDocumentDrawModelAccess(); + const sal_uInt8 nId = GetFormat()->GetOpaque().GetValue() ? pIDDMA->GetHeavenId() : pIDDMA->GetHellId(); GetVirtDrawObj()->SetLayer( nId ); @@ -904,17 +904,17 @@ void SwFlyFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew, if ( Lower() ) { // Delete contour in the Node if necessary - if( Lower()->IsNoTxtFrm() && - !GetFmt()->GetSurround().IsContour() ) + if( Lower()->IsNoTextFrm() && + !GetFormat()->GetSurround().IsContour() ) { - SwNoTxtNode *pNd = static_cast<SwNoTxtNode*>(static_cast<SwCntntFrm*>(Lower())->GetNode()); + SwNoTextNode *pNd = static_cast<SwNoTextNode*>(static_cast<SwContentFrm*>(Lower())->GetNode()); if ( pNd->HasContour() ) pNd->SetContour( 0 ); } else if( !Lower()->IsColumnFrm() ) { SwFrm* pFrm = GetLastLower(); - if( pFrm->IsTxtFrm() && static_cast<SwTxtFrm*>(pFrm)->IsUndersized() ) + if( pFrm->IsTextFrm() && static_cast<SwTextFrm*>(pFrm)->IsUndersized() ) pFrm->Prepare( PREP_ADJUST_FRM ); } } @@ -976,7 +976,7 @@ void SwFlyFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew, if ( pSh ) pSh->InvalidateWindows( Frm() ); - const IDocumentDrawModelAccess* pIDDMA = GetFmt()->getIDocumentDrawModelAccess(); + const IDocumentDrawModelAccess* pIDDMA = GetFormat()->getIDocumentDrawModelAccess(); const sal_uInt8 nId = static_cast<const SvxOpaqueItem*>(pNew)->GetValue() ? pIDDMA->GetHeavenId() : pIDDMA->GetHellId(); @@ -999,21 +999,21 @@ void SwFlyFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew, case RES_URL: // The interface changes the frame size when interacting with text frames, // the Map, however, needs to be relative to FrmSize(). - if ( (!Lower() || !Lower()->IsNoTxtFrm()) && pNew && pOld && - static_cast<const SwFmtURL*>(pNew)->GetMap() && static_cast<const SwFmtURL*>(pOld)->GetMap() ) + if ( (!Lower() || !Lower()->IsNoTextFrm()) && pNew && pOld && + static_cast<const SwFormatURL*>(pNew)->GetMap() && static_cast<const SwFormatURL*>(pOld)->GetMap() ) { - const SwFmtFrmSize &rSz = GetFmt()->GetFrmSize(); + const SwFormatFrmSize &rSz = GetFormat()->GetFrmSize(); if ( rSz.GetHeight() != Frm().Height() || rSz.GetWidth() != Frm().Width() ) { - SwFmtURL aURL( GetFmt()->GetURL() ); + SwFormatURL aURL( GetFormat()->GetURL() ); Fraction aScaleX( Frm().Width(), rSz.GetWidth() ); Fraction aScaleY( Frm().Height(), rSz.GetHeight() ); aURL.GetMap()->Scale( aScaleX, aScaleY ); - SwFrmFmt *pFmt = GetFmt(); - pFmt->LockModify(); - pFmt->SetFmtAttr( aURL ); - pFmt->UnlockModify(); + SwFrameFormat *pFormat = GetFormat(); + pFormat->LockModify(); + pFormat->SetFormatAttr( aURL ); + pFormat->UnlockModify(); } } // No invalidation necessary @@ -1022,7 +1022,7 @@ void SwFlyFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew, case RES_CHAIN: if (pNew) { - const SwFmtChain *pChain = static_cast<const SwFmtChain*>(pNew); + const SwFormatChain *pChain = static_cast<const SwFormatChain*>(pNew); if ( pChain->GetNext() ) { SwFlyFrm *pFollow = FindChainNeighbour( *pChain->GetNext() ); @@ -1122,20 +1122,20 @@ void SwFlyFrm::ChgRelPos( const Point &rNewPos ) { if ( GetCurrRelPos() != rNewPos ) { - SwFrmFmt *pFmt = GetFmt(); + SwFrameFormat *pFormat = GetFormat(); const bool bVert = GetAnchorFrm()->IsVertical(); const SwTwips nNewY = bVert ? rNewPos.X() : rNewPos.Y(); SwTwips nTmpY = nNewY == LONG_MAX ? 0 : nNewY; if( bVert ) nTmpY = -nTmpY; - SfxItemSet aSet( pFmt->GetDoc()->GetAttrPool(), + SfxItemSet aSet( pFormat->GetDoc()->GetAttrPool(), RES_VERT_ORIENT, RES_HORI_ORIENT); - SwFmtVertOrient aVert( pFmt->GetVertOrient() ); - const SwTxtFrm *pAutoFrm = NULL; + SwFormatVertOrient aVert( pFormat->GetVertOrient() ); + const SwTextFrm *pAutoFrm = NULL; // #i34948# - handle also at-page and at-fly anchored // Writer fly frames - const RndStdIds eAnchorType = GetFrmFmt().GetAnchor().GetAnchorId(); + const RndStdIds eAnchorType = GetFrameFormat().GetAnchor().GetAnchorId(); if ( eAnchorType == FLY_AT_PAGE ) { aVert.SetVertOrient( text::VertOrientation::NONE ); @@ -1154,9 +1154,9 @@ void SwFlyFrm::ChgRelPos( const Point &rNewPos ) { aVert.SetVertOrient( text::VertOrientation::NONE ); sal_Int32 nOfs = - pFmt->GetAnchor().GetCntntAnchor()->nContent.GetIndex(); - OSL_ENSURE( GetAnchorFrm()->IsTxtFrm(), "TxtFrm expected" ); - pAutoFrm = static_cast<const SwTxtFrm*>(GetAnchorFrm()); + pFormat->GetAnchor().GetContentAnchor()->nContent.GetIndex(); + OSL_ENSURE( GetAnchorFrm()->IsTextFrm(), "TextFrm expected" ); + pAutoFrm = static_cast<const SwTextFrm*>(GetAnchorFrm()); while( pAutoFrm->GetFollow() && pAutoFrm->GetFollow()->GetOfst() <= nOfs ) { @@ -1185,7 +1185,7 @@ void SwFlyFrm::ChgRelPos( const Point &rNewPos ) { const SwTwips nNewX = bVert ? rNewPos.Y() : rNewPos.X(); SwTwips nTmpX = nNewX == LONG_MAX ? 0 : nNewX; - SwFmtHoriOrient aHori( pFmt->GetHoriOrient() ); + SwFormatHoriOrient aHori( pFormat->GetHoriOrient() ); // #i34948# - handle also at-page and at-fly anchored // Writer fly frames if ( eAnchorType == FLY_AT_PAGE ) @@ -1209,10 +1209,10 @@ void SwFlyFrm::ChgRelPos( const Point &rNewPos ) { if( !pAutoFrm ) { - sal_Int32 nOfs = pFmt->GetAnchor().GetCntntAnchor() + sal_Int32 nOfs = pFormat->GetAnchor().GetContentAnchor() ->nContent.GetIndex(); - OSL_ENSURE( GetAnchorFrm()->IsTxtFrm(), "TxtFrm expected"); - pAutoFrm = static_cast<const SwTxtFrm*>(GetAnchorFrm()); + OSL_ENSURE( GetAnchorFrm()->IsTextFrm(), "TextFrm expected"); + pAutoFrm = static_cast<const SwTextFrm*>(GetAnchorFrm()); while( pAutoFrm->GetFollow() && pAutoFrm->GetFollow()->GetOfst() <= nOfs ) pAutoFrm = pAutoFrm->GetFollow(); @@ -1228,7 +1228,7 @@ void SwFlyFrm::ChgRelPos( const Point &rNewPos ) aSet.Put( aHori ); } SetCurrRelPos( rNewPos ); - pFmt->GetDoc()->SetAttr( aSet, *pFmt ); + pFormat->GetDoc()->SetAttr( aSet, *pFormat ); } } @@ -1261,7 +1261,7 @@ void SwFlyFrm::Format( const SwBorderAttrs *pAttrs ) const SwTwips nUL = pAttrs->CalcTopLine() + pAttrs->CalcBottomLine(); const SwTwips nLR = pAttrs->CalcLeftLine() + pAttrs->CalcRightLine(); - const SwFmtFrmSize &rFrmSz = GetFmt()->GetFrmSize(); + const SwFormatFrmSize &rFrmSz = GetFormat()->GetFrmSize(); Size aRelSize( CalcRel( rFrmSz ) ); OSL_ENSURE( pAttrs->GetSize().Height() != 0 || rFrmSz.GetHeightPercent(), "FrameAttr height is 0." ); @@ -1297,11 +1297,11 @@ void SwFlyFrm::Format( const SwBorderAttrs *pAttrs ) } mbValidSize = true; - std::map<SwFrmFmt*, SwFrmFmt*> aShapes = SwTextBoxHelper::findShapes(GetFmt()->GetDoc()); - if (aShapes.find(GetFmt()) != aShapes.end()) + std::map<SwFrameFormat*, SwFrameFormat*> aShapes = SwTextBoxHelper::findShapes(GetFormat()->GetDoc()); + if (aShapes.find(GetFormat()) != aShapes.end()) { // This fly is a textbox of a draw shape. - SdrObject* pShape = aShapes[GetFmt()]->FindSdrObject(); + SdrObject* pShape = aShapes[GetFormat()]->FindSdrObject(); if (SdrObjCustomShape* pCustomShape = PTR_CAST(SdrObjCustomShape, pShape)) { // The shape is a customshape: then inform it about the calculated fly size. @@ -1372,10 +1372,10 @@ void SwFlyFrm::Format( const SwBorderAttrs *pAttrs ) // OD 11.04.2003 #108824# - new parameter <bNoCalcFollow> was used by method // <FormatWidthCols(..)> to avoid follow formatting // for text frames. But, unformatted follows causes -// problems in method <SwCntntFrm::_WouldFit(..)>, +// problems in method <SwContentFrm::_WouldFit(..)>, // which assumes that the follows are formatted. // Thus, <bNoCalcFollow> no longer used by <FormatWidthCols(..)>. -void CalcCntnt( SwLayoutFrm *pLay, +void CalcContent( SwLayoutFrm *pLay, bool bNoColl, bool bNoCalcFollow ) { @@ -1387,9 +1387,9 @@ void CalcCntnt( SwLayoutFrm *pLay, if( pSect->IsEndnAtEnd() && !bNoColl ) { bCollect = true; - SwLayouter::CollectEndnotes( pLay->GetFmt()->GetDoc(), pSect ); + SwLayouter::CollectEndnotes( pLay->GetFormat()->GetDoc(), pSect ); } - pSect->CalcFtnCntnt(); + pSect->CalcFootnoteContent(); } else pSect = NULL; @@ -1405,13 +1405,13 @@ void CalcCntnt( SwLayoutFrm *pLay, if( pSect->IsEndnAtEnd() ) { if( bCollect ) - pLay->GetFmt()->GetDoc()->getIDocumentLayoutAccess().GetLayouter()-> + pLay->GetFormat()->GetDoc()->getIDocumentLayoutAccess().GetLayouter()-> InsertEndnotes( pSect ); - bool bLock = pSect->IsFtnLock(); - pSect->SetFtnLock( true ); - pSect->CalcFtnCntnt(); - pSect->CalcFtnCntnt(); - pSect->SetFtnLock( bLock ); + bool bLock = pSect->IsFootnoteLock(); + pSect->SetFootnoteLock( true ); + pSect->CalcFootnoteContent(); + pSect->CalcFootnoteContent(); + pSect->SetFootnoteLock( bLock ); } return; } @@ -1459,15 +1459,15 @@ void CalcCntnt( SwLayoutFrm *pLay, } // OD 14.03.2003 #i11760# - forbid format of follow, if requested. - if ( bNoCalcFollow && pFrm->IsTxtFrm() ) - static_cast<SwTxtFrm*>(pFrm)->ForbidFollowFormat(); + if ( bNoCalcFollow && pFrm->IsTextFrm() ) + static_cast<SwTextFrm*>(pFrm)->ForbidFollowFormat(); pFrm->Calc(); // OD 14.03.2003 #i11760# - reset control flag for follow format. - if ( pFrm->IsTxtFrm() ) + if ( pFrm->IsTextFrm() ) { - static_cast<SwTxtFrm*>(pFrm)->AllowFollowFormat(); + static_cast<SwTextFrm*>(pFrm)->AllowFollowFormat(); } // #111937# The keep-attribute can cause the position @@ -1531,15 +1531,15 @@ void CalcCntnt( SwLayoutFrm *pLay, bAgain = true; if ( pAgainObj2 == pAnchoredObj ) { - OSL_FAIL( "::CalcCntnt(..) - loop detected, perform attribute changes to avoid the loop" ); + OSL_FAIL( "::CalcContent(..) - loop detected, perform attribute changes to avoid the loop" ); // Prevent oscillation - SwFrmFmt& rFmt = pAnchoredObj->GetFrmFmt(); - SwFmtSurround aAttr( rFmt.GetSurround() ); + SwFrameFormat& rFormat = pAnchoredObj->GetFrameFormat(); + SwFormatSurround aAttr( rFormat.GetSurround() ); if( SURROUND_THROUGHT != aAttr.GetSurround() ) { // When on auto position, we can only set it to // flow through - if ((rFmt.GetAnchor().GetAnchorId() == + if ((rFormat.GetAnchor().GetAnchorId() == FLY_AT_CHAR) && (SURROUND_PARALLEL == aAttr.GetSurround())) @@ -1550,9 +1550,9 @@ void CalcCntnt( SwLayoutFrm *pLay, { aAttr.SetSurround( SURROUND_PARALLEL ); } - rFmt.LockModify(); - rFmt.SetFmtAttr( aAttr ); - rFmt.UnlockModify(); + rFormat.LockModify(); + rFormat.SetFormatAttr( aAttr ); + rFormat.UnlockModify(); } } else @@ -1587,14 +1587,14 @@ void CalcCntnt( SwLayoutFrm *pLay, // OD 2004-05-17 #i28701# - format anchor frame after its objects // are formatted, if the wrapping style influence has to be considered. - if ( pLay->GetFmt()->getIDocumentSettingAccess()->get(DocumentSettingId::CONSIDER_WRAP_ON_OBJECT_POSITION) ) + if ( pLay->GetFormat()->getIDocumentSettingAccess()->get(DocumentSettingId::CONSIDER_WRAP_ON_OBJECT_POSITION) ) { pFrm->Calc(); } if ( bAgain ) { - pFrm = pLay->ContainsCntnt(); + pFrm = pLay->ContainsContent(); if ( pFrm && pFrm->IsInTab() ) pFrm = pFrm->FindTabFrm(); if( pFrm && pFrm->IsInSct() ) @@ -1615,7 +1615,7 @@ void CalcCntnt( SwLayoutFrm *pLay, if ( nLoopControlRuns < nLoopControlMax ) continue; - OSL_FAIL( "LoopControl in CalcCntnt" ); + OSL_FAIL( "LoopControl in CalcContent" ); } } if ( pFrm->IsTabFrm() ) @@ -1642,7 +1642,7 @@ void CalcCntnt( SwLayoutFrm *pLay, } } // Stay in the pLay - // Except for SectionFrms with Follow: the first CntntFrm of the Follow + // Except for SectionFrms with Follow: the first ContentFrm of the Follow // will be formatted, so that it get's a chance to load in the pLay. // As long as these Frames are loading in pLay, we continue } while ( pFrm && @@ -1659,16 +1659,16 @@ void CalcCntnt( SwLayoutFrm *pLay, { if( bCollect ) { - pLay->GetFmt()->GetDoc()->getIDocumentLayoutAccess().GetLayouter()->InsertEndnotes(pSect); - pSect->CalcFtnCntnt(); + pLay->GetFormat()->GetDoc()->getIDocumentLayoutAccess().GetLayouter()->InsertEndnotes(pSect); + pSect->CalcFootnoteContent(); } if( pSect->HasFollow() ) { SwSectionFrm* pNxt = pSect->GetFollow(); - while( pNxt && !pNxt->ContainsCntnt() ) + while( pNxt && !pNxt->ContainsContent() ) pNxt = pNxt->GetFollow(); if( pNxt ) - pNxt->CalcFtnCntnt(); + pNxt->CalcFootnoteContent(); } if( bCollect ) { @@ -1730,7 +1730,7 @@ void SwFlyFrm::MakeContentPos( const SwBorderAttrs &rAttrs ) m_bValidContentPos = true; const SwTwips nUL = rAttrs.CalcTopLine() + rAttrs.CalcBottomLine(); - Size aRelSize( CalcRel( GetFmt()->GetFrmSize() ) ); + Size aRelSize( CalcRel( GetFormat()->GetFrmSize() ) ); SWRECTFN( this ) long nMinHeight = 0; @@ -1739,7 +1739,7 @@ void SwFlyFrm::MakeContentPos( const SwBorderAttrs &rAttrs ) Point aNewContentPos; aNewContentPos = Prt().Pos(); - const SdrTextVertAdjust nAdjust = GetFmt()->GetTextVertAdjust().GetValue(); + const SdrTextVertAdjust nAdjust = GetFormat()->GetTextVertAdjust().GetValue(); if( nAdjust != SDRTEXTVERTADJUST_TOP ) { @@ -1830,10 +1830,10 @@ SwTwips SwFlyFrm::_Grow( SwTwips nDist, bool bTst ) mbValidPos = true; // #i55416# // Suppress format of width for autowidth frame, because the - // format of the width would call <SwTxtFrm::CalcFitToContent()> + // format of the width would call <SwTextFrm::CalcFitToContent()> // for the lower frame, which initiated this grow. const bool bOldFormatHeightOnly = bFormatHeightOnly; - const SwFmtFrmSize& rFrmSz = GetFmt()->GetFrmSize(); + const SwFormatFrmSize& rFrmSz = GetFormat()->GetFrmSize(); if ( rFrmSz.GetWidthSizeType() != ATT_FIX_SIZE ) { bFormatHeightOnly = true; @@ -1875,10 +1875,10 @@ SwTwips SwFlyFrm::_Shrink( SwTwips nDist, bool bTst ) SwTwips nVal = nDist; if ( IsMinHeight() ) { - const SwFmtFrmSize& rFmtSize = GetFmt()->GetFrmSize(); - SwTwips nFmtHeight = bVert ? rFmtSize.GetWidth() : rFmtSize.GetHeight(); + const SwFormatFrmSize& rFormatSize = GetFormat()->GetFrmSize(); + SwTwips nFormatHeight = bVert ? rFormatSize.GetWidth() : rFormatSize.GetHeight(); - nVal = std::min( nDist, nHeight - nFmtHeight ); + nVal = std::min( nDist, nHeight - nFormatHeight ); } if ( nVal <= 0L ) @@ -1925,10 +1925,10 @@ SwTwips SwFlyFrm::_Shrink( SwTwips nDist, bool bTst ) mbValidPos = true; // #i55416# // Suppress format of width for autowidth frame, because the - // format of the width would call <SwTxtFrm::CalcFitToContent()> + // format of the width would call <SwTextFrm::CalcFitToContent()> // for the lower frame, which initiated this shrink. const bool bOldFormatHeightOnly = bFormatHeightOnly; - const SwFmtFrmSize& rFrmSz = GetFmt()->GetFrmSize(); + const SwFormatFrmSize& rFrmSz = GetFormat()->GetFrmSize(); if ( rFrmSz.GetWidthSizeType() != ATT_FIX_SIZE ) { bFormatHeightOnly = true; @@ -1972,8 +1972,8 @@ Size SwFlyFrm::ChgSize( const Size& aNewSize ) Size aAdjustedNewSize( aNewSize ); { if ( dynamic_cast<SwFlyAtCntFrm*>(this) && - Lower() && dynamic_cast<SwNoTxtFrm*>(Lower()) && - static_cast<SwNoTxtFrm*>(Lower())->GetNode()->GetOLENode() ) + Lower() && dynamic_cast<SwNoTextFrm*>(Lower()) && + static_cast<SwNoTextFrm*>(Lower())->GetNode()->GetOLENode() ) { SwRect aClipRect; ::CalcClipRect( GetVirtDrawObj(), aClipRect, false ); @@ -1989,12 +1989,12 @@ Size SwFlyFrm::ChgSize( const Size& aNewSize ) } if ( aAdjustedNewSize != Frm().SSize() ) { - SwFrmFmt *pFmt = GetFmt(); - SwFmtFrmSize aSz( pFmt->GetFrmSize() ); + SwFrameFormat *pFormat = GetFormat(); + SwFormatFrmSize aSz( pFormat->GetFrmSize() ); aSz.SetWidth( aAdjustedNewSize.Width() ); aSz.SetHeight( aAdjustedNewSize.Height() ); // go via the Doc for UNDO - pFmt->GetDoc()->SetAttr( aSz, *pFmt ); + pFormat->GetDoc()->SetAttr( aSz, *pFormat ); return aSz.GetSize(); } else @@ -2049,7 +2049,7 @@ void SwFrm::RemoveFly( SwFlyFrm *pToRemove ) else { if ( pToRemove->IsAccessibleFrm() && - pToRemove->GetFmt() && + pToRemove->GetFormat() && !pToRemove->IsFlyInCntFrm() ) { SwRootFrm *pRootFrm = getRootFrm(); @@ -2190,7 +2190,7 @@ void SwFrm::InvalidateObjs( const bool _bInvaPosOnly, { SwAnchoredObject* pAnchoredObj = (*GetDrawObjs())[i]; if ( _bNoInvaOfAsCharAnchoredObjs && - (pAnchoredObj->GetFrmFmt().GetAnchor().GetAnchorId() + (pAnchoredObj->GetFrameFormat().GetAnchor().GetAnchorId() == FLY_AS_CHAR) ) { continue; @@ -2201,7 +2201,7 @@ void SwFrm::InvalidateObjs( const bool _bInvaPosOnly, if ( pAnchoredObj->GetPageFrm() && pAnchoredObj->GetPageFrm() != pPageFrm ) { - SwTxtFrm* pAnchorCharFrm = pAnchoredObj->FindAnchorCharFrm(); + SwTextFrm* pAnchorCharFrm = pAnchoredObj->FindAnchorCharFrm(); if ( pAnchorCharFrm && pAnchoredObj->GetPageFrm() == pAnchorCharFrm->FindPageFrm() ) { @@ -2324,11 +2324,11 @@ void SwFlyFrm::NotifyDrawObj() pObj->SetRectsDirty(); pObj->SetChanged(); pObj->BroadcastObjectChange(); - if ( GetFmt()->GetSurround().IsContour() ) + if ( GetFormat()->GetSurround().IsContour() ) ClrContourCache( pObj ); } -Size SwFlyFrm::CalcRel( const SwFmtFrmSize &rSz ) const +Size SwFlyFrm::CalcRel( const SwFormatFrmSize &rSz ) const { Size aRet( rSz.GetSize() ); @@ -2412,19 +2412,19 @@ static SwTwips lcl_CalcAutoWidth( const SwLayoutFrm& rFrm ) { nMin = lcl_CalcAutoWidth( *static_cast<const SwSectionFrm*>(pFrm) ); } - if ( pFrm->IsTxtFrm() ) + if ( pFrm->IsTextFrm() ) { - nMin = const_cast<SwTxtFrm*>(static_cast<const SwTxtFrm*>(pFrm))->CalcFitToContent(); + nMin = const_cast<SwTextFrm*>(static_cast<const SwTextFrm*>(pFrm))->CalcFitToContent(); const SvxLRSpaceItem &rSpace = - static_cast<const SwTxtFrm*>(pFrm)->GetTxtNode()->GetSwAttrSet().GetLRSpace(); - if (!static_cast<const SwTxtFrm*>(pFrm)->IsLocked()) - nMin += rSpace.GetRight() + rSpace.GetTxtLeft() + rSpace.GetTxtFirstLineOfst(); + static_cast<const SwTextFrm*>(pFrm)->GetTextNode()->GetSwAttrSet().GetLRSpace(); + if (!static_cast<const SwTextFrm*>(pFrm)->IsLocked()) + nMin += rSpace.GetRight() + rSpace.GetTextLeft() + rSpace.GetTextFirstLineOfst(); } else if ( pFrm->IsTabFrm() ) { - const SwFmtFrmSize& rTblFmtSz = static_cast<const SwTabFrm*>(pFrm)->GetTable()->GetFrmFmt()->GetFrmSize(); - if ( USHRT_MAX == rTblFmtSz.GetSize().Width() || - text::HoriOrientation::NONE == static_cast<const SwTabFrm*>(pFrm)->GetFmt()->GetHoriOrient().GetHoriOrient() ) + const SwFormatFrmSize& rTableFormatSz = static_cast<const SwTabFrm*>(pFrm)->GetTable()->GetFrameFormat()->GetFrmSize(); + if ( USHRT_MAX == rTableFormatSz.GetSize().Width() || + text::HoriOrientation::NONE == static_cast<const SwTabFrm*>(pFrm)->GetFormat()->GetHoriOrient().GetHoriOrient() ) { const SwPageFrm* pPage = rFrm.FindPageFrm(); // auto width table @@ -2434,7 +2434,7 @@ static SwTwips lcl_CalcAutoWidth( const SwLayoutFrm& rFrm ) } else { - nMin = rTblFmtSz.GetSize().Width(); + nMin = rTableFormatSz.GetSize().Width(); } } @@ -2452,18 +2452,18 @@ SwTwips SwFlyFrm::CalcAutoWidth() const return lcl_CalcAutoWidth( *this ); } -/// OD 16.04.2003 #i13147# - If called for paint and the <SwNoTxtFrm> contains +/// OD 16.04.2003 #i13147# - If called for paint and the <SwNoTextFrm> contains /// a graphic, load of intrinsic graphic has to be avoided. bool SwFlyFrm::GetContour( tools::PolyPolygon& rContour, const bool _bForPaint ) const { bool bRet = false; - if( GetFmt()->GetSurround().IsContour() && Lower() && - Lower()->IsNoTxtFrm() ) + if( GetFormat()->GetSurround().IsContour() && Lower() && + Lower()->IsNoTextFrm() ) { - SwNoTxtNode *pNd = const_cast<SwNoTxtNode*>(static_cast<const SwNoTxtNode*>(static_cast<const SwCntntFrm*>(Lower())->GetNode())); + SwNoTextNode *pNd = const_cast<SwNoTextNode*>(static_cast<const SwNoTextNode*>(static_cast<const SwContentFrm*>(Lower())->GetNode())); // OD 16.04.2003 #i13147# - determine <GraphicObject> instead of <Graphic> - // in order to avoid load of graphic, if <SwNoTxtNode> contains a graphic + // in order to avoid load of graphic, if <SwNoTextNode> contains a graphic // node and method is called for paint. const GraphicObject* pGrfObj = NULL; bool bGrfObjCreated = false; @@ -2477,7 +2477,7 @@ bool SwFlyFrm::GetContour( tools::PolyPolygon& rContour, pGrfObj = new GraphicObject( pNd->GetGraphic() ); bGrfObjCreated = true; } - OSL_ENSURE( pGrfObj, "SwFlyFrm::GetContour() - No Graphic/GraphicObject found at <SwNoTxtNode>." ); + OSL_ENSURE( pGrfObj, "SwFlyFrm::GetContour() - No Graphic/GraphicObject found at <SwNoTextNode>." ); if ( pGrfObj && pGrfObj->GetType() != GRAPHIC_NONE ) { if( !pNd->HasContour() ) @@ -2486,7 +2486,7 @@ bool SwFlyFrm::GetContour( tools::PolyPolygon& rContour, // during paint. Thus, return (value of <bRet> should be <false>). if ( pGrfNd && _bForPaint ) { - OSL_FAIL( "SwFlyFrm::GetContour() - No Contour found at <SwNoTxtNode> during paint." ); + OSL_FAIL( "SwFlyFrm::GetContour() - No Contour found at <SwNoTextNode> during paint." ); return bRet; } pNd->CreateContour(); @@ -2497,7 +2497,7 @@ bool SwFlyFrm::GetContour( tools::PolyPolygon& rContour, SwRect aClip; SwRect aOrig; Lower()->Calc(); - static_cast<const SwNoTxtFrm*>(Lower())->GetGrfArea( aClip, &aOrig, false ); + static_cast<const SwNoTextFrm*>(Lower())->GetGrfArea( aClip, &aOrig, false ); // OD 16.04.2003 #i13147# - copy method code <SvxContourDlg::ScaleContour(..)> // in order to avoid that graphic has to be loaded for contour scale. //SvxContourDlg::ScaleContour( rContour, aGrf, MAP_TWIP, aOrig.SSize() ); @@ -2574,17 +2574,17 @@ void SwFlyFrm::InvalidateObjPos() InvalidateObjRectWithSpaces(); } -SwFrmFmt& SwFlyFrm::GetFrmFmt() +SwFrameFormat& SwFlyFrm::GetFrameFormat() { - OSL_ENSURE( GetFmt(), - "<SwFlyFrm::GetFrmFmt()> - missing frame format -> crash." ); - return *GetFmt(); + OSL_ENSURE( GetFormat(), + "<SwFlyFrm::GetFrameFormat()> - missing frame format -> crash." ); + return *GetFormat(); } -const SwFrmFmt& SwFlyFrm::GetFrmFmt() const +const SwFrameFormat& SwFlyFrm::GetFrameFormat() const { - OSL_ENSURE( GetFmt(), - "<SwFlyFrm::GetFrmFmt()> - missing frame format -> crash." ); - return *GetFmt(); + OSL_ENSURE( GetFormat(), + "<SwFlyFrm::GetFrameFormat()> - missing frame format -> crash." ); + return *GetFormat(); } const SwRect SwFlyFrm::GetObjRect() const @@ -2637,21 +2637,21 @@ bool SwFlyFrm::IsFormatPossible() const !IsLocked() && !IsColLocked(); } -void SwFlyFrm::GetAnchoredObjects( std::list<SwAnchoredObject*>& aList, const SwFmt& rFmt ) +void SwFlyFrm::GetAnchoredObjects( std::list<SwAnchoredObject*>& aList, const SwFormat& rFormat ) { - SwIterator<SwFlyFrm,SwFmt> aIter( rFmt ); + SwIterator<SwFlyFrm,SwFormat> aIter( rFormat ); for( SwFlyFrm* pFlyFrm = aIter.First(); pFlyFrm; pFlyFrm = aIter.Next() ) aList.push_back( pFlyFrm ); } -const SwFlyFrmFmt * SwFlyFrm::GetFmt() const +const SwFlyFrameFormat * SwFlyFrm::GetFormat() const { - return static_cast< const SwFlyFrmFmt * >( GetDep() ); + return static_cast< const SwFlyFrameFormat * >( GetDep() ); } -SwFlyFrmFmt * SwFlyFrm::GetFmt() +SwFlyFrameFormat * SwFlyFrm::GetFormat() { - return static_cast< SwFlyFrmFmt * >( GetDep() ); + return static_cast< SwFlyFrameFormat * >( GetDep() ); } void SwFlyFrm::Calc() const @@ -2679,9 +2679,9 @@ SwTwips SwFlyFrm::CalcContentHeight(const SwBorderAttrs *pAttrs, const SwTwips n while ( pFrm ) { nHeight += (pFrm->Frm().*fnRect->fnGetHeight)(); - if( pFrm->IsTxtFrm() && static_cast<SwTxtFrm*>(pFrm)->IsUndersized() ) - // This TxtFrm would like to be a bit larger - nHeight += static_cast<SwTxtFrm*>(pFrm)->GetParHeight() + if( pFrm->IsTextFrm() && static_cast<SwTextFrm*>(pFrm)->IsUndersized() ) + // This TextFrm would like to be a bit larger + nHeight += static_cast<SwTextFrm*>(pFrm)->GetParHeight() - (pFrm->Prt().*fnRect->fnGetHeight)(); else if( pFrm->IsSctFrm() && static_cast<SwSectionFrm*>(pFrm)->IsUndersized() ) nHeight += static_cast<SwSectionFrm*>(pFrm)->Undersize(); @@ -2704,7 +2704,7 @@ SwTwips SwFlyFrm::CalcContentHeight(const SwBorderAttrs *pAttrs, const SwTwips n // only Writer fly frames, which follow the text flow. if ( pFly->IsFlyLayFrm() && pFly->Frm().Top() != FAR_AWAY && - pFly->GetFmt()->GetFollowTextFlow().GetValue() ) + pFly->GetFormat()->GetFollowTextFlow().GetValue() ) { SwTwips nDist = -(pFly->Frm().*fnRect-> fnBottomDist)( nTop ); diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx index 20ac174c1a3d..fde2e2d91843 100644 --- a/sw/source/core/layout/flycnt.cxx +++ b/sw/source/core/layout/flycnt.cxx @@ -49,7 +49,7 @@ using namespace ::com::sun::star; namespace { -static inline SwTwips lcl_GetTopForObjPos(const SwCntntFrm* pCnt, const bool bVert, const bool bVertL2R) +static inline SwTwips lcl_GetTopForObjPos(const SwContentFrm* pCnt, const bool bVert, const bool bVertL2R) { if ( bVert ) { @@ -66,11 +66,11 @@ static inline SwTwips lcl_GetTopForObjPos(const SwCntntFrm* pCnt, const bool bVe } -SwFlyAtCntFrm::SwFlyAtCntFrm( SwFlyFrmFmt *pFmt, SwFrm* pSib, SwFrm *pAnch ) : - SwFlyFreeFrm( pFmt, pSib, pAnch ) +SwFlyAtCntFrm::SwFlyAtCntFrm( SwFlyFrameFormat *pFormat, SwFrm* pSib, SwFrm *pAnch ) : + SwFlyFreeFrm( pFormat, pSib, pAnch ) { bAtCnt = true; - bAutoPosition = (FLY_AT_CHAR == pFmt->GetAnchor().GetAnchorId()); + bAutoPosition = (FLY_AT_CHAR == pFormat->GetAnchor().GetAnchorId()); } // #i28701# @@ -79,7 +79,7 @@ TYPEINIT1(SwFlyAtCntFrm,SwFlyFreeFrm); void SwFlyAtCntFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) { const sal_uInt16 nWhich = pNew ? pNew->Which() : 0; - const SwFmtAnchor *pAnch = 0; + const SwFormatAnchor *pAnch = 0; if( RES_ATTRSET_CHG == nWhich && SfxItemState::SET == static_cast<const SwAttrSetChg*>(pNew)->GetChgSet()->GetItemState( RES_ANCHOR, false, @@ -91,27 +91,27 @@ void SwFlyAtCntFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) //Change anchor, I move myself to a new place. //The anchor type must not change, this is only possible using //SwFEShell. - pAnch = static_cast<const SwFmtAnchor*>(pNew); + pAnch = static_cast<const SwFormatAnchor*>(pNew); } if( pAnch ) { - OSL_ENSURE( pAnch->GetAnchorId() == GetFmt()->GetAnchor().GetAnchorId(), + OSL_ENSURE( pAnch->GetAnchorId() == GetFormat()->GetAnchor().GetAnchorId(), "Illegal change of anchor type. " ); //Unregister, get hold of a new anchor and attach it SwRect aOld( GetObjRectWithSpaces() ); SwPageFrm *pOldPage = FindPageFrm(); const SwFrm *pOldAnchor = GetAnchorFrm(); - SwCntntFrm *pCntnt = const_cast<SwCntntFrm*>(static_cast<const SwCntntFrm*>(GetAnchorFrm())); + SwContentFrm *pContent = const_cast<SwContentFrm*>(static_cast<const SwContentFrm*>(GetAnchorFrm())); AnchorFrm()->RemoveFly( this ); - const bool bBodyFtn = (pCntnt->IsInDocBody() || pCntnt->IsInFtn()); + const bool bBodyFootnote = (pContent->IsInDocBody() || pContent->IsInFootnote()); // Search the new anchor using the NodeIdx; the relation between old // and new NodeIdx determines the search direction - const SwNodeIndex aNewIdx( pAnch->GetCntntAnchor()->nNode ); - SwNodeIndex aOldIdx( *pCntnt->GetNode() ); + const SwNodeIndex aNewIdx( pAnch->GetContentAnchor()->nNode ); + SwNodeIndex aOldIdx( *pContent->GetNode() ); //fix: depending on which index was smaller, searching in the do-while //loop previously was done forward or backwards respectively. This however @@ -122,35 +122,35 @@ void SwFlyAtCntFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) const bool bNext = aOldIdx < aNewIdx; // consider the case that at found anchor frame candidate already a // fly frame of the given fly format is registered. - // consider, that <pCntnt> is the already + // consider, that <pContent> is the already // the new anchor frame. bool bFound( aOldIdx == aNewIdx ); - while ( pCntnt && !bFound ) + while ( pContent && !bFound ) { do { if ( bNext ) - pCntnt = pCntnt->GetNextCntntFrm(); + pContent = pContent->GetNextContentFrm(); else - pCntnt = pCntnt->GetPrevCntntFrm(); - } while ( pCntnt && - !( bBodyFtn == ( pCntnt->IsInDocBody() || - pCntnt->IsInFtn() ) ) ); - if ( pCntnt ) - aOldIdx = *pCntnt->GetNode(); + pContent = pContent->GetPrevContentFrm(); + } while ( pContent && + !( bBodyFootnote == ( pContent->IsInDocBody() || + pContent->IsInFootnote() ) ) ); + if ( pContent ) + aOldIdx = *pContent->GetNode(); // check, if at found anchor frame candidate already a fly frame // of the given fly frame format is registered. bFound = aOldIdx == aNewIdx; - if (bFound && pCntnt && pCntnt->GetDrawObjs()) + if (bFound && pContent && pContent->GetDrawObjs()) { - SwFrmFmt* pMyFlyFrmFmt( &GetFrmFmt() ); - SwSortedObjs &rObjs = *pCntnt->GetDrawObjs(); + SwFrameFormat* pMyFlyFrameFormat( &GetFrameFormat() ); + SwSortedObjs &rObjs = *pContent->GetDrawObjs(); for( size_t i = 0; i < rObjs.size(); ++i) { SwFlyFrm* pFlyFrm = dynamic_cast<SwFlyFrm*>(rObjs[i]); if ( pFlyFrm && - &(pFlyFrm->GetFrmFmt()) == pMyFlyFrmFmt ) + &(pFlyFrm->GetFrameFormat()) == pMyFlyFrameFormat ) { bFound = false; break; @@ -158,21 +158,21 @@ void SwFlyAtCntFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) } } } - if ( !pCntnt ) + if ( !pContent ) { - SwCntntNode *pNode = aNewIdx.GetNode().GetCntntNode(); - pCntnt = pNode->getLayoutFrm( getRootFrm(), &pOldAnchor->Frm().Pos(), 0, false ); - OSL_ENSURE( pCntnt, "Neuen Anker nicht gefunden" ); + SwContentNode *pNode = aNewIdx.GetNode().GetContentNode(); + pContent = pNode->getLayoutFrm( getRootFrm(), &pOldAnchor->Frm().Pos(), 0, false ); + OSL_ENSURE( pContent, "Neuen Anker nicht gefunden" ); } //Flys are never attached to a follow, but always on the master which //we are going to search now. - SwCntntFrm* pFlow = pCntnt; + SwContentFrm* pFlow = pContent; while ( pFlow->IsFollow() ) pFlow = pFlow->FindMaster(); - pCntnt = pFlow; + pContent = pFlow; //and *puff* it's attached... - pCntnt->AppendFly( this ); + pContent->AppendFly( this ); if ( pOldPage && pOldPage != FindPageFrm() ) NotifyBackground( pOldPage, aOld, PREP_FLY_LEAVE ); @@ -310,7 +310,7 @@ bool SwOszControl::ChkOsz() |* the anchor reacts to changes of the fly. To this reaction the fly must |* certaily react too. Sadly this can lead to oscillations; for example the |* fly wants to go down therefore the content can go up - this leads to a -|* smaller TxtFrm thus the fly needs to go up again whereby the text will +|* smaller TextFrm thus the fly needs to go up again whereby the text will |* get pushed down... |* To avoid such oscillations, a small position stack is built. If the fly |* reaches a position which it already had once, the action is stopped. @@ -323,7 +323,7 @@ bool SwOszControl::ChkOsz() |*/ void SwFlyAtCntFrm::MakeAll() { - if ( !GetFmt()->GetDoc()->getIDocumentDrawModelAccess().IsVisibleLayerId( GetVirtDrawObj()->GetLayer() ) ) + if ( !GetFormat()->GetDoc()->getIDocumentDrawModelAccess().IsVisibleLayerId( GetVirtDrawObj()->GetLayer() ) ) { return; } @@ -343,19 +343,19 @@ void SwFlyAtCntFrm::MakeAll() { bSetCompletePaintOnInvalidate = true; { - SwFlyFrmFmt *pFmt = GetFmt(); - const SwFmtFrmSize &rFrmSz = GetFmt()->GetFrmSize(); + SwFlyFrameFormat *pFormat = GetFormat(); + const SwFormatFrmSize &rFrmSz = GetFormat()->GetFrmSize(); if( rFrmSz.GetHeightPercent() != 0xFF && rFrmSz.GetHeightPercent() >= 100 ) { - pFmt->LockModify(); - SwFmtSurround aMain( pFmt->GetSurround() ); + pFormat->LockModify(); + SwFormatSurround aMain( pFormat->GetSurround() ); if ( aMain.GetSurround() == SURROUND_NONE ) { aMain.SetSurround( SURROUND_THROUGHT ); - pFmt->SetFmtAttr( aMain ); + pFormat->SetFormatAttr( aMain ); } - pFmt->UnlockModify(); + pFormat->UnlockModify(); } } @@ -366,7 +366,7 @@ void SwFlyAtCntFrm::MakeAll() // contains the anchor position. E.g., for at-character anchored // object this can be the follow frame of the anchor frame. const bool bFormatAnchor = - !static_cast<const SwTxtFrm*>( GetAnchorFrmContainingAnchPos() )->IsAnyJoinLocked() && + !static_cast<const SwTextFrm*>( GetAnchorFrmContainingAnchPos() )->IsAnyJoinLocked() && !ConsiderObjWrapInfluenceOnObjPos() && !ConsiderObjWrapInfluenceOfOtherObjs(); @@ -404,10 +404,10 @@ void SwFlyAtCntFrm::MakeAll() // wrapping style influence is considered on object positioning if ( bFormatAnchor ) { - SwTxtFrm& rAnchPosAnchorFrm = - dynamic_cast<SwTxtFrm&>(*GetAnchorFrmContainingAnchPos()); + SwTextFrm& rAnchPosAnchorFrm = + dynamic_cast<SwTextFrm&>(*GetAnchorFrmContainingAnchPos()); // #i58182# - For the usage of new method - // <SwObjectFormatterTxtFrm::CheckMovedFwdCondition(..)> + // <SwObjectFormatterTextFrm::CheckMovedFwdCondition(..)> // to check move forward of anchor frame due to the object // positioning it's needed to know, if the object is anchored // at the master frame before the anchor frame is formatted. @@ -417,35 +417,35 @@ void SwFlyAtCntFrm::MakeAll() // perform complete format of anchor text frame and its // previous frames, which have become invalid due to the // fly frame format. - SwObjectFormatterTxtFrm::FormatAnchorFrmAndItsPrevs( rAnchPosAnchorFrm ); + SwObjectFormatterTextFrm::FormatAnchorFrmAndItsPrevs( rAnchPosAnchorFrm ); // #i35911# // #i40444# // #i58182# - usage of new method - // <SwObjectFormatterTxtFrm::CheckMovedFwdCondition(..)> + // <SwObjectFormatterTextFrm::CheckMovedFwdCondition(..)> sal_uInt32 nToPageNum( 0L ); bool bDummy( false ); - if ( SwObjectFormatterTxtFrm::CheckMovedFwdCondition( + if ( SwObjectFormatterTextFrm::CheckMovedFwdCondition( *this, GetPageFrm()->GetPhyPageNum(), bAnchoredAtMaster, nToPageNum, bDummy ) ) { bConsiderWrapInfluenceDueToMovedFwdAnchor = true; // mark anchor text frame // directly, that it is moved forward by object positioning. - SwTxtFrm* pAnchorTxtFrm( static_cast<SwTxtFrm*>(AnchorFrm()) ); + SwTextFrm* pAnchorTextFrm( static_cast<SwTextFrm*>(AnchorFrm()) ); bool bInsert( true ); sal_uInt32 nAnchorFrmToPageNum( 0L ); - const SwDoc& rDoc = *(GetFrmFmt().GetDoc()); + const SwDoc& rDoc = *(GetFrameFormat().GetDoc()); if ( SwLayouter::FrmMovedFwdByObjPos( - rDoc, *pAnchorTxtFrm, nAnchorFrmToPageNum ) ) + rDoc, *pAnchorTextFrm, nAnchorFrmToPageNum ) ) { if ( nAnchorFrmToPageNum < nToPageNum ) - SwLayouter::RemoveMovedFwdFrm( rDoc, *pAnchorTxtFrm ); + SwLayouter::RemoveMovedFwdFrm( rDoc, *pAnchorTextFrm ); else bInsert = false; } if ( bInsert ) { - SwLayouter::InsertMovedFwdFrm( rDoc, *pAnchorTxtFrm, + SwLayouter::InsertMovedFwdFrm( rDoc, *pAnchorTextFrm, nToPageNum ); } } @@ -462,18 +462,18 @@ void SwFlyAtCntFrm::MakeAll() HasFixSize() && IsClipped() && GetAnchorFrm()->GetUpper()->IsCellFrm() ) { - SwFrmFmt* pFmt = GetFmt(); - const SwFmtFrmSize& rFrmSz = pFmt->GetFrmSize(); + SwFrameFormat* pFormat = GetFormat(); + const SwFormatFrmSize& rFrmSz = pFormat->GetFrmSize(); if ( rFrmSz.GetWidthPercent() && rFrmSz.GetHeightPercent() == 0xFF ) { - SwFmtSurround aSurround( pFmt->GetSurround() ); + SwFormatSurround aSurround( pFormat->GetSurround() ); if ( aSurround.GetSurround() == SURROUND_NONE ) { - pFmt->LockModify(); + pFormat->LockModify(); aSurround.SetSurround( SURROUND_THROUGHT ); - pFmt->SetFmtAttr( aSurround ); - pFmt->UnlockModify(); + pFormat->SetFormatAttr( aSurround ); + pFormat->UnlockModify(); bOsz = false; OSL_FAIL( "<SwFlyAtCntFrm::MakeAll()> - special loop prevention for dedicated document of b6403541 applied" ); } @@ -494,7 +494,7 @@ void SwFlyAtCntFrm::MakeAll() !bConsiderWrapInfluenceDueToOverlapPrevCol && // #i40444# !bConsiderWrapInfluenceDueToMovedFwdAnchor && - GetFmt()->GetDoc()->getIDocumentDrawModelAccess().IsVisibleLayerId( GetVirtDrawObj()->GetLayer() ) ); + GetFormat()->GetDoc()->getIDocumentDrawModelAccess().IsVisibleLayerId( GetVirtDrawObj()->GetLayer() ) ); // #i3317# - instead of attribute change apply // temporarly the 'straightforward positioning process'. @@ -559,10 +559,10 @@ public: static const SwFrm * lcl_CalcDownDist( SwDistance &rRet, const Point &rPt, - const SwCntntFrm *pCnt ) + const SwContentFrm *pCnt ) { rRet.nSub = 0; - //If the point stays inside the Cnt everything is clear already; the Cntnt + //If the point stays inside the Cnt everything is clear already; the Content //automatically has a distance of 0. if ( pCnt->Frm().IsInside( rPt ) ) { @@ -726,7 +726,7 @@ static const SwFrm * lcl_CalcDownDist( SwDistance &rRet, ( pLay->IsInSct() && pLay->FindSctFrm()->GetUpper()->Frm().Top() <= rPt.Y())) ) { - if ( pLay->IsFtnContFrm() ) + if ( pLay->IsFootnoteContFrm() ) { if ( !static_cast<const SwLayoutFrm*>(pLay)->Lower() ) { @@ -837,7 +837,7 @@ static const SwFrm * lcl_CalcDownDist( SwDistance &rRet, else rRet.nMain += nDiff; } - if ( pLay->IsFtnContFrm() && !static_cast<const SwLayoutFrm*>(pLay)->Lower() ) + if ( pLay->IsFootnoteContFrm() && !static_cast<const SwLayoutFrm*>(pLay)->Lower() ) { SwFrm *pDel = const_cast<SwFrm*>(pLay); pDel->Cut(); @@ -854,25 +854,25 @@ static const SwFrm * lcl_CalcDownDist( SwDistance &rRet, } static sal_uInt64 lcl_FindCntDiff( const Point &rPt, const SwLayoutFrm *pLay, - const SwCntntFrm *& rpCnt, - const bool bBody, const bool bFtn ) + const SwContentFrm *& rpCnt, + const bool bBody, const bool bFootnote ) { // Searches below pLay the nearest Cnt to the point. The reference point of - //the Cntnts is always the left upper corner. + //the Contents is always the left upper corner. //The Cnt should preferably be above the point. rpCnt = 0; sal_uInt64 nDistance = SAL_MAX_UINT64; sal_uInt64 nNearest = SAL_MAX_UINT64; - const SwCntntFrm *pCnt = pLay ? pLay->ContainsCntnt() : NULL; + const SwContentFrm *pCnt = pLay ? pLay->ContainsContent() : NULL; - while ( pCnt && (bBody != pCnt->IsInDocBody() || bFtn != pCnt->IsInFtn())) + while ( pCnt && (bBody != pCnt->IsInDocBody() || bFootnote != pCnt->IsInFootnote())) { - pCnt = pCnt->GetNextCntntFrm(); + pCnt = pCnt->GetNextContentFrm(); if ( !pLay->IsAnLower( pCnt ) ) pCnt = 0; } - const SwCntntFrm *pNearest = pCnt; + const SwContentFrm *pNearest = pCnt; if ( pCnt ) { do @@ -899,10 +899,10 @@ static sal_uInt64 lcl_FindCntDiff( const Point &rPt, const SwLayoutFrm *pLay, nNearest = nDiff; pNearest = pCnt; } - pCnt = pCnt->GetNextCntntFrm(); + pCnt = pCnt->GetNextContentFrm(); while ( pCnt && - (bBody != pCnt->IsInDocBody() || bFtn != pCnt->IsInFtn())) - pCnt = pCnt->GetNextCntntFrm(); + (bBody != pCnt->IsInDocBody() || bFootnote != pCnt->IsInFootnote())) + pCnt = pCnt->GetNextContentFrm(); } while ( pCnt && pLay->IsAnLower( pCnt ) ); } @@ -913,29 +913,29 @@ static sal_uInt64 lcl_FindCntDiff( const Point &rPt, const SwLayoutFrm *pLay, return nDistance; } -static const SwCntntFrm * lcl_FindCnt( const Point &rPt, const SwCntntFrm *pCnt, - const bool bBody, const bool bFtn ) +static const SwContentFrm * lcl_FindCnt( const Point &rPt, const SwContentFrm *pCnt, + const bool bBody, const bool bFootnote ) { - //Starting from pCnt searches the CntntFrm whose left upper corner is the + //Starting from pCnt searches the ContentFrm whose left upper corner is the //nearest to the point. - //Always returns a CntntFrm. + //Always returns a ContentFrm. - //First the nearest Cntnt inside the page which contains the Cntnt is + //First the nearest Content inside the page which contains the Content is //searched. Starting from this page the pages in both directions need to - //be considered. If possible a Cntnt is returned whose Y-position is + //be considered. If possible a Content is returned whose Y-position is //above the point. - const SwCntntFrm *pRet, *pNew; + const SwContentFrm *pRet, *pNew; const SwLayoutFrm *pLay = pCnt->FindPageFrm(); sal_uInt64 nDist; // not sure if a sal_Int32 would be enough? - nDist = ::lcl_FindCntDiff( rPt, pLay, pNew, bBody, bFtn ); + nDist = ::lcl_FindCntDiff( rPt, pLay, pNew, bBody, bFootnote ); if ( pNew ) pRet = pNew; else { pRet = pCnt; nDist = SAL_MAX_UINT64; } - const SwCntntFrm *pNearest = pRet; + const SwContentFrm *pNearest = pRet; sal_uInt64 nNearest = nDist; if ( pLay ) @@ -945,7 +945,7 @@ static const SwCntntFrm * lcl_FindCnt( const Point &rPt, const SwCntntFrm *pCnt, for ( int i = 0; pPge->GetPrev() && (i < 3); ++i ) { pPge = static_cast<const SwLayoutFrm*>(pPge->GetPrev()); - const sal_uInt64 nNew = ::lcl_FindCntDiff( rPt, pPge, pNew, bBody, bFtn ); + const sal_uInt64 nNew = ::lcl_FindCntDiff( rPt, pPge, pNew, bBody, bFootnote ); if ( nNew < nDist ) { if ( pNew->Frm().Top() <= rPt.Y() ) @@ -970,7 +970,7 @@ static const SwCntntFrm * lcl_FindCnt( const Point &rPt, const SwCntntFrm *pCnt, for ( int j = 0; pPge->GetNext() && (j < 3); ++j ) { pPge = static_cast<const SwLayoutFrm*>(pPge->GetNext()); - const sal_uInt64 nNew = ::lcl_FindCntDiff( rPt, pPge, pNew, bBody, bFtn ); + const sal_uInt64 nNew = ::lcl_FindCntDiff( rPt, pPge, pNew, bBody, bFootnote ); if ( nNew < nDist ) { if ( pNew->Frm().Top() <= rPt.Y() ) @@ -1016,15 +1016,15 @@ static void lcl_PointToPrt( Point &rPoint, const SwFrm *pFrm ) * This is used to show anchors as well as changing anchors * when dragging paragraph bound objects. */ -const SwCntntFrm *FindAnchor( const SwFrm *pOldAnch, const Point &rNew, +const SwContentFrm *FindAnchor( const SwFrm *pOldAnch, const Point &rNew, const bool bBodyOnly ) { //Search the nearest Cnt around the given document position in the text //flow. The given anchor is the starting Frm. - const SwCntntFrm* pCnt; - if ( pOldAnch->IsCntntFrm() ) + const SwContentFrm* pCnt; + if ( pOldAnch->IsContentFrm() ) { - pCnt = static_cast<const SwCntntFrm*>(pOldAnch); + pCnt = static_cast<const SwContentFrm*>(pOldAnch); } else { @@ -1035,13 +1035,13 @@ const SwCntntFrm *FindAnchor( const SwFrm *pOldAnch, const Point &rNew, SwRect aTmpRect( aTmp, Size(0,0) ); pTmpLay = static_cast<const SwLayoutFrm*>(::FindPage( aTmpRect, pTmpLay->Lower() )); } - pCnt = pTmpLay->GetCntntPos( aTmp, false, bBodyOnly ); + pCnt = pTmpLay->GetContentPos( aTmp, false, bBodyOnly ); } //Take care to use meaningful ranges during search. This means to not enter //or leave header/footer in this case. const bool bBody = pCnt->IsInDocBody() || bBodyOnly; - const bool bFtn = !bBodyOnly && pCnt->IsInFtn(); + const bool bFootnote = !bBodyOnly && pCnt->IsInFootnote(); Point aNew( rNew ); if ( bBody ) @@ -1061,8 +1061,8 @@ const SwCntntFrm *FindAnchor( const SwFrm *pOldAnch, const Point &rNew, // Maybe the selected anchor is on the same page as the current anchor. // With this we won't run into problems with the columns. Point aTmp( aNew ); - const SwCntntFrm *pTmp = pCnt->FindPageFrm()-> - GetCntntPos( aTmp, false, true, false ); + const SwContentFrm *pTmp = pCnt->FindPageFrm()-> + GetContentPos( aTmp, false, true, false ); if ( pTmp && pTmp->Frm().IsInside( aNew ) ) return pTmp; } @@ -1071,8 +1071,8 @@ const SwCntntFrm *FindAnchor( const SwFrm *pOldAnch, const Point &rNew, //the nearest one respectively. //Not the direct distance is relevant but the distance which needs to be //traveled through the text flow. - const SwCntntFrm *pUpLst; - const SwCntntFrm *pUpFrm = pCnt; + const SwContentFrm *pUpLst; + const SwContentFrm *pUpFrm = pCnt; SwDistance nUp, nUpLst; ::lcl_CalcDownDist( nUp, aNew, pUpFrm ); SwDistance nDown = nUp; @@ -1080,10 +1080,10 @@ const SwCntntFrm *FindAnchor( const SwFrm *pOldAnch, const Point &rNew, do { pUpLst = pUpFrm; nUpLst = nUp; - pUpFrm = pUpLst->GetPrevCntntFrm(); + pUpFrm = pUpLst->GetPrevContentFrm(); while ( pUpFrm && - (bBody != pUpFrm->IsInDocBody() || bFtn != pUpFrm->IsInFtn())) - pUpFrm = pUpFrm->GetPrevCntntFrm(); + (bBody != pUpFrm->IsInDocBody() || bFootnote != pUpFrm->IsInFootnote())) + pUpFrm = pUpFrm->GetPrevContentFrm(); if ( pUpFrm ) { ::lcl_CalcDownDist( nUp, aNew, pUpFrm ); @@ -1094,7 +1094,7 @@ const SwCntntFrm *FindAnchor( const SwFrm *pOldAnch, const Point &rNew, while ( pUpFrm && ((nUpLst < nUp && pUpFrm->IsInTab()) || bBody != pUpFrm->IsInDocBody()) ) { - pUpFrm = pUpFrm->GetPrevCntntFrm(); + pUpFrm = pUpFrm->GetPrevContentFrm(); if ( pUpFrm ) ::lcl_CalcDownDist( nUp, aNew, pUpFrm ); } @@ -1113,18 +1113,18 @@ const SwCntntFrm *FindAnchor( const SwFrm *pOldAnch, const Point &rNew, } } while ( pUpFrm && ( ( bNegAllowed && nUp.nMain < 0 ) || ( nUp <= nUpLst ) ) ); - const SwCntntFrm *pDownLst; - const SwCntntFrm *pDownFrm = pCnt; + const SwContentFrm *pDownLst; + const SwContentFrm *pDownFrm = pCnt; SwDistance nDownLst; if ( nDown.nMain < 0 ) nDown.nMain = LONG_MAX; do { pDownLst = pDownFrm; nDownLst = nDown; - pDownFrm = pDownLst->GetNextCntntFrm(); + pDownFrm = pDownLst->GetNextContentFrm(); while ( pDownFrm && - (bBody != pDownFrm->IsInDocBody() || bFtn != pDownFrm->IsInFtn())) - pDownFrm = pDownFrm->GetNextCntntFrm(); + (bBody != pDownFrm->IsInDocBody() || bFootnote != pDownFrm->IsInFootnote())) + pDownFrm = pDownFrm->GetNextContentFrm(); if ( pDownFrm ) { ::lcl_CalcDownDist( nDown, aNew, pDownFrm ); @@ -1136,7 +1136,7 @@ const SwCntntFrm *FindAnchor( const SwFrm *pOldAnch, const Point &rNew, { while ( pDownFrm && ( ( nDown.nMain != LONG_MAX && pDownFrm->IsInTab()) || bBody != pDownFrm->IsInDocBody() ) ) { - pDownFrm = pDownFrm->GetNextCntntFrm(); + pDownFrm = pDownFrm->GetNextContentFrm(); if ( pDownFrm ) ::lcl_CalcDownDist( nDown, aNew, pDownFrm ); if ( nDown.nMain < 0 ) @@ -1150,7 +1150,7 @@ const SwCntntFrm *FindAnchor( const SwFrm *pOldAnch, const Point &rNew, } while ( pDownFrm && nDown <= nDownLst && nDown.nMain != LONG_MAX && nDownLst.nMain != LONG_MAX ); - //If we couldn't find one in both directions, we'll search the Cntnt whose + //If we couldn't find one in both directions, we'll search the Content whose //left upper corner is the nearest to the point. Such a situation may //happen, if the point doesn't lay in the text flow but in any margin. if ( nDownLst.nMain == LONG_MAX && nUpLst.nMain == LONG_MAX ) @@ -1161,7 +1161,7 @@ const SwCntntFrm *FindAnchor( const SwFrm *pOldAnch, const Point &rNew, if ( pCnt->IsInFly() ) return pCnt; - return ::lcl_FindCnt( aNew, pCnt, bBody, bFtn ); + return ::lcl_FindCnt( aNew, pCnt, bBody, bFootnote ); } else return nDownLst < nUpLst ? pDownLst : pUpLst; @@ -1175,9 +1175,9 @@ void SwFlyAtCntFrm::SetAbsPos( const Point &rNew ) if( ( GetAnchorFrm()->IsVertical() && !GetAnchorFrm()->IsVertLR() ) || GetAnchorFrm()->IsRightToLeft() ) aNew.setX(aNew.getX() + Frm().Width()); - SwCntntFrm *pCnt = const_cast<SwCntntFrm*>(::FindAnchor( GetAnchorFrm(), aNew )); + SwContentFrm *pCnt = const_cast<SwContentFrm*>(::FindAnchor( GetAnchorFrm(), aNew )); if( pCnt->IsProtected() ) - pCnt = const_cast<SwCntntFrm*>(static_cast<const SwCntntFrm*>(GetAnchorFrm())); + pCnt = const_cast<SwContentFrm*>(static_cast<const SwContentFrm*>(GetAnchorFrm())); SwPageFrm *pTmpPage = 0; const bool bVert = pCnt->IsVertical(); @@ -1236,12 +1236,12 @@ void SwFlyAtCntFrm::SetAbsPos( const Point &rNew ) { // Flys are never attached to the follow but always to the master, // which we're going to search now. - const SwCntntFrm *pOriginal = pCnt; - const SwCntntFrm *pFollow = pCnt; + const SwContentFrm *pOriginal = pCnt; + const SwContentFrm *pFollow = pCnt; while ( pCnt->IsFollow() ) { do - { pCnt = pCnt->GetPrevCntntFrm(); + { pCnt = pCnt->GetPrevContentFrm(); } while ( pCnt->GetFollow() != pFollow ); pFollow = pCnt; } @@ -1284,7 +1284,7 @@ void SwFlyAtCntFrm::SetAbsPos( const Point &rNew ) } } - SwFlyFrmFmt *pFmt = GetFmt(); + SwFlyFrameFormat *pFormat = GetFormat(); if( bVert ) { @@ -1310,34 +1310,34 @@ void SwFlyAtCntFrm::SetAbsPos( const Point &rNew ) nX = rNew.X() - pFrm->Frm().Left(); } } - GetFmt()->GetDoc()->GetIDocumentUndoRedo().StartUndo( UNDO_START, NULL ); + GetFormat()->GetDoc()->GetIDocumentUndoRedo().StartUndo( UNDO_START, NULL ); - if( pCnt != GetAnchorFrm() || ( IsAutoPos() && pCnt->IsTxtFrm() && - GetFmt()->getIDocumentSettingAccess()->get(DocumentSettingId::HTML_MODE)) ) + if( pCnt != GetAnchorFrm() || ( IsAutoPos() && pCnt->IsTextFrm() && + GetFormat()->getIDocumentSettingAccess()->get(DocumentSettingId::HTML_MODE)) ) { //Set the anchor attribute according to the new Cnt. - SwFmtAnchor aAnch( pFmt->GetAnchor() ); - SwPosition pos = *aAnch.GetCntntAnchor(); - if( IsAutoPos() && pCnt->IsTxtFrm() ) + SwFormatAnchor aAnch( pFormat->GetAnchor() ); + SwPosition pos = *aAnch.GetContentAnchor(); + if( IsAutoPos() && pCnt->IsTextFrm() ) { SwCrsrMoveState eTmpState( MV_SETONLYTEXT ); Point aPt( rNew ); if( pCnt->GetCrsrOfst( &pos, aPt, &eTmpState ) && pos.nNode == *pCnt->GetNode() ) { - if ( pCnt->GetNode()->GetTxtNode() != NULL ) + if ( pCnt->GetNode()->GetTextNode() != NULL ) { - const SwTxtAttr* pTxtInputFld = - pCnt->GetNode()->GetTxtNode()->GetTxtAttrAt( pos.nContent.GetIndex(), RES_TXTATR_INPUTFIELD, SwTxtNode::PARENT ); - if ( pTxtInputFld != NULL ) + const SwTextAttr* pTextInputField = + pCnt->GetNode()->GetTextNode()->GetTextAttrAt( pos.nContent.GetIndex(), RES_TXTATR_INPUTFIELD, SwTextNode::PARENT ); + if ( pTextInputField != NULL ) { - pos.nContent = pTxtInputFld->GetStart(); + pos.nContent = pTextInputField->GetStart(); } } ResetLastCharRectHeight(); - if( text::RelOrientation::CHAR == pFmt->GetVertOrient().GetRelationOrient() ) + if( text::RelOrientation::CHAR == pFormat->GetVertOrient().GetRelationOrient() ) nY = LONG_MAX; - if( text::RelOrientation::CHAR == pFmt->GetHoriOrient().GetRelationOrient() ) + if( text::RelOrientation::CHAR == pFormat->GetHoriOrient().GetRelationOrient() ) nX = LONG_MAX; } else @@ -1358,8 +1358,8 @@ void SwFlyAtCntFrm::SetAbsPos( const Point &rNew ) // re-created. Thus, delete all fly frames except the <this> before the // anchor attribute is change and re-create them afterwards. { - SwHandleAnchorNodeChg aHandleAnchorNodeChg( *pFmt, aAnch, this ); - pFmt->GetDoc()->SetAttr( aAnch, *pFmt ); + SwHandleAnchorNodeChg aHandleAnchorNodeChg( *pFormat, aAnch, this ); + pFormat->GetDoc()->SetAttr( aAnch, *pFormat ); } } else if ( pTmpPage && pTmpPage != GetPageFrm() ) @@ -1369,7 +1369,7 @@ void SwFlyAtCntFrm::SetAbsPos( const Point &rNew ) ChgRelPos( aRelPos ); - GetFmt()->GetDoc()->GetIDocumentUndoRedo().EndUndo( UNDO_END, NULL ); + GetFormat()->GetDoc()->GetIDocumentUndoRedo().EndUndo( UNDO_END, NULL ); if ( pOldPage != FindPageFrm() ) ::Notify_Background( GetVirtDrawObj(), pOldPage, aOld, PREP_FLY_LEAVE, false ); @@ -1421,7 +1421,7 @@ void SwFlyAtCntFrm::MakeObjPos() } // use new class to position object - objectpositioning::SwToCntntAnchoredObjectPosition + objectpositioning::SwToContentAnchoredObjectPosition aObjPositioning( *GetVirtDrawObj() ); aObjPositioning.CalcPosition(); diff --git a/sw/source/core/layout/flyincnt.cxx b/sw/source/core/layout/flyincnt.cxx index 7758b7af8117..dde26732eff6 100644 --- a/sw/source/core/layout/flyincnt.cxx +++ b/sw/source/core/layout/flyincnt.cxx @@ -27,11 +27,11 @@ #include <IDocumentSettingAccess.hxx> #include <IDocumentDrawModelAccess.hxx> -SwFlyInCntFrm::SwFlyInCntFrm( SwFlyFrmFmt *pFmt, SwFrm* pSib, SwFrm *pAnch ) : - SwFlyFrm( pFmt, pSib, pAnch ) +SwFlyInCntFrm::SwFlyInCntFrm( SwFlyFrameFormat *pFormat, SwFrm* pSib, SwFrm *pAnch ) : + SwFlyFrm( pFormat, pSib, pAnch ) { - bInCnt = bInvalidLayout = bInvalidCntnt = true; - SwTwips nRel = pFmt->GetVertOrient().GetPos(); + bInCnt = bInvalidLayout = bInvalidContent = true; + SwTwips nRel = pFormat->GetVertOrient().GetPos(); // OD 2004-05-27 #i26791# - member <aRelPos> moved to <SwAnchoredObject> Point aRelPos; if( pAnch && pAnch->IsVertical() ) @@ -43,7 +43,7 @@ SwFlyInCntFrm::SwFlyInCntFrm( SwFlyFrmFmt *pFmt, SwFrm* pSib, SwFrm *pAnch ) : void SwFlyInCntFrm::DestroyImpl() { - if ( !GetFmt()->GetDoc()->IsInDtor() && GetAnchorFrm() ) + if ( !GetFormat()->GetDoc()->IsInDtor() && GetAnchorFrm() ) { SwRect aTmp( GetObjRectWithSpaces() ); SwFlyInCntFrm::NotifyBackground( FindPageFrm(), aTmp, PREP_FLY_LEAVE ); @@ -124,7 +124,7 @@ void SwFlyInCntFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) } if ( bCallPrepare && GetAnchorFrm() ) - AnchorFrm()->Prepare( PREP_FLY_ATTR_CHG, GetFmt() ); + AnchorFrm()->Prepare( PREP_FLY_ATTR_CHG, GetFormat() ); } /// Here the content gets formatted initially. @@ -133,10 +133,10 @@ void SwFlyInCntFrm::Format( const SwBorderAttrs *pAttrs ) if ( !Frm().Height() ) { Lock(); //don't format the anchor on the crook. - SwCntntFrm *pCntnt = ContainsCntnt(); - while ( pCntnt ) - { pCntnt->Calc(); - pCntnt = pCntnt->GetNextCntntFrm(); + SwContentFrm *pContent = ContainsContent(); + while ( pContent ) + { pContent->Calc(); + pContent = pContent->GetNextContentFrm(); } Unlock(); } @@ -153,8 +153,8 @@ void SwFlyInCntFrm::MakeObjPos() if ( !mbValidPos ) { mbValidPos = true; - SwFlyFrmFmt *pFmt = GetFmt(); - const SwFmtVertOrient &rVert = pFmt->GetVertOrient(); + SwFlyFrameFormat *pFormat = GetFormat(); + const SwFormatVertOrient &rVert = pFormat->GetVertOrient(); //Update the current values in the format if needed, during this we of //course must not send any Modify. const bool bVert = GetAnchorFrm()->IsVertical(); @@ -165,11 +165,11 @@ void SwFlyInCntFrm::MakeObjPos() nAct = -nAct; if( nAct != nOld ) { - SwFmtVertOrient aVert( rVert ); + SwFormatVertOrient aVert( rVert ); aVert.SetPos( nAct ); - pFmt->LockModify(); - pFmt->SetFmtAttr( aVert ); - pFmt->UnlockModify(); + pFormat->LockModify(); + pFormat->SetFormatAttr( aVert ); + pFormat->UnlockModify(); } } } @@ -178,7 +178,7 @@ void SwFlyInCntFrm::MakeObjPos() void SwFlyInCntFrm::_ActionOnInvalidation( const InvalidationType _nInvalid ) { if ( INVALID_POS == _nInvalid || INVALID_ALL == _nInvalid ) - AnchorFrm()->Prepare( PREP_FLY_ATTR_CHG, &GetFrmFmt() ); + AnchorFrm()->Prepare( PREP_FLY_ATTR_CHG, &GetFrameFormat() ); } void SwFlyInCntFrm::NotifyBackground( SwPageFrm *, const SwRect& rRect, @@ -207,7 +207,7 @@ void SwFlyInCntFrm::RegistFlys() void SwFlyInCntFrm::MakeAll() { // OD 2004-01-19 #110582# - if ( !GetFmt()->GetDoc()->getIDocumentDrawModelAccess().IsVisibleLayerId( GetVirtDrawObj()->GetLayer() ) ) + if ( !GetFormat()->GetDoc()->getIDocumentDrawModelAccess().IsVisibleLayerId( GetVirtDrawObj()->GetLayer() ) ) { return; } @@ -253,7 +253,7 @@ void SwFlyInCntFrm::MakeAll() // re-activate clipping of as-character anchored Writer fly frames // depending on compatibility option <ClipAsCharacterAnchoredWriterFlyFrames> if ( mbValidPos && mbValidSize && - GetFmt()->getIDocumentSettingAccess()->get( DocumentSettingId::CLIP_AS_CHARACTER_ANCHORED_WRITER_FLY_FRAME ) ) + GetFormat()->getIDocumentSettingAccess()->get( DocumentSettingId::CLIP_AS_CHARACTER_ANCHORED_WRITER_FLY_FRAME ) ) { SwFrm* pFrm = AnchorFrm(); if ( Frm().Left() == (pFrm->Frm().Left()+pFrm->Prt().Left()) && diff --git a/sw/source/core/layout/flylay.cxx b/sw/source/core/layout/flylay.cxx index 8e5dce7d6bdd..dd4866f44993 100644 --- a/sw/source/core/layout/flylay.cxx +++ b/sw/source/core/layout/flylay.cxx @@ -43,8 +43,8 @@ using namespace ::com::sun::star; -SwFlyFreeFrm::SwFlyFreeFrm( SwFlyFrmFmt *pFmt, SwFrm* pSib, SwFrm *pAnch ) : - SwFlyFrm( pFmt, pSib, pAnch ), +SwFlyFreeFrm::SwFlyFreeFrm( SwFlyFrameFormat *pFormat, SwFrm* pSib, SwFrm *pAnch ) : + SwFlyFrm( pFormat, pSib, pAnch ), pPage( 0 ), // #i34753# mbNoMakePos( false ), @@ -59,7 +59,7 @@ void SwFlyFreeFrm::DestroyImpl() // #i28701# - use new method <GetPageFrm()> if( GetPageFrm() ) { - if( GetFmt()->GetDoc()->IsInDtor() ) + if( GetFormat()->GetDoc()->IsInDtor() ) { // #i29879# - remove also to-frame anchored Writer // fly frame from page. @@ -88,11 +88,11 @@ SwFlyFreeFrm::~SwFlyFreeFrm() // #i28701# TYPEINIT1(SwFlyFreeFrm,SwFlyFrm); -/** Notifies the background (all CntntFrms that currently are overlapping). +/** Notifies the background (all ContentFrms that currently are overlapping). * * Additionally, the window is also directly invalidated (especially where - * there are no overlapping CntntFrms). - * This also takes CntntFrms within other Flys into account. + * there are no overlapping ContentFrms). + * This also takes ContentFrms within other Flys into account. */ void SwFlyFreeFrm::NotifyBackground( SwPageFrm *pPageFrm, const SwRect& rRect, PrepareHint eHint ) @@ -102,7 +102,7 @@ void SwFlyFreeFrm::NotifyBackground( SwPageFrm *pPageFrm, void SwFlyFreeFrm::MakeAll() { - if ( !GetFmt()->GetDoc()->getIDocumentDrawModelAccess().IsVisibleLayerId( GetVirtDrawObj()->GetLayer() ) ) + if ( !GetFormat()->GetDoc()->getIDocumentDrawModelAccess().IsVisibleLayerId( GetVirtDrawObj()->GetLayer() ) ) { return; } @@ -136,7 +136,7 @@ void SwFlyFreeFrm::MakeAll() if ( !IsNoMoveOnCheckClip() && !( PositionLocked() && GetAnchorFrm()->IsInFly() && - GetFrmFmt().GetFollowTextFlow().GetValue() ) ) + GetFrameFormat().GetFollowTextFlow().GetValue() ) ) { mbValidPos = false; } @@ -149,7 +149,7 @@ void SwFlyFreeFrm::MakeAll() while ( !mbValidPos || !mbValidSize || !mbValidPrtArea || bFormatHeightOnly || !m_bValidContentPos ) { SWRECTFN( this ) - const SwFmtFrmSize *pSz; + const SwFormatFrmSize *pSz; { // Additional scope, so aAccess will be destroyed before the check! SwBorderAttrAccess aAccess( SwFrm::GetCache(), this ); @@ -258,7 +258,7 @@ bool SwFlyFreeFrm::HasEnvironmentAutoSize() const return bRetVal; } -void SwFlyFreeFrm::CheckClip( const SwFmtFrmSize &rSz ) +void SwFlyFreeFrm::CheckClip( const SwFormatFrmSize &rSz ) { // It's probably time now to take appropriate measures, if the Fly // doesn't fit into its surrounding. @@ -307,7 +307,7 @@ void SwFlyFreeFrm::CheckClip( const SwFmtFrmSize &rSz ) Frm().Pos().X() = std::max( aClip.Left(), nClipRig - Frm().Width() ); if ( Frm().Left() != nOld ) { - const SwFmtHoriOrient &rH = GetFmt()->GetHoriOrient(); + const SwFormatHoriOrient &rH = GetFormat()->GetHoriOrient(); // Left-aligned ones may not be moved to the left when they // are avoiding another one. if( rH.GetHoriOrient() == text::HoriOrientation::LEFT ) @@ -359,8 +359,8 @@ void SwFlyFreeFrm::CheckClip( const SwFmtFrmSize &rSz ) // (3) fly frames with 'auto' size // Note: section frames seems to be not critical - didn't found // any critical layout situation so far. - if ( Lower() && Lower()->IsNoTxtFrm() && - ( static_cast<SwCntntFrm*>(Lower())->GetNode()->GetOLENode() || + if ( Lower() && Lower()->IsNoTextFrm() && + ( static_cast<SwContentFrm*>(Lower())->GetNode()->GetOLENode() || !HasEnvironmentAutoSize() ) ) { // If width and height got adjusted, then the bigger @@ -400,16 +400,16 @@ void SwFlyFreeFrm::CheckClip( const SwFmtFrmSize &rSz ) // attributes permanentely. Maybe one day somebody dares to remove // this code. if ( aFrmRect.HasArea() && - static_cast<SwCntntFrm*>(Lower())->GetNode()->GetOLENode() && + static_cast<SwContentFrm*>(Lower())->GetNode()->GetOLENode() && ( bWidthClipped || bHeightClipped ) ) { - SwFlyFrmFmt *pFmt = GetFmt(); - pFmt->LockModify(); - SwFmtFrmSize aFrmSize( rSz ); + SwFlyFrameFormat *pFormat = GetFormat(); + pFormat->LockModify(); + SwFormatFrmSize aFrmSize( rSz ); aFrmSize.SetWidth( aFrmRect.Width() ); aFrmSize.SetHeight( aFrmRect.Height() ); - pFmt->SetFmtAttr( aFrmSize ); - pFmt->UnlockModify(); + pFormat->SetFormatAttr( aFrmSize ); + pFormat->UnlockModify(); } } @@ -435,7 +435,7 @@ void SwFlyFreeFrm::CheckClip( const SwFmtFrmSize &rSz ) static_cast<SwLayoutFrm*>(pLow)->Lower()->Calc(); pLow = pLow->GetNext(); } while ( pLow ); - ::CalcCntnt( this ); + ::CalcContent( this ); ColUnlock(); if ( !mbValidSize && !bWidthClipped ) bFormatHeightOnly = mbValidSize = true; @@ -463,8 +463,8 @@ bool SwFlyFreeFrm::IsFormatPossible() const ( GetAnchorFrm() && GetAnchorFrm()->IsInFly() ) ); } -SwFlyLayFrm::SwFlyLayFrm( SwFlyFrmFmt *pFmt, SwFrm* pSib, SwFrm *pAnch ) : - SwFlyFreeFrm( pFmt, pSib, pAnch ) +SwFlyLayFrm::SwFlyLayFrm( SwFlyFrameFormat *pFormat, SwFrm* pSib, SwFrm *pAnch ) : + SwFlyFreeFrm( pFormat, pSib, pAnch ) { bLayout = true; } @@ -476,7 +476,7 @@ void SwFlyLayFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) { const sal_uInt16 nWhich = pNew ? pNew->Which() : 0; - const SwFmtAnchor *pAnch = 0; + const SwFormatAnchor *pAnch = 0; if( RES_ATTRSET_CHG == nWhich && SfxItemState::SET == static_cast<const SwAttrSetChg*>(pNew)->GetChgSet()->GetItemState( RES_ANCHOR, false, reinterpret_cast<const SfxPoolItem**>(&pAnch) )) @@ -487,13 +487,13 @@ void SwFlyLayFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) // Change of anchor. I'm attaching myself to the new place. // It's not allowed to change the anchor type. This is only // possible via SwFEShell. - pAnch = static_cast<const SwFmtAnchor*>(pNew); + pAnch = static_cast<const SwFormatAnchor*>(pNew); } if( pAnch ) { OSL_ENSURE( pAnch->GetAnchorId() == - GetFmt()->GetAnchor().GetAnchorId(), + GetFormat()->GetAnchor().GetAnchorId(), "8-) Invalid change of anchor type." ); // Unregister, get hold of the page, attach to the corresponding LayoutFrm. @@ -524,12 +524,12 @@ void SwFlyLayFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) } else { - SwNodeIndex aIdx( pAnch->GetCntntAnchor()->nNode ); - SwCntntFrm *pCntnt = GetFmt()->GetDoc()->GetNodes().GoNext( &aIdx )-> - GetCntntNode()->getLayoutFrm( getRootFrm(), 0, 0, false ); - if( pCntnt ) + SwNodeIndex aIdx( pAnch->GetContentAnchor()->nNode ); + SwContentFrm *pContent = GetFormat()->GetDoc()->GetNodes().GoNext( &aIdx )-> + GetContentNode()->getLayoutFrm( getRootFrm(), 0, 0, false ); + if( pContent ) { - SwFlyFrm *pTmp = pCntnt->FindFlyFrm(); + SwFlyFrm *pTmp = pContent->FindFlyFrm(); if( pTmp ) pTmp->AppendFly( this ); } @@ -576,12 +576,12 @@ void SwPageFrm::AppendFlyToPage( SwFlyFrm *pNew ) pFly->GetVirtDrawObj()->SetOrdNum( nNewNum ); } - // Don't look further at Flys that sit inside the Cntnt. + // Don't look further at Flys that sit inside the Content. if ( pNew->IsFlyInCntFrm() ) InvalidateFlyInCnt(); else { - InvalidateFlyCntnt(); + InvalidateFlyContent(); if ( !pSortedObjs ) pSortedObjs = new SwSortedObjs(); @@ -654,7 +654,7 @@ void SwPageFrm::RemoveFlyFromPage( SwFlyFrm *pToRemove ) static_cast<SwRootFrm*>(GetUpper())->InvalidateBrowseWidth(); } - // Don't look further at Flys that sit inside the Cntnt. + // Don't look further at Flys that sit inside the Content. if ( pToRemove->IsFlyInCntFrm() ) return; @@ -744,7 +744,7 @@ void SwPageFrm::MoveFly( SwFlyFrm *pToMove, SwPageFrm *pDest ) pToMove->SetPageFrm( pDest ); pToMove->InvalidatePage( pDest ); pToMove->SetNotifyBack(); - pDest->InvalidateFlyCntnt(); + pDest->InvalidateFlyContent(); // #i28701# pToMove->UnlockPosition(); @@ -814,7 +814,7 @@ void SwPageFrm::AppendDrawObjToPage( SwAnchoredObject& _rNewObj ) pFlyFrm->GetVirtDrawObj()->SetOrdNum( nNewNum ); } - if ( FLY_AS_CHAR == _rNewObj.GetFrmFmt().GetAnchor().GetAnchorId() ) + if ( FLY_AS_CHAR == _rNewObj.GetFrameFormat().GetAnchor().GetAnchorId() ) { return; } @@ -855,7 +855,7 @@ void SwPageFrm::RemoveDrawObjFromPage( SwAnchoredObject& _rToRemoveObj ) if ( GetUpper() ) { if (FLY_AS_CHAR != - _rToRemoveObj.GetFrmFmt().GetAnchor().GetAnchorId()) + _rToRemoveObj.GetFrameFormat().GetAnchor().GetAnchorId()) { static_cast<SwRootFrm*>(GetUpper())->SetSuperfluous(); InvalidatePage(); @@ -867,7 +867,7 @@ void SwPageFrm::RemoveDrawObjFromPage( SwAnchoredObject& _rToRemoveObj ) } // #i50432# - adjust method description and synopsis. -void SwPageFrm::PlaceFly( SwFlyFrm* pFly, SwFlyFrmFmt* pFmt ) +void SwPageFrm::PlaceFly( SwFlyFrm* pFly, SwFlyFrameFormat* pFormat ) { // #i50432# - consider the case that page is an empty page: // In this case append the fly frame at the next page @@ -875,7 +875,7 @@ void SwPageFrm::PlaceFly( SwFlyFrm* pFly, SwFlyFrmFmt* pFmt ) "<SwPageFrm::PlaceFly(..)> - empty page with no next page! -> fly frame appended at empty page" ); if ( IsEmptyPage() && GetNext() ) { - static_cast<SwPageFrm*>(GetNext())->PlaceFly( pFly, pFmt ); + static_cast<SwPageFrm*>(GetNext())->PlaceFly( pFly, pFormat ); } else { @@ -885,8 +885,8 @@ void SwPageFrm::PlaceFly( SwFlyFrm* pFly, SwFlyFrmFmt* pFmt ) AppendFly( pFly ); else { - OSL_ENSURE( pFmt, ":-( No Format given for Fly." ); - pFly = new SwFlyLayFrm( pFmt, this, this ); + OSL_ENSURE( pFormat, ":-( No Format given for Fly." ); + pFly = new SwFlyLayFrm( pFormat, this, this ); AppendFly( pFly ); ::RegistFlys( this, pFly ); } @@ -909,11 +909,11 @@ bool CalcClipRect( const SdrObject *pSdrObj, SwRect &rRect, bool bMove ) if ( pSdrObj->ISA(SwVirtFlyDrawObj) ) { const SwFlyFrm* pFly = static_cast<const SwVirtFlyDrawObj*>(pSdrObj)->GetFlyFrm(); - const bool bFollowTextFlow = pFly->GetFmt()->GetFollowTextFlow().GetValue(); + const bool bFollowTextFlow = pFly->GetFormat()->GetFollowTextFlow().GetValue(); // #i28701# const bool bConsiderWrapOnObjPos = - pFly->GetFmt()->getIDocumentSettingAccess()->get(DocumentSettingId::CONSIDER_WRAP_ON_OBJECT_POSITION); - const SwFmtVertOrient &rV = pFly->GetFmt()->GetVertOrient(); + pFly->GetFormat()->getIDocumentSettingAccess()->get(DocumentSettingId::CONSIDER_WRAP_ON_OBJECT_POSITION); + const SwFormatVertOrient &rV = pFly->GetFormat()->GetVertOrient(); if( pFly->IsFlyLayFrm() ) { const SwFrm* pClip; @@ -939,7 +939,7 @@ bool CalcClipRect( const SdrObject *pSdrObj, SwRect &rRect, bool bMove ) (rRect.*fnRect->fnSetBottom)( (pClip->*fnRect->fnGetPrtBottom)() ); } // horizontal clipping: Top and Bottom, also to PrtArea if necessary - const SwFmtHoriOrient &rH = pFly->GetFmt()->GetHoriOrient(); + const SwFormatHoriOrient &rH = pFly->GetFormat()->GetHoriOrient(); if( rH.GetHoriOrient() != text::HoriOrientation::NONE && rH.GetRelationOrient() == text::RelOrientation::PRINT_AREA ) { @@ -1081,9 +1081,9 @@ bool CalcClipRect( const SdrObject *pSdrObj, SwRect &rRect, bool bMove ) } pUp = pTmpFly; } - else if( pUp->IsInFtn() ) + else if( pUp->IsInFootnote() ) { - const SwFtnFrm *pTmp = pUp->FindFtnFrm(); + const SwFootnoteFrm *pTmp = pUp->FindFootnoteFrm(); while( pTmp->GetFollow() ) { pTmp = pTmp->GetFollow(); @@ -1147,8 +1147,8 @@ bool CalcClipRect( const SdrObject *pSdrObj, SwRect &rRect, bool bMove ) } long nHeight = (9*(rRect.*fnRect->fnGetHeight)())/10; long nTop; - const SwFmt *pFmt = static_cast<SwContact*>(GetUserCall(pSdrObj))->GetFmt(); - const SvxULSpaceItem &rUL = pFmt->GetULSpace(); + const SwFormat *pFormat = static_cast<SwContact*>(GetUserCall(pSdrObj))->GetFormat(); + const SvxULSpaceItem &rUL = pFormat->GetULSpace(); if( bMove ) { nTop = bVert ? static_cast<const SwFlyInCntFrm*>(pFly)->GetRefPoint().X() : @@ -1173,8 +1173,8 @@ bool CalcClipRect( const SdrObject *pSdrObj, SwRect &rRect, bool bMove ) else { const SwDrawContact *pC = static_cast<const SwDrawContact*>(GetUserCall(pSdrObj)); - const SwFrmFmt *pFmt = pC->GetFmt(); - const SwFmtAnchor &rAnch = pFmt->GetAnchor(); + const SwFrameFormat *pFormat = pC->GetFormat(); + const SwFormatAnchor &rAnch = pFormat->GetAnchor(); if ( FLY_AS_CHAR == rAnch.GetAnchorId() ) { const SwFrm* pAnchorFrm = pC->GetAnchorFrm( pSdrObj ); @@ -1190,7 +1190,7 @@ bool CalcClipRect( const SdrObject *pSdrObj, SwRect &rRect, bool bMove ) SWRECTFN( pAnchorFrm ) long nHeight = (9*(rRect.*fnRect->fnGetHeight)())/10; long nTop; - const SvxULSpaceItem &rUL = pFmt->GetULSpace(); + const SvxULSpaceItem &rUL = pFormat->GetULSpace(); SwRect aSnapRect( pSdrObj->GetSnapRect() ); long nTmpH = 0; if( bMove ) diff --git a/sw/source/core/layout/flypos.cxx b/sw/source/core/layout/flypos.cxx index 60c44bf1528e..e1f73d0eaaf8 100644 --- a/sw/source/core/layout/flypos.cxx +++ b/sw/source/core/layout/flypos.cxx @@ -36,32 +36,32 @@ bool SwPosFlyFrmCmp::operator()(const SwPosFlyFrmPtr& rA, const SwPosFlyFrmPtr& return rA->GetNdIndex() < rB->GetNdIndex(); } -SwPosFlyFrm::SwPosFlyFrm( const SwNodeIndex& rIdx, const SwFrmFmt* pFmt, +SwPosFlyFrm::SwPosFlyFrm( const SwNodeIndex& rIdx, const SwFrameFormat* pFormat, sal_uInt16 nArrPos ) - : pFrmFmt( pFmt ), pNdIdx( const_cast<SwNodeIndex*>(&rIdx) ) + : pFrameFormat( pFormat ), pNdIdx( const_cast<SwNodeIndex*>(&rIdx) ) { bool bFnd = false; - const SwFmtAnchor& rAnchor = pFmt->GetAnchor(); + const SwFormatAnchor& rAnchor = pFormat->GetAnchor(); if (FLY_AT_PAGE == rAnchor.GetAnchorId()) { pNdIdx = new SwNodeIndex( rIdx ); } - else if( pFmt->GetDoc()->getIDocumentLayoutAccess().GetCurrentViewShell() ) + else if( pFormat->GetDoc()->getIDocumentLayoutAccess().GetCurrentViewShell() ) { - if( RES_FLYFRMFMT == pFmt->Which() ) + if( RES_FLYFRMFMT == pFormat->Which() ) { // Let's see if we have an SdrObject for this - SwFlyFrm* pFly = SwIterator<SwFlyFrm,SwFmt>(*pFmt).First(); + SwFlyFrm* pFly = SwIterator<SwFlyFrm,SwFormat>(*pFormat).First(); if( pFly ) { nOrdNum = pFly->GetVirtDrawObj()->GetOrdNum(); bFnd = true; } } - else if( RES_DRAWFRMFMT == pFmt->Which() ) + else if( RES_DRAWFRMFMT == pFormat->Which() ) { // Let's see if we have an SdrObject for this - SwDrawContact* pContact = SwIterator<SwDrawContact,SwFmt>(*pFmt).First(); + SwDrawContact* pContact = SwIterator<SwDrawContact,SwFormat>(*pFormat).First(); if( pContact ) { nOrdNum = pContact->GetMaster()->GetOrdNum(); @@ -72,14 +72,14 @@ SwPosFlyFrm::SwPosFlyFrm( const SwNodeIndex& rIdx, const SwFrmFmt* pFmt, if( !bFnd ) { - nOrdNum = pFmt->GetDoc()->GetSpzFrmFmts()->size(); + nOrdNum = pFormat->GetDoc()->GetSpzFrameFormats()->size(); nOrdNum += nArrPos; } } SwPosFlyFrm::~SwPosFlyFrm() { - const SwFmtAnchor& rAnchor = pFrmFmt->GetAnchor(); + const SwFormatAnchor& rAnchor = pFrameFormat->GetAnchor(); if (FLY_AT_PAGE == rAnchor.GetAnchorId()) { delete pNdIdx; diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx index 39fdfae1416b..3855f33ed544 100644 --- a/sw/source/core/layout/frmtool.cxx +++ b/sw/source/core/layout/frmtool.cxx @@ -87,10 +87,10 @@ SwFrmNotify::SwFrmNotify( SwFrm *pF ) : bValidSize( pF->GetValidSizeFlag() ), mbFrmDeleted( false ) // #i49383# { - if ( pF->IsTxtFrm() ) + if ( pF->IsTextFrm() ) { - mnFlyAnchorOfst = static_cast<SwTxtFrm*>(pF)->GetBaseOfstForFly( true ); - mnFlyAnchorOfstNoWrap = static_cast<SwTxtFrm*>(pF)->GetBaseOfstForFly( false ); + mnFlyAnchorOfst = static_cast<SwTextFrm*>(pF)->GetBaseOfstForFly( true ); + mnFlyAnchorOfstNoWrap = static_cast<SwTextFrm*>(pF)->GetBaseOfstForFly( false ); } else { @@ -98,7 +98,7 @@ SwFrmNotify::SwFrmNotify( SwFrm *pF ) : mnFlyAnchorOfstNoWrap = 0; } - bHadFollow = pF->IsCntntFrm() && static_cast<SwCntntFrm*>(pF)->GetFollow(); + bHadFollow = pF->IsContentFrm() && static_cast<SwContentFrm*>(pF)->GetFollow(); } SwFrmNotify::~SwFrmNotify() @@ -115,11 +115,11 @@ SwFrmNotify::~SwFrmNotify() (aFrm.*fnRect->fnGetWidth)() != (pFrm->Frm().*fnRect->fnGetWidth)(); const bool bChgHeight = (aFrm.*fnRect->fnGetHeight)()!=(pFrm->Frm().*fnRect->fnGetHeight)(); - const bool bChgFlyBasePos = pFrm->IsTxtFrm() && - ( ( mnFlyAnchorOfst != static_cast<SwTxtFrm*>(pFrm)->GetBaseOfstForFly( true ) ) || - ( mnFlyAnchorOfstNoWrap != static_cast<SwTxtFrm*>(pFrm)->GetBaseOfstForFly( false ) ) ); + const bool bChgFlyBasePos = pFrm->IsTextFrm() && + ( ( mnFlyAnchorOfst != static_cast<SwTextFrm*>(pFrm)->GetBaseOfstForFly( true ) ) || + ( mnFlyAnchorOfstNoWrap != static_cast<SwTextFrm*>(pFrm)->GetBaseOfstForFly( false ) ) ); - if ( pFrm->IsFlowFrm() && !pFrm->IsInFtn() ) + if ( pFrm->IsFlowFrm() && !pFrm->IsInFootnote() ) { SwFlowFrm *pFlow = SwFlowFrm::CastFlowFrm( pFrm ); @@ -139,7 +139,7 @@ SwFrmNotify::~SwFrmNotify() if ( !bInvalidPrePos && pPre->IsTabFrm() ) { SwTabFrm* pPreTab = static_cast<SwTabFrm*>(pPre); - if ( pPreTab->GetFmt()->GetDoc()->GetDocumentSettingManager().get(DocumentSettingId::TABLE_ROW_KEEP) ) + if ( pPreTab->GetFormat()->GetDoc()->GetDocumentSettingManager().get(DocumentSettingId::TABLE_ROW_KEEP) ) { SwRowFrm* pLastRow = static_cast<SwRowFrm*>(pPreTab->GetLastLower()); if ( pLastRow && pLastRow->ShouldRowKeepWithNext() ) @@ -188,7 +188,7 @@ SwFrmNotify::~SwFrmNotify() // A fresh follow frame does not have to be invalidated, because // it is already formatted: - if ( bHadFollow || !pFrm->IsCntntFrm() || !static_cast<SwCntntFrm*>(pFrm)->GetFollow() ) + if ( bHadFollow || !pFrm->IsContentFrm() || !static_cast<SwContentFrm*>(pFrm)->GetFollow() ) { if ( !pFrm->IsTabFrm() || !static_cast<SwTabFrm*>(pFrm)->GetFollow() ) pFrm->InvalidateNextPos(); @@ -307,8 +307,8 @@ SwFrmNotify::~SwFrmNotify() // its positioning and alignment else { - const SwFmtVertOrient& rVert = - pContact->GetFmt()->GetVertOrient(); + const SwFormatVertOrient& rVert = + pContact->GetFormat()->GetVertOrient(); if ( ( rVert.GetVertOrient() == text::VertOrientation::CENTER || rVert.GetVertOrient() == text::VertOrientation::BOTTOM || rVert.GetRelationOrient() == text::RelOrientation::PRINT_AREA ) && @@ -318,8 +318,8 @@ SwFrmNotify::~SwFrmNotify() } if ( !bNotify ) { - const SwFmtHoriOrient& rHori = - pContact->GetFmt()->GetHoriOrient(); + const SwFormatHoriOrient& rHori = + pContact->GetFormat()->GetHoriOrient(); if ( ( rHori.GetHoriOrient() != text::HoriOrientation::NONE || rHori.GetRelationOrient()== text::RelOrientation::PRINT_AREA || rHori.GetRelationOrient()== text::RelOrientation::FRAME ) && @@ -365,13 +365,13 @@ SwFrmNotify::~SwFrmNotify() } else { - OSL_FAIL( "<SwCntntNotify::~SwCntntNotify()> - unknown anchored object type. Please inform OD." ); + OSL_FAIL( "<SwContentNotify::~SwContentNotify()> - unknown anchored object type. Please inform OD." ); } } } } } - else if( pFrm->IsTxtFrm() && bValidSize != pFrm->GetValidSizeFlag() ) + else if( pFrm->IsTextFrm() && bValidSize != pFrm->GetValidSizeFlag() ) { SwRootFrm *pRootFrm = pFrm->getRootFrm(); if( pRootFrm && pRootFrm->IsAnyShellAccessible() && @@ -392,7 +392,7 @@ SwFrmNotify::~SwFrmNotify() // width doesn't make sense for such Writer fly frames. if ( pFly->Lower() && !pFly->Lower()->IsColumnFrm() ) { - const SwFmtFrmSize &rFrmSz = pFly->GetFmt()->GetFrmSize(); + const SwFormatFrmSize &rFrmSz = pFly->GetFormat()->GetFrmSize(); // This could be optimized. Basically the fly frame only has to // be invalidated, if the first line of pFrm (if pFrm is a content @@ -436,9 +436,9 @@ static void lcl_InvalidatePosOfLowers( SwLayoutFrm& _rLayoutFrm ) while ( pLowerFrm ) { pLowerFrm->InvalidatePos(); - if ( pLowerFrm->IsTxtFrm() ) + if ( pLowerFrm->IsTextFrm() ) { - static_cast<SwTxtFrm*>(pLowerFrm)->Prepare( PREP_POS_CHGD ); + static_cast<SwTextFrm*>(pLowerFrm)->Prepare( PREP_POS_CHGD ); } else if ( pLowerFrm->IsTabFrm() ) { @@ -606,9 +606,9 @@ SwLayNotify::~SwLayNotify() } // #i49383# - check for footnote frame, if unlock // of position of lower objects is allowed. - else if ( bUnlockPosOfObjs && pLay->IsFtnFrm() ) + else if ( bUnlockPosOfObjs && pLay->IsFootnoteFrm() ) { - bUnlockPosOfObjs = static_cast<SwFtnFrm*>(pLay)->IsUnlockPosOfLowerObjs(); + bUnlockPosOfObjs = static_cast<SwFootnoteFrm*>(pLay)->IsUnlockPosOfLowerObjs(); } // #i51303# - no unlock of object positions for sections else if ( bUnlockPosOfObjs && pLay->IsSctFrm() ) @@ -617,7 +617,7 @@ SwLayNotify::~SwLayNotify() } pLay->NotifyLowerObjs( bUnlockPosOfObjs ); } - if ( bPos && pLay->IsFtnFrm() && pLay->Lower() ) + if ( bPos && pLay->IsFootnoteFrm() && pLay->Lower() ) { // OD 2004-05-11 #i28701# ::lcl_InvalidatePosOfLowers( *pLay ); @@ -656,7 +656,7 @@ SwFlyNotify::~SwFlyNotify() ::Notify( pFly, pOldPage, aFrmAndSpace, &aPrt ); // #i35640# - additional notify anchor text frame, // if Writer fly frame has changed its page - if ( pFly->GetAnchorFrm()->IsTxtFrm() && + if ( pFly->GetAnchorFrm()->IsTextFrm() && pFly->GetPageFrm() != pOldPage ) { pFly->AnchorFrm()->Prepare( PREP_FLY_LEAVE ); @@ -694,7 +694,7 @@ SwFlyNotify::~SwFlyNotify() // #i26945# - notify anchor. // Needed for negative positioned Writer fly frames - if ( pFly->GetAnchorFrm()->IsTxtFrm() ) + if ( pFly->GetAnchorFrm()->IsTextFrm() ) { pFly->AnchorFrm()->Prepare( PREP_FLY_LEAVE ); } @@ -738,13 +738,13 @@ SwFlyNotify::~SwFlyNotify() } } -SwCntntFrm *SwCntntNotify::GetCnt() +SwContentFrm *SwContentNotify::GetCnt() { - return static_cast<SwCntntFrm*>(pFrm); + return static_cast<SwContentFrm*>(pFrm); } -SwCntntNotify::SwCntntNotify( SwCntntFrm *pCntntFrm ) : - SwFrmNotify( pCntntFrm ), +SwContentNotify::SwContentNotify( SwContentFrm *pContentFrm ) : + SwFrmNotify( pContentFrm ), // OD 08.01.2004 #i11859# mbChkHeightOfLastLine( false ), mnHeightOfLastLine( 0L ), @@ -753,23 +753,23 @@ SwCntntNotify::SwCntntNotify( SwCntntFrm *pCntntFrm ) : mbBordersJoinedWithPrev( false ) { // OD 08.01.2004 #i11859# - if ( pCntntFrm->IsTxtFrm() ) + if ( pContentFrm->IsTextFrm() ) { - SwTxtFrm* pTxtFrm = static_cast<SwTxtFrm*>(pCntntFrm); - if ( !pTxtFrm->GetTxtNode()->getIDocumentSettingAccess()->get(DocumentSettingId::OLD_LINE_SPACING) ) + SwTextFrm* pTextFrm = static_cast<SwTextFrm*>(pContentFrm); + if ( !pTextFrm->GetTextNode()->getIDocumentSettingAccess()->get(DocumentSettingId::OLD_LINE_SPACING) ) { - const SwAttrSet* pSet = pTxtFrm->GetAttrSet(); + const SwAttrSet* pSet = pTextFrm->GetAttrSet(); const SvxLineSpacingItem &rSpace = pSet->GetLineSpacing(); if ( rSpace.GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_PROP ) { mbChkHeightOfLastLine = true; - mnHeightOfLastLine = pTxtFrm->GetHeightOfLastLine(); + mnHeightOfLastLine = pTextFrm->GetHeightOfLastLine(); } } } } -SwCntntNotify::~SwCntntNotify() +SwContentNotify::~SwContentNotify() { // #i49383# if ( mbFrmDeleted ) @@ -777,7 +777,7 @@ SwCntntNotify::~SwCntntNotify() return; } - SwCntntFrm *pCnt = GetCnt(); + SwContentFrm *pCnt = GetCnt(); if ( bSetCompletePaintOnInvalidate ) pCnt->SetCompletePaint(); @@ -789,13 +789,13 @@ SwCntntNotify::~SwCntntNotify() while( !pCell->IsCellFrm() && pCell->GetUpper() ) pCell = pCell->GetUpper(); OSL_ENSURE( pCell->IsCellFrm(), "Where's my cell?" ); - if ( text::VertOrientation::NONE != pCell->GetFmt()->GetVertOrient().GetVertOrient() ) + if ( text::VertOrientation::NONE != pCell->GetFormat()->GetVertOrient().GetVertOrient() ) pCell->InvalidatePrt(); //for the vertical align. } // OD 2004-02-26 #i25029# if ( mbInvalidatePrevPrtArea && mbBordersJoinedWithPrev && - pCnt->IsTxtFrm() && + pCnt->IsTextFrm() && !pCnt->IsFollow() && !pCnt->GetIndPrev() ) { // determine previous frame @@ -805,8 +805,8 @@ SwCntntNotify::~SwCntntNotify() while ( pPrevFrm && ( ( pPrevFrm->IsSctFrm() && !static_cast<SwSectionFrm*>(pPrevFrm)->GetSection() ) || - ( pPrevFrm->IsTxtFrm() && - static_cast<SwTxtFrm*>(pPrevFrm)->IsHiddenNow() ) ) ) + ( pPrevFrm->IsTextFrm() && + static_cast<SwTextFrm*>(pPrevFrm)->IsHiddenNow() ) ) ) { pPrevFrm = pPrevFrm->FindPrev(); } @@ -825,11 +825,11 @@ SwCntntNotify::~SwCntntNotify() // <pCnt> had joined its borders/shadow with the // last content of the found section. // Invalidate printing area of last content in found section. - SwFrm* pLstCntntOfSctFrm = - static_cast<SwSectionFrm*>(pPrevFrm)->FindLastCntnt(); - if ( pLstCntntOfSctFrm ) + SwFrm* pLstContentOfSctFrm = + static_cast<SwSectionFrm*>(pPrevFrm)->FindLastContent(); + if ( pLstContentOfSctFrm ) { - pLstCntntOfSctFrm->InvalidatePrt(); + pLstContentOfSctFrm->InvalidatePrt(); } } } @@ -842,7 +842,7 @@ SwCntntNotify::~SwCntntNotify() const bool bFirst = (aFrm.*fnRect->fnGetWidth)() == 0; - if ( pCnt->IsNoTxtFrm() ) + if ( pCnt->IsNoTextFrm() ) { //Active PlugIn's or OLE-Objects should know something of the change //thereby they move their window appropriate. @@ -854,7 +854,7 @@ SwCntntNotify::~SwCntntNotify() (pNd->GetOLEObj().IsOleRef() || pNd->IsOLESizeInvalid()) ) { - const bool bNoTxtFrmPrtAreaChanged = + const bool bNoTextFrmPrtAreaChanged = ( aPrt.SSize().Width() != 0 && aPrt.SSize().Height() != 0 ) && aPrt.SSize() != pCnt->Prt().SSize(); @@ -870,7 +870,7 @@ SwCntntNotify::~SwCntntNotify() // I think this should mean "do not call CalcAndSetScale" // if the frame is formatted for the first time. // Unfortunately this is not valid anymore since the - // SwNoTxtFrm already gets a width during CalcLowerPreps. + // SwNoTextFrm already gets a width during CalcLowerPreps. // Nevertheless, the indention of !bFirst seemed to be // to assure that the OLE objects have already been notified // if necessary before calling CalcAndSetScale. @@ -878,14 +878,14 @@ SwCntntNotify::~SwCntntNotify() // one additional problem specific to the word import: // The layout is calculated _before_ calling PrtOLENotify, // and the OLE objects are not invalidated during import. - // Therefore I added the condition !IsUpdateExpFld, + // Therefore I added the condition !IsUpdateExpField, // have a look at the occurrence of CalcLayout in // uiview/view.cxx. if ( !pNd->IsOLESizeInvalid() && - !pSh->GetDoc()->getIDocumentState().IsUpdateExpFld() ) + !pSh->GetDoc()->getIDocumentState().IsUpdateExpField() ) pFESh->CalcAndSetScale( xObj, &pFly->Prt(), &pFly->Frm(), - bNoTxtFrmPrtAreaChanged ); + bNoTextFrmPrtAreaChanged ); } } @@ -896,9 +896,9 @@ SwCntntNotify::~SwCntntNotify() } } //dito animated graphics - if ( Frm().HasArea() && static_cast<SwNoTxtFrm*>(pCnt)->HasAnimation() ) + if ( Frm().HasArea() && static_cast<SwNoTextFrm*>(pCnt)->HasAnimation() ) { - static_cast<SwNoTxtFrm*>(pCnt)->StopAnimation(); + static_cast<SwNoTextFrm*>(pCnt)->StopAnimation(); pSh->InvalidateWindows( Frm() ); } } @@ -909,7 +909,7 @@ SwCntntNotify::~SwCntntNotify() pCnt->SetRetouche(); //fix(13870) SwDoc *pDoc = pCnt->GetNode()->GetDoc(); - if ( !pDoc->GetSpzFrmFmts()->empty() && + if ( !pDoc->GetSpzFrameFormats()->empty() && pDoc->DoesContainAtPageObjWithContentAnchor() && !pDoc->getIDocumentState().IsNewDoc() ) { // If certain import filters for foreign file format import @@ -922,14 +922,14 @@ SwCntntNotify::~SwCntntNotify() const SwPageFrm *pPage = 0; SwNodeIndex *pIdx = 0; - SwFrmFmts *pTbl = pDoc->GetSpzFrmFmts(); + SwFrameFormats *pTable = pDoc->GetSpzFrameFormats(); - for ( size_t i = 0; i < pTbl->size(); ++i ) + for ( size_t i = 0; i < pTable->size(); ++i ) { - SwFrmFmt *pFmt = (*pTbl)[i]; - const SwFmtAnchor &rAnch = pFmt->GetAnchor(); + SwFrameFormat *pFormat = (*pTable)[i]; + const SwFormatAnchor &rAnch = pFormat->GetAnchor(); if ( FLY_AT_PAGE != rAnch.GetAnchorId() || - rAnch.GetCntntAnchor() == 0 ) + rAnch.GetContentAnchor() == 0 ) { continue; } @@ -938,20 +938,20 @@ SwCntntNotify::~SwCntntNotify() { pIdx = new SwNodeIndex( *pCnt->GetNode() ); } - if ( rAnch.GetCntntAnchor()->nNode == *pIdx ) + if ( rAnch.GetContentAnchor()->nNode == *pIdx ) { - OSL_FAIL( "<SwCntntNotify::~SwCntntNotify()> - to page anchored object with content position. Please inform OD." ); + OSL_FAIL( "<SwContentNotify::~SwContentNotify()> - to page anchored object with content position. Please inform OD." ); if ( !pPage ) { pPage = pCnt->FindPageFrm(); } - SwFmtAnchor aAnch( rAnch ); + SwFormatAnchor aAnch( rAnch ); aAnch.SetAnchor( 0 ); aAnch.SetPageNum( pPage->GetPhyPageNum() ); - pFmt->SetFmtAttr( aAnch ); - if ( RES_DRAWFRMFMT != pFmt->Which() ) + pFormat->SetFormatAttr( aAnch ); + if ( RES_DRAWFRMFMT != pFormat->Which() ) { - pFmt->MakeFrms(); + pFormat->MakeFrms(); } } } @@ -961,28 +961,28 @@ SwCntntNotify::~SwCntntNotify() // OD 12.01.2004 #i11859# - invalidate printing area of following frame, // if height of last line has changed. - if ( pCnt->IsTxtFrm() && mbChkHeightOfLastLine ) + if ( pCnt->IsTextFrm() && mbChkHeightOfLastLine ) { - if ( mnHeightOfLastLine != static_cast<SwTxtFrm*>(pCnt)->GetHeightOfLastLine() ) + if ( mnHeightOfLastLine != static_cast<SwTextFrm*>(pCnt)->GetHeightOfLastLine() ) { pCnt->InvalidateNextPrtArea(); } } // #i44049# - if ( pCnt->IsTxtFrm() && POS_DIFF( aFrm, pCnt->Frm() ) ) + if ( pCnt->IsTextFrm() && POS_DIFF( aFrm, pCnt->Frm() ) ) { pCnt->InvalidateObjs( true ); } // #i43255# - move code to invalidate at-character // anchored objects due to a change of its anchor character from - // method <SwTxtFrm::Format(..)>. - if ( pCnt->IsTxtFrm() ) + // method <SwTextFrm::Format(..)>. + if ( pCnt->IsTextFrm() ) { - SwTxtFrm* pMasterFrm = pCnt->IsFollow() - ? static_cast<SwTxtFrm*>(pCnt)->FindMaster() - : static_cast<SwTxtFrm*>(pCnt); + SwTextFrm* pMasterFrm = pCnt->IsFollow() + ? static_cast<SwTextFrm*>(pCnt)->FindMaster() + : static_cast<SwTextFrm*>(pCnt); if ( pMasterFrm && !pMasterFrm->IsFlyLock() && pMasterFrm->GetDrawObjs() ) { @@ -990,7 +990,7 @@ SwCntntNotify::~SwCntntNotify() for ( size_t i = 0; i < pObjs->size(); ++i ) { SwAnchoredObject* pAnchoredObj = (*pObjs)[i]; - if ( pAnchoredObj->GetFrmFmt().GetAnchor().GetAnchorId() + if ( pAnchoredObj->GetFrameFormat().GetAnchor().GetAnchorId() == FLY_AT_CHAR ) { pAnchoredObj->CheckCharRectAndTopOfLine( !pMasterFrm->IsEmpty() ); @@ -1000,65 +1000,65 @@ SwCntntNotify::~SwCntntNotify() } } -void AppendObjs( const SwFrmFmts *pTbl, sal_uLong nIndex, +void AppendObjs( const SwFrameFormats *pTable, sal_uLong nIndex, SwFrm *pFrm, SwPageFrm *pPage, SwDoc* doc ) { - (void) pTbl; + (void) pTable; #if OSL_DEBUG_LEVEL > 0 - std::list<SwFrmFmt*> checkFmts; - for ( size_t i = 0; i < pTbl->size(); ++i ) + std::list<SwFrameFormat*> checkFormats; + for ( size_t i = 0; i < pTable->size(); ++i ) { - SwFrmFmt *pFmt = (*pTbl)[i]; - const SwFmtAnchor &rAnch = pFmt->GetAnchor(); - if ( rAnch.GetCntntAnchor() && - (rAnch.GetCntntAnchor()->nNode.GetIndex() == nIndex) ) + SwFrameFormat *pFormat = (*pTable)[i]; + const SwFormatAnchor &rAnch = pFormat->GetAnchor(); + if ( rAnch.GetContentAnchor() && + (rAnch.GetContentAnchor()->nNode.GetIndex() == nIndex) ) { - checkFmts.push_back( pFmt ); + checkFormats.push_back( pFormat ); } } #else - (void)pTbl; + (void)pTable; #endif SwNode const& rNode(*doc->GetNodes()[nIndex]); - std::vector<SwFrmFmt*> const*const pFlys(rNode.GetAnchoredFlys()); + std::vector<SwFrameFormat*> const*const pFlys(rNode.GetAnchoredFlys()); for (size_t it = 0; pFlys && it != pFlys->size(); ) { - SwFrmFmt *const pFmt = (*pFlys)[it]; - const SwFmtAnchor &rAnch = pFmt->GetAnchor(); - if ( rAnch.GetCntntAnchor() && - (rAnch.GetCntntAnchor()->nNode.GetIndex() == nIndex) ) + SwFrameFormat *const pFormat = (*pFlys)[it]; + const SwFormatAnchor &rAnch = pFormat->GetAnchor(); + if ( rAnch.GetContentAnchor() && + (rAnch.GetContentAnchor()->nNode.GetIndex() == nIndex) ) { #if OSL_DEBUG_LEVEL > 0 - std::list<SwFrmFmt*>::iterator checkPos = std::find( checkFmts.begin(), checkFmts.end(), pFmt ); - assert( checkPos != checkFmts.end()); - checkFmts.erase( checkPos ); + std::list<SwFrameFormat*>::iterator checkPos = std::find( checkFormats.begin(), checkFormats.end(), pFormat ); + assert( checkPos != checkFormats.end()); + checkFormats.erase( checkPos ); #endif const bool bFlyAtFly = rAnch.GetAnchorId() == FLY_AT_FLY; // LAYER_IMPL //Is a frame or a SdrObject described? - const bool bSdrObj = RES_DRAWFRMFMT == pFmt->Which(); + const bool bSdrObj = RES_DRAWFRMFMT == pFormat->Which(); // OD 23.06.2003 #108784# - append also drawing objects anchored // as character. - const bool bDrawObjInCntnt = bSdrObj && + const bool bDrawObjInContent = bSdrObj && (rAnch.GetAnchorId() == FLY_AS_CHAR); if( bFlyAtFly || (rAnch.GetAnchorId() == FLY_AT_PARA) || (rAnch.GetAnchorId() == FLY_AT_CHAR) || - bDrawObjInCntnt ) + bDrawObjInContent ) { SdrObject* pSdrObj = 0; - if ( bSdrObj && 0 == (pSdrObj = pFmt->FindSdrObject()) ) + if ( bSdrObj && 0 == (pSdrObj = pFormat->FindSdrObject()) ) { OSL_ENSURE( !bSdrObj, "DrawObject not found." ); ++it; - pFmt->GetDoc()->DelFrmFmt( pFmt ); + pFormat->GetDoc()->DelFrameFormat( pFormat ); continue; } if ( pSdrObj ) { if ( !pSdrObj->GetPage() ) { - pFmt->getIDocumentDrawModelAccess()->GetDrawModel()->GetPage(0)-> + pFormat->getIDocumentDrawModelAccess()->GetDrawModel()->GetPage(0)-> InsertObject(pSdrObj, pSdrObj->GetOrdNumDirect()); } @@ -1085,9 +1085,9 @@ void AppendObjs( const SwFrmFmts *pTbl, sal_uLong nIndex, { SwFlyFrm *pFly; if( bFlyAtFly ) - pFly = new SwFlyLayFrm( static_cast<SwFlyFrmFmt*>(pFmt), pFrm, pFrm ); + pFly = new SwFlyLayFrm( static_cast<SwFlyFrameFormat*>(pFormat), pFrm, pFrm ); else - pFly = new SwFlyAtCntFrm( static_cast<SwFlyFrmFmt*>(pFmt), pFrm, pFrm ); + pFly = new SwFlyAtCntFrm( static_cast<SwFlyFrameFormat*>(pFormat), pFrm, pFrm ); pFly->Lock(); pFrm->AppendFly( pFly ); pFly->Unlock(); @@ -1099,15 +1099,15 @@ void AppendObjs( const SwFrmFmts *pTbl, sal_uLong nIndex, ++it; } #if OSL_DEBUG_LEVEL > 0 - assert( checkFmts.empty()); + assert( checkFormats.empty()); #endif } -static bool lcl_ObjConnected( const SwFrmFmt *pFmt, const SwFrm* pSib ) +static bool lcl_ObjConnected( const SwFrameFormat *pFormat, const SwFrm* pSib ) { - if ( RES_FLYFRMFMT == pFmt->Which() ) + if ( RES_FLYFRMFMT == pFormat->Which() ) { - SwIterator<SwFlyFrm,SwFmt> aIter( *pFmt ); + SwIterator<SwFlyFrm,SwFormat> aIter( *pFormat ); const SwRootFrm* pRoot = pSib ? pSib->getRootFrm() : 0; const SwFlyFrm* pTmpFrm; for( pTmpFrm = aIter.First(); pTmpFrm; pTmpFrm = aIter.Next() ) @@ -1118,56 +1118,56 @@ static bool lcl_ObjConnected( const SwFrmFmt *pFmt, const SwFrm* pSib ) } else { - SwDrawContact *pContact = SwIterator<SwDrawContact,SwFmt>(*pFmt).First(); + SwDrawContact *pContact = SwIterator<SwDrawContact,SwFormat>(*pFormat).First(); if ( pContact ) return pContact->GetAnchorFrm() != 0; } return false; } -/** helper method to determine, if a <SwFrmFmt>, which has an object connected, +/** helper method to determine, if a <SwFrameFormat>, which has an object connected, is located in header or footer. OD 23.06.2003 #108784# */ -static bool lcl_InHeaderOrFooter( const SwFrmFmt& _rFmt ) +static bool lcl_InHeaderOrFooter( const SwFrameFormat& _rFormat ) { bool bRetVal = false; - const SwFmtAnchor& rAnch = _rFmt.GetAnchor(); + const SwFormatAnchor& rAnch = _rFormat.GetAnchor(); if (rAnch.GetAnchorId() != FLY_AT_PAGE) { - bRetVal = _rFmt.GetDoc()->IsInHeaderFooter( rAnch.GetCntntAnchor()->nNode ); + bRetVal = _rFormat.GetDoc()->IsInHeaderFooter( rAnch.GetContentAnchor()->nNode ); } return bRetVal; } -void AppendAllObjs( const SwFrmFmts *pTbl, const SwFrm* pSib ) +void AppendAllObjs( const SwFrameFormats *pTable, const SwFrm* pSib ) { - //Connecting of all Objects, which are described in the SpzTbl with the + //Connecting of all Objects, which are described in the SpzTable with the //layout. //If nothing happens anymore we can stop. Then formats can still remain, //because we neither use character bound frames nor objects which //are anchored to character bounds. - // Optimization: This code used to make a copy of pTbl and erase() handled items, but using + // Optimization: This code used to make a copy of pTable and erase() handled items, but using // vector::erase() is a bad idea for performance (especially with large mailmerge documents // it results in extensive repeated copying). Use another vector for marking whether the item // has been handled and operate on the original data without altering them. - std::vector< bool > handled( pTbl->size(), false ); + std::vector< bool > handled( pTable->size(), false ); size_t handledCount = 0; - while ( handledCount < pTbl->size()) + while ( handledCount < pTable->size()) { bool changed = false; - for ( int i = 0; i < int(pTbl->size()); ++i ) + for ( int i = 0; i < int(pTable->size()); ++i ) { if( handled[ i ] ) continue; - SwFrmFmt *pFmt = (*pTbl)[ i ]; - const SwFmtAnchor &rAnch = pFmt->GetAnchor(); + SwFrameFormat *pFormat = (*pTable)[ i ]; + const SwFormatAnchor &rAnch = pFormat->GetAnchor(); bool bRemove = false; if ((rAnch.GetAnchorId() == FLY_AT_PAGE) || (rAnch.GetAnchorId() == FLY_AS_CHAR)) @@ -1178,8 +1178,8 @@ void AppendAllObjs( const SwFrmFmts *pTbl, const SwFrm* pSib ) } else { - bRemove = ::lcl_ObjConnected( pFmt, pSib ); - if ( !bRemove || ::lcl_InHeaderOrFooter( *pFmt ) ) + bRemove = ::lcl_ObjConnected( pFormat, pSib ); + if ( !bRemove || ::lcl_InHeaderOrFooter( *pFormat ) ) { // OD 23.06.2003 #108784# - correction: for objects in header // or footer create frames, in spite of the fact that an connected @@ -1187,8 +1187,8 @@ void AppendAllObjs( const SwFrmFmts *pTbl, const SwFrm* pSib ) //Call for Flys and DrawObjs only a MakeFrms if nor //no dependent exists, otherwise, or if the MakeDrms creates no //dependents, remove. - pFmt->MakeFrms(); - bRemove = ::lcl_ObjConnected( pFmt, pSib ); + pFormat->MakeFrms(); + bRemove = ::lcl_ObjConnected( pFormat, pSib ); } } if ( bRemove ) @@ -1247,7 +1247,7 @@ void _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc, const bool bStartPercent = bPages && !nEndIndex; SwPageFrm *pPage = pLay->FindPageFrm(); - const SwFrmFmts *pTbl = pDoc->GetSpzFrmFmts(); + const SwFrameFormats *pTable = pDoc->GetSpzFrameFormats(); SwFrm *pFrm = 0; bool bBreakAfter = false; @@ -1286,7 +1286,7 @@ void _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc, // The same applies for areas in tables, if inside the table will be // something inserted, it's only allowed to break up areas, which // lies in the inside also. - if( ( !pLay->IsInFtn() || pSct->IsInFtn() ) && + if( ( !pLay->IsInFootnote() || pSct->IsInFootnote() ) && ( !pLay->IsInTab() || pSct->IsInTab() ) ) { pActualSection = new SwActualSection( 0, pSct, 0 ); @@ -1304,9 +1304,9 @@ void _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc, while( true ) { SwNode *pNd = pDoc->GetNodes()[nIndex]; - if ( pNd->IsCntntNode() ) + if ( pNd->IsContentNode() ) { - SwCntntNode* pNode = static_cast<SwCntntNode*>(pNd); + SwContentNode* pNode = static_cast<SwContentNode*>(pNd); pFrm = pNode->MakeFrm(pLay); if( pPageMaker ) pPageMaker->CheckInsert( nIndex ); @@ -1317,7 +1317,7 @@ void _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc, // CONTENT_FLOWS_FROM/_TO relation. // Relation CONTENT_FLOWS_FROM for next paragraph will change // and relation CONTENT_FLOWS_TO for previous paragraph will change. - if ( pFrm->IsTxtFrm() ) + if ( pFrm->IsTextFrm() ) { SwViewShell* pViewShell( pFrm->getRootFrm()->GetCurrShell() ); // no notification, if <SwViewShell> is in construction @@ -1326,8 +1326,8 @@ void _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc, pViewShell->GetLayout()->IsAnyShellAccessible() ) { pViewShell->InvalidateAccessibleParaFlowRelation( - dynamic_cast<SwTxtFrm*>(pFrm->FindNextCnt( true )), - dynamic_cast<SwTxtFrm*>(pFrm->FindPrevCnt( true )) ); + dynamic_cast<SwTextFrm*>(pFrm->FindNextCnt( true )), + dynamic_cast<SwTextFrm*>(pFrm->FindPrevCnt( true )) ); // #i68958# // The information flags of the text frame are validated // in methods <FindNextCnt(..)> and <FindPrevCnt(..)>. @@ -1342,22 +1342,22 @@ void _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc, lcl_SetPos( *pFrm, *pLay ); pPrv = pFrm; - if ( !pTbl->empty() && bObjsDirect && !bDontCreateObjects ) - AppendObjs( pTbl, nIndex, pFrm, pPage, pDoc ); + if ( !pTable->empty() && bObjsDirect && !bDontCreateObjects ) + AppendObjs( pTable, nIndex, pFrm, pPage, pDoc ); } else if ( pNd->IsTableNode() ) { //Should we have encountered a table? - SwTableNode *pTblNode = static_cast<SwTableNode*>(pNd); + SwTableNode *pTableNode = static_cast<SwTableNode*>(pNd); // #108116# loading may produce table structures that GCLines // needs to clean up. To keep table formulas correct, change // all table formulas to internal (BOXPTR) representation. - SwTableFmlUpdate aMsgHnt( &pTblNode->GetTable() ); - aMsgHnt.eFlags = TBL_BOXPTR; - pDoc->getIDocumentFieldsAccess().UpdateTblFlds( &aMsgHnt ); - pTblNode->GetTable().GCLines(); + SwTableFormulaUpdate aMsgHint( &pTableNode->GetTable() ); + aMsgHint.eFlags = TBL_BOXPTR; + pDoc->getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint ); + pTableNode->GetTable().GCLines(); - pFrm = pTblNode->MakeFrm( pLay ); + pFrm = pTableNode->MakeFrm( pLay ); if( pPageMaker ) pPageMaker->CheckInsert( nIndex ); @@ -1376,11 +1376,11 @@ void _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc, pViewShell->GetLayout()->IsAnyShellAccessible() ) { pViewShell->InvalidateAccessibleParaFlowRelation( - dynamic_cast<SwTxtFrm*>(pFrm->FindNextCnt( true )), - dynamic_cast<SwTxtFrm*>(pFrm->FindPrevCnt( true )) ); + dynamic_cast<SwTextFrm*>(pFrm->FindNextCnt( true )), + dynamic_cast<SwTextFrm*>(pFrm->FindPrevCnt( true )) ); } } - if ( bObjsDirect && !pTbl->empty() ) + if ( bObjsDirect && !pTable->empty() ) static_cast<SwTabFrm*>(pFrm)->RegistFlys(); // OD 12.08.2003 #i17969# - consider horizontal/vertical layout // for setting position at newly inserted frame @@ -1388,7 +1388,7 @@ void _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc, pPrv = pFrm; //Set the index to the endnode of the table section. - nIndex = pTblNode->EndOfSectionIndex(); + nIndex = pTableNode->EndOfSectionIndex(); SwTabFrm* pTmpFrm = static_cast<SwTabFrm*>(pFrm); while ( pTmpFrm ) @@ -1427,15 +1427,15 @@ void _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc, static_cast<SwSectionFrm*>(pFrm)->Init(); // #i33963# - // Do not trust the IsInFtn flag. If we are currently + // Do not trust the IsInFootnote flag. If we are currently // building up a table, the upper of pPrv may be a cell // frame, but the cell frame does not have an upper yet. - if( pPrv && 0 != pPrv->ImplFindFtnFrm() ) + if( pPrv && 0 != pPrv->ImplFindFootnoteFrm() ) { if( pPrv->IsSctFrm() ) - pPrv = static_cast<SwSectionFrm*>(pPrv)->ContainsCntnt(); - if( pPrv && pPrv->IsTxtFrm() ) - static_cast<SwTxtFrm*>(pPrv)->Prepare( PREP_QUOVADIS, 0, false ); + pPrv = static_cast<SwSectionFrm*>(pPrv)->ContainsContent(); + if( pPrv && pPrv->IsTextFrm() ) + static_cast<SwTextFrm*>(pPrv)->Prepare( PREP_QUOVADIS, 0, false ); } } // #i27138# @@ -1451,8 +1451,8 @@ void _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc, pViewShell->GetLayout()->IsAnyShellAccessible() ) { pViewShell->InvalidateAccessibleParaFlowRelation( - dynamic_cast<SwTxtFrm*>(pFrm->FindNextCnt( true )), - dynamic_cast<SwTxtFrm*>(pFrm->FindPrevCnt( true )) ); + dynamic_cast<SwTextFrm*>(pFrm->FindNextCnt( true )), + dynamic_cast<SwTextFrm*>(pFrm->FindPrevCnt( true )) ); } } pFrm->CheckDirChange(); @@ -1472,11 +1472,11 @@ void _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc, // FME 10.11.2003 #112243# // Invalidate fly content flag: if ( pFrm->IsInFly() ) - pPage->InvalidateFlyCntnt(); + pPage->InvalidateFlyContent(); // OD 14.11.2002 #104684# - invalidate page content in order to // force format and paint of section content. - pPage->InvalidateCntnt(); + pPage->InvalidateContent(); } pLay = static_cast<SwLayoutFrm*>(pFrm); @@ -1500,7 +1500,7 @@ void _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc, { //Could be, that the last SectionFrm remains empty. //Then now is the time to remove them. - if ( !pLay->ContainsCntnt() ) + if ( !pLay->ContainsContent() ) { SwFrm *pTmpFrm = pLay; pLay = pTmpFrm->GetUpper(); @@ -1536,7 +1536,7 @@ void _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc, // We don't want to leave empty parts back. if( ! pOuterSectionFrm->IsColLocked() && - ! pOuterSectionFrm->ContainsCntnt() ) + ! pOuterSectionFrm->ContainsContent() ) { pOuterSectionFrm->DelEmpty( true ); SwFrm::DestroyFrm(pOuterSectionFrm); @@ -1559,15 +1559,15 @@ void _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc, else if( pNd->IsStartNode() && SwFlyStartNode == static_cast<SwStartNode*>(pNd)->GetStartNodeType() ) { - if ( !pTbl->empty() && bObjsDirect && !bDontCreateObjects ) + if ( !pTable->empty() && bObjsDirect && !bDontCreateObjects ) { SwFlyFrm* pFly = pLay->FindFlyFrm(); if( pFly ) - AppendObjs( pTbl, nIndex, pFly, pPage, pDoc ); + AppendObjs( pTable, nIndex, pFly, pPage, pDoc ); } } else - // Neither Cntnt nor table nor section, + // Neither Content nor table nor section, // so we have to be ready. break; @@ -1581,7 +1581,7 @@ void _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc, if ( pActualSection ) { // Might happen that an empty (Follow-)Section is left over. - if ( !(pLay = pActualSection->GetSectionFrm())->ContainsCntnt() ) + if ( !(pLay = pActualSection->GetSectionFrm())->ContainsContent() ) { pLay->RemoveFromLayout(); SwFrm::DestroyFrm(pLay); @@ -1592,7 +1592,7 @@ void _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc, if ( bPages ) // let the Flys connect to each other { if ( !bDontCreateObjects ) - AppendAllObjs( pTbl, pLayout ); + AppendAllObjs( pTable, pLayout ); bObjsDirect = true; } @@ -1631,20 +1631,20 @@ void MakeFrms( SwDoc *pDoc, const SwNodeIndex &rSttIdx, while( 0 != (pFrm = aNode2Layout.NextFrm()) ) { SwLayoutFrm *pUpper = pFrm->GetUpper(); - SwFtnFrm* pFtnFrm = pUpper->FindFtnFrm(); - bool bOldLock, bOldFtn; - if( pFtnFrm ) + SwFootnoteFrm* pFootnoteFrm = pUpper->FindFootnoteFrm(); + bool bOldLock, bOldFootnote; + if( pFootnoteFrm ) { - bOldFtn = pFtnFrm->IsColLocked(); - pFtnFrm->ColLock(); + bOldFootnote = pFootnoteFrm->IsColLocked(); + pFootnoteFrm->ColLock(); } else - bOldFtn = true; + bOldFootnote = true; SwSectionFrm* pSct = pUpper->FindSctFrm(); // Inside of footnotes only those areas are interesting that are inside of them. But // not the ones (e.g. column areas) in which are the footnote containers positioned. // #109767# Table frame is in section, insert section in cell frame. - if( pSct && ((pFtnFrm && !pSct->IsInFtn()) || pUpper->IsCellFrm()) ) + if( pSct && ((pFootnoteFrm && !pSct->IsInFootnote()) || pUpper->IsCellFrm()) ) pSct = NULL; if( pSct ) { // to prevent pTmp->MoveFwd from destroying the SectionFrm @@ -1704,8 +1704,8 @@ void MakeFrms( SwDoc *pDoc, const SwNodeIndex &rSttIdx, if( pMove ) { - if ( pMove->IsCntntFrm() ) - pTmp = static_cast<SwCntntFrm*>(pMove); + if ( pMove->IsContentFrm() ) + pTmp = static_cast<SwContentFrm*>(pMove); else if ( pMove->IsTabFrm() ) pTmp = static_cast<SwTabFrm*>(pMove); else if ( pMove->IsSctFrm() ) @@ -1780,9 +1780,9 @@ void MakeFrms( SwDoc *pDoc, const SwNodeIndex &rSttIdx, // depend on value of <bAllowMove> if( !bDontCreateObjects ) { - const SwFrmFmts *pTbl = pDoc->GetSpzFrmFmts(); - if( !pTbl->empty() ) - AppendAllObjs( pTbl, pUpper ); + const SwFrameFormats *pTable = pDoc->GetSpzFrameFormats(); + if( !pTable->empty() ) + AppendAllObjs( pTable, pUpper ); } // If nothing was added (e.g. a hidden section), the split must be reversed. @@ -1797,14 +1797,14 @@ void MakeFrms( SwDoc *pDoc, const SwNodeIndex &rSttIdx, SwPageFrm *pPage = pUpper->FindPageFrm(); SwFrm::CheckPageDescs( pPage, false ); - if( !bOldFtn ) - pFtnFrm->ColUnlock(); + if( !bOldFootnote ) + pFootnoteFrm->ColUnlock(); if( !bOldLock ) { pSct->ColUnlock(); // pSct might be empty (e.g. when inserting linked section containing further // sections) and can be destroyed in such cases. - if( !pSct->ContainsCntnt() ) + if( !pSct->ContainsContent() ) { pSct->DelEmpty( true ); pUpper->getRootFrm()->RemoveFromList( pSct ); @@ -1819,9 +1819,9 @@ void MakeFrms( SwDoc *pDoc, const SwNodeIndex &rSttIdx, SwBorderAttrs::SwBorderAttrs(const SwModify *pMod, const SwFrm *pConstructor) : SwCacheObj(pMod) - , rAttrSet(pConstructor->IsCntntFrm() - ? static_cast<const SwCntntFrm*>(pConstructor)->GetNode()->GetSwAttrSet() - : static_cast<const SwLayoutFrm*>(pConstructor)->GetFmt()->GetAttrSet()) + , rAttrSet(pConstructor->IsContentFrm() + ? static_cast<const SwContentFrm*>(pConstructor)->GetNode()->GetSwAttrSet() + : static_cast<const SwLayoutFrm*>(pConstructor)->GetFormat()->GetAttrSet()) , rUL(rAttrSet.GetULSpace()) // #i96772# // LRSpaceItem is copied due to the possibility that it is adjusted - see below @@ -1842,12 +1842,12 @@ SwBorderAttrs::SwBorderAttrs(const SwModify *pMod, const SwFrm *pConstructor) , nGetBottomLine(0) { // #i96772# - const SwTxtFrm* pTxtFrm = dynamic_cast<const SwTxtFrm*>(pConstructor); - if ( pTxtFrm ) + const SwTextFrm* pTextFrm = dynamic_cast<const SwTextFrm*>(pConstructor); + if ( pTextFrm ) { - pTxtFrm->GetTxtNode()->ClearLRSpaceItemDueToListLevelIndents( rLR ); + pTextFrm->GetTextNode()->ClearLRSpaceItemDueToListLevelIndents( rLR ); } - else if ( pConstructor->IsNoTxtFrm() ) + else if ( pConstructor->IsNoTextFrm() ) { rLR = SvxLRSpaceItem ( RES_LR_SPACE ); } @@ -1893,7 +1893,7 @@ long SwBorderAttrs::CalcRight( const SwFrm* pCaller ) const { long nRight=0; - if (!pCaller->IsTxtFrm() || !static_cast<const SwTxtFrm*>(pCaller)->GetTxtNode()->GetDoc()->GetDocumentSettingManager().get(DocumentSettingId::INVERT_BORDER_SPACING)) { + if (!pCaller->IsTextFrm() || !static_cast<const SwTextFrm*>(pCaller)->GetTextNode()->GetDoc()->GetDocumentSettingManager().get(DocumentSettingId::INVERT_BORDER_SPACING)) { // OD 23.01.2003 #106895# - for cell frame in R2L text direction the left // and right border are painted on the right respectively left. if ( pCaller->IsCellFrm() && pCaller->IsRightToLeft() ) @@ -1903,26 +1903,26 @@ long SwBorderAttrs::CalcRight( const SwFrm* pCaller ) const } // for paragraphs, "left" is "before text" and "right" is "after text" - if ( pCaller->IsTxtFrm() && pCaller->IsRightToLeft() ) + if ( pCaller->IsTextFrm() && pCaller->IsRightToLeft() ) nRight += rLR.GetLeft(); else nRight += rLR.GetRight(); // correction: retrieve left margin for numbering in R2L-layout - if ( pCaller->IsTxtFrm() && pCaller->IsRightToLeft() ) + if ( pCaller->IsTextFrm() && pCaller->IsRightToLeft() ) { - nRight += static_cast<const SwTxtFrm*>(pCaller)->GetTxtNode()->GetLeftMarginWithNum(); + nRight += static_cast<const SwTextFrm*>(pCaller)->GetTextNode()->GetLeftMarginWithNum(); } return nRight; } /// Tries to detect if this paragraph has a floating table attached. -static bool lcl_hasTabFrm(const SwTxtFrm* pTxtFrm) +static bool lcl_hasTabFrm(const SwTextFrm* pTextFrm) { - if (pTxtFrm->GetDrawObjs()) + if (pTextFrm->GetDrawObjs()) { - const SwSortedObjs* pSortedObjs = pTxtFrm->GetDrawObjs(); + const SwSortedObjs* pSortedObjs = pTextFrm->GetDrawObjs(); if (pSortedObjs->size() > 0) { SwAnchoredObject* pObject = (*pSortedObjs)[0]; @@ -1941,7 +1941,7 @@ long SwBorderAttrs::CalcLeft( const SwFrm *pCaller ) const { long nLeft=0; - if (!pCaller->IsTxtFrm() || !static_cast<const SwTxtFrm*>(pCaller)->GetTxtNode()->GetDoc()->GetDocumentSettingManager().get(DocumentSettingId::INVERT_BORDER_SPACING)) { + if (!pCaller->IsTextFrm() || !static_cast<const SwTextFrm*>(pCaller)->GetTextNode()->GetDoc()->GetDocumentSettingManager().get(DocumentSettingId::INVERT_BORDER_SPACING)) { // OD 23.01.2003 #106895# - for cell frame in R2L text direction the left // and right border are painted on the right respectively left. if ( pCaller->IsCellFrm() && pCaller->IsRightToLeft() ) @@ -1951,21 +1951,21 @@ long SwBorderAttrs::CalcLeft( const SwFrm *pCaller ) const } // for paragraphs, "left" is "before text" and "right" is "after text" - if ( pCaller->IsTxtFrm() && pCaller->IsRightToLeft() ) + if ( pCaller->IsTextFrm() && pCaller->IsRightToLeft() ) nLeft += rLR.GetRight(); else { bool bIgnoreMargin = false; - if (pCaller->IsTxtFrm()) + if (pCaller->IsTextFrm()) { - const SwTxtFrm* pTxtFrm = static_cast<const SwTxtFrm*>(pCaller); - if (pTxtFrm->GetTxtNode()->GetDoc()->GetDocumentSettingManager().get(DocumentSettingId::FLOATTABLE_NOMARGINS)) + const SwTextFrm* pTextFrm = static_cast<const SwTextFrm*>(pCaller); + if (pTextFrm->GetTextNode()->GetDoc()->GetDocumentSettingManager().get(DocumentSettingId::FLOATTABLE_NOMARGINS)) { // If this is explicitly requested, ignore the margins next to the floating table. - if (lcl_hasTabFrm(pTxtFrm)) + if (lcl_hasTabFrm(pTextFrm)) bIgnoreMargin = true; // TODO here we only handle the first two paragraphs, would be nice to generalize this. - else if (pTxtFrm->FindPrev() && pTxtFrm->FindPrev()->IsTxtFrm() && lcl_hasTabFrm(static_cast<const SwTxtFrm*>(pTxtFrm->FindPrev()))) + else if (pTextFrm->FindPrev() && pTextFrm->FindPrev()->IsTextFrm() && lcl_hasTabFrm(static_cast<const SwTextFrm*>(pTextFrm->FindPrev()))) bIgnoreMargin = true; } } @@ -1974,9 +1974,9 @@ long SwBorderAttrs::CalcLeft( const SwFrm *pCaller ) const } // correction: do not retrieve left margin for numbering in R2L-layout - if ( pCaller->IsTxtFrm() && !pCaller->IsRightToLeft() ) + if ( pCaller->IsTextFrm() && !pCaller->IsRightToLeft() ) { - nLeft += static_cast<const SwTxtFrm*>(pCaller)->GetTxtNode()->GetLeftMarginWithNum(); + nLeft += static_cast<const SwTextFrm*>(pCaller)->GetTextNode()->GetLeftMarginWithNum(); } return nLeft; @@ -2088,7 +2088,7 @@ void SwBorderAttrs::_CalcJoinedWithPrev( const SwFrm& _rFrm, // set default bJoinedWithPrev = false; - if ( _rFrm.IsTxtFrm() ) + if ( _rFrm.IsTextFrm() ) { // text frame can potentially join with previous text frame, if // corresponding attribute set is set at previous text frame. @@ -2096,12 +2096,12 @@ void SwBorderAttrs::_CalcJoinedWithPrev( const SwFrm& _rFrm, // one as previous frame. const SwFrm* pPrevFrm = _pPrevFrm ? _pPrevFrm : _rFrm.GetPrev(); // OD 2004-02-13 #i25029# - skip hidden text frames. - while ( pPrevFrm && pPrevFrm->IsTxtFrm() && - static_cast<const SwTxtFrm*>(pPrevFrm)->IsHiddenNow() ) + while ( pPrevFrm && pPrevFrm->IsTextFrm() && + static_cast<const SwTextFrm*>(pPrevFrm)->IsHiddenNow() ) { pPrevFrm = pPrevFrm->GetPrev(); } - if ( pPrevFrm && pPrevFrm->IsTxtFrm() && + if ( pPrevFrm && pPrevFrm->IsTextFrm() && pPrevFrm->GetAttrSet()->GetParaConnectBorder().GetValue() ) { @@ -2122,18 +2122,18 @@ void SwBorderAttrs::_CalcJoinedWithNext( const SwFrm& _rFrm ) // set default bJoinedWithNext = false; - if ( _rFrm.IsTxtFrm() ) + if ( _rFrm.IsTextFrm() ) { // text frame can potentially join with next text frame, if // corresponding attribute set is set at current text frame. // OD 2004-02-13 #i25029# - get next frame, but skip hidden text frames. const SwFrm* pNextFrm = _rFrm.GetNext(); - while ( pNextFrm && pNextFrm->IsTxtFrm() && - static_cast<const SwTxtFrm*>(pNextFrm)->IsHiddenNow() ) + while ( pNextFrm && pNextFrm->IsTextFrm() && + static_cast<const SwTextFrm*>(pNextFrm)->IsHiddenNow() ) { pNextFrm = pNextFrm->GetNext(); } - if ( pNextFrm && pNextFrm->IsTxtFrm() && + if ( pNextFrm && pNextFrm->IsTextFrm() && _rFrm.GetAttrSet()->GetParaConnectBorder().GetValue() ) { @@ -2206,12 +2206,12 @@ void SwBorderAttrs::_GetBottomLine( const SwFrm& _rFrm ) SwBorderAttrAccess::SwBorderAttrAccess( SwCache &rCach, const SwFrm *pFrm ) : SwCacheAccess( rCach, - (pFrm->IsCntntFrm() ? - (void*)static_cast<const SwCntntFrm*>(pFrm)->GetNode() : - (void*)static_cast<const SwLayoutFrm*>(pFrm)->GetFmt()), - (pFrm->IsCntntFrm() ? - ((SwModify*)static_cast<const SwCntntFrm*>(pFrm)->GetNode())->IsInCache() : - ((SwModify*)static_cast<const SwLayoutFrm*>(pFrm)->GetFmt())->IsInCache()) ), + (pFrm->IsContentFrm() ? + (void*)static_cast<const SwContentFrm*>(pFrm)->GetNode() : + (void*)static_cast<const SwLayoutFrm*>(pFrm)->GetFormat()), + (pFrm->IsContentFrm() ? + ((SwModify*)static_cast<const SwContentFrm*>(pFrm)->GetNode())->IsInCache() : + ((SwModify*)static_cast<const SwLayoutFrm*>(pFrm)->GetFormat())->IsInCache()) ), pConstructor( pFrm ) { } @@ -2349,7 +2349,7 @@ const SdrObject *SwOrderIter::Prev() // Do not look at each neighbor one by one to set all pointers correctly. // It is sufficient to detach a part of a chain and check if another chain needs to be added // when attaching it again. Only the pointers necessary for the chain connection need to be -// adjusted. The correction happens in RestoreCntnt(). In between all access is restricted. +// adjusted. The correction happens in RestoreContent(). In between all access is restricted. // During this action, the Flys are detached from the page. // #115759# - 'remove' also drawing object from page and @@ -2379,12 +2379,12 @@ static void lcl_RemoveObjsFromPage( SwFrm* _pFrm ) ::lcl_RemoveObjsFromPage( pFlyFrm ); } - SwCntntFrm* pCnt = pFlyFrm->ContainsCntnt(); + SwContentFrm* pCnt = pFlyFrm->ContainsContent(); while ( pCnt ) { if ( pCnt->GetDrawObjs() ) ::lcl_RemoveObjsFromPage( pCnt ); - pCnt = pCnt->GetNextCntntFrm(); + pCnt = pCnt->GetNextContentFrm(); } if ( pFlyFrm->IsFlyFreeFrm() ) { @@ -2395,7 +2395,7 @@ static void lcl_RemoveObjsFromPage( SwFrm* _pFrm ) // #115759# - remove also drawing objects from page else if ( pObj->ISA(SwAnchoredDrawObject) ) { - if (pObj->GetFrmFmt().GetAnchor().GetAnchorId() != FLY_AS_CHAR) + if (pObj->GetFrameFormat().GetAnchor().GetAnchorId() != FLY_AS_CHAR) { pObj->GetPageFrm()->RemoveDrawObjFromPage( *(static_cast<SwAnchoredDrawObject*>(pObj)) ); @@ -2404,20 +2404,20 @@ static void lcl_RemoveObjsFromPage( SwFrm* _pFrm ) } } -SwFrm *SaveCntnt( SwLayoutFrm *pLay, SwFrm *pStart ) +SwFrm *SaveContent( SwLayoutFrm *pLay, SwFrm *pStart ) { if( pLay->IsSctFrm() && pLay->Lower() && pLay->Lower()->IsColumnFrm() ) - sw_RemoveFtns( static_cast<SwColumnFrm*>(pLay->Lower()), true, true ); + sw_RemoveFootnotes( static_cast<SwColumnFrm*>(pLay->Lower()), true, true ); SwFrm *pSav; if ( 0 == (pSav = pLay->ContainsAny()) ) return 0; - if( pSav->IsInFtn() && !pLay->IsInFtn() ) + if( pSav->IsInFootnote() && !pLay->IsInFootnote() ) { do pSav = pSav->FindNext(); - while( pSav && pSav->IsInFtn() ); + while( pSav && pSav->IsInFootnote() ); if( !pSav || !pLay->IsAnLower( pSav ) ) return NULL; } @@ -2453,20 +2453,20 @@ SwFrm *SaveCntnt( SwLayoutFrm *pLay, SwFrm *pStart ) { if( bGo ) { - if ( pFloat->IsCntntFrm() ) + if ( pFloat->IsContentFrm() ) { if ( pFloat->GetDrawObjs() ) - ::lcl_RemoveObjsFromPage( static_cast<SwCntntFrm*>(pFloat) ); + ::lcl_RemoveObjsFromPage( static_cast<SwContentFrm*>(pFloat) ); } else if ( pFloat->IsTabFrm() || pFloat->IsSctFrm() ) { - SwCntntFrm *pCnt = static_cast<SwLayoutFrm*>(pFloat)->ContainsCntnt(); + SwContentFrm *pCnt = static_cast<SwLayoutFrm*>(pFloat)->ContainsContent(); if( pCnt ) { do { if ( pCnt->GetDrawObjs() ) ::lcl_RemoveObjsFromPage( pCnt ); - pCnt = pCnt->GetNextCntntFrm(); + pCnt = pCnt->GetNextContentFrm(); } while ( pCnt && static_cast<SwLayoutFrm*>(pFloat)->IsAnLower( pCnt ) ); } } @@ -2496,8 +2496,8 @@ SwFrm *SaveCntnt( SwLayoutFrm *pLay, SwFrm *pStart ) if( bGo ) pFloat->mpUpper = NULL; - if( !pLay->IsInFtn() ) - while( pTmp && pTmp->IsInFtn() ) + if( !pLay->IsInFootnote() ) + while( pTmp && pTmp->IsInFootnote() ) pTmp = pTmp->FindNext(); if ( !pLay->IsAnLower( pTmp ) ) @@ -2548,18 +2548,18 @@ static void lcl_AddObjsToPage( SwFrm* _pFrm, SwPageFrm* _pPage ) ::lcl_AddObjsToPage( pFlyFrm, _pPage ); } - SwCntntFrm *pCnt = pFlyFrm->ContainsCntnt(); + SwContentFrm *pCnt = pFlyFrm->ContainsContent(); while ( pCnt ) { if ( pCnt->GetDrawObjs() ) ::lcl_AddObjsToPage( pCnt, _pPage ); - pCnt = pCnt->GetNextCntntFrm(); + pCnt = pCnt->GetNextContentFrm(); } } // #115759# - remove also drawing objects from page else if ( pObj->ISA(SwAnchoredDrawObject) ) { - if (pObj->GetFrmFmt().GetAnchor().GetAnchorId() != FLY_AS_CHAR) + if (pObj->GetFrameFormat().GetAnchor().GetAnchorId() != FLY_AS_CHAR) { pObj->InvalidateObjPos(); _pPage->AppendDrawObjToPage( @@ -2569,14 +2569,14 @@ static void lcl_AddObjsToPage( SwFrm* _pFrm, SwPageFrm* _pPage ) } } -void RestoreCntnt( SwFrm *pSav, SwLayoutFrm *pParent, SwFrm *pSibling, bool bGrow ) +void RestoreContent( SwFrm *pSav, SwLayoutFrm *pParent, SwFrm *pSibling, bool bGrow ) { - OSL_ENSURE( pSav && pParent, "no Save or Parent provided for RestoreCntnt." ); + OSL_ENSURE( pSav && pParent, "no Save or Parent provided for RestoreContent." ); SWRECTFN( pParent ) // If there are already FlowFrms below the new parent, so add the chain (starting with pSav) // after the last one. The parts are inserted and invalidated if needed. - // On the way, the Flys of the CntntFrms are registered at the page. + // On the way, the Flys of the ContentFrms are registered at the page. SwPageFrm *pPage = pParent->FindPageFrm(); @@ -2601,11 +2601,11 @@ void RestoreCntnt( SwFrm *pSav, SwLayoutFrm *pParent, SwFrm *pSibling, bool bGro pParent->m_pLower = pSav; pSav->mpUpper = pParent; // set here already, so that it is explicit when invalidating - if ( pSav->IsCntntFrm() ) - static_cast<SwCntntFrm*>(pSav)->InvalidatePage( pPage ); + if ( pSav->IsContentFrm() ) + static_cast<SwContentFrm*>(pSav)->InvalidatePage( pPage ); else { // pSav might be an empty SectFrm - SwCntntFrm* pCnt = pParent->ContainsCntnt(); + SwContentFrm* pCnt = pParent->ContainsContent(); if( pCnt ) pCnt->InvalidatePage( pPage ); } @@ -2619,27 +2619,27 @@ void RestoreCntnt( SwFrm *pSav, SwLayoutFrm *pParent, SwFrm *pSibling, bool bGro nGrowVal += (pSav->Frm().*fnRect->fnGetHeight)(); pSav->_InvalidateAll(); - // register Flys, if TxtFrms than also invalidate appropriately - if ( pSav->IsCntntFrm() ) + // register Flys, if TextFrms than also invalidate appropriately + if ( pSav->IsContentFrm() ) { - if ( pSav->IsTxtFrm() && - static_cast<SwTxtFrm*>(pSav)->GetCacheIdx() != USHRT_MAX ) - static_cast<SwTxtFrm*>(pSav)->Init(); // I am its friend + if ( pSav->IsTextFrm() && + static_cast<SwTextFrm*>(pSav)->GetCacheIdx() != USHRT_MAX ) + static_cast<SwTextFrm*>(pSav)->Init(); // I am its friend if ( pPage && pSav->GetDrawObjs() ) - ::lcl_AddObjsToPage( static_cast<SwCntntFrm*>(pSav), pPage ); + ::lcl_AddObjsToPage( static_cast<SwContentFrm*>(pSav), pPage ); } else - { SwCntntFrm *pBlub = static_cast<SwLayoutFrm*>(pSav)->ContainsCntnt(); + { SwContentFrm *pBlub = static_cast<SwLayoutFrm*>(pSav)->ContainsContent(); if( pBlub ) { do { if ( pPage && pBlub->GetDrawObjs() ) ::lcl_AddObjsToPage( pBlub, pPage ); - if( pBlub->IsTxtFrm() && static_cast<SwTxtFrm*>(pBlub)->HasFtn() && - static_cast<SwTxtFrm*>(pBlub)->GetCacheIdx() != USHRT_MAX ) - static_cast<SwTxtFrm*>(pBlub)->Init(); // I am its friend - pBlub = pBlub->GetNextCntntFrm(); + if( pBlub->IsTextFrm() && static_cast<SwTextFrm*>(pBlub)->HasFootnote() && + static_cast<SwTextFrm*>(pBlub)->GetCacheIdx() != USHRT_MAX ) + static_cast<SwTextFrm*>(pBlub)->Init(); // I am its friend + pBlub = pBlub->GetNextContentFrm(); } while ( pBlub && static_cast<SwLayoutFrm*>(pSav)->IsAnLower( pBlub )); } } @@ -2659,11 +2659,11 @@ void RestoreCntnt( SwFrm *pSav, SwLayoutFrm *pParent, SwFrm *pSibling, bool bGro } SwPageFrm * InsertNewPage( SwPageDesc &rDesc, SwFrm *pUpper, - bool bOdd, bool bFirst, bool bInsertEmpty, bool bFtn, + bool bOdd, bool bFirst, bool bInsertEmpty, bool bFootnote, SwFrm *pSibling ) { SwPageFrm *pRet; - SwDoc *pDoc = static_cast<SwLayoutFrm*>(pUpper)->GetFmt()->GetDoc(); + SwDoc *pDoc = static_cast<SwLayoutFrm*>(pUpper)->GetFormat()->GetDoc(); if (bFirst) { if (rDesc.IsFirstShared()) @@ -2672,38 +2672,38 @@ SwPageFrm * InsertNewPage( SwPageDesc &rDesc, SwFrm *pUpper, // FIXME: is this still needed? if (bOdd) { - rDesc.GetFirstMaster().SetFmtAttr( rDesc.GetMaster().GetHeader() ); - rDesc.GetFirstMaster().SetFmtAttr( rDesc.GetMaster().GetFooter() ); + rDesc.GetFirstMaster().SetFormatAttr( rDesc.GetMaster().GetHeader() ); + rDesc.GetFirstMaster().SetFormatAttr( rDesc.GetMaster().GetFooter() ); // fdo#60250 copy margins for mirrored pages - rDesc.GetFirstMaster().SetFmtAttr( rDesc.GetMaster().GetLRSpace() ); + rDesc.GetFirstMaster().SetFormatAttr( rDesc.GetMaster().GetLRSpace() ); } else { - rDesc.GetFirstLeft().SetFmtAttr( rDesc.GetLeft().GetHeader() ); - rDesc.GetFirstLeft().SetFmtAttr( rDesc.GetLeft().GetFooter() ); - rDesc.GetFirstLeft().SetFmtAttr( rDesc.GetLeft().GetLRSpace() ); + rDesc.GetFirstLeft().SetFormatAttr( rDesc.GetLeft().GetHeader() ); + rDesc.GetFirstLeft().SetFormatAttr( rDesc.GetLeft().GetFooter() ); + rDesc.GetFirstLeft().SetFormatAttr( rDesc.GetLeft().GetLRSpace() ); } } } - SwFrmFmt *pFmt(bOdd ? rDesc.GetRightFmt(bFirst) : rDesc.GetLeftFmt(bFirst)); - // If there is no FrmFmt for this page, add an empty page - if ( !pFmt ) + SwFrameFormat *pFormat(bOdd ? rDesc.GetRightFormat(bFirst) : rDesc.GetLeftFormat(bFirst)); + // If there is no FrameFormat for this page, add an empty page + if ( !pFormat ) { - pFmt = bOdd ? rDesc.GetLeftFmt() : rDesc.GetRightFmt(); - OSL_ENSURE( pFmt, "Descriptor without any format?!" ); + pFormat = bOdd ? rDesc.GetLeftFormat() : rDesc.GetRightFormat(); + OSL_ENSURE( pFormat, "Descriptor without any format?!" ); bInsertEmpty = !bInsertEmpty; } if( bInsertEmpty ) { SwPageDesc *pTmpDesc = pSibling && pSibling->GetPrev() ? static_cast<SwPageFrm*>(pSibling->GetPrev())->GetPageDesc() : &rDesc; - pRet = new SwPageFrm( pDoc->GetEmptyPageFmt(), pUpper, pTmpDesc ); + pRet = new SwPageFrm( pDoc->GetEmptyPageFormat(), pUpper, pTmpDesc ); pRet->Paste( pUpper, pSibling ); - pRet->PreparePage( bFtn ); + pRet->PreparePage( bFootnote ); } - pRet = new SwPageFrm( pFmt, pUpper, &rDesc ); + pRet = new SwPageFrm( pFormat, pUpper, &rDesc ); pRet->Paste( pUpper, pSibling ); - pRet->PreparePage( bFtn ); + pRet->PreparePage( bFootnote ); if ( pRet->GetNext() ) SwRootFrm::AssertPageFlys( pRet ); return pRet; @@ -2781,7 +2781,7 @@ void Notify( SwFlyFrm *pFly, SwPageFrm *pOld, const SwRect &rOld, if ( rOld.Pos() != aFrm.Pos() ) { // changed position, invalidate old and new area if ( rOld.HasArea() && - rOld.Left()+pFly->GetFmt()->GetLRSpace().GetLeft() < FAR_AWAY ) + rOld.Left()+pFly->GetFormat()->GetLRSpace().GetLeft() < FAR_AWAY ) { pFly->NotifyBackground( pOld, rOld, PREP_FLY_LEAVE ); } @@ -2841,7 +2841,7 @@ void Notify( SwFlyFrm *pFly, SwPageFrm *pOld, const SwRect &rOld, } } else if ( pOldPrt && *pOldPrt != pFly->Prt() && - pFly->GetFmt()->GetSurround().IsContour() ) + pFly->GetFormat()->GetSurround().IsContour() ) { // #i24097# pFly->NotifyBackground( pFly->FindPageFrm(), aFrm, PREP_FLY_ARRIVE ); @@ -2860,7 +2860,7 @@ static void lcl_CheckFlowBack( SwFrm* pFrm, const SwRect &rRect ) } else if( !pFrm->GetNext() && nBottom > pFrm->Frm().Bottom() ) { - if( pFrm->IsCntntFrm() && static_cast<SwCntntFrm*>(pFrm)->HasFollow() ) + if( pFrm->IsContentFrm() && static_cast<SwContentFrm*>(pFrm)->HasFollow() ) pFrm->InvalidateSize(); else pFrm->InvalidateNextPos(); @@ -2869,10 +2869,10 @@ static void lcl_CheckFlowBack( SwFrm* pFrm, const SwRect &rRect ) } } -static void lcl_NotifyCntnt( const SdrObject *pThis, SwCntntFrm *pCnt, +static void lcl_NotifyContent( const SdrObject *pThis, SwContentFrm *pCnt, const SwRect &rRect, const PrepareHint eHint ) { - if ( pCnt->IsTxtFrm() ) + if ( pCnt->IsTextFrm() ) { SwRect aCntPrt( pCnt->Prt() ); aCntPrt.Pos() += pCnt->Frm().Pos(); @@ -2898,11 +2898,11 @@ static void lcl_NotifyCntnt( const SdrObject *pThis, SwCntntFrm *pCnt, SwFlyFrm *pFly = static_cast<SwFlyFrm*>(pObj); if ( pFly->IsFlyInCntFrm() ) { - SwCntntFrm *pCntnt = pFly->ContainsCntnt(); - while ( pCntnt ) + SwContentFrm *pContent = pFly->ContainsContent(); + while ( pContent ) { - ::lcl_NotifyCntnt( pThis, pCntnt, rRect, eHint ); - pCntnt = pCntnt->GetNextCntntFrm(); + ::lcl_NotifyContent( pThis, pContent, rRect, eHint ); + pContent = pContent->GetNextContentFrm(); } } } @@ -2939,7 +2939,7 @@ void Notify_Background( const SdrObject* pObj, pArea = pAnchor->FindFlyFrm(); else pArea = pPage; - SwCntntFrm *pCnt = 0; + SwContentFrm *pCnt = 0; if ( pArea ) { if( PREP_FLY_ARRIVE != eHint ) @@ -2957,14 +2957,14 @@ void Notify_Background( const SdrObject* pObj, // #i3317# - The complete area has always been // processed. { - pCnt = pArea->ContainsCntnt(); + pCnt = pArea->ContainsContent(); } } SwFrm *pLastTab = 0; while ( pCnt && pArea && pArea->IsAnLower( pCnt ) ) { - ::lcl_NotifyCntnt( pObj, pCnt, rRect, eHint ); + ::lcl_NotifyContent( pObj, pCnt, rRect, eHint ); if ( pCnt->IsInTab() ) { SwLayoutFrm* pCell = pCnt->GetUpper(); @@ -2975,7 +2975,7 @@ void Notify_Background( const SdrObject* pObj, ( pCell->Frm().IsOver( pObj->GetLastBoundRect() ) || pCell->Frm().IsOver( rRect ) ) ) { - const SwFmtVertOrient &rOri = pCell->GetFmt()->GetVertOrient(); + const SwFormatVertOrient &rOri = pCell->GetFormat()->GetVertOrient(); if ( text::VertOrientation::NONE != rOri.GetVertOrient() ) pCell->InvalidatePrt(); } @@ -2994,7 +2994,7 @@ void Notify_Background( const SdrObject* pObj, } } } - pCnt = pCnt->GetNextCntntFrm(); + pCnt = pCnt->GetNextContentFrm(); } // #128702# - make code robust if ( pPage && pPage->GetSortedObjs() ) @@ -3016,11 +3016,11 @@ void Notify_Background( const SdrObject* pObj, (!pFly->IsLowerOf( pFlyFrm ) && pFly->GetVirtDrawObj()->GetOrdNumDirect() < pObj->GetOrdNumDirect())) { - pCnt = pFly->ContainsCntnt(); + pCnt = pFly->ContainsContent(); while ( pCnt ) { - ::lcl_NotifyCntnt( pObj, pCnt, rRect, eHint ); - pCnt = pCnt->GetNextCntntFrm(); + ::lcl_NotifyContent( pObj, pCnt, rRect, eHint ); + pCnt = pCnt->GetNextContentFrm(); } } if( pFly->IsFlyLayFrm() ) @@ -3042,7 +3042,7 @@ void Notify_Background( const SdrObject* pObj, pFly->GetVirtDrawObj()->GetOrdNumDirect() && pFlyFrm && !pFly->IsLowerOf( pFlyFrm ) ) { - const SwFmtHoriOrient &rH = pFly->GetFmt()->GetHoriOrient(); + const SwFormatHoriOrient &rH = pFly->GetFormat()->GetHoriOrient(); if ( text::HoriOrientation::NONE != rH.GetHoriOrient() && text::HoriOrientation::CENTER != rH.GetHoriOrient() && ( !pFly->IsAutoPos() || text::RelOrientation::CHAR != rH.GetRelationOrient() ) && @@ -3069,14 +3069,14 @@ void Notify_Background( const SdrObject* pObj, /// is a chained border or a footnote, the "virtual" Upper might be returne. const SwFrm* GetVirtualUpper( const SwFrm* pFrm, const Point& rPos ) { - if( pFrm->IsTxtFrm() ) + if( pFrm->IsTextFrm() ) { pFrm = pFrm->GetUpper(); if( !pFrm->Frm().IsInside( rPos ) ) { - if( pFrm->IsFtnFrm() ) + if( pFrm->IsFootnoteFrm() ) { - const SwFtnFrm* pTmp = static_cast<const SwFtnFrm*>(pFrm)->GetFollow(); + const SwFootnoteFrm* pTmp = static_cast<const SwFootnoteFrm*>(pFrm)->GetFollow(); while( pTmp ) { if( pTmp->Frm().IsInside( rPos ) ) @@ -3174,15 +3174,15 @@ bool IsFrmInSameKontext( const SwFrm *pInnerFrm, const SwFrm *pFrm ) static SwTwips lcl_CalcCellRstHeight( SwLayoutFrm *pCell ) { - if ( pCell->Lower()->IsCntntFrm() || pCell->Lower()->IsSctFrm() ) + if ( pCell->Lower()->IsContentFrm() || pCell->Lower()->IsSctFrm() ) { SwFrm *pLow = pCell->Lower(); long nHeight = 0, nFlyAdd = 0; do { long nLow = pLow->Frm().Height(); - if( pLow->IsTxtFrm() && static_cast<SwTxtFrm*>(pLow)->IsUndersized() ) - nLow += static_cast<SwTxtFrm*>(pLow)->GetParHeight()-pLow->Prt().Height(); + if( pLow->IsTextFrm() && static_cast<SwTextFrm*>(pLow)->IsUndersized() ) + nLow += static_cast<SwTextFrm*>(pLow)->GetParHeight()-pLow->Prt().Height(); else if( pLow->IsSctFrm() && static_cast<SwSectionFrm*>(pLow)->IsUndersized() ) nLow += static_cast<SwSectionFrm*>(pLow)->Undersize(); nFlyAdd = std::max( 0L, nFlyAdd - nLow ); @@ -3366,8 +3366,8 @@ SwFrm* GetFrmOfModify( const SwRootFrm* pLayout, SwModify const& rMod, sal_uInt1 } } while( bClientIterChanged ); - if( pPos && pMinFrm && pMinFrm->IsTxtFrm() ) - return static_cast<SwTxtFrm*>(pMinFrm)->GetFrmAtPos( *pPos ); + if( pPos && pMinFrm && pMinFrm->IsTextFrm() ) + return static_cast<SwTextFrm*>(pMinFrm)->GetFrmAtPos( *pPos ); return pMinFrm; } @@ -3378,7 +3378,7 @@ bool IsExtraData( const SwDoc *pDoc ) return rInf.IsPaintLineNumbers() || rInf.IsCountInFlys() || ((sal_Int16)SW_MOD()->GetRedlineMarkPos() != text::HoriOrientation::NONE && - !pDoc->getIDocumentRedlineAccess().GetRedlineTbl().empty()); + !pDoc->getIDocumentRedlineAccess().GetRedlineTable().empty()); } // OD 22.09.2003 #110978# @@ -3432,12 +3432,12 @@ void GetSpacingValuesOfFrm( const SwFrm& rFrm, onLineSpacing = 0; obIsLineSpacingProportional = false; - if ( rFrm.IsTxtFrm() ) + if ( rFrm.IsTextFrm() ) { - onLineSpacing = static_cast<const SwTxtFrm&>(rFrm).GetLineSpace(); + onLineSpacing = static_cast<const SwTextFrm&>(rFrm).GetLineSpace(); obIsLineSpacingProportional = onLineSpacing != 0 && - static_cast<const SwTxtFrm&>(rFrm).GetLineSpace( true ) == 0; + static_cast<const SwTextFrm&>(rFrm).GetLineSpace( true ) == 0; } OSL_ENSURE( onLowerSpacing >= 0 && onLineSpacing >= 0, @@ -3446,26 +3446,26 @@ void GetSpacingValuesOfFrm( const SwFrm& rFrm, } /// get the content of the table cell, skipping content from nested tables -const SwCntntFrm* GetCellCntnt( const SwLayoutFrm& rCell ) +const SwContentFrm* GetCellContent( const SwLayoutFrm& rCell ) { - const SwCntntFrm* pCntnt = rCell.ContainsCntnt(); + const SwContentFrm* pContent = rCell.ContainsContent(); const SwTabFrm* pTab = rCell.FindTabFrm(); - while ( pCntnt && rCell.IsAnLower( pCntnt ) ) + while ( pContent && rCell.IsAnLower( pContent ) ) { - const SwTabFrm* pTmpTab = pCntnt->FindTabFrm(); + const SwTabFrm* pTmpTab = pContent->FindTabFrm(); if ( pTmpTab != pTab ) { - pCntnt = pTmpTab->FindLastCntnt(); - if ( pCntnt ) + pContent = pTmpTab->FindLastContent(); + if ( pContent ) - pCntnt = pCntnt->FindNextCnt(); + pContent = pContent->FindNextCnt(); } else break; } - return pCntnt; + return pContent; } /// Can be used to check if a frame has been deleted diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx index 23f683ae53bf..4836695768c2 100644 --- a/sw/source/core/layout/ftnfrm.cxx +++ b/sw/source/core/layout/ftnfrm.cxx @@ -36,50 +36,50 @@ #define ENDNOTE 0x80000000 -/// Search the position of an attribute in the FtnArray at the document, +/// Search the position of an attribute in the FootnoteArray at the document, /// because all footnotes are located there, ordered by their index. -static sal_uLong lcl_FindFtnPos( const SwDoc *pDoc, const SwTxtFtn *pAttr ) +static sal_uLong lcl_FindFootnotePos( const SwDoc *pDoc, const SwTextFootnote *pAttr ) { - const SwFtnIdxs &rFtnIdxs = pDoc->GetFtnIdxs(); + const SwFootnoteIdxs &rFootnoteIdxs = pDoc->GetFootnoteIdxs(); - SwTxtFtn* pBla = const_cast<SwTxtFtn*>(pAttr); - SwFtnIdxs::const_iterator it = rFtnIdxs.find( pBla ); - if ( it != rFtnIdxs.end() ) + SwTextFootnote* pBla = const_cast<SwTextFootnote*>(pAttr); + SwFootnoteIdxs::const_iterator it = rFootnoteIdxs.find( pBla ); + if ( it != rFootnoteIdxs.end() ) { - sal_uLong nRet = it - rFtnIdxs.begin(); - if( pAttr->GetFtn().IsEndNote() ) + sal_uLong nRet = it - rFootnoteIdxs.begin(); + if( pAttr->GetFootnote().IsEndNote() ) return nRet + ENDNOTE; return nRet; } - OSL_ENSURE( !pDoc, "FtnPos not found." ); + OSL_ENSURE( !pDoc, "FootnotePos not found." ); return 0; } -bool SwFtnFrm::operator<( const SwTxtFtn* pTxtFtn ) const +bool SwFootnoteFrm::operator<( const SwTextFootnote* pTextFootnote ) const { - const SwDoc* pDoc = GetFmt()->GetDoc(); - OSL_ENSURE( pDoc, "SwFtnFrm: Missing doc!" ); - return lcl_FindFtnPos( pDoc, GetAttr() ) < - lcl_FindFtnPos( pDoc, pTxtFtn ); + const SwDoc* pDoc = GetFormat()->GetDoc(); + OSL_ENSURE( pDoc, "SwFootnoteFrm: Missing doc!" ); + return lcl_FindFootnotePos( pDoc, GetAttr() ) < + lcl_FindFootnotePos( pDoc, pTextFootnote ); } /* |* -|* bool lcl_NextFtnBoss( SwFtnBossFrm* pBoss, SwPageFrm* pPage) -|* sets pBoss on the next SwFtnBossFrm, which can either be a column +|* bool lcl_NextFootnoteBoss( SwFootnoteBossFrm* pBoss, SwPageFrm* pPage) +|* sets pBoss on the next SwFootnoteBossFrm, which can either be a column |* or a page (without columns). If the page changes meanwhile, |* pPage contains the new page and this function returns true. |* |*/ -static bool lcl_NextFtnBoss( SwFtnBossFrm* &rpBoss, SwPageFrm* &rpPage, +static bool lcl_NextFootnoteBoss( SwFootnoteBossFrm* &rpBoss, SwPageFrm* &rpPage, bool bDontLeave ) { if( rpBoss->IsColumnFrm() ) { if( rpBoss->GetNext() ) { - rpBoss = static_cast<SwFtnBossFrm*>(rpBoss->GetNext()); //next column + rpBoss = static_cast<SwFootnoteBossFrm*>(rpBoss->GetNext()); //next column return false; } if( rpBoss->IsInSct() ) @@ -108,7 +108,7 @@ static bool lcl_NextFtnBoss( SwFtnBossFrm* &rpBoss, SwPageFrm* &rpPage, { SwLayoutFrm* pBody = rpPage->FindBodyCont(); if( pBody && pBody->Lower() && pBody->Lower()->IsColumnFrm() ) - rpBoss = static_cast<SwFtnBossFrm*>(pBody->Lower()); // first column + rpBoss = static_cast<SwFootnoteBossFrm*>(pBody->Lower()); // first column } return true; } @@ -142,26 +142,26 @@ static sal_uInt16 lcl_ColumnNum( const SwFrm* pBoss ) return nRet; } -SwFtnContFrm::SwFtnContFrm( SwFrmFmt *pFmt, SwFrm* pSib ): - SwLayoutFrm( pFmt, pSib ) +SwFootnoteContFrm::SwFootnoteContFrm( SwFrameFormat *pFormat, SwFrm* pSib ): + SwLayoutFrm( pFormat, pSib ) { mnFrmType = FRM_FTNCONT; } // lcl_Undersize(..) walks over a SwFrm and its contents -// and returns the sum of all requested TxtFrm magnifications. +// and returns the sum of all requested TextFrm magnifications. static long lcl_Undersize( const SwFrm* pFrm ) { long nRet = 0; SWRECTFN( pFrm ) - if( pFrm->IsTxtFrm() ) + if( pFrm->IsTextFrm() ) { - if( static_cast<const SwTxtFrm*>(pFrm)->IsUndersized() ) + if( static_cast<const SwTextFrm*>(pFrm)->IsUndersized() ) { - // Does this TxtFrm would like to be a little bit bigger? - nRet = static_cast<const SwTxtFrm*>(pFrm)->GetParHeight() - + // Does this TextFrm would like to be a little bit bigger? + nRet = static_cast<const SwTextFrm*>(pFrm)->GetParHeight() - (pFrm->Prt().*fnRect->fnGetHeight)(); if( nRet < 0 ) nRet = 0; @@ -180,11 +180,11 @@ static long lcl_Undersize( const SwFrm* pFrm ) } /// "format" the frame (Fixsize is not set here). -void SwFtnContFrm::Format( const SwBorderAttrs * ) +void SwFootnoteContFrm::Format( const SwBorderAttrs * ) { // calculate total border, only one distance to the top const SwPageFrm* pPage = FindPageFrm(); - const SwPageFtnInfo &rInf = pPage->GetPageDesc()->GetFtnInfo(); + const SwPageFootnoteInfo &rInf = pPage->GetPageDesc()->GetFootnoteInfo(); const SwTwips nBorder = rInf.GetTopDist() + rInf.GetBottomDist() + rInf.GetLineWidth(); SWRECTFN( this ) @@ -194,13 +194,13 @@ void SwFtnContFrm::Format( const SwBorderAttrs * ) (Prt().*fnRect->fnSetTop)( nBorder ); (Prt().*fnRect->fnSetWidth)( (Frm().*fnRect->fnGetWidth)() ); (Prt().*fnRect->fnSetHeight)((Frm().*fnRect->fnGetHeight)() - nBorder ); - if( (Prt().*fnRect->fnGetHeight)() < 0 && !pPage->IsFtnPage() ) + if( (Prt().*fnRect->fnGetHeight)() < 0 && !pPage->IsFootnotePage() ) mbValidSize = false; } if ( !mbValidSize ) { - bool bGrow = pPage->IsFtnPage(); + bool bGrow = pPage->IsFootnotePage(); if( bGrow ) { const SwViewShell *pSh = getRootFrm() ? getRootFrm()->GetCurrShell() : 0; @@ -215,7 +215,7 @@ void SwFtnContFrm::Format( const SwBorderAttrs * ) SwTwips nRemaining = 0; SwFrm *pFrm = m_pLower; while ( pFrm ) - { // lcl_Undersize(..) respects (recursively) TxtFrms, which + { // lcl_Undersize(..) respects (recursively) TextFrms, which // would like to be bigger. They are created especially in // columnized borders, if these do not have their maximum // size yet. @@ -260,19 +260,19 @@ void SwFtnContFrm::Format( const SwBorderAttrs * ) } } -SwTwips SwFtnContFrm::GrowFrm( SwTwips nDist, bool bTst, bool ) +SwTwips SwFootnoteContFrm::GrowFrm( SwTwips nDist, bool bTst, bool ) { - // No check if FixSize since FtnContainer are variable up to their max. height. + // No check if FixSize since FootnoteContainer are variable up to their max. height. // If the max. height is LONG_MAX, take as much space as needed. // If the page is a special footnote page, take also as much as possible. - assert(GetUpper() && GetUpper()->IsFtnBossFrm()); + assert(GetUpper() && GetUpper()->IsFootnoteBossFrm()); SWRECTFN( this ) if( (Frm().*fnRect->fnGetHeight)() > 0 && nDist > ( LONG_MAX - (Frm().*fnRect->fnGetHeight)() ) ) nDist = LONG_MAX - (Frm().*fnRect->fnGetHeight)(); - SwFtnBossFrm *pBoss = static_cast<SwFtnBossFrm*>(GetUpper()); + SwFootnoteBossFrm *pBoss = static_cast<SwFootnoteBossFrm*>(GetUpper()); if( IsInSct() ) { SwSectionFrm* pSect = FindSctFrm(); @@ -289,16 +289,16 @@ SwTwips SwFtnContFrm::GrowFrm( SwTwips nDist, bool bTst, bool ) const SwViewShell *pSh = getRootFrm() ? getRootFrm()->GetCurrShell() : 0; const bool bBrowseMode = pSh && pSh->GetViewOptions()->getBrowseMode(); SwPageFrm *pPage = pBoss->FindPageFrm(); - if ( bBrowseMode || !pPage->IsFtnPage() ) + if ( bBrowseMode || !pPage->IsFootnotePage() ) { - if ( pBoss->GetMaxFtnHeight() != LONG_MAX ) + if ( pBoss->GetMaxFootnoteHeight() != LONG_MAX ) { - nDist = std::min( nDist, pBoss->GetMaxFtnHeight() + nDist = std::min( nDist, pBoss->GetMaxFootnoteHeight() - (Frm().*fnRect->fnGetHeight)() ); if ( nDist <= 0 ) return 0L; } - // FtnBoss also influences the max value + // FootnoteBoss also influences the max value if( !IsInSct() ) { const SwTwips nMax = pBoss->GetVarSpace(); @@ -343,12 +343,12 @@ SwTwips SwFtnContFrm::GrowFrm( SwTwips nDist, bool bTst, bool ) { if( NA_GROW_ADJUST == nAdjust ) { - SwFrm* pFtn = Lower(); - if( pFtn ) + SwFrm* pFootnote = Lower(); + if( pFootnote ) { - while( pFtn->GetNext() ) - pFtn = pFtn->GetNext(); - if( static_cast<SwFtnFrm*>(pFtn)->GetAttr()->GetFtn().IsEndNote() ) + while( pFootnote->GetNext() ) + pFootnote = pFootnote->GetNext(); + if( static_cast<SwFootnoteFrm*>(pFootnote)->GetAttr()->GetFootnote().IsEndNote() ) { nReal = AdjustNeighbourhood( nGrow, bTst ); nAdjust = NA_GROW_SHRINK; // no more AdjustNeighbourhood @@ -387,13 +387,13 @@ SwTwips SwFtnContFrm::GrowFrm( SwTwips nDist, bool bTst, bool ) return nReal; } -SwTwips SwFtnContFrm::ShrinkFrm( SwTwips nDiff, bool bTst, bool bInfo ) +SwTwips SwFootnoteContFrm::ShrinkFrm( SwTwips nDiff, bool bTst, bool bInfo ) { SwPageFrm *pPage = FindPageFrm(); bool bShrink = false; if ( pPage ) { - if( !pPage->IsFtnPage() ) + if( !pPage->IsFootnotePage() ) bShrink = true; else { @@ -417,8 +417,8 @@ SwTwips SwFtnContFrm::ShrinkFrm( SwTwips nDiff, bool bTst, bool bInfo ) return 0; } -SwFtnFrm::SwFtnFrm( SwFrmFmt *pFmt, SwFrm* pSib, SwCntntFrm *pCnt, SwTxtFtn *pAt ): - SwLayoutFrm( pFmt, pSib ), +SwFootnoteFrm::SwFootnoteFrm( SwFrameFormat *pFormat, SwFrm* pSib, SwContentFrm *pCnt, SwTextFootnote *pAt ): + SwLayoutFrm( pFormat, pSib ), pFollow( 0 ), pMaster( 0 ), pRef( pCnt ), @@ -430,7 +430,7 @@ SwFtnFrm::SwFtnFrm( SwFrmFmt *pFmt, SwFrm* pSib, SwCntntFrm *pCnt, SwTxtFtn *pAt mnFrmType = FRM_FTN; } -void SwFtnFrm::InvalidateNxtFtnCnts( SwPageFrm *pPage ) +void SwFootnoteFrm::InvalidateNxtFootnoteCnts( SwPageFrm *pPage ) { if ( GetNext() ) { @@ -455,11 +455,11 @@ void SwFtnFrm::InvalidateNxtFtnCnts( SwPageFrm *pPage ) } #ifdef DBG_UTIL -SwTwips SwFtnFrm::GrowFrm( SwTwips nDist, bool bTst, bool bInfo ) +SwTwips SwFootnoteFrm::GrowFrm( SwTwips nDist, bool bTst, bool bInfo ) { static sal_uInt16 nNum = USHRT_MAX; - SwTxtFtn* pTxtFtn = GetAttr(); - if ( pTxtFtn->GetFtn().GetNumber() == nNum ) + SwTextFootnote* pTextFootnote = GetAttr(); + if ( pTextFootnote->GetFootnote().GetNumber() == nNum ) { int bla = 5; (void)bla; @@ -468,13 +468,13 @@ SwTwips SwFtnFrm::GrowFrm( SwTwips nDist, bool bTst, bool bInfo ) return SwLayoutFrm::GrowFrm( nDist, bTst, bInfo ); } -SwTwips SwFtnFrm::ShrinkFrm( SwTwips nDist, bool bTst, bool bInfo ) +SwTwips SwFootnoteFrm::ShrinkFrm( SwTwips nDist, bool bTst, bool bInfo ) { static sal_uInt16 nNum = USHRT_MAX; if( nNum != USHRT_MAX ) { - SwTxtFtn* pTxtFtn = GetAttr(); - if( pTxtFtn->GetFtn().GetNumber() == nNum ) + SwTextFootnote* pTextFootnote = GetAttr(); + if( pTextFootnote->GetFootnote().GetNumber() == nNum ) { int bla = 5; (void)bla; @@ -484,7 +484,7 @@ SwTwips SwFtnFrm::ShrinkFrm( SwTwips nDist, bool bTst, bool bInfo ) } #endif -void SwFtnFrm::Cut() +void SwFootnoteFrm::Cut() { if ( GetNext() ) GetNext()->InvalidatePos(); @@ -495,13 +495,13 @@ void SwFtnFrm::Cut() SwLayoutFrm *pUp = GetUpper(); // correct chaining - SwFtnFrm *pFtn = this; - if ( pFtn->GetFollow() ) - pFtn->GetFollow()->SetMaster( pFtn->GetMaster() ); - if ( pFtn->GetMaster() ) - pFtn->GetMaster()->SetFollow( pFtn->GetFollow() ); - pFtn->SetFollow( 0 ); - pFtn->SetMaster( 0 ); + SwFootnoteFrm *pFootnote = this; + if ( pFootnote->GetFollow() ) + pFootnote->GetFollow()->SetMaster( pFootnote->GetMaster() ); + if ( pFootnote->GetMaster() ) + pFootnote->GetMaster()->SetFollow( pFootnote->GetFollow() ); + pFootnote->SetFollow( 0 ); + pFootnote->SetMaster( 0 ); // cut all connections RemoveFromLayout(); @@ -515,7 +515,7 @@ void SwFtnFrm::Cut() if ( pPage ) { SwLayoutFrm *pBody = pPage->FindBodyCont(); - if( pBody && !pBody->ContainsCntnt() ) + if( pBody && !pBody->ContainsContent() ) pPage->getRootFrm()->SetSuperfluous(); } SwSectionFrm* pSect = pUp->FindSctFrm(); @@ -535,10 +535,10 @@ void SwFtnFrm::Cut() } } -void SwFtnFrm::Paste( SwFrm* pParent, SwFrm* pSibling ) +void SwFootnoteFrm::Paste( SwFrm* pParent, SwFrm* pSibling ) { OSL_ENSURE( pParent, "no parent in Paste." ); - OSL_ENSURE( pParent->IsLayoutFrm(), "Parent is CntntFrm." ); + OSL_ENSURE( pParent->IsLayoutFrm(), "Parent is ContentFrm." ); OSL_ENSURE( pParent != this, "I am my own parent." ); OSL_ENSURE( pSibling != this, "I am my own sibling." ); OSL_ENSURE( !GetPrev() && !GetNext() && !GetUpper(), @@ -578,31 +578,31 @@ void SwFtnFrm::Paste( SwFrm* pParent, SwFrm* pSibling ) SwFrm::DestroyFrm(pDel); } #if OSL_DEBUG_LEVEL > 0 - SwDoc *pDoc = GetFmt()->GetDoc(); + SwDoc *pDoc = GetFormat()->GetDoc(); if ( GetPrev() ) { - OSL_ENSURE( lcl_FindFtnPos( pDoc, static_cast<SwFtnFrm*>(GetPrev())->GetAttr() ) <= - lcl_FindFtnPos( pDoc, GetAttr() ), "Prev is not FtnPrev" ); + OSL_ENSURE( lcl_FindFootnotePos( pDoc, static_cast<SwFootnoteFrm*>(GetPrev())->GetAttr() ) <= + lcl_FindFootnotePos( pDoc, GetAttr() ), "Prev is not FootnotePrev" ); } if ( GetNext() ) { - OSL_ENSURE( lcl_FindFtnPos( pDoc, GetAttr() ) <= - lcl_FindFtnPos( pDoc, static_cast<SwFtnFrm*>(GetNext())->GetAttr() ), - "Next is not FtnNext" ); + OSL_ENSURE( lcl_FindFootnotePos( pDoc, GetAttr() ) <= + lcl_FindFootnotePos( pDoc, static_cast<SwFootnoteFrm*>(GetNext())->GetAttr() ), + "Next is not FootnoteNext" ); } #endif - InvalidateNxtFtnCnts( pPage ); + InvalidateNxtFootnoteCnts( pPage ); } /// Return the next layout leaf in that the frame can be moved. /// New pages will only be created if specified by the parameter. -SwLayoutFrm *SwFrm::GetNextFtnLeaf( MakePageType eMakePage ) +SwLayoutFrm *SwFrm::GetNextFootnoteLeaf( MakePageType eMakePage ) { - SwFtnBossFrm *pOldBoss = FindFtnBossFrm(); + SwFootnoteBossFrm *pOldBoss = FindFootnoteBossFrm(); SwPageFrm* pOldPage = pOldBoss->FindPageFrm(); SwPageFrm* pPage; - SwFtnBossFrm *pBoss = pOldBoss->IsColumnFrm() ? - static_cast<SwFtnBossFrm*>(pOldBoss->GetNext()) : 0; // next column, if existing + SwFootnoteBossFrm *pBoss = pOldBoss->IsColumnFrm() ? + static_cast<SwFootnoteBossFrm*>(pOldBoss->GetNext()) : 0; // next column, if existing if( pBoss ) pPage = NULL; else @@ -612,8 +612,8 @@ SwLayoutFrm *SwFrm::GetNextFtnLeaf( MakePageType eMakePage ) SwLayoutFrm* pNxt = pOldBoss->GetNextSctLeaf( eMakePage ); if( pNxt ) { - OSL_ENSURE( pNxt->IsColBodyFrm(), "GetNextFtnLeaf: Funny Leaf" ); - pBoss = static_cast<SwFtnBossFrm*>(pNxt->GetUpper()); + OSL_ENSURE( pNxt->IsColBodyFrm(), "GetNextFootnoteLeaf: Funny Leaf" ); + pBoss = static_cast<SwFootnoteBossFrm*>(pNxt->GetUpper()); pPage = pBoss->FindPageFrm(); } else @@ -635,20 +635,20 @@ SwLayoutFrm *SwFrm::GetNextFtnLeaf( MakePageType eMakePage ) // pBoss == NULL => pPage == NULL, so there are no following pages // If the footnote has already a Follow we do not need to search. - // However, if there are unwanted empty columns/pages between Ftn and Follow, + // However, if there are unwanted empty columns/pages between Footnote and Follow, // create another Follow on the next best column/page and the rest will sort itself out. - SwFtnFrm *pFtn = FindFtnFrm(); - if ( pFtn && pFtn->GetFollow() ) + SwFootnoteFrm *pFootnote = FindFootnoteFrm(); + if ( pFootnote && pFootnote->GetFollow() ) { - SwFtnBossFrm* pTmpBoss = pFtn->GetFollow()->FindFtnBossFrm(); + SwFootnoteBossFrm* pTmpBoss = pFootnote->GetFollow()->FindFootnoteBossFrm(); // Following cases will be handled: - // 1. both "FtnBoss"es are neighboring columns/pages + // 1. both "FootnoteBoss"es are neighboring columns/pages // 2. the new one is the first column of a neighboring page // 3. the new one is the first column in a section of the next page while( pTmpBoss != pBoss && pTmpBoss && !pTmpBoss->GetPrev() ) - pTmpBoss = pTmpBoss->GetUpper()->FindFtnBossFrm(); + pTmpBoss = pTmpBoss->GetUpper()->FindFootnoteBossFrm(); if( pTmpBoss == pBoss ) - return pFtn->GetFollow(); + return pFootnote->GetFollow(); } // If no pBoss could be found or it is a "wrong" page, we need a new page. @@ -656,7 +656,7 @@ SwLayoutFrm *SwFrm::GetNextFtnLeaf( MakePageType eMakePage ) { if ( eMakePage == MAKEPAGE_APPEND || eMakePage == MAKEPAGE_INSERT ) { - pBoss = InsertPage( pOldPage, pOldPage->IsFtnPage() ); + pBoss = InsertPage( pOldPage, pOldPage->IsFootnotePage() ); static_cast<SwPageFrm*>(pBoss)->SetEndNotePage( pOldPage->IsEndNotePage() ); } else @@ -667,25 +667,25 @@ SwLayoutFrm *SwFrm::GetNextFtnLeaf( MakePageType eMakePage ) // If this page has columns, then go to the first one SwLayoutFrm* pLay = pBoss->FindBodyCont(); if( pLay && pLay->Lower() && pLay->Lower()->IsColumnFrm() ) - pBoss = static_cast<SwFtnBossFrm*>(pLay->Lower()); + pBoss = static_cast<SwFootnoteBossFrm*>(pLay->Lower()); } // found column/page - add myself - SwFtnContFrm *pCont = pBoss->FindFtnCont(); - if ( !pCont && pBoss->GetMaxFtnHeight() && + SwFootnoteContFrm *pCont = pBoss->FindFootnoteCont(); + if ( !pCont && pBoss->GetMaxFootnoteHeight() && ( eMakePage == MAKEPAGE_APPEND || eMakePage == MAKEPAGE_INSERT ) ) - pCont = pBoss->MakeFtnCont(); + pCont = pBoss->MakeFootnoteCont(); return pCont; } /// Get the preceding layout leaf in that the frame can be moved. -SwLayoutFrm *SwFrm::GetPrevFtnLeaf( MakePageType eMakeFtn ) +SwLayoutFrm *SwFrm::GetPrevFootnoteLeaf( MakePageType eMakeFootnote ) { // The predecessor of a footnote is (if possible) // the master of the chain of the footnote. - SwFtnFrm *pFtn = FindFtnFrm(); - SwLayoutFrm *pRet = pFtn->GetMaster(); + SwFootnoteFrm *pFootnote = FindFootnoteFrm(); + SwLayoutFrm *pRet = pFootnote->GetMaster(); - SwFtnBossFrm* pOldBoss = FindFtnBossFrm(); + SwFootnoteBossFrm* pOldBoss = FindFootnoteBossFrm(); SwPageFrm *pOldPage = pOldBoss->FindPageFrm(); if ( !pOldBoss->GetPrev() && !pOldPage->GetPrev() ) @@ -693,38 +693,38 @@ SwLayoutFrm *SwFrm::GetPrevFtnLeaf( MakePageType eMakeFtn ) if ( !pRet ) { - bool bEndn = pFtn->GetAttr()->GetFtn().IsEndNote(); + bool bEndn = pFootnote->GetAttr()->GetFootnote().IsEndNote(); SwFrm* pTmpRef = NULL; - if( bEndn && pFtn->IsInSct() ) + if( bEndn && pFootnote->IsInSct() ) { - SwSectionFrm* pSect = pFtn->FindSctFrm(); + SwSectionFrm* pSect = pFootnote->FindSctFrm(); if( pSect->IsEndnAtEnd() ) - pTmpRef = pSect->FindLastCntnt( FINDMODE_LASTCNT ); + pTmpRef = pSect->FindLastContent( FINDMODE_LASTCNT ); } if( !pTmpRef ) - pTmpRef = pFtn->GetRef(); - SwFtnBossFrm* pStop = pTmpRef->FindFtnBossFrm( !bEndn ); + pTmpRef = pFootnote->GetRef(); + SwFootnoteBossFrm* pStop = pTmpRef->FindFootnoteBossFrm( !bEndn ); const sal_uInt16 nNum = pStop->GetPhyPageNum(); // Do not leave the corresponding page if the footnote should // be shown at the document ending or the footnote is an endnote. const bool bEndNote = pOldPage->IsEndNotePage(); - const bool bFtnEndDoc = pOldPage->IsFtnPage(); - SwFtnBossFrm* pNxtBoss = pOldBoss; + const bool bFootnoteEndDoc = pOldPage->IsFootnotePage(); + SwFootnoteBossFrm* pNxtBoss = pOldBoss; SwSectionFrm *pSect = pNxtBoss->GetUpper()->IsSctFrm() ? static_cast<SwSectionFrm*>(pNxtBoss->GetUpper()) : 0; do { if( pNxtBoss->IsColumnFrm() && pNxtBoss->GetPrev() ) - pNxtBoss = static_cast<SwFtnBossFrm*>(pNxtBoss->GetPrev()); // one column backwards + pNxtBoss = static_cast<SwFootnoteBossFrm*>(pNxtBoss->GetPrev()); // one column backwards else // one page backwards { SwLayoutFrm* pBody = 0; if( pSect ) { - if( pSect->IsFtnLock() ) + if( pSect->IsFootnoteLock() ) { if( pNxtBoss == pOldBoss ) return 0; @@ -736,8 +736,8 @@ SwLayoutFrm *SwFrm::GetPrevFtnLeaf( MakePageType eMakeFtn ) if( !pSect || !pSect->Lower() ) return 0; OSL_ENSURE( pSect->Lower()->IsColumnFrm(), - "GetPrevFtnLeaf: Where's the column?" ); - pNxtBoss = static_cast<SwFtnBossFrm*>(pSect->Lower()); + "GetPrevFootnoteLeaf: Where's the column?" ); + pNxtBoss = static_cast<SwFootnoteBossFrm*>(pSect->Lower()); pBody = pSect; } } @@ -745,7 +745,7 @@ SwLayoutFrm *SwFrm::GetPrevFtnLeaf( MakePageType eMakeFtn ) { SwPageFrm* pPage = static_cast<SwPageFrm*>(pNxtBoss->FindPageFrm()->GetPrev()); if( !pPage || pPage->GetPhyPageNum() < nNum || - bEndNote != pPage->IsEndNotePage() || bFtnEndDoc != pPage->IsFtnPage() ) + bEndNote != pPage->IsEndNotePage() || bFootnoteEndDoc != pPage->IsFootnotePage() ) return NULL; // no further pages found pNxtBoss = pPage; pBody = pPage->FindBodyCont(); @@ -755,11 +755,11 @@ SwLayoutFrm *SwFrm::GetPrevFtnLeaf( MakePageType eMakeFtn ) { if ( pBody->Lower() && pBody->Lower()->IsColumnFrm() ) { - pNxtBoss = static_cast<SwFtnBossFrm*>(pBody->GetLastLower()); + pNxtBoss = static_cast<SwFootnoteBossFrm*>(pBody->GetLastLower()); } } } - SwFtnContFrm *pCont = pNxtBoss->FindFtnCont(); + SwFootnoteContFrm *pCont = pNxtBoss->FindFootnoteCont(); if ( pCont ) { pRet = pCont; @@ -769,15 +769,15 @@ SwLayoutFrm *SwFrm::GetPrevFtnLeaf( MakePageType eMakeFtn ) { // Reached the column/page of the reference. // Try to add a container and paste our content. - if ( eMakeFtn == MAKEPAGE_FTN && pNxtBoss->GetMaxFtnHeight() ) - pRet = pNxtBoss->MakeFtnCont(); + if ( eMakeFootnote == MAKEPAGE_FTN && pNxtBoss->GetMaxFootnoteHeight() ) + pRet = pNxtBoss->MakeFootnoteCont(); break; } } while( !pRet ); } if ( pRet ) { - const SwFtnBossFrm* pNewBoss = pRet->FindFtnBossFrm(); + const SwFootnoteBossFrm* pNewBoss = pRet->FindFootnoteBossFrm(); bool bJump = false; if( pOldBoss->IsColumnFrm() && pOldBoss->GetPrev() ) // a previous column exists bJump = pOldBoss->GetPrev() != (SwFrm*)pNewBoss; // did we chose it? @@ -798,7 +798,7 @@ SwLayoutFrm *SwFrm::GetPrevFtnLeaf( MakePageType eMakeFtn ) return pRet; } -bool SwFrm::IsFtnAllowed() const +bool SwFrm::IsFootnoteAllowed() const { if ( !IsInDocBody() ) return false; @@ -813,52 +813,52 @@ bool SwFrm::IsFtnAllowed() const return true; } -void SwRootFrm::UpdateFtnNums() +void SwRootFrm::UpdateFootnoteNums() { // page numbering only if set at the document - if ( GetFmt()->GetDoc()->GetFtnInfo().eNum == FTNNUM_PAGE ) + if ( GetFormat()->GetDoc()->GetFootnoteInfo().eNum == FTNNUM_PAGE ) { SwPageFrm *pPage = static_cast<SwPageFrm*>(Lower()); - while ( pPage && !pPage->IsFtnPage() ) + while ( pPage && !pPage->IsFootnotePage() ) { - pPage->UpdateFtnNum(); + pPage->UpdateFootnoteNum(); pPage = static_cast<SwPageFrm*>(pPage->GetNext()); } } } /// remove all footnotes (not the references) and all footnote pages -void sw_RemoveFtns( SwFtnBossFrm* pBoss, bool bPageOnly, bool bEndNotes ) +void sw_RemoveFootnotes( SwFootnoteBossFrm* pBoss, bool bPageOnly, bool bEndNotes ) { do { - SwFtnContFrm *pCont = pBoss->FindFtnCont(); + SwFootnoteContFrm *pCont = pBoss->FindFootnoteCont(); if ( pCont ) { - SwFtnFrm *pFtn = static_cast<SwFtnFrm*>(pCont->Lower()); - OSL_ENSURE( pFtn, "Footnote content without footnote." ); + SwFootnoteFrm *pFootnote = static_cast<SwFootnoteFrm*>(pCont->Lower()); + OSL_ENSURE( pFootnote, "Footnote content without footnote." ); if ( bPageOnly ) - while ( pFtn->GetMaster() ) - pFtn = pFtn->GetMaster(); + while ( pFootnote->GetMaster() ) + pFootnote = pFootnote->GetMaster(); do { - SwFtnFrm *pNxt = static_cast<SwFtnFrm*>(pFtn->GetNext()); - if ( !pFtn->GetAttr()->GetFtn().IsEndNote() || + SwFootnoteFrm *pNxt = static_cast<SwFootnoteFrm*>(pFootnote->GetNext()); + if ( !pFootnote->GetAttr()->GetFootnote().IsEndNote() || bEndNotes ) { - pFtn->GetRef()->Prepare( PREP_FTN, (void*)pFtn->GetAttr() ); + pFootnote->GetRef()->Prepare( PREP_FTN, (void*)pFootnote->GetAttr() ); if ( bPageOnly && !pNxt ) - pNxt = pFtn->GetFollow(); - pFtn->Cut(); - SwFrm::DestroyFrm(pFtn); + pNxt = pFootnote->GetFollow(); + pFootnote->Cut(); + SwFrm::DestroyFrm(pFootnote); } - pFtn = pNxt; + pFootnote = pNxt; - } while ( pFtn ); + } while ( pFootnote ); } if( !pBoss->IsInSct() ) { - // A sectionframe with the Ftn/EndnAtEnd-flags may contain + // A sectionframe with the Footnote/EndnAtEnd-flags may contain // foot/endnotes. If the last lower frame of the bodyframe is // a multicolumned sectionframe, it may contain footnotes, too. SwLayoutFrm* pBody = pBoss->FindBodyCont(); @@ -871,7 +871,7 @@ void sw_RemoveFtns( SwFtnBossFrm* pBoss, bool bPageOnly, bool bEndNotes ) static_cast<SwSectionFrm*>(pLow)->IsAnyNoteAtEnd() ) && static_cast<SwSectionFrm*>(pLow)->Lower() && static_cast<SwSectionFrm*>(pLow)->Lower()->IsColumnFrm() ) - sw_RemoveFtns( static_cast<SwColumnFrm*>(static_cast<SwSectionFrm*>(pLow)->Lower()), + sw_RemoveFootnotes( static_cast<SwColumnFrm*>(static_cast<SwSectionFrm*>(pLow)->Lower()), bPageOnly, bEndNotes ); pLow = pLow->GetNext(); } @@ -882,23 +882,23 @@ void sw_RemoveFtns( SwFtnBossFrm* pBoss, bool bPageOnly, bool bEndNotes ) } while( pBoss ); } -void SwRootFrm::RemoveFtns( SwPageFrm *pPage, bool bPageOnly, bool bEndNotes ) +void SwRootFrm::RemoveFootnotes( SwPageFrm *pPage, bool bPageOnly, bool bEndNotes ) { if ( !pPage ) pPage = static_cast<SwPageFrm*>(Lower()); do { // On columned pages we have to clean up in all columns - SwFtnBossFrm* pBoss; + SwFootnoteBossFrm* pBoss; SwLayoutFrm* pBody = pPage->FindBodyCont(); if( pBody && pBody->Lower() && pBody->Lower()->IsColumnFrm() ) - pBoss = static_cast<SwFtnBossFrm*>(pBody->Lower()); // the first column + pBoss = static_cast<SwFootnoteBossFrm*>(pBody->Lower()); // the first column else pBoss = pPage; // no columns - sw_RemoveFtns( pBoss, bPageOnly, bEndNotes ); + sw_RemoveFootnotes( pBoss, bPageOnly, bEndNotes ); if ( !bPageOnly ) { - if ( pPage->IsFtnPage() && + if ( pPage->IsFootnotePage() && (!pPage->IsEndNotePage() || bEndNotes) ) { SwFrm *pDel = pPage; @@ -916,10 +916,10 @@ void SwRootFrm::RemoveFtns( SwPageFrm *pPage, bool bPageOnly, bool bEndNotes ) } /// Change the page template of the footnote pages -void SwRootFrm::CheckFtnPageDescs( bool bEndNote ) +void SwRootFrm::CheckFootnotePageDescs( bool bEndNote ) { SwPageFrm *pPage = static_cast<SwPageFrm*>(Lower()); - while ( pPage && !pPage->IsFtnPage() ) + while ( pPage && !pPage->IsFootnotePage() ) pPage = static_cast<SwPageFrm*>(pPage->GetNext()); while ( pPage && pPage->IsEndNotePage() != bEndNote ) pPage = static_cast<SwPageFrm*>(pPage->GetNext()); @@ -932,86 +932,86 @@ void SwRootFrm::CheckFtnPageDescs( bool bEndNote ) * * A footnote container is always placed directly behind the body text. * - * The frame format (FrmFmt) is always the default frame format. + * The frame format (FrameFormat) is always the default frame format. * * @return footnote container frame */ -SwFtnContFrm *SwFtnBossFrm::MakeFtnCont() +SwFootnoteContFrm *SwFootnoteBossFrm::MakeFootnoteCont() { - SAL_WARN_IF(FindFtnCont(), "sw.core", "footnote container exists already"); + SAL_WARN_IF(FindFootnoteCont(), "sw.core", "footnote container exists already"); - SwFtnContFrm *pNew = new SwFtnContFrm( GetFmt()->GetDoc()->GetDfltFrmFmt(), this ); + SwFootnoteContFrm *pNew = new SwFootnoteContFrm( GetFormat()->GetDoc()->GetDfltFrameFormat(), this ); SwLayoutFrm *pLay = FindBodyCont(); pNew->Paste( this, pLay->GetNext() ); return pNew; } -SwFtnContFrm *SwFtnBossFrm::FindFtnCont() +SwFootnoteContFrm *SwFootnoteBossFrm::FindFootnoteCont() { SwFrm *pFrm = Lower(); - while( pFrm && !pFrm->IsFtnContFrm() ) + while( pFrm && !pFrm->IsFootnoteContFrm() ) pFrm = pFrm->GetNext(); #if OSL_DEBUG_LEVEL > 0 if ( pFrm ) { - SwFrm *pFtn = pFrm->GetLower(); - OSL_ENSURE( pFtn, "Content without footnote." ); - while ( pFtn ) + SwFrm *pFootnote = pFrm->GetLower(); + OSL_ENSURE( pFootnote, "Content without footnote." ); + while ( pFootnote ) { - OSL_ENSURE( pFtn->IsFtnFrm(), "Neighbor of footnote is not a footnote." ); - pFtn = pFtn->GetNext(); + OSL_ENSURE( pFootnote->IsFootnoteFrm(), "Neighbor of footnote is not a footnote." ); + pFootnote = pFootnote->GetNext(); } } #endif - return static_cast<SwFtnContFrm*>(pFrm); + return static_cast<SwFootnoteContFrm*>(pFrm); } /// Search the next available footnote container. -SwFtnContFrm *SwFtnBossFrm::FindNearestFtnCont( bool bDontLeave ) +SwFootnoteContFrm *SwFootnoteBossFrm::FindNearestFootnoteCont( bool bDontLeave ) { - SwFtnContFrm *pCont = 0; - if ( !GetFmt()->GetDoc()->GetFtnIdxs().empty() ) + SwFootnoteContFrm *pCont = 0; + if ( !GetFormat()->GetDoc()->GetFootnoteIdxs().empty() ) { - pCont = FindFtnCont(); + pCont = FindFootnoteCont(); if ( !pCont ) { SwPageFrm *pPage = FindPageFrm(); - SwFtnBossFrm* pBoss = this; + SwFootnoteBossFrm* pBoss = this; bool bEndNote = pPage->IsEndNotePage(); do { - bool bChgPage = lcl_NextFtnBoss( pBoss, pPage, bDontLeave ); + bool bChgPage = lcl_NextFootnoteBoss( pBoss, pPage, bDontLeave ); // Found another boss? When changing pages, also the endnote flag must match. if( pBoss && ( !bChgPage || pPage->IsEndNotePage() == bEndNote ) ) - pCont = pBoss->FindFtnCont(); + pCont = pBoss->FindFootnoteCont(); } while ( !pCont && pPage ); } } return pCont; } -SwFtnFrm *SwFtnBossFrm::FindFirstFtn() +SwFootnoteFrm *SwFootnoteBossFrm::FindFirstFootnote() { // search for the nearest footnote container - SwFtnContFrm *pCont = FindNearestFtnCont(); + SwFootnoteContFrm *pCont = FindNearestFootnoteCont(); if ( !pCont ) return 0; // Starting from the first footnote, search the first // footnote that is referenced by the current column/page - SwFtnFrm *pRet = static_cast<SwFtnFrm*>(pCont->Lower()); + SwFootnoteFrm *pRet = static_cast<SwFootnoteFrm*>(pCont->Lower()); const sal_uInt16 nRefNum = FindPageFrm()->GetPhyPageNum(); const sal_uInt16 nRefCol = lcl_ColumnNum( this ); sal_uInt16 nPgNum, nColNum; // page number, column number - SwFtnBossFrm* pBoss; + SwFootnoteBossFrm* pBoss; SwPageFrm* pPage; if( pRet ) { - pBoss = pRet->GetRef()->FindFtnBossFrm(); - OSL_ENSURE( pBoss, "FindFirstFtn: No boss found" ); + pBoss = pRet->GetRef()->FindFootnoteBossFrm(); + OSL_ENSURE( pBoss, "FindFirstFootnote: No boss found" ); if( !pBoss ) return NULL; // ?There must be a bug, but no GPF pPage = pBoss->FindPageFrm(); @@ -1036,20 +1036,20 @@ SwFtnFrm *SwFtnBossFrm::FindFirstFtn() while ( pRet->GetFollow() ) pRet = pRet->GetFollow(); - SwFtnFrm *pNxt = static_cast<SwFtnFrm*>(pRet->GetNext()); + SwFootnoteFrm *pNxt = static_cast<SwFootnoteFrm*>(pRet->GetNext()); if ( !pNxt ) { - pBoss = pRet->FindFtnBossFrm(); + pBoss = pRet->FindFootnoteBossFrm(); pPage = pBoss->FindPageFrm(); - lcl_NextFtnBoss( pBoss, pPage, false ); // next FtnBoss - pCont = pBoss ? pBoss->FindNearestFtnCont() : 0; + lcl_NextFootnoteBoss( pBoss, pPage, false ); // next FootnoteBoss + pCont = pBoss ? pBoss->FindNearestFootnoteCont() : 0; if ( pCont ) - pNxt = static_cast<SwFtnFrm*>(pCont->Lower()); + pNxt = static_cast<SwFootnoteFrm*>(pCont->Lower()); } if ( pNxt ) { pRet = pNxt; - pBoss = pRet->GetRef()->FindFtnBossFrm(); + pBoss = pRet->GetRef()->FindFootnoteBossFrm(); pPage = pBoss->FindPageFrm(); nPgNum = pPage->GetPhyPageNum(); if ( nPgNum == nRefNum ) @@ -1070,9 +1070,9 @@ SwFtnFrm *SwFtnBossFrm::FindFirstFtn() } /// Get the first footnote of a given content -const SwFtnFrm *SwFtnBossFrm::FindFirstFtn( SwCntntFrm *pCnt ) const +const SwFootnoteFrm *SwFootnoteBossFrm::FindFirstFootnote( SwContentFrm *pCnt ) const { - const SwFtnFrm *pRet = const_cast<SwFtnBossFrm*>(this)->FindFirstFtn(); + const SwFootnoteFrm *pRet = const_cast<SwFootnoteBossFrm*>(this)->FindFirstFootnote(); if ( pRet ) { const sal_uInt16 nColNum = lcl_ColumnNum( this ); @@ -1083,17 +1083,17 @@ const SwFtnFrm *SwFtnBossFrm::FindFirstFtn( SwCntntFrm *pCnt ) const pRet = pRet->GetFollow(); if ( pRet->GetNext() ) - pRet = static_cast<const SwFtnFrm*>(pRet->GetNext()); + pRet = static_cast<const SwFootnoteFrm*>(pRet->GetNext()); else - { SwFtnBossFrm *pBoss = const_cast<SwFtnBossFrm*>(pRet->FindFtnBossFrm()); + { SwFootnoteBossFrm *pBoss = const_cast<SwFootnoteBossFrm*>(pRet->FindFootnoteBossFrm()); SwPageFrm *pPage = pBoss->FindPageFrm(); - lcl_NextFtnBoss( pBoss, pPage, false ); // next FtnBoss - SwFtnContFrm *pCont = pBoss ? pBoss->FindNearestFtnCont() : 0; - pRet = pCont ? static_cast<SwFtnFrm*>(pCont->Lower()) : 0; + lcl_NextFootnoteBoss( pBoss, pPage, false ); // next FootnoteBoss + SwFootnoteContFrm *pCont = pBoss ? pBoss->FindNearestFootnoteCont() : 0; + pRet = pCont ? static_cast<SwFootnoteFrm*>(pCont->Lower()) : 0; } if ( pRet ) { - const SwFtnBossFrm* pBoss = pRet->GetRef()->FindFtnBossFrm(); + const SwFootnoteBossFrm* pBoss = pRet->GetRef()->FindFootnoteBossFrm(); if( pBoss->GetPhyPageNum() != nPageNum || nColNum != lcl_ColumnNum( pBoss ) ) pRet = 0; @@ -1103,38 +1103,38 @@ const SwFtnFrm *SwFtnBossFrm::FindFirstFtn( SwCntntFrm *pCnt ) const return pRet; } -void SwFtnBossFrm::ResetFtn( const SwFtnFrm *pCheck ) +void SwFootnoteBossFrm::ResetFootnote( const SwFootnoteFrm *pCheck ) { // Destroy the incarnations of footnotes to an attribute, if they don't // belong to pAssumed OSL_ENSURE( !pCheck->GetMaster(), "given master is not a Master." ); SwNodeIndex aIdx( *pCheck->GetAttr()->GetStartNode(), 1 ); - SwCntntNode *pNd = aIdx.GetNode().GetCntntNode(); + SwContentNode *pNd = aIdx.GetNode().GetContentNode(); if ( !pNd ) - pNd = pCheck->GetFmt()->GetDoc()-> + pNd = pCheck->GetFormat()->GetDoc()-> GetNodes().GoNextSection( &aIdx, true, false ); - SwIterator<SwFrm,SwCntntNode> aIter( *pNd ); + SwIterator<SwFrm,SwContentNode> aIter( *pNd ); SwFrm* pFrm = aIter.First(); while( pFrm ) { if( pFrm->getRootFrm() == pCheck->getRootFrm() ) { SwFrm *pTmp = pFrm->GetUpper(); - while ( pTmp && !pTmp->IsFtnFrm() ) + while ( pTmp && !pTmp->IsFootnoteFrm() ) pTmp = pTmp->GetUpper(); - SwFtnFrm *pFtn = static_cast<SwFtnFrm*>(pTmp); - while ( pFtn && pFtn->GetMaster() ) - pFtn = pFtn->GetMaster(); - if ( pFtn != pCheck ) + SwFootnoteFrm *pFootnote = static_cast<SwFootnoteFrm*>(pTmp); + while ( pFootnote && pFootnote->GetMaster() ) + pFootnote = pFootnote->GetMaster(); + if ( pFootnote != pCheck ) { - while ( pFtn ) + while ( pFootnote ) { - SwFtnFrm *pNxt = pFtn->GetFollow(); - pFtn->Cut(); - SwFrm::DestroyFrm(pFtn); - pFtn = pNxt; + SwFootnoteFrm *pNxt = pFootnote->GetFollow(); + pFootnote->Cut(); + SwFrm::DestroyFrm(pFootnote); + pFootnote = pNxt; } } } @@ -1143,7 +1143,7 @@ void SwFtnBossFrm::ResetFtn( const SwFtnFrm *pCheck ) } } -void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew ) +void SwFootnoteBossFrm::InsertFootnote( SwFootnoteFrm* pNew ) { // Place the footnote in front of the footnote whose attribute // is in front of the new one (get position via the Doc). @@ -1151,8 +1151,8 @@ void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew ) // If there is a container but no footnote for this footnote-boss yet, place // the footnote behind the last footnote of the closest previous column/page. - ResetFtn( pNew ); - SwFtnFrm *pSibling = FindFirstFtn(); + ResetFootnote( pNew ); + SwFootnoteFrm *pSibling = FindFirstFootnote(); bool bDontLeave = false; // Ok, a sibling has been found, but is the sibling in an acceptable @@ -1160,17 +1160,17 @@ void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew ) if( IsInSct() ) { SwSectionFrm* pMySect = ImplFindSctFrm(); - bool bEndnt = pNew->GetAttr()->GetFtn().IsEndNote(); + bool bEndnt = pNew->GetAttr()->GetFootnote().IsEndNote(); if( bEndnt ) { - const SwSectionFmt* pEndFmt = pMySect->GetEndSectFmt(); - bDontLeave = 0 != pEndFmt; + const SwSectionFormat* pEndFormat = pMySect->GetEndSectFormat(); + bDontLeave = 0 != pEndFormat; if( pSibling ) { - if( pEndFmt ) + if( pEndFormat ) { if( !pSibling->IsInSct() || - !pSibling->ImplFindSctFrm()->IsDescendantFrom( pEndFmt ) ) + !pSibling->ImplFindSctFrm()->IsDescendantFrom( pEndFormat ) ) pSibling = NULL; } else if( pSibling->IsInSct() ) @@ -1179,10 +1179,10 @@ void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew ) } else { - bDontLeave = pMySect->IsFtnAtEnd(); + bDontLeave = pMySect->IsFootnoteAtEnd(); if( pSibling ) { - if( pMySect->IsFtnAtEnd() ) + if( pMySect->IsFootnoteAtEnd() ) { if( !pSibling->IsInSct() || !pMySect->IsAnFollow( pSibling->ImplFindSctFrm() ) ) @@ -1199,34 +1199,34 @@ void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew ) pSibling = NULL; // use the Doc to find out the position - SwDoc *pDoc = GetFmt()->GetDoc(); - const sal_uLong nStPos = ::lcl_FindFtnPos( pDoc, pNew->GetAttr() ); + SwDoc *pDoc = GetFormat()->GetDoc(); + const sal_uLong nStPos = ::lcl_FindFootnotePos( pDoc, pNew->GetAttr() ); sal_uLong nCmpPos = 0; sal_uLong nLastPos = 0; - SwFtnContFrm *pParent = 0; + SwFootnoteContFrm *pParent = 0; if( pSibling ) { - nCmpPos = ::lcl_FindFtnPos( pDoc, pSibling->GetAttr() ); + nCmpPos = ::lcl_FindFootnotePos( pDoc, pSibling->GetAttr() ); if( nCmpPos > nStPos ) pSibling = NULL; } if ( !pSibling ) - { pParent = FindFtnCont(); + { pParent = FindFootnoteCont(); if ( !pParent ) { // There is no footnote container yet. Before creating one, keep in mind that // there might exist another following footnote that must be placed before the // new inserted one e.g. because it was divided over multiple pages etc. - pParent = FindNearestFtnCont( bDontLeave ); + pParent = FindNearestFootnoteCont( bDontLeave ); if ( pParent ) { - SwFtnFrm *pFtn = static_cast<SwFtnFrm*>(pParent->Lower()); - if ( pFtn ) + SwFootnoteFrm *pFootnote = static_cast<SwFootnoteFrm*>(pParent->Lower()); + if ( pFootnote ) { - nCmpPos = ::lcl_FindFtnPos( pDoc, pFtn->GetAttr() ); + nCmpPos = ::lcl_FindFootnotePos( pDoc, pFootnote->GetAttr() ); if ( nCmpPos > nStPos ) pParent = 0; } @@ -1236,20 +1236,20 @@ void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew ) } if ( !pParent ) // here, we are sure that we can create a footnote container - pParent = MakeFtnCont(); + pParent = MakeFootnoteCont(); else { // Based on the first footnote below the Parent, search for the first footnote whose // index is after the index of the newly inserted, to place the new one correctly - pSibling = static_cast<SwFtnFrm*>(pParent->Lower()); + pSibling = static_cast<SwFootnoteFrm*>(pParent->Lower()); if ( !pSibling ) { OSL_ENSURE( false, "Could not find space for footnote."); return; } - nCmpPos = ::lcl_FindFtnPos( pDoc, pSibling->GetAttr() ); + nCmpPos = ::lcl_FindFootnotePos( pDoc, pSibling->GetAttr() ); - SwFtnBossFrm *pNxtB; // remember the last one to not - SwFtnFrm *pLastSib = 0; // go too far. + SwFootnoteBossFrm *pNxtB; // remember the last one to not + SwFootnoteFrm *pLastSib = 0; // go too far. while ( pSibling && nCmpPos <= nStPos ) { @@ -1261,30 +1261,30 @@ void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew ) if ( pSibling->GetNext() ) { - pSibling = static_cast<SwFtnFrm*>(pSibling->GetNext()); + pSibling = static_cast<SwFootnoteFrm*>(pSibling->GetNext()); OSL_ENSURE( !pSibling->GetMaster() || ( ENDNOTE > nStPos && - pSibling->GetAttr()->GetFtn().IsEndNote() ), - "InsertFtn: Master expected I" ); + pSibling->GetAttr()->GetFootnote().IsEndNote() ), + "InsertFootnote: Master expected I" ); } else { - pNxtB = pSibling->FindFtnBossFrm(); + pNxtB = pSibling->FindFootnoteBossFrm(); SwPageFrm *pSibPage = pNxtB->FindPageFrm(); bool bEndNote = pSibPage->IsEndNotePage(); - bool bChgPage = lcl_NextFtnBoss( pNxtB, pSibPage, bDontLeave ); + bool bChgPage = lcl_NextFootnoteBoss( pNxtB, pSibPage, bDontLeave ); // When changing pages, also the endnote flag must match. - SwFtnContFrm *pCont = pNxtB && ( !bChgPage || + SwFootnoteContFrm *pCont = pNxtB && ( !bChgPage || pSibPage->IsEndNotePage() == bEndNote ) - ? pNxtB->FindNearestFtnCont( bDontLeave ) : 0; + ? pNxtB->FindNearestFootnoteCont( bDontLeave ) : 0; if( pCont ) - pSibling = static_cast<SwFtnFrm*>(pCont->Lower()); - else // no further FtnContainer, insert after pSibling + pSibling = static_cast<SwFootnoteFrm*>(pCont->Lower()); + else // no further FootnoteContainer, insert after pSibling break; } if ( pSibling ) { - nCmpPos = ::lcl_FindFtnPos( pDoc, pSibling->GetAttr() ); - OSL_ENSURE( nCmpPos > nLastPos, "InsertFtn: Order of FtnFrm's buggy" ); + nCmpPos = ::lcl_FindFootnotePos( pDoc, pSibling->GetAttr() ); + OSL_ENSURE( nCmpPos > nLastPos, "InsertFootnote: Order of FootnoteFrm's buggy" ); } } // pLastSib is the last footnote before the new one and @@ -1303,7 +1303,7 @@ void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew ) pSibling = pLastSib; while( pSibling->GetFollow() ) pSibling = pSibling->GetFollow(); - OSL_ENSURE( !pSibling->GetNext(), "InsertFtn: Who's that guy?" ); + OSL_ENSURE( !pSibling->GetNext(), "InsertFootnote: Who's that guy?" ); } } } @@ -1311,12 +1311,12 @@ void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew ) { // First footnote of the column/page found. Now search from there for the first one on the // same column/page whose index is after the given one. The last one found is the predecessor. - SwFtnBossFrm* pBoss = pNew->GetRef()->FindFtnBossFrm( - !pNew->GetAttr()->GetFtn().IsEndNote() ); + SwFootnoteBossFrm* pBoss = pNew->GetRef()->FindFootnoteBossFrm( + !pNew->GetAttr()->GetFootnote().IsEndNote() ); sal_uInt16 nRefNum = pBoss->GetPhyPageNum(); // page number of the new footnote sal_uInt16 nRefCol = lcl_ColumnNum( pBoss ); // column number of the new footnote bool bEnd = false; - SwFtnFrm *pLastSib = 0; + SwFootnoteFrm *pLastSib = 0; while ( pSibling && !bEnd && (nCmpPos <= nStPos) ) { pLastSib = pSibling; @@ -1325,11 +1325,11 @@ void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew ) while ( pSibling->GetFollow() ) pSibling = pSibling->GetFollow(); - SwFtnFrm *pFoll = static_cast<SwFtnFrm*>(pSibling->GetNext()); + SwFootnoteFrm *pFoll = static_cast<SwFootnoteFrm*>(pSibling->GetNext()); if ( pFoll ) { - pBoss = pSibling->GetRef()->FindFtnBossFrm( !pSibling-> - GetAttr()->GetFtn().IsEndNote() ); + pBoss = pSibling->GetRef()->FindFootnoteBossFrm( !pSibling-> + GetAttr()->GetFootnote().IsEndNote() ); sal_uInt16 nTmpRef; if( nStPos >= ENDNOTE || (nTmpRef = pBoss->GetPhyPageNum()) < nRefNum || @@ -1340,21 +1340,21 @@ void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew ) } else { - SwFtnBossFrm* pNxtB = pSibling->FindFtnBossFrm(); + SwFootnoteBossFrm* pNxtB = pSibling->FindFootnoteBossFrm(); SwPageFrm *pSibPage = pNxtB->FindPageFrm(); bool bEndNote = pSibPage->IsEndNotePage(); - bool bChgPage = lcl_NextFtnBoss( pNxtB, pSibPage, bDontLeave ); + bool bChgPage = lcl_NextFootnoteBoss( pNxtB, pSibPage, bDontLeave ); // When changing pages, also the endnote flag must match. - SwFtnContFrm *pCont = pNxtB && ( !bChgPage || + SwFootnoteContFrm *pCont = pNxtB && ( !bChgPage || pSibPage->IsEndNotePage() == bEndNote ) - ? pNxtB->FindNearestFtnCont( bDontLeave ) : 0; + ? pNxtB->FindNearestFootnoteCont( bDontLeave ) : 0; if ( pCont ) - pSibling = static_cast<SwFtnFrm*>(pCont->Lower()); + pSibling = static_cast<SwFootnoteFrm*>(pCont->Lower()); else bEnd = true; } if ( !bEnd && pSibling ) - nCmpPos = ::lcl_FindFtnPos( pDoc, pSibling->GetAttr() ); + nCmpPos = ::lcl_FindFootnotePos( pDoc, pSibling->GetAttr() ); if ( pSibling && pLastSib && (pSibling != pLastSib) ) { // too far? @@ -1368,13 +1368,13 @@ void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew ) } if ( pSibling ) { - nCmpPos = ::lcl_FindFtnPos( pDoc, pSibling->GetAttr() ); + nCmpPos = ::lcl_FindFootnotePos( pDoc, pSibling->GetAttr() ); if ( nCmpPos < nStPos ) { while ( pSibling->GetFollow() ) pSibling = pSibling->GetFollow(); - pParent = static_cast<SwFtnContFrm*>(pSibling->GetUpper()); - pSibling = static_cast<SwFtnFrm*>(pSibling->GetNext()); + pParent = static_cast<SwFootnoteContFrm*>(pSibling->GetUpper()); + pSibling = static_cast<SwFootnoteFrm*>(pSibling->GetNext()); } else { @@ -1382,23 +1382,23 @@ void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew ) { if( ENDNOTE > nCmpPos || nStPos >= ENDNOTE ) { - OSL_FAIL( "InsertFtn: Master expected II" ); + OSL_FAIL( "InsertFootnote: Master expected II" ); do pSibling = pSibling->GetMaster(); while ( pSibling->GetMaster() ); } } - pParent = static_cast<SwFtnContFrm*>(pSibling->GetUpper()); + pParent = static_cast<SwFootnoteContFrm*>(pSibling->GetUpper()); } } OSL_ENSURE( pParent, "paste in space?" ); pNew->Paste( pParent, pSibling ); } -void SwFtnBossFrm::AppendFtn( SwCntntFrm *pRef, SwTxtFtn *pAttr ) +void SwFootnoteBossFrm::AppendFootnote( SwContentFrm *pRef, SwTextFootnote *pAttr ) { // If the footnote already exists, do nothing. - if ( FindFtn( pRef, pAttr ) ) + if ( FindFootnote( pRef, pAttr ) ) return; // If footnotes are inserted at the end of the document, @@ -1406,23 +1406,23 @@ void SwFtnBossFrm::AppendFtn( SwCntntFrm *pRef, SwTxtFtn *pAttr ) // If there is none yet, we need to create one. // If it is an Endnote, we need to search for or create an // Endnote page. - SwDoc *pDoc = GetFmt()->GetDoc(); - SwFtnBossFrm *pBoss = this; + SwDoc *pDoc = GetFormat()->GetDoc(); + SwFootnoteBossFrm *pBoss = this; SwPageFrm *pPage = FindPageFrm(); SwPageFrm *pMyPage = pPage; bool bChgPage = false; bool bEnd = false; - if ( pAttr->GetFtn().IsEndNote() ) + if ( pAttr->GetFootnote().IsEndNote() ) { bEnd = true; if( GetUpper()->IsSctFrm() && static_cast<SwSectionFrm*>(GetUpper())->IsEndnAtEnd() ) { SwFrm* pLast = - static_cast<SwSectionFrm*>(GetUpper())->FindLastCntnt( FINDMODE_ENDNOTE ); + static_cast<SwSectionFrm*>(GetUpper())->FindLastContent( FINDMODE_ENDNOTE ); if( pLast ) { - pBoss = pLast->FindFtnBossFrm(); + pBoss = pLast->FindFootnoteBossFrm(); pPage = pBoss->FindPageFrm(); } } @@ -1447,15 +1447,15 @@ void SwFtnBossFrm::AppendFtn( SwCntntFrm *pRef, SwTxtFtn *pAttr ) // To ensure to be finished in finite time even if hundreds // of footnotes exist SwPageFrm *pNxt = static_cast<SwPageFrm*>(pPage->GetNext()); - const sal_uLong nStPos = ::lcl_FindFtnPos( pDoc, pAttr ); + const sal_uLong nStPos = ::lcl_FindFootnotePos( pDoc, pAttr ); while ( pNxt && pNxt->IsEndNotePage() ) { - SwFtnContFrm *pCont = pNxt->FindFtnCont(); + SwFootnoteContFrm *pCont = pNxt->FindFootnoteCont(); if ( pCont && pCont->Lower() ) { - OSL_ENSURE( pCont->Lower()->IsFtnFrm(), "no footnote in the container" ); - if ( nStPos > ::lcl_FindFtnPos( pDoc, - static_cast<SwFtnFrm*>(pCont->Lower())->GetAttr())) + OSL_ENSURE( pCont->Lower()->IsFootnoteFrm(), "no footnote in the container" ); + if ( nStPos > ::lcl_FindFootnotePos( pDoc, + static_cast<SwFootnoteFrm*>(pCont->Lower())->GetAttr())) { pPage = pNxt; pNxt = static_cast<SwPageFrm*>(pPage->GetNext()); @@ -1467,19 +1467,19 @@ void SwFtnBossFrm::AppendFtn( SwCntntFrm *pRef, SwTxtFtn *pAttr ) } } } - else if( FTNPOS_CHAPTER == pDoc->GetFtnInfo().ePos && ( !GetUpper()-> - IsSctFrm() || !static_cast<SwSectionFrm*>(GetUpper())->IsFtnAtEnd() ) ) + else if( FTNPOS_CHAPTER == pDoc->GetFootnoteInfo().ePos && ( !GetUpper()-> + IsSctFrm() || !static_cast<SwSectionFrm*>(GetUpper())->IsFootnoteAtEnd() ) ) { - while ( pPage->GetNext() && !pPage->IsFtnPage() && + while ( pPage->GetNext() && !pPage->IsFootnotePage() && !static_cast<SwPageFrm*>(pPage->GetNext())->IsEndNotePage() ) { pPage = static_cast<SwPageFrm*>(pPage->GetNext()); bChgPage = true; } - if ( !pPage->IsFtnPage() ) + if ( !pPage->IsFootnotePage() ) { - SwPageDesc *pDesc = pDoc->GetFtnInfo().GetPageDesc( *pDoc ); + SwPageDesc *pDesc = pDoc->GetFootnoteInfo().GetPageDesc( *pDoc ); pPage = ::InsertNewPage( *pDesc, pPage->GetUpper(), !pPage->OnRightPage(), false, false, true, pPage->GetNext() ); bChgPage = true; @@ -1490,15 +1490,15 @@ void SwFtnBossFrm::AppendFtn( SwCntntFrm *pRef, SwTxtFtn *pAttr ) // to ensure that we will finish in finite time even if // hundreds of footnotes exist. SwPageFrm *pNxt = static_cast<SwPageFrm*>(pPage->GetNext()); - const sal_uLong nStPos = ::lcl_FindFtnPos( pDoc, pAttr ); - while ( pNxt && pNxt->IsFtnPage() && !pNxt->IsEndNotePage() ) + const sal_uLong nStPos = ::lcl_FindFootnotePos( pDoc, pAttr ); + while ( pNxt && pNxt->IsFootnotePage() && !pNxt->IsEndNotePage() ) { - SwFtnContFrm *pCont = pNxt->FindFtnCont(); + SwFootnoteContFrm *pCont = pNxt->FindFootnoteCont(); if ( pCont && pCont->Lower() ) { - OSL_ENSURE( pCont->Lower()->IsFtnFrm(), "no footnote in the container" ); - if ( nStPos > ::lcl_FindFtnPos( pDoc, - static_cast<SwFtnFrm*>(pCont->Lower())->GetAttr())) + OSL_ENSURE( pCont->Lower()->IsFootnoteFrm(), "no footnote in the container" ); + if ( nStPos > ::lcl_FindFootnotePos( pDoc, + static_cast<SwFootnoteFrm*>(pCont->Lower())->GetAttr())) { pPage = pNxt; pNxt = static_cast<SwPageFrm*>(pPage->GetNext()); @@ -1519,25 +1519,25 @@ void SwFtnBossFrm::AppendFtn( SwCntntFrm *pRef, SwTxtFtn *pAttr ) // If there is already a footnote content on the column/page, // another one cannot be created in a column area. - if( pBoss->IsInSct() && pBoss->IsColumnFrm() && !pPage->IsFtnPage() ) + if( pBoss->IsInSct() && pBoss->IsColumnFrm() && !pPage->IsFootnotePage() ) { SwSectionFrm* pSct = pBoss->FindSctFrm(); - if( bEnd ? !pSct->IsEndnAtEnd() : !pSct->IsFtnAtEnd() ) + if( bEnd ? !pSct->IsEndnAtEnd() : !pSct->IsFootnoteAtEnd() ) { - SwFtnContFrm* pFtnCont = pSct->FindFtnBossFrm(!bEnd)->FindFtnCont(); - if( pFtnCont ) + SwFootnoteContFrm* pFootnoteCont = pSct->FindFootnoteBossFrm(!bEnd)->FindFootnoteCont(); + if( pFootnoteCont ) { - SwFtnFrm* pTmp = static_cast<SwFtnFrm*>(pFtnCont->Lower()); + SwFootnoteFrm* pTmp = static_cast<SwFootnoteFrm*>(pFootnoteCont->Lower()); if( bEnd ) - while( pTmp && !pTmp->GetAttr()->GetFtn().IsEndNote() ) - pTmp = static_cast<SwFtnFrm*>(pTmp->GetNext()); + while( pTmp && !pTmp->GetAttr()->GetFootnote().IsEndNote() ) + pTmp = static_cast<SwFootnoteFrm*>(pTmp->GetNext()); if( pTmp && *pTmp < pAttr ) return; } } } - SwFtnFrm *pNew = new SwFtnFrm( pDoc->GetDfltFrmFmt(), this, pRef, pAttr ); + SwFootnoteFrm *pNew = new SwFootnoteFrm( pDoc->GetDfltFrameFormat(), this, pRef, pAttr ); { SwNodeIndex aIdx( *pAttr->GetStartNode(), 1 ); ::_InsertCnt( pNew, pDoc, aIdx.GetIndex() ); @@ -1547,49 +1547,49 @@ void SwFtnBossFrm::AppendFtn( SwCntntFrm *pRef, SwTxtFtn *pAttr ) if( bChgPage ) { SwLayoutFrm* pBody = pPage->FindBodyCont(); - OSL_ENSURE( pBody, "AppendFtn: NoPageBody?" ); + OSL_ENSURE( pBody, "AppendFootnote: NoPageBody?" ); if( pBody->Lower() && pBody->Lower()->IsColumnFrm() ) - pBoss = static_cast<SwFtnBossFrm*>(pBody->Lower()); + pBoss = static_cast<SwFootnoteBossFrm*>(pBody->Lower()); else pBoss = pPage; // page if no columns exist } - pBoss->InsertFtn( pNew ); + pBoss->InsertFootnote( pNew ); if ( pNew->GetUpper() ) // inserted or not? { ::RegistFlys( pNew->FindPageFrm(), pNew ); SwSectionFrm* pSect = FindSctFrm(); - // The content of a FtnContainer in a (column) section only need to be calculated + // The content of a FootnoteContainer in a (column) section only need to be calculated // if the section stretches already to the bottom edge of the Upper. if( pSect && !pSect->IsJoinLocked() && ( bEnd ? !pSect->IsEndnAtEnd() : - !pSect->IsFtnAtEnd() ) && pSect->Growable() ) + !pSect->IsFootnoteAtEnd() ) && pSect->Growable() ) pSect->InvalidateSize(); else { // #i49383# - disable unlock of position of // lower objects during format of footnote content. - const bool bOldFtnFrmLocked( pNew->IsColLocked() ); + const bool bOldFootnoteFrmLocked( pNew->IsColLocked() ); pNew->ColLock(); pNew->KeepLockPosOfLowerObjs(); // #i57914# - adjust fix #i49383# - SwCntntFrm *pCnt = pNew->ContainsCntnt(); - while ( pCnt && pCnt->FindFtnFrm()->GetAttr() == pAttr ) + SwContentFrm *pCnt = pNew->ContainsContent(); + while ( pCnt && pCnt->FindFootnoteFrm()->GetAttr() == pAttr ) { pCnt->Calc(); // #i49383# - format anchored objects - if ( pCnt->IsTxtFrm() && pCnt->IsValid() ) + if ( pCnt->IsTextFrm() && pCnt->IsValid() ) { if ( !SwObjectFormatter::FormatObjsAtFrm( *pCnt, *(pCnt->FindPageFrm()) ) ) { // restart format with first content - pCnt = pNew->ContainsCntnt(); + pCnt = pNew->ContainsContent(); continue; } } pCnt = pCnt->FindNextCnt(); } // #i49383# - if ( !bOldFtnFrmLocked ) + if ( !bOldFootnoteFrmLocked ) { pNew->ColUnlock(); } @@ -1598,52 +1598,52 @@ void SwFtnBossFrm::AppendFtn( SwCntntFrm *pRef, SwTxtFtn *pAttr ) pNew->UnlockPosOfLowerObjs(); pNew->Calc(); // #i57914# - adjust fix #i49383# - if ( !bOldFtnFrmLocked && !pNew->GetLower() && + if ( !bOldFootnoteFrmLocked && !pNew->GetLower() && !pNew->IsColLocked() && !pNew->IsBackMoveLocked() ) { pNew->Cut(); SwFrm::DestroyFrm(pNew); } } - pMyPage->UpdateFtnNum(); + pMyPage->UpdateFootnoteNum(); } else SwFrm::DestroyFrm(pNew); } -SwFtnFrm *SwFtnBossFrm::FindFtn( const SwCntntFrm *pRef, const SwTxtFtn *pAttr ) +SwFootnoteFrm *SwFootnoteBossFrm::FindFootnote( const SwContentFrm *pRef, const SwTextFootnote *pAttr ) { // the easiest and savest way goes via the attribute - OSL_ENSURE( pAttr->GetStartNode(), "FtnAtr without StartNode." ); + OSL_ENSURE( pAttr->GetStartNode(), "FootnoteAtr without StartNode." ); SwNodeIndex aIdx( *pAttr->GetStartNode(), 1 ); - SwCntntNode *pNd = aIdx.GetNode().GetCntntNode(); + SwContentNode *pNd = aIdx.GetNode().GetContentNode(); if ( !pNd ) pNd = pRef->GetAttrSet()->GetDoc()-> GetNodes().GoNextSection( &aIdx, true, false ); if ( !pNd ) return 0; - SwIterator<SwFrm,SwCntntNode> aIter( *pNd ); + SwIterator<SwFrm,SwContentNode> aIter( *pNd ); SwFrm* pFrm = aIter.First(); if( pFrm ) do { pFrm = pFrm->GetUpper(); // #i28500#, #i27243# Due to the endnode collector, there are - // SwFtnFrms, which are not in the layout. Therefore the - // bInfFtn flags are not set correctly, and a cell of FindFtnFrm - // would return 0. Therefore we better call ImplFindFtnFrm(). - SwFtnFrm *pFtn = pFrm->ImplFindFtnFrm(); - if ( pFtn && pFtn->GetRef() == pRef ) + // SwFootnoteFrms, which are not in the layout. Therefore the + // bInfFootnote flags are not set correctly, and a cell of FindFootnoteFrm + // would return 0. Therefore we better call ImplFindFootnoteFrm(). + SwFootnoteFrm *pFootnote = pFrm->ImplFindFootnoteFrm(); + if ( pFootnote && pFootnote->GetRef() == pRef ) { // The following condition becomes true, if the whole // footnotecontent is a section. While no frames exist, // the HiddenFlag of the section is set, this causes // the GoNextSection-function leaves the footnote. - if( pFtn->GetAttr() != pAttr ) + if( pFootnote->GetAttr() != pAttr ) return 0; - while ( pFtn && pFtn->GetMaster() ) - pFtn = pFtn->GetMaster(); - return pFtn; + while ( pFootnote && pFootnote->GetMaster() ) + pFootnote = pFootnote->GetMaster(); + return pFootnote; } } while ( 0 != (pFrm = aIter.Next()) ); @@ -1651,64 +1651,64 @@ SwFtnFrm *SwFtnBossFrm::FindFtn( const SwCntntFrm *pRef, const SwTxtFtn *pAttr ) return 0; } -void SwFtnBossFrm::RemoveFtn( const SwCntntFrm *pRef, const SwTxtFtn *pAttr, +void SwFootnoteBossFrm::RemoveFootnote( const SwContentFrm *pRef, const SwTextFootnote *pAttr, bool bPrep ) { - SwFtnFrm *pFtn = FindFtn( pRef, pAttr ); - if( pFtn ) + SwFootnoteFrm *pFootnote = FindFootnote( pRef, pAttr ); + if( pFootnote ) { do { - SwFtnFrm *pFoll = pFtn->GetFollow(); - pFtn->Cut(); - SwFrm::DestroyFrm(pFtn); - pFtn = pFoll; - } while ( pFtn ); + SwFootnoteFrm *pFoll = pFootnote->GetFollow(); + pFootnote->Cut(); + SwFrm::DestroyFrm(pFootnote); + pFootnote = pFoll; + } while ( pFootnote ); if( bPrep && pRef->IsFollow() ) { - OSL_ENSURE( pRef->IsTxtFrm(), "NoTxtFrm has Footnote?" ); - SwTxtFrm* pMaster = pRef->FindMaster(); + OSL_ENSURE( pRef->IsTextFrm(), "NoTextFrm has Footnote?" ); + SwTextFrm* pMaster = pRef->FindMaster(); if( !pMaster->IsLocked() ) pMaster->Prepare( PREP_FTN_GONE ); } } - FindPageFrm()->UpdateFtnNum(); + FindPageFrm()->UpdateFootnoteNum(); } -void SwFtnBossFrm::ChangeFtnRef( const SwCntntFrm *pOld, const SwTxtFtn *pAttr, - SwCntntFrm *pNew ) +void SwFootnoteBossFrm::ChangeFootnoteRef( const SwContentFrm *pOld, const SwTextFootnote *pAttr, + SwContentFrm *pNew ) { - SwFtnFrm *pFtn = FindFtn( pOld, pAttr ); - while ( pFtn ) + SwFootnoteFrm *pFootnote = FindFootnote( pOld, pAttr ); + while ( pFootnote ) { - pFtn->SetRef( pNew ); - pFtn = pFtn->GetFollow(); + pFootnote->SetRef( pNew ); + pFootnote = pFootnote->GetFollow(); } } -/// OD 03.04.2003 #108446# - add parameter <_bCollectOnlyPreviousFtns> in +/// OD 03.04.2003 #108446# - add parameter <_bCollectOnlyPreviousFootnotes> in /// order to control, if only footnotes, which are positioned before the /// footnote boss frame <this> have to be collected. -void SwFtnBossFrm::CollectFtns( const SwCntntFrm* _pRef, - SwFtnBossFrm* _pOld, - SwFtnFrms& _rFtnArr, - const bool _bCollectOnlyPreviousFtns ) +void SwFootnoteBossFrm::CollectFootnotes( const SwContentFrm* _pRef, + SwFootnoteBossFrm* _pOld, + SwFootnoteFrms& _rFootnoteArr, + const bool _bCollectOnlyPreviousFootnotes ) { - SwFtnFrm *pFtn = _pOld->FindFirstFtn(); - while( !pFtn ) + SwFootnoteFrm *pFootnote = _pOld->FindFirstFootnote(); + while( !pFootnote ) { if( _pOld->IsColumnFrm() ) { // visit columns - while ( !pFtn && _pOld->GetPrev() ) + while ( !pFootnote && _pOld->GetPrev() ) { // Still no problem if no footnote was found yet. The loop is needed to pick up // following rows in tables. In all other cases it might correct bad contexts. - _pOld = static_cast<SwFtnBossFrm*>(_pOld->GetPrev()); - pFtn = _pOld->FindFirstFtn(); + _pOld = static_cast<SwFootnoteBossFrm*>(_pOld->GetPrev()); + pFootnote = _pOld->FindFirstFootnote(); } } - if( !pFtn ) + if( !pFootnote ) { // previous page SwPageFrm* pPg; @@ -1726,45 +1726,45 @@ void SwFtnBossFrm::CollectFtns( const SwCntntFrm* _pRef, if( pBody->Lower() && pBody->Lower()->IsColumnFrm() ) { // multiple columns on one page => search last column - _pOld = static_cast<SwFtnBossFrm*>(pBody->GetLastLower()); + _pOld = static_cast<SwFootnoteBossFrm*>(pBody->GetLastLower()); } else _pOld = pPg; // single column page - pFtn = _pOld->FindFirstFtn(); + pFootnote = _pOld->FindFirstFootnote(); } } - // OD 03.04.2003 #108446# - consider new parameter <_bCollectOnlyPreviousFtns> - SwFtnBossFrm* pRefBossFrm = NULL; - if ( _bCollectOnlyPreviousFtns ) + // OD 03.04.2003 #108446# - consider new parameter <_bCollectOnlyPreviousFootnotes> + SwFootnoteBossFrm* pRefBossFrm = NULL; + if ( _bCollectOnlyPreviousFootnotes ) { pRefBossFrm = this; } - _CollectFtns( _pRef, pFtn, _rFtnArr, _bCollectOnlyPreviousFtns, pRefBossFrm ); + _CollectFootnotes( _pRef, pFootnote, _rFootnoteArr, _bCollectOnlyPreviousFootnotes, pRefBossFrm ); } -inline void FtnInArr( SwFtnFrms& rFtnArr, SwFtnFrm* pFtn ) +inline void FootnoteInArr( SwFootnoteFrms& rFootnoteArr, SwFootnoteFrm* pFootnote ) { - if ( rFtnArr.end() == std::find( rFtnArr.begin(), rFtnArr.end(), pFtn ) ) - rFtnArr.push_back( pFtn ); + if ( rFootnoteArr.end() == std::find( rFootnoteArr.begin(), rFootnoteArr.end(), pFootnote ) ) + rFootnoteArr.push_back( pFootnote ); } -/// OD 03.04.2003 #108446# - add parameters <_bCollectOnlyPreviousFtns> and -/// <_pRefFtnBossFrm> in order to control, if only footnotes, which are positioned +/// OD 03.04.2003 #108446# - add parameters <_bCollectOnlyPreviousFootnotes> and +/// <_pRefFootnoteBossFrm> in order to control, if only footnotes, which are positioned /// before the given reference footnote boss frame have to be collected. -/// Note: if parameter <_bCollectOnlyPreviousFtns> is true, then parameter -/// <_pRefFtnBossFrm> have to be referenced to an object. +/// Note: if parameter <_bCollectOnlyPreviousFootnotes> is true, then parameter +/// <_pRefFootnoteBossFrm> have to be referenced to an object. /// Adjust parameter names. -void SwFtnBossFrm::_CollectFtns( const SwCntntFrm* _pRef, - SwFtnFrm* _pFtn, - SwFtnFrms& _rFtnArr, - bool _bCollectOnlyPreviousFtns, - const SwFtnBossFrm* _pRefFtnBossFrm) +void SwFootnoteBossFrm::_CollectFootnotes( const SwContentFrm* _pRef, + SwFootnoteFrm* _pFootnote, + SwFootnoteFrms& _rFootnoteArr, + bool _bCollectOnlyPreviousFootnotes, + const SwFootnoteBossFrm* _pRefFootnoteBossFrm) { // OD 03.04.2003 #108446# - assert, that no reference footnote boss frame // is set, in spite of the order, that only previous footnotes has to be // collected. - OSL_ENSURE( !_bCollectOnlyPreviousFtns || _pRefFtnBossFrm, - "<SwFtnBossFrm::_CollectFtns(..)> - No reference footnote boss frame for collecting only previous footnotes set.\nCrash will be caused!" ); + OSL_ENSURE( !_bCollectOnlyPreviousFootnotes || _pRefFootnoteBossFrm, + "<SwFootnoteBossFrm::_CollectFootnotes(..)> - No reference footnote boss frame for collecting only previous footnotes set.\nCrash will be caused!" ); // Collect all footnotes referenced by pRef (attribute by attribute), combine them // (the content might be divided over multiple pages) and cut them. @@ -1772,12 +1772,12 @@ void SwFtnBossFrm::_CollectFtns( const SwCntntFrm* _pRef, // For robustness, we do not log the corresponding footnotes here. If a footnote // is touched twice, there might be a crash. This allows this function here to // also handle corrupt layouts in some degrees (without loops or even crashes). - SwFtnFrms aNotFtnArr; + SwFootnoteFrms aNotFootnoteArr; // here we have a footnote placed in front of the first one of the reference - OSL_ENSURE( !_pFtn->GetMaster() || _pFtn->GetRef() != _pRef, "move FollowFtn?" ); - while ( _pFtn->GetMaster() ) - _pFtn = _pFtn->GetMaster(); + OSL_ENSURE( !_pFootnote->GetMaster() || _pFootnote->GetRef() != _pRef, "move FollowFootnote?" ); + while ( _pFootnote->GetMaster() ) + _pFootnote = _pFootnote->GetMaster(); bool bFound = false; @@ -1785,72 +1785,72 @@ void SwFtnBossFrm::_CollectFtns( const SwCntntFrm* _pRef, { // Search for the next footnote in this column/page so that // we do not start from zero again after cutting one footnote. - SwFtnFrm *pNxtFtn = _pFtn; - while ( pNxtFtn->GetFollow() ) - pNxtFtn = pNxtFtn->GetFollow(); - pNxtFtn = static_cast<SwFtnFrm*>(pNxtFtn->GetNext()); + SwFootnoteFrm *pNxtFootnote = _pFootnote; + while ( pNxtFootnote->GetFollow() ) + pNxtFootnote = pNxtFootnote->GetFollow(); + pNxtFootnote = static_cast<SwFootnoteFrm*>(pNxtFootnote->GetNext()); - if ( !pNxtFtn ) + if ( !pNxtFootnote ) { - SwFtnBossFrm* pBoss = _pFtn->FindFtnBossFrm(); + SwFootnoteBossFrm* pBoss = _pFootnote->FindFootnoteBossFrm(); SwPageFrm* pPage = pBoss->FindPageFrm(); do { - lcl_NextFtnBoss( pBoss, pPage, false ); + lcl_NextFootnoteBoss( pBoss, pPage, false ); if( pBoss ) { - SwLayoutFrm* pCont = pBoss->FindFtnCont(); + SwLayoutFrm* pCont = pBoss->FindFootnoteCont(); if( pCont ) { - pNxtFtn = static_cast<SwFtnFrm*>(pCont->Lower()); - if( pNxtFtn ) + pNxtFootnote = static_cast<SwFootnoteFrm*>(pCont->Lower()); + if( pNxtFootnote ) { - while( pNxtFtn->GetMaster() ) - pNxtFtn = pNxtFtn->GetMaster(); - if( pNxtFtn == _pFtn ) - pNxtFtn = NULL; + while( pNxtFootnote->GetMaster() ) + pNxtFootnote = pNxtFootnote->GetMaster(); + if( pNxtFootnote == _pFootnote ) + pNxtFootnote = NULL; } } } - } while( !pNxtFtn && pBoss ); + } while( !pNxtFootnote && pBoss ); } - else if( !pNxtFtn->GetAttr()->GetFtn().IsEndNote() ) - { OSL_ENSURE( !pNxtFtn->GetMaster(), "_CollectFtn: Master expected" ); - while ( pNxtFtn->GetMaster() ) - pNxtFtn = pNxtFtn->GetMaster(); + else if( !pNxtFootnote->GetAttr()->GetFootnote().IsEndNote() ) + { OSL_ENSURE( !pNxtFootnote->GetMaster(), "_CollectFootnote: Master expected" ); + while ( pNxtFootnote->GetMaster() ) + pNxtFootnote = pNxtFootnote->GetMaster(); } - if ( pNxtFtn == _pFtn ) + if ( pNxtFootnote == _pFootnote ) { - OSL_FAIL( "_CollectFtn: Vicious circle" ); - pNxtFtn = 0; + OSL_FAIL( "_CollectFootnote: Vicious circle" ); + pNxtFootnote = 0; } // OD 03.04.2003 #108446# - determine, if found footnote has to be collected. - bool bCollectFoundFtn = false; - if ( _pFtn->GetRef() == _pRef && !_pFtn->GetAttr()->GetFtn().IsEndNote() ) + bool bCollectFoundFootnote = false; + if ( _pFootnote->GetRef() == _pRef && !_pFootnote->GetAttr()->GetFootnote().IsEndNote() ) { - if ( _bCollectOnlyPreviousFtns ) + if ( _bCollectOnlyPreviousFootnotes ) { - SwFtnBossFrm* pBossOfFoundFtn = _pFtn->FindFtnBossFrm( true ); - OSL_ENSURE( pBossOfFoundFtn, - "<SwFtnBossFrm::_CollectFtns(..)> - footnote boss frame of found footnote frame missing.\nWrong layout!" ); - if ( !pBossOfFoundFtn || // don't crash, if no footnote boss is found. - pBossOfFoundFtn->IsBefore( _pRefFtnBossFrm ) + SwFootnoteBossFrm* pBossOfFoundFootnote = _pFootnote->FindFootnoteBossFrm( true ); + OSL_ENSURE( pBossOfFoundFootnote, + "<SwFootnoteBossFrm::_CollectFootnotes(..)> - footnote boss frame of found footnote frame missing.\nWrong layout!" ); + if ( !pBossOfFoundFootnote || // don't crash, if no footnote boss is found. + pBossOfFoundFootnote->IsBefore( _pRefFootnoteBossFrm ) ) { - bCollectFoundFtn = true; + bCollectFoundFootnote = true; } } else { - bCollectFoundFtn = true; + bCollectFoundFootnote = true; } } - if ( bCollectFoundFtn ) + if ( bCollectFoundFootnote ) { - OSL_ENSURE( !_pFtn->GetMaster(), "move FollowFtn?" ); - SwFtnFrm *pNxt = _pFtn->GetFollow(); + OSL_ENSURE( !_pFootnote->GetMaster(), "move FollowFootnote?" ); + SwFootnoteFrm *pNxt = _pFootnote->GetFollow(); while ( pNxt ) { SwFrm *pCnt = pNxt->ContainsAny(); @@ -1860,7 +1860,7 @@ void SwFtnBossFrm::_CollectFtns( const SwCntntFrm* _pRef, do { SwFrm *pNxtCnt = pCnt->GetNext(); pCnt->Cut(); - pCnt->Paste( _pFtn ); + pCnt->Paste( _pFootnote ); pCnt = pNxtCnt; } while ( pCnt ); } @@ -1870,29 +1870,29 @@ void SwFtnBossFrm::_CollectFtns( const SwCntntFrm* _pRef, pNxt->Cut(); SwFrm::DestroyFrm(pNxt); } - pNxt = _pFtn->GetFollow(); + pNxt = _pFootnote->GetFollow(); } - _pFtn->Cut(); - FtnInArr( _rFtnArr, _pFtn ); + _pFootnote->Cut(); + FootnoteInArr( _rFootnoteArr, _pFootnote ); bFound = true; } else { - FtnInArr( aNotFtnArr, _pFtn ); + FootnoteInArr( aNotFootnoteArr, _pFootnote ); if( bFound ) break; } - if ( pNxtFtn && - _rFtnArr.end() == std::find( _rFtnArr.begin(), _rFtnArr.end(), pNxtFtn ) && - aNotFtnArr.end() == std::find( aNotFtnArr.begin(), aNotFtnArr.end(), pNxtFtn ) ) - _pFtn = pNxtFtn; + if ( pNxtFootnote && + _rFootnoteArr.end() == std::find( _rFootnoteArr.begin(), _rFootnoteArr.end(), pNxtFootnote ) && + aNotFootnoteArr.end() == std::find( aNotFootnoteArr.begin(), aNotFootnoteArr.end(), pNxtFootnote ) ) + _pFootnote = pNxtFootnote; else break; } - while ( _pFtn ); + while ( _pFootnote ); } -void SwFtnBossFrm::_MoveFtns( SwFtnFrms &rFtnArr, bool bCalc ) +void SwFootnoteBossFrm::_MoveFootnotes( SwFootnoteFrms &rFootnoteArr, bool bCalc ) { // All footnotes referenced by pRef need to be moved // to a new position (based on the new column/page) @@ -1902,12 +1902,12 @@ void SwFtnBossFrm::_MoveFtns( SwFtnFrms &rFtnArr, bool bCalc ) // #i21478# - keep last inserted footnote in order to // format the content of the following one. - SwFtnFrm* pLastInsertedFtn = 0L; - for ( size_t i = 0; i < rFtnArr.size(); ++i ) + SwFootnoteFrm* pLastInsertedFootnote = 0L; + for ( size_t i = 0; i < rFootnoteArr.size(); ++i ) { - SwFtnFrm *pFtn = rFtnArr[i]; + SwFootnoteFrm *pFootnote = rFootnoteArr[i]; - SwFtnBossFrm* pRefBoss = pFtn->GetRef()->FindFtnBossFrm( true ); + SwFootnoteBossFrm* pRefBoss = pFootnote->GetRef()->FindFootnoteBossFrm( true ); if( pRefBoss != this ) { const sal_uInt16 nRefNum = pRefBoss->FindPageFrm()->GetPhyPageNum(); @@ -1915,14 +1915,14 @@ void SwFtnBossFrm::_MoveFtns( SwFtnFrms &rFtnArr, bool bCalc ) if( nRefNum < nMyNum || ( nRefNum == nMyNum && nRefCol <= nMyCol ) ) pRefBoss = this; } - pRefBoss->InsertFtn( pFtn ); + pRefBoss->InsertFootnote( pFootnote ); - if ( pFtn->GetUpper() ) // robust, e.g. with duplicates + if ( pFootnote->GetUpper() ) // robust, e.g. with duplicates { // First condense the content so that footnote frames that do not fit on the page // do not do too much harm (Loop 66312). So, the footnote content first grows as // soon as the content gets formatted and it is sure that it fits on the page. - SwFrm *pCnt = pFtn->ContainsAny(); + SwFrm *pCnt = pFootnote->ContainsAny(); while( pCnt ) { if( pCnt->IsLayoutFrm() ) @@ -1942,35 +1942,35 @@ void SwFtnBossFrm::_MoveFtns( SwFtnFrms &rFtnArr, bool bCalc ) (pCnt->Prt().*fnRect->fnSetHeight)(0); pCnt = pCnt->GetNext(); } - (pFtn->Frm().*fnRect->fnSetHeight)(0); - (pFtn->Prt().*fnRect->fnSetHeight)(0); - pFtn->Calc(); - pFtn->GetUpper()->Calc(); + (pFootnote->Frm().*fnRect->fnSetHeight)(0); + (pFootnote->Prt().*fnRect->fnSetHeight)(0); + pFootnote->Calc(); + pFootnote->GetUpper()->Calc(); if( bCalc ) { - SwTxtFtn *pAttr = pFtn->GetAttr(); - pCnt = pFtn->ContainsAny(); - bool bUnlock = !pFtn->IsBackMoveLocked(); - pFtn->LockBackMove(); + SwTextFootnote *pAttr = pFootnote->GetAttr(); + pCnt = pFootnote->ContainsAny(); + bool bUnlock = !pFootnote->IsBackMoveLocked(); + pFootnote->LockBackMove(); // #i49383# - disable unlock of position of // lower objects during format of footnote content. - pFtn->KeepLockPosOfLowerObjs(); + pFootnote->KeepLockPosOfLowerObjs(); // #i57914# - adjust fix #i49383# - while ( pCnt && pCnt->FindFtnFrm()->GetAttr() == pAttr ) + while ( pCnt && pCnt->FindFootnoteFrm()->GetAttr() == pAttr ) { pCnt->_InvalidatePos(); pCnt->Calc(); // #i49383# - format anchored objects - if ( pCnt->IsTxtFrm() && pCnt->IsValid() ) + if ( pCnt->IsTextFrm() && pCnt->IsValid() ) { if ( !SwObjectFormatter::FormatObjsAtFrm( *pCnt, *(pCnt->FindPageFrm()) ) ) { // restart format with first content - pCnt = pFtn->ContainsAny(); + pCnt = pFootnote->ContainsAny(); continue; } } @@ -1988,69 +1988,69 @@ void SwFtnBossFrm::_MoveFtns( SwFtnFrms &rFtnArr, bool bCalc ) } if( bUnlock ) { - pFtn->UnlockBackMove(); - if( !pFtn->ContainsAny() && !pFtn->IsColLocked() ) + pFootnote->UnlockBackMove(); + if( !pFootnote->ContainsAny() && !pFootnote->IsColLocked() ) { - pFtn->Cut(); - SwFrm::DestroyFrm(pFtn); + pFootnote->Cut(); + SwFrm::DestroyFrm(pFootnote); // #i21478# - pFtn = 0L; + pFootnote = 0L; } } // #i49383# - if ( pFtn ) + if ( pFootnote ) { // #i57914# - adjust fix #i49383# // enable lock of lower object position before format of footnote frame. - pFtn->UnlockPosOfLowerObjs(); - pFtn->Calc(); + pFootnote->UnlockPosOfLowerObjs(); + pFootnote->Calc(); } } } else - { OSL_ENSURE( !pFtn->GetMaster() && !pFtn->GetFollow(), - "DelFtn and Master/Follow?" ); - SwFrm::DestroyFrm(pFtn); + { OSL_ENSURE( !pFootnote->GetMaster() && !pFootnote->GetFollow(), + "DelFootnote and Master/Follow?" ); + SwFrm::DestroyFrm(pFootnote); // #i21478# - pFtn = 0L; + pFootnote = 0L; } // #i21478# - if ( pFtn ) + if ( pFootnote ) { - pLastInsertedFtn = pFtn; + pLastInsertedFootnote = pFootnote; } } // #i21478# - format content of footnote following // the new inserted ones. - if ( bCalc && pLastInsertedFtn ) + if ( bCalc && pLastInsertedFootnote ) { - if ( pLastInsertedFtn->GetNext() ) + if ( pLastInsertedFootnote->GetNext() ) { - SwFtnFrm* pNextFtn = static_cast<SwFtnFrm*>(pLastInsertedFtn->GetNext()); - SwTxtFtn* pAttr = pNextFtn->GetAttr(); - SwFrm* pCnt = pNextFtn->ContainsAny(); + SwFootnoteFrm* pNextFootnote = static_cast<SwFootnoteFrm*>(pLastInsertedFootnote->GetNext()); + SwTextFootnote* pAttr = pNextFootnote->GetAttr(); + SwFrm* pCnt = pNextFootnote->ContainsAny(); - bool bUnlock = !pNextFtn->IsBackMoveLocked(); - pNextFtn->LockBackMove(); + bool bUnlock = !pNextFootnote->IsBackMoveLocked(); + pNextFootnote->LockBackMove(); // #i49383# - disable unlock of position of // lower objects during format of footnote content. - pNextFtn->KeepLockPosOfLowerObjs(); + pNextFootnote->KeepLockPosOfLowerObjs(); // #i57914# - adjust fix #i49383# - while ( pCnt && pCnt->FindFtnFrm()->GetAttr() == pAttr ) + while ( pCnt && pCnt->FindFootnoteFrm()->GetAttr() == pAttr ) { pCnt->_InvalidatePos(); pCnt->Calc(); // #i49383# - format anchored objects - if ( pCnt->IsTxtFrm() && pCnt->IsValid() ) + if ( pCnt->IsTextFrm() && pCnt->IsValid() ) { if ( !SwObjectFormatter::FormatObjsAtFrm( *pCnt, *(pCnt->FindPageFrm()) ) ) { // restart format with first content - pCnt = pNextFtn->ContainsAny(); + pCnt = pNextFootnote->ContainsAny(); continue; } } @@ -2068,136 +2068,136 @@ void SwFtnBossFrm::_MoveFtns( SwFtnFrms &rFtnArr, bool bCalc ) } if( bUnlock ) { - pNextFtn->UnlockBackMove(); + pNextFootnote->UnlockBackMove(); } // #i49383# // #i57914# - adjust fix #i49383# // enable lock of lower object position before format of footnote frame. - pNextFtn->UnlockPosOfLowerObjs(); - pNextFtn->Calc(); + pNextFootnote->UnlockPosOfLowerObjs(); + pNextFootnote->Calc(); } } } -void SwFtnBossFrm::MoveFtns( const SwCntntFrm *pSrc, SwCntntFrm *pDest, - SwTxtFtn *pAttr ) +void SwFootnoteBossFrm::MoveFootnotes( const SwContentFrm *pSrc, SwContentFrm *pDest, + SwTextFootnote *pAttr ) { - if( ( GetFmt()->GetDoc()->GetFtnInfo().ePos == FTNPOS_CHAPTER && - (!GetUpper()->IsSctFrm() || !static_cast<SwSectionFrm*>(GetUpper())->IsFtnAtEnd())) - || pAttr->GetFtn().IsEndNote() ) + if( ( GetFormat()->GetDoc()->GetFootnoteInfo().ePos == FTNPOS_CHAPTER && + (!GetUpper()->IsSctFrm() || !static_cast<SwSectionFrm*>(GetUpper())->IsFootnoteAtEnd())) + || pAttr->GetFootnote().IsEndNote() ) return; - OSL_ENSURE( this == pSrc->FindFtnBossFrm( true ), - "SwPageFrm::MoveFtns: source frame isn't on that FtnBoss" ); + OSL_ENSURE( this == pSrc->FindFootnoteBossFrm( true ), + "SwPageFrm::MoveFootnotes: source frame isn't on that FootnoteBoss" ); - SwFtnFrm *pFtn = FindFirstFtn(); - if( pFtn ) + SwFootnoteFrm *pFootnote = FindFirstFootnote(); + if( pFootnote ) { - ChangeFtnRef( pSrc, pAttr, pDest ); - SwFtnBossFrm *pDestBoss = pDest->FindFtnBossFrm( true ); - OSL_ENSURE( pDestBoss, "+SwPageFrm::MoveFtns: no destination boss" ); + ChangeFootnoteRef( pSrc, pAttr, pDest ); + SwFootnoteBossFrm *pDestBoss = pDest->FindFootnoteBossFrm( true ); + OSL_ENSURE( pDestBoss, "+SwPageFrm::MoveFootnotes: no destination boss" ); if( pDestBoss ) // robust { - SwFtnFrms aFtnArr; - SwFtnBossFrm::_CollectFtns( pDest, pFtn, aFtnArr ); - if ( !aFtnArr.empty() ) + SwFootnoteFrms aFootnoteArr; + SwFootnoteBossFrm::_CollectFootnotes( pDest, pFootnote, aFootnoteArr ); + if ( !aFootnoteArr.empty() ) { - pDestBoss->_MoveFtns( aFtnArr, true ); + pDestBoss->_MoveFootnotes( aFootnoteArr, true ); SwPageFrm* pSrcPage = FindPageFrm(); SwPageFrm* pDestPage = pDestBoss->FindPageFrm(); - // update FtnNum only at page change + // update FootnoteNum only at page change if( pSrcPage != pDestPage ) { if( pSrcPage->GetPhyPageNum() > pDestPage->GetPhyPageNum() ) - pSrcPage->UpdateFtnNum(); - pDestPage->UpdateFtnNum(); + pSrcPage->UpdateFootnoteNum(); + pDestPage->UpdateFootnoteNum(); } } } } } -void SwFtnBossFrm::RearrangeFtns( const SwTwips nDeadLine, const bool bLock, - const SwTxtFtn *pAttr ) +void SwFootnoteBossFrm::RearrangeFootnotes( const SwTwips nDeadLine, const bool bLock, + const SwTextFootnote *pAttr ) { // Format all footnotes of a column/page so that they might change the column/page. - SwSaveFtnHeight aSave( this, nDeadLine ); - SwFtnFrm *pFtn = FindFirstFtn(); - if( pFtn && pFtn->GetPrev() && bLock ) + SwSaveFootnoteHeight aSave( this, nDeadLine ); + SwFootnoteFrm *pFootnote = FindFirstFootnote(); + if( pFootnote && pFootnote->GetPrev() && bLock ) { - SwFtnFrm* pFirst = static_cast<SwFtnFrm*>(pFtn->GetUpper()->Lower()); - SwFrm* pCntnt = pFirst->ContainsAny(); - if( pCntnt ) + SwFootnoteFrm* pFirst = static_cast<SwFootnoteFrm*>(pFootnote->GetUpper()->Lower()); + SwFrm* pContent = pFirst->ContainsAny(); + if( pContent ) { bool bUnlock = !pFirst->IsBackMoveLocked(); pFirst->LockBackMove(); pFirst->Calc(); - pCntnt->Calc(); + pContent->Calc(); // #i49383# - format anchored objects - if ( pCntnt->IsTxtFrm() && pCntnt->IsValid() ) + if ( pContent->IsTextFrm() && pContent->IsValid() ) { - SwObjectFormatter::FormatObjsAtFrm( *pCntnt, - *(pCntnt->FindPageFrm()) ); + SwObjectFormatter::FormatObjsAtFrm( *pContent, + *(pContent->FindPageFrm()) ); } if( bUnlock ) pFirst->UnlockBackMove(); } - pFtn = FindFirstFtn(); + pFootnote = FindFirstFootnote(); } - SwDoc *pDoc = GetFmt()->GetDoc(); - const sal_uLong nFtnPos = pAttr ? ::lcl_FindFtnPos( pDoc, pAttr ) : 0; - SwFrm *pCnt = pFtn ? pFtn->ContainsAny() : 0; + SwDoc *pDoc = GetFormat()->GetDoc(); + const sal_uLong nFootnotePos = pAttr ? ::lcl_FindFootnotePos( pDoc, pAttr ) : 0; + SwFrm *pCnt = pFootnote ? pFootnote->ContainsAny() : 0; if ( pCnt ) { bool bMore = true; bool bStart = pAttr == 0; // If no attribute is given, process all // #i49383# - disable unlock of position of // lower objects during format of footnote and footnote content. - SwFtnFrm* pLastFtnFrm( 0L ); + SwFootnoteFrm* pLastFootnoteFrm( 0L ); // footnote frame needs to be locked, if <bLock> isn't set. - bool bUnlockLastFtnFrm( false ); + bool bUnlockLastFootnoteFrm( false ); do { if( !bStart ) - bStart = ::lcl_FindFtnPos( pDoc, pCnt->FindFtnFrm()->GetAttr() ) - == nFtnPos; + bStart = ::lcl_FindFootnotePos( pDoc, pCnt->FindFootnoteFrm()->GetAttr() ) + == nFootnotePos; if( bStart ) { pCnt->_InvalidatePos(); pCnt->_InvalidateSize(); pCnt->Prepare( PREP_ADJUST_FRM ); - SwFtnFrm* pFtnFrm = pCnt->FindFtnFrm(); + SwFootnoteFrm* pFootnoteFrm = pCnt->FindFootnoteFrm(); // #i49383# - if ( pFtnFrm != pLastFtnFrm ) + if ( pFootnoteFrm != pLastFootnoteFrm ) { - if ( pLastFtnFrm ) + if ( pLastFootnoteFrm ) { - if ( !bLock && bUnlockLastFtnFrm ) + if ( !bLock && bUnlockLastFootnoteFrm ) { - pLastFtnFrm->ColUnlock(); + pLastFootnoteFrm->ColUnlock(); } // #i57914# - adjust fix #i49383# // enable lock of lower object position before format of footnote frame. - pLastFtnFrm->UnlockPosOfLowerObjs(); - pLastFtnFrm->Calc(); - if ( !bLock && bUnlockLastFtnFrm && - !pLastFtnFrm->GetLower() && - !pLastFtnFrm->IsColLocked() && - !pLastFtnFrm->IsBackMoveLocked() ) + pLastFootnoteFrm->UnlockPosOfLowerObjs(); + pLastFootnoteFrm->Calc(); + if ( !bLock && bUnlockLastFootnoteFrm && + !pLastFootnoteFrm->GetLower() && + !pLastFootnoteFrm->IsColLocked() && + !pLastFootnoteFrm->IsBackMoveLocked() ) { - pLastFtnFrm->Cut(); - SwFrm::DestroyFrm(pLastFtnFrm); - pLastFtnFrm = 0L; + pLastFootnoteFrm->Cut(); + SwFrm::DestroyFrm(pLastFootnoteFrm); + pLastFootnoteFrm = 0L; } } if ( !bLock ) { - bUnlockLastFtnFrm = !pFtnFrm->IsColLocked(); - pFtnFrm->ColLock(); + bUnlockLastFootnoteFrm = !pFootnoteFrm->IsColLocked(); + pFootnoteFrm->ColLock(); } - pFtnFrm->KeepLockPosOfLowerObjs(); - pLastFtnFrm = pFtnFrm; + pFootnoteFrm->KeepLockPosOfLowerObjs(); + pLastFootnoteFrm = pFootnoteFrm; } // OD 30.10.2002 #97265# - invalidate position of footnote // frame, if it's below its footnote container, in order to @@ -2205,56 +2205,56 @@ void SwFtnBossFrm::RearrangeFtns( const SwTwips nDeadLine, const bool bLock, // footnote frames. { SWRECTFN( this ); - SwFrm* aFtnContFrm = pFtnFrm->GetUpper(); - if ( (pFtnFrm->Frm().*fnRect->fnTopDist)((aFtnContFrm->*fnRect->fnGetPrtBottom)()) > 0 ) + SwFrm* aFootnoteContFrm = pFootnoteFrm->GetUpper(); + if ( (pFootnoteFrm->Frm().*fnRect->fnTopDist)((aFootnoteContFrm->*fnRect->fnGetPrtBottom)()) > 0 ) { - pFtnFrm->_InvalidatePos(); + pFootnoteFrm->_InvalidatePos(); } } if ( bLock ) { - bool bUnlock = !pFtnFrm->IsBackMoveLocked(); - pFtnFrm->LockBackMove(); - pFtnFrm->Calc(); + bool bUnlock = !pFootnoteFrm->IsBackMoveLocked(); + pFootnoteFrm->LockBackMove(); + pFootnoteFrm->Calc(); pCnt->Calc(); // #i49383# - format anchored objects - if ( pCnt->IsTxtFrm() && pCnt->IsValid() ) + if ( pCnt->IsTextFrm() && pCnt->IsValid() ) { if ( !SwObjectFormatter::FormatObjsAtFrm( *pCnt, *(pCnt->FindPageFrm()) ) ) { // restart format with first content - pCnt = pFtn->ContainsAny(); + pCnt = pFootnote->ContainsAny(); continue; } } if( bUnlock ) { - pFtnFrm->UnlockBackMove(); - if( !pFtnFrm->Lower() && - !pFtnFrm->IsColLocked() ) + pFootnoteFrm->UnlockBackMove(); + if( !pFootnoteFrm->Lower() && + !pFootnoteFrm->IsColLocked() ) { // #i49383# - OSL_ENSURE( pLastFtnFrm == pFtnFrm, - "<SwFtnBossFrm::RearrangeFtns(..)> - <pLastFtnFrm> != <pFtnFrm>" ); - pLastFtnFrm = 0L; - pFtnFrm->Cut(); - SwFrm::DestroyFrm(pFtnFrm); + OSL_ENSURE( pLastFootnoteFrm == pFootnoteFrm, + "<SwFootnoteBossFrm::RearrangeFootnotes(..)> - <pLastFootnoteFrm> != <pFootnoteFrm>" ); + pLastFootnoteFrm = 0L; + pFootnoteFrm->Cut(); + SwFrm::DestroyFrm(pFootnoteFrm); } } } else { - pFtnFrm->Calc(); + pFootnoteFrm->Calc(); pCnt->Calc(); // #i49383# - format anchored objects - if ( pCnt->IsTxtFrm() && pCnt->IsValid() ) + if ( pCnt->IsTextFrm() && pCnt->IsValid() ) { if ( !SwObjectFormatter::FormatObjsAtFrm( *pCnt, *(pCnt->FindPageFrm()) ) ) { // restart format with first content - pCnt = pFtn->ContainsAny(); + pCnt = pFootnote->ContainsAny(); continue; } } @@ -2278,9 +2278,9 @@ void SwFtnBossFrm::RearrangeFtns( const SwTwips nDeadLine, const bool bLock, pCnt = pCnt->FindNext(); if ( pCnt ) { - SwFtnFrm* pFtnFrm = pCnt->FindFtnFrm(); - if( pFtnFrm->GetRef()->FindFtnBossFrm( - pFtnFrm->GetAttr()->GetFtn().IsEndNote() ) != this ) + SwFootnoteFrm* pFootnoteFrm = pCnt->FindFootnoteFrm(); + if( pFootnoteFrm->GetRef()->FindFootnoteBossFrm( + pFootnoteFrm->GetAttr()->GetFootnote().IsEndNote() ) != this ) bMore = false; } else @@ -2288,133 +2288,133 @@ void SwFtnBossFrm::RearrangeFtns( const SwTwips nDeadLine, const bool bLock, } if( pDel ) { - bool bUnlockLastFtnFrmGuard = pLastFtnFrm && !pLastFtnFrm->IsColLocked(); - if (bUnlockLastFtnFrmGuard) - pLastFtnFrm->ColLock(); + bool bUnlockLastFootnoteFrmGuard = pLastFootnoteFrm && !pLastFootnoteFrm->IsColLocked(); + if (bUnlockLastFootnoteFrmGuard) + pLastFootnoteFrm->ColLock(); pDel->Cut(); - if (bUnlockLastFtnFrmGuard) - pLastFtnFrm->ColUnlock(); + if (bUnlockLastFootnoteFrmGuard) + pLastFootnoteFrm->ColUnlock(); SwFrm::DestroyFrm(pDel); } if ( bMore ) { // Go not further than to the provided footnote (if given) if ( pAttr && - (::lcl_FindFtnPos( pDoc, - pCnt->FindFtnFrm()->GetAttr()) > nFtnPos ) ) + (::lcl_FindFootnotePos( pDoc, + pCnt->FindFootnoteFrm()->GetAttr()) > nFootnotePos ) ) bMore = false; } } while ( bMore ); // #i49383# - if ( pLastFtnFrm ) + if ( pLastFootnoteFrm ) { - if ( !bLock && bUnlockLastFtnFrm ) + if ( !bLock && bUnlockLastFootnoteFrm ) { - pLastFtnFrm->ColUnlock(); + pLastFootnoteFrm->ColUnlock(); } // #i57914# - adjust fix #i49383# // enable lock of lower object position before format of footnote frame. - pLastFtnFrm->UnlockPosOfLowerObjs(); - pLastFtnFrm->Calc(); - if ( !bLock && bUnlockLastFtnFrm && - !pLastFtnFrm->GetLower() && - !pLastFtnFrm->IsColLocked() && - !pLastFtnFrm->IsBackMoveLocked() ) - { - pLastFtnFrm->Cut(); - SwFrm::DestroyFrm(pLastFtnFrm); + pLastFootnoteFrm->UnlockPosOfLowerObjs(); + pLastFootnoteFrm->Calc(); + if ( !bLock && bUnlockLastFootnoteFrm && + !pLastFootnoteFrm->GetLower() && + !pLastFootnoteFrm->IsColLocked() && + !pLastFootnoteFrm->IsBackMoveLocked() ) + { + pLastFootnoteFrm->Cut(); + SwFrm::DestroyFrm(pLastFootnoteFrm); } } } } -void SwPageFrm::UpdateFtnNum() +void SwPageFrm::UpdateFootnoteNum() { // page numbering only if set at the document - if ( GetFmt()->GetDoc()->GetFtnInfo().eNum != FTNNUM_PAGE ) + if ( GetFormat()->GetDoc()->GetFootnoteInfo().eNum != FTNNUM_PAGE ) return; SwLayoutFrm* pBody = FindBodyCont(); if( !pBody || !pBody->Lower() ) return; - SwCntntFrm* pCntnt = pBody->ContainsCntnt(); + SwContentFrm* pContent = pBody->ContainsContent(); sal_uInt16 nNum = 0; - while( pCntnt && pCntnt->FindPageFrm() == this ) + while( pContent && pContent->FindPageFrm() == this ) { - if( static_cast<SwTxtFrm*>(pCntnt)->HasFtn() ) + if( static_cast<SwTextFrm*>(pContent)->HasFootnote() ) { - SwFtnBossFrm* pBoss = pCntnt->FindFtnBossFrm( true ); + SwFootnoteBossFrm* pBoss = pContent->FindFootnoteBossFrm( true ); if( pBoss->GetUpper()->IsSctFrm() && - static_cast<SwSectionFrm*>(pBoss->GetUpper())->IsOwnFtnNum() ) - pCntnt = static_cast<SwSectionFrm*>(pBoss->GetUpper())->FindLastCntnt(); + static_cast<SwSectionFrm*>(pBoss->GetUpper())->IsOwnFootnoteNum() ) + pContent = static_cast<SwSectionFrm*>(pBoss->GetUpper())->FindLastContent(); else { - SwFtnFrm* pFtn = const_cast<SwFtnFrm*>(pBoss->FindFirstFtn( pCntnt )); - while( pFtn ) + SwFootnoteFrm* pFootnote = const_cast<SwFootnoteFrm*>(pBoss->FindFirstFootnote( pContent )); + while( pFootnote ) { - SwTxtFtn* pTxtFtn = pFtn->GetAttr(); - if( !pTxtFtn->GetFtn().IsEndNote() && - pTxtFtn->GetFtn().GetNumStr().isEmpty() && - !pFtn->GetMaster() && - (pTxtFtn->GetFtn().GetNumber() != ++nNum) ) + SwTextFootnote* pTextFootnote = pFootnote->GetAttr(); + if( !pTextFootnote->GetFootnote().IsEndNote() && + pTextFootnote->GetFootnote().GetNumStr().isEmpty() && + !pFootnote->GetMaster() && + (pTextFootnote->GetFootnote().GetNumber() != ++nNum) ) { - pTxtFtn->SetNumber( nNum, OUString() ); + pTextFootnote->SetNumber( nNum, OUString() ); } - if ( pFtn->GetNext() ) - pFtn = static_cast<SwFtnFrm*>(pFtn->GetNext()); + if ( pFootnote->GetNext() ) + pFootnote = static_cast<SwFootnoteFrm*>(pFootnote->GetNext()); else { - SwFtnBossFrm* pTmpBoss = pFtn->FindFtnBossFrm( true ); + SwFootnoteBossFrm* pTmpBoss = pFootnote->FindFootnoteBossFrm( true ); if( pTmpBoss ) { SwPageFrm* pPage = pTmpBoss->FindPageFrm(); - pFtn = NULL; - lcl_NextFtnBoss( pTmpBoss, pPage, false ); - SwFtnContFrm *pCont = pTmpBoss ? pTmpBoss->FindNearestFtnCont() : NULL; + pFootnote = NULL; + lcl_NextFootnoteBoss( pTmpBoss, pPage, false ); + SwFootnoteContFrm *pCont = pTmpBoss ? pTmpBoss->FindNearestFootnoteCont() : NULL; if ( pCont ) - pFtn = static_cast<SwFtnFrm*>(pCont->Lower()); + pFootnote = static_cast<SwFootnoteFrm*>(pCont->Lower()); } } - if( pFtn && pFtn->GetRef() != pCntnt ) - pFtn = NULL; + if( pFootnote && pFootnote->GetRef() != pContent ) + pFootnote = NULL; } } } - pCntnt = pCntnt->FindNextCnt(); + pContent = pContent->FindNextCnt(); } } -void SwFtnBossFrm::SetFtnDeadLine( const SwTwips nDeadLine ) +void SwFootnoteBossFrm::SetFootnoteDeadLine( const SwTwips nDeadLine ) { SwFrm *pBody = FindBodyCont(); pBody->Calc(); - SwFrm *pCont = FindFtnCont(); - const SwTwips nMax = nMaxFtnHeight;// current should exceed MaxHeight + SwFrm *pCont = FindFootnoteCont(); + const SwTwips nMax = nMaxFootnoteHeight;// current should exceed MaxHeight SWRECTFN( this ) if ( pCont ) { pCont->Calc(); - nMaxFtnHeight = -(pCont->Frm().*fnRect->fnBottomDist)( nDeadLine ); + nMaxFootnoteHeight = -(pCont->Frm().*fnRect->fnBottomDist)( nDeadLine ); } else - nMaxFtnHeight = -(pBody->Frm().*fnRect->fnBottomDist)( nDeadLine ); + nMaxFootnoteHeight = -(pBody->Frm().*fnRect->fnBottomDist)( nDeadLine ); const SwViewShell *pSh = getRootFrm() ? getRootFrm()->GetCurrShell() : 0; if( pSh && pSh->GetViewOptions()->getBrowseMode() ) - nMaxFtnHeight += pBody->Grow( LONG_MAX, true ); + nMaxFootnoteHeight += pBody->Grow( LONG_MAX, true ); if ( IsInSct() ) - nMaxFtnHeight += FindSctFrm()->Grow( LONG_MAX, true ); + nMaxFootnoteHeight += FindSctFrm()->Grow( LONG_MAX, true ); - if ( nMaxFtnHeight < 0 ) - nMaxFtnHeight = 0; - if ( nMax != LONG_MAX && nMaxFtnHeight > nMax ) - nMaxFtnHeight = nMax; + if ( nMaxFootnoteHeight < 0 ) + nMaxFootnoteHeight = 0; + if ( nMax != LONG_MAX && nMaxFootnoteHeight > nMax ) + nMaxFootnoteHeight = nMax; } -SwTwips SwFtnBossFrm::GetVarSpace() const +SwTwips SwFootnoteBossFrm::GetVarSpace() const { // To not fall below 20% of the page height // (in contrast to MSOffice where footnotes can fill a whole column/page) @@ -2438,15 +2438,15 @@ SwTwips SwFtnBossFrm::GetVarSpace() const if( pSect->IsEndnAtEnd() ) // endnotes allowed? { OSL_ENSURE( !Lower() || !Lower()->GetNext() || Lower()->GetNext()-> - IsFtnContFrm(), "FtnContainer expected" ); - const SwFtnContFrm* pCont = Lower() ? - static_cast<const SwFtnContFrm*>(Lower()->GetNext()) : 0; + IsFootnoteContFrm(), "FootnoteContainer expected" ); + const SwFootnoteContFrm* pCont = Lower() ? + static_cast<const SwFootnoteContFrm*>(Lower()->GetNext()) : 0; if( pCont ) { - const SwFtnFrm* pFtn = static_cast<const SwFtnFrm*>(pCont->Lower()); - while( pFtn) + const SwFootnoteFrm* pFootnote = static_cast<const SwFootnoteFrm*>(pCont->Lower()); + while( pFootnote) { - if( pFtn->GetAttr()->GetFtn().IsEndNote() ) + if( pFootnote->GetAttr()->GetFootnote().IsEndNote() ) { // endnote found const SwFrm* pFrm = static_cast<const SwLayoutFrm*>(Lower())->Lower(); if( pFrm ) @@ -2459,7 +2459,7 @@ SwTwips SwFtnBossFrm::GetVarSpace() const } break; } - pFtn = static_cast<const SwFtnFrm*>(pFtn->GetNext()); + pFootnote = static_cast<const SwFootnoteFrm*>(pFootnote->GetNext()); } } } @@ -2495,7 +2495,7 @@ SwTwips SwFtnBossFrm::GetVarSpace() const * @see Grow() * @see Shrink() */ -sal_uInt8 SwFtnBossFrm::_NeighbourhoodAdjustment( const SwFrm* ) const +sal_uInt8 SwFootnoteBossFrm::_NeighbourhoodAdjustment( const SwFrm* ) const { sal_uInt8 nRet = NA_ONLY_ADJUST; if( GetUpper() && !GetUpper()->IsPageBodyFrm() ) @@ -2507,7 +2507,7 @@ sal_uInt8 SwFtnBossFrm::_NeighbourhoodAdjustment( const SwFrm* ) const { OSL_ENSURE( GetUpper()->IsSctFrm(), "NeighbourhoodAdjustment: Unexpected Upper" ); if( !GetNext() && !GetPrev() ) - nRet = NA_GROW_ADJUST; // section with a single column (FtnAtEnd) + nRet = NA_GROW_ADJUST; // section with a single column (FootnoteAtEnd) else { const SwFrm* pTmp = Lower(); @@ -2516,7 +2516,7 @@ sal_uInt8 SwFtnBossFrm::_NeighbourhoodAdjustment( const SwFrm* ) const nRet = NA_GROW_SHRINK; else if( !GetUpper()->IsColLocked() ) nRet = NA_ADJUST_GROW; - OSL_ENSURE( !pTmp->GetNext() || pTmp->GetNext()->IsFtnContFrm(), + OSL_ENSURE( !pTmp->GetNext() || pTmp->GetNext()->IsFootnoteContFrm(), "NeighbourhoodAdjustment: Who's that guy?" ); } } @@ -2524,7 +2524,7 @@ sal_uInt8 SwFtnBossFrm::_NeighbourhoodAdjustment( const SwFrm* ) const return nRet; } -void SwPageFrm::SetColMaxFtnHeight() +void SwPageFrm::SetColMaxFootnoteHeight() { SwLayoutFrm *pBody = FindBodyCont(); if( pBody && pBody->Lower() && pBody->Lower()->IsColumnFrm() ) @@ -2532,50 +2532,50 @@ void SwPageFrm::SetColMaxFtnHeight() SwColumnFrm* pCol = static_cast<SwColumnFrm*>(pBody->Lower()); do { - pCol->SetMaxFtnHeight( GetMaxFtnHeight() ); + pCol->SetMaxFootnoteHeight( GetMaxFootnoteHeight() ); pCol = static_cast<SwColumnFrm*>(pCol->GetNext()); } while ( pCol ); } } -bool SwLayoutFrm::MoveLowerFtns( SwCntntFrm *pStart, SwFtnBossFrm *pOldBoss, - SwFtnBossFrm *pNewBoss, const bool bFtnNums ) +bool SwLayoutFrm::MoveLowerFootnotes( SwContentFrm *pStart, SwFootnoteBossFrm *pOldBoss, + SwFootnoteBossFrm *pNewBoss, const bool bFootnoteNums ) { - SwDoc *pDoc = GetFmt()->GetDoc(); - if ( pDoc->GetFtnIdxs().empty() ) + SwDoc *pDoc = GetFormat()->GetDoc(); + if ( pDoc->GetFootnoteIdxs().empty() ) return false; - if( pDoc->GetFtnInfo().ePos == FTNPOS_CHAPTER && - ( !IsInSct() || !FindSctFrm()->IsFtnAtEnd() ) ) + if( pDoc->GetFootnoteInfo().ePos == FTNPOS_CHAPTER && + ( !IsInSct() || !FindSctFrm()->IsFootnoteAtEnd() ) ) return true; if ( !pNewBoss ) - pNewBoss = FindFtnBossFrm( true ); + pNewBoss = FindFootnoteBossFrm( true ); if ( pNewBoss == pOldBoss ) return false; bool bMoved = false; if( !pStart ) - pStart = ContainsCntnt(); + pStart = ContainsContent(); - SwFtnFrms aFtnArr; + SwFootnoteFrms aFootnoteArr; while ( IsAnLower( pStart ) ) { - if ( static_cast<SwTxtFrm*>(pStart)->HasFtn() ) + if ( static_cast<SwTextFrm*>(pStart)->HasFootnote() ) { // OD 03.04.2003 #108446# - To avoid unnecessary moves of footnotes - // use new parameter <_bCollectOnlyPreviousFtn> (4th parameter of - // method <SwFtnBossFrm::CollectFtn(..)>) to control, that only + // use new parameter <_bCollectOnlyPreviousFootnote> (4th parameter of + // method <SwFootnoteBossFrm::CollectFootnote(..)>) to control, that only // footnotes have to be collected, that are positioned before the // new dedicated footnote boss frame. - pNewBoss->CollectFtns( pStart, pOldBoss, aFtnArr, true ); + pNewBoss->CollectFootnotes( pStart, pOldBoss, aFootnoteArr, true ); } - pStart = pStart->GetNextCntntFrm(); + pStart = pStart->GetNextContentFrm(); } OSL_ENSURE( pOldBoss->IsInSct() == pNewBoss->IsInSct(), - "MoveLowerFtns: Section confusion" ); - SwFtnFrms *pFtnArr; + "MoveLowerFootnotes: Section confusion" ); + SwFootnoteFrms *pFootnoteArr; SwLayoutFrm* pNewChief = 0; SwLayoutFrm* pOldChief = 0; @@ -2589,61 +2589,61 @@ bool SwLayoutFrm::MoveLowerFtns( SwCntntFrm *pStart, SwFtnBossFrm *pOldBoss, if (bFoundCandidate) { - pFtnArr = new SwFtnFrms; - pOldChief = pOldBoss->FindFtnBossFrm( true ); - pNewChief = pNewBoss->FindFtnBossFrm( true ); + pFootnoteArr = new SwFootnoteFrms; + pOldChief = pOldBoss->FindFootnoteBossFrm( true ); + pNewChief = pNewBoss->FindFootnoteBossFrm( true ); while( pOldChief->IsAnLower( pStart ) ) { - if ( static_cast<SwTxtFrm*>(pStart)->HasFtn() ) - static_cast<SwFtnBossFrm*>(pNewChief)->CollectFtns( pStart, - pOldBoss, *pFtnArr ); - pStart = pStart->GetNextCntntFrm(); + if ( static_cast<SwTextFrm*>(pStart)->HasFootnote() ) + static_cast<SwFootnoteBossFrm*>(pNewChief)->CollectFootnotes( pStart, + pOldBoss, *pFootnoteArr ); + pStart = pStart->GetNextContentFrm(); } - if( pFtnArr->empty() ) + if( pFootnoteArr->empty() ) { - delete pFtnArr; - pFtnArr = NULL; + delete pFootnoteArr; + pFootnoteArr = NULL; } } else - pFtnArr = NULL; + pFootnoteArr = NULL; - if ( !aFtnArr.empty() || pFtnArr ) + if ( !aFootnoteArr.empty() || pFootnoteArr ) { - if( !aFtnArr.empty() ) - pNewBoss->_MoveFtns( aFtnArr, true ); - if( pFtnArr ) + if( !aFootnoteArr.empty() ) + pNewBoss->_MoveFootnotes( aFootnoteArr, true ); + if( pFootnoteArr ) { - static_cast<SwFtnBossFrm*>(pNewChief)->_MoveFtns( *pFtnArr, true ); - delete pFtnArr; + static_cast<SwFootnoteBossFrm*>(pNewChief)->_MoveFootnotes( *pFootnoteArr, true ); + delete pFootnoteArr; } bMoved = true; - // update FtnNum only at page change - if ( bFtnNums ) + // update FootnoteNum only at page change + if ( bFootnoteNums ) { SwPageFrm* pOldPage = pOldBoss->FindPageFrm(); SwPageFrm* pNewPage =pNewBoss->FindPageFrm(); if( pOldPage != pNewPage ) { - pOldPage->UpdateFtnNum(); - pNewPage->UpdateFtnNum(); + pOldPage->UpdateFootnoteNum(); + pNewPage->UpdateFootnoteNum(); } } } return bMoved; } -bool SwCntntFrm::MoveFtnCntFwd( bool bMakePage, SwFtnBossFrm *pOldBoss ) +bool SwContentFrm::MoveFootnoteCntFwd( bool bMakePage, SwFootnoteBossFrm *pOldBoss ) { - OSL_ENSURE( IsInFtn(), "no footnote." ); - SwLayoutFrm *pFtn = FindFtnFrm(); + OSL_ENSURE( IsInFootnote(), "no footnote." ); + SwLayoutFrm *pFootnote = FindFootnoteFrm(); // The first paragraph in the first footnote in the first column in the // sectionfrm at the top of the page has not to move forward, if the // columnbody is empty. if( pOldBoss->IsInSct() && !pOldBoss->GetIndPrev() && !GetIndPrev() && - !pFtn->GetPrev() ) + !pFootnote->GetPrev() ) { SwLayoutFrm* pBody = pOldBoss->FindBodyCont(); if( !pBody || !pBody->Lower() ) @@ -2651,7 +2651,7 @@ bool SwCntntFrm::MoveFtnCntFwd( bool bMakePage, SwFtnBossFrm *pOldBoss ) } //fix(9538): if the footnote has neighbors behind itself, remove them temporarily - SwLayoutFrm *pNxt = static_cast<SwLayoutFrm*>(pFtn->GetNext()); + SwLayoutFrm *pNxt = static_cast<SwLayoutFrm*>(pFootnote->GetNext()); SwLayoutFrm *pLst = 0; while ( pNxt ) { @@ -2661,10 +2661,10 @@ bool SwCntntFrm::MoveFtnCntFwd( bool bMakePage, SwFtnBossFrm *pOldBoss ) pNxt = 0; else { pLst = pNxt; - SwCntntFrm *pCnt = pNxt->ContainsCntnt(); + SwContentFrm *pCnt = pNxt->ContainsContent(); if( pCnt ) - pCnt->MoveFtnCntFwd( true, pOldBoss ); - pNxt = static_cast<SwLayoutFrm*>(pFtn->GetNext()); + pCnt->MoveFootnoteCntFwd( true, pOldBoss ); + pNxt = static_cast<SwLayoutFrm*>(pFootnote->GetNext()); } } @@ -2675,7 +2675,7 @@ bool SwCntntFrm::MoveFtnCntFwd( bool bMakePage, SwFtnBossFrm *pOldBoss ) if ( pNewUpper ) { bool bSameBoss = true; - SwFtnBossFrm * const pNewBoss = pNewUpper->FindFtnBossFrm(); + SwFootnoteBossFrm * const pNewBoss = pNewUpper->FindFootnoteBossFrm(); // Are we changing the column/page? if ( !( bSameBoss = (pNewBoss == pOldBoss) ) ) { @@ -2689,49 +2689,49 @@ bool SwCntntFrm::MoveFtnCntFwd( bool bMakePage, SwFtnBossFrm *pOldBoss ) // If it is a container or the reference differs, create a new footnote and add // it into the container. // Create also a SectionFrame if currently in a area inside a footnote. - SwFtnFrm* pTmpFtn = pNewUpper->IsFtnFrm() ? static_cast<SwFtnFrm*>(pNewUpper) : 0; - if( !pTmpFtn ) + SwFootnoteFrm* pTmpFootnote = pNewUpper->IsFootnoteFrm() ? static_cast<SwFootnoteFrm*>(pNewUpper) : 0; + if( !pTmpFootnote ) { - OSL_ENSURE( pNewUpper->IsFtnContFrm(), "New Upper not a FtnCont."); - SwFtnContFrm *pCont = static_cast<SwFtnContFrm*>(pNewUpper); + OSL_ENSURE( pNewUpper->IsFootnoteContFrm(), "New Upper not a FootnoteCont."); + SwFootnoteContFrm *pCont = static_cast<SwFootnoteContFrm*>(pNewUpper); // create footnote - SwFtnFrm *pOld = FindFtnFrm(); - pTmpFtn = new SwFtnFrm( pOld->GetFmt()->GetDoc()->GetDfltFrmFmt(), + SwFootnoteFrm *pOld = FindFootnoteFrm(); + pTmpFootnote = new SwFootnoteFrm( pOld->GetFormat()->GetDoc()->GetDfltFrameFormat(), pOld, pOld->GetRef(), pOld->GetAttr() ); // chaining of footnotes if ( pOld->GetFollow() ) { - pTmpFtn->SetFollow( pOld->GetFollow() ); - pOld->GetFollow()->SetMaster( pTmpFtn ); + pTmpFootnote->SetFollow( pOld->GetFollow() ); + pOld->GetFollow()->SetMaster( pTmpFootnote ); } - pOld->SetFollow( pTmpFtn ); - pTmpFtn->SetMaster( pOld ); + pOld->SetFollow( pTmpFootnote ); + pTmpFootnote->SetMaster( pOld ); SwFrm* pNx = pCont->Lower(); - if( pNx && pTmpFtn->GetAttr()->GetFtn().IsEndNote() ) - while(pNx && !static_cast<SwFtnFrm*>(pNx)->GetAttr()->GetFtn().IsEndNote()) + if( pNx && pTmpFootnote->GetAttr()->GetFootnote().IsEndNote() ) + while(pNx && !static_cast<SwFootnoteFrm*>(pNx)->GetAttr()->GetFootnote().IsEndNote()) pNx = pNx->GetNext(); - pTmpFtn->Paste( pCont, pNx ); - pTmpFtn->Calc(); + pTmpFootnote->Paste( pCont, pNx ); + pTmpFootnote->Calc(); } - OSL_ENSURE( pTmpFtn->GetAttr() == FindFtnFrm()->GetAttr(), "Wrong Footnote!" ); + OSL_ENSURE( pTmpFootnote->GetAttr() == FindFootnoteFrm()->GetAttr(), "Wrong Footnote!" ); // areas inside of footnotes get a special treatment - SwLayoutFrm *pNewUp = pTmpFtn; + SwLayoutFrm *pNewUp = pTmpFootnote; if( IsInSct() ) { SwSectionFrm* pSect = FindSctFrm(); // area inside of a footnote (or only footnote in an area)? - if( pSect->IsInFtn() ) + if( pSect->IsInFootnote() ) { - if( pTmpFtn->Lower() && pTmpFtn->Lower()->IsSctFrm() && - pSect->GetFollow() == static_cast<SwSectionFrm*>(pTmpFtn->Lower()) ) - pNewUp = static_cast<SwSectionFrm*>(pTmpFtn->Lower()); + if( pTmpFootnote->Lower() && pTmpFootnote->Lower()->IsSctFrm() && + pSect->GetFollow() == static_cast<SwSectionFrm*>(pTmpFootnote->Lower()) ) + pNewUp = static_cast<SwSectionFrm*>(pTmpFootnote->Lower()); else { pNewUp = new SwSectionFrm( *pSect, false ); - pNewUp->InsertBefore( pTmpFtn, pTmpFtn->Lower() ); + pNewUp->InsertBefore( pTmpFootnote, pTmpFootnote->Lower() ); static_cast<SwSectionFrm*>(pNewUp)->Init(); - pNewUp->Frm().Pos() = pTmpFtn->Frm().Pos(); + pNewUp->Frm().Pos() = pTmpFootnote->Frm().Pos(); pNewUp->Frm().Pos().Y() += 1; // for notifications // If the section frame has a successor then the latter needs @@ -2740,8 +2740,8 @@ bool SwCntntFrm::MoveFtnCntFwd( bool bMakePage, SwFtnBossFrm *pOldBoss ) if( pTmp ) { SwFlowFrm* pTmpNxt; - if( pTmp->IsCntntFrm() ) - pTmpNxt = static_cast<SwCntntFrm*>(pTmp); + if( pTmp->IsContentFrm() ) + pTmpNxt = static_cast<SwContentFrm*>(pTmp); else if( pTmp->IsSctFrm() ) pTmpNxt = static_cast<SwSectionFrm*>(pTmp); else @@ -2749,7 +2749,7 @@ bool SwCntntFrm::MoveFtnCntFwd( bool bMakePage, SwFtnBossFrm *pOldBoss ) OSL_ENSURE( pTmp->IsTabFrm(), "GetNextSctLeaf: Wrong Type" ); pTmpNxt = static_cast<SwTabFrm*>(pTmp); } - pTmpNxt->MoveSubTree( pTmpFtn, pNewUp->GetNext() ); + pTmpNxt->MoveSubTree( pTmpFootnote, pNewUp->GetNext() ); } } } @@ -2763,19 +2763,19 @@ bool SwCntntFrm::MoveFtnCntFwd( bool bMakePage, SwFtnBossFrm *pOldBoss ) return bSamePage; } -SwSaveFtnHeight::SwSaveFtnHeight( SwFtnBossFrm *pBs, const SwTwips nDeadLine ) : +SwSaveFootnoteHeight::SwSaveFootnoteHeight( SwFootnoteBossFrm *pBs, const SwTwips nDeadLine ) : pBoss( pBs ), - nOldHeight( pBs->GetMaxFtnHeight() ) + nOldHeight( pBs->GetMaxFootnoteHeight() ) { - pBoss->SetFtnDeadLine( nDeadLine ); - nNewHeight = pBoss->GetMaxFtnHeight(); + pBoss->SetFootnoteDeadLine( nDeadLine ); + nNewHeight = pBoss->GetMaxFootnoteHeight(); } -SwSaveFtnHeight::~SwSaveFtnHeight() +SwSaveFootnoteHeight::~SwSaveFootnoteHeight() { // If somebody tweaked the deadline meanwhile, we let it happen - if ( nNewHeight == pBoss->GetMaxFtnHeight() ) - pBoss->nMaxFtnHeight = nOldHeight; + if ( nNewHeight == pBoss->GetMaxFootnoteHeight() ) + pBoss->nMaxFootnoteHeight = nOldHeight; } #ifdef DBG_UTIL @@ -2787,18 +2787,18 @@ SwSaveFtnHeight::~SwSaveFtnHeight() // but the GetRef() is called first, so we have to ignore a master/follow // mismatch. -const SwCntntFrm* SwFtnFrm::GetRef() const +const SwContentFrm* SwFootnoteFrm::GetRef() const { - const SwCntntFrm* pRefAttr = GetRefFromAttr(); + const SwContentFrm* pRefAttr = GetRefFromAttr(); SAL_WARN_IF( pRef != pRefAttr && !pRef->IsAnFollow( pRefAttr ) && !pRefAttr->IsAnFollow( pRef ), "sw", "access to deleted Frame? pRef != pAttr->GetRef()" ); return pRef; } -SwCntntFrm* SwFtnFrm::GetRef() +SwContentFrm* SwFootnoteFrm::GetRef() { - const SwCntntFrm* pRefAttr = GetRefFromAttr(); + const SwContentFrm* pRefAttr = GetRefFromAttr(); SAL_WARN_IF( pRef != pRefAttr && !pRef->IsAnFollow( pRefAttr ) && !pRefAttr->IsAnFollow( pRef ), "sw", "access to deleted Frame? pRef != pAttr->GetRef()" ); @@ -2806,18 +2806,18 @@ SwCntntFrm* SwFtnFrm::GetRef() } #endif -const SwCntntFrm* SwFtnFrm::GetRefFromAttr() const +const SwContentFrm* SwFootnoteFrm::GetRefFromAttr() const { - SwFtnFrm* pThis = const_cast<SwFtnFrm*>(this); + SwFootnoteFrm* pThis = const_cast<SwFootnoteFrm*>(this); return pThis->GetRefFromAttr(); } -SwCntntFrm* SwFtnFrm::GetRefFromAttr() +SwContentFrm* SwFootnoteFrm::GetRefFromAttr() { assert(pAttr && "invalid Attribute"); - SwTxtNode& rTNd = (SwTxtNode&)pAttr->GetTxtNode(); + SwTextNode& rTNd = (SwTextNode&)pAttr->GetTextNode(); SwPosition aPos( rTNd, SwIndex( &rTNd, pAttr->GetStart() )); - SwCntntFrm* pCFrm = rTNd.getLayoutFrm( getRootFrm(), 0, &aPos, false ); + SwContentFrm* pCFrm = rTNd.getLayoutFrm( getRootFrm(), 0, &aPos, false ); return pCFrm; } @@ -2825,44 +2825,44 @@ SwCntntFrm* SwFtnFrm::GetRefFromAttr() OD 2005-12-02 #i27138# */ -SwCntntFrm* SwFtnFrm::FindLastCntnt() +SwContentFrm* SwFootnoteFrm::FindLastContent() { - SwCntntFrm* pLastCntntFrm( 0L ); + SwContentFrm* pLastContentFrm( 0L ); // find last lower, which is a content frame or contains content. // hidden text frames, empty sections and empty tables have to be skipped. - SwFrm* pLastLowerOfFtn( GetLower() ); - SwFrm* pTmpLastLower( pLastLowerOfFtn ); + SwFrm* pLastLowerOfFootnote( GetLower() ); + SwFrm* pTmpLastLower( pLastLowerOfFootnote ); while ( pTmpLastLower && pTmpLastLower->GetNext() ) { pTmpLastLower = pTmpLastLower->GetNext(); - if ( ( pTmpLastLower->IsTxtFrm() && - !static_cast<SwTxtFrm*>(pTmpLastLower)->IsHiddenNow() ) || + if ( ( pTmpLastLower->IsTextFrm() && + !static_cast<SwTextFrm*>(pTmpLastLower)->IsHiddenNow() ) || ( pTmpLastLower->IsSctFrm() && static_cast<SwSectionFrm*>(pTmpLastLower)->GetSection() && - static_cast<SwSectionFrm*>(pTmpLastLower)->ContainsCntnt() ) || + static_cast<SwSectionFrm*>(pTmpLastLower)->ContainsContent() ) || ( pTmpLastLower->IsTabFrm() && - static_cast<SwTabFrm*>(pTmpLastLower)->ContainsCntnt() ) ) + static_cast<SwTabFrm*>(pTmpLastLower)->ContainsContent() ) ) { - pLastLowerOfFtn = pTmpLastLower; + pLastLowerOfFootnote = pTmpLastLower; } } // determine last content frame depending on type of found last lower. - if ( pLastLowerOfFtn && pLastLowerOfFtn->IsTabFrm() ) + if ( pLastLowerOfFootnote && pLastLowerOfFootnote->IsTabFrm() ) { - pLastCntntFrm = static_cast<SwTabFrm*>(pLastLowerOfFtn)->FindLastCntnt(); + pLastContentFrm = static_cast<SwTabFrm*>(pLastLowerOfFootnote)->FindLastContent(); } - else if ( pLastLowerOfFtn && pLastLowerOfFtn->IsSctFrm() ) + else if ( pLastLowerOfFootnote && pLastLowerOfFootnote->IsSctFrm() ) { - pLastCntntFrm = static_cast<SwSectionFrm*>(pLastLowerOfFtn)->FindLastCntnt(); + pLastContentFrm = static_cast<SwSectionFrm*>(pLastLowerOfFootnote)->FindLastContent(); } else { - pLastCntntFrm = dynamic_cast<SwCntntFrm*>(pLastLowerOfFtn); + pLastContentFrm = dynamic_cast<SwContentFrm*>(pLastLowerOfFootnote); } - return pLastCntntFrm; + return pLastContentFrm; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/layout/hffrm.cxx b/sw/source/core/layout/hffrm.cxx index 7d4dcb5a63e2..18b29faf9a4f 100644 --- a/sw/source/core/layout/hffrm.cxx +++ b/sw/source/core/layout/hffrm.cxx @@ -36,7 +36,7 @@ extern bool bObjsDirect; //frmtool.cxx static SwTwips lcl_GetFrmMinHeight(const SwLayoutFrm & rFrm) { - const SwFmtFrmSize &rSz = rFrm.GetFmt()->GetFrmSize(); + const SwFormatFrmSize &rSz = rFrm.GetFormat()->GetFrmSize(); SwTwips nMinHeight; switch (rSz.GetHeightSizeType()) @@ -64,11 +64,11 @@ static SwTwips lcl_CalcContentHeight(SwLayoutFrm & frm) nTmp = pFrm->Frm().Height(); nRemaining += nTmp; - if( pFrm->IsTxtFrm() && static_cast<SwTxtFrm*>(pFrm)->IsUndersized() ) + if( pFrm->IsTextFrm() && static_cast<SwTextFrm*>(pFrm)->IsUndersized() ) { - nTmp = static_cast<SwTxtFrm*>(pFrm)->GetParHeight() + nTmp = static_cast<SwTextFrm*>(pFrm)->GetParHeight() - pFrm->Prt().Height(); - // This TxtFrm would like to be a bit bigger + // This TextFrm would like to be a bit bigger nRemaining += nTmp; } else if( pFrm->IsSctFrm() && static_cast<SwSectionFrm*>(pFrm)->IsUndersized() ) @@ -93,21 +93,21 @@ static void lcl_LayoutFrmEnsureMinHeight(SwLayoutFrm & rFrm, } } -SwHeadFootFrm::SwHeadFootFrm( SwFrmFmt * pFmt, SwFrm* pSib, sal_uInt16 nTypeIn) - : SwLayoutFrm( pFmt, pSib ) +SwHeadFootFrm::SwHeadFootFrm( SwFrameFormat * pFormat, SwFrm* pSib, sal_uInt16 nTypeIn) + : SwLayoutFrm( pFormat, pSib ) { mnFrmType = nTypeIn; SetDerivedVert( false ); - const SwFmtCntnt &rCnt = pFmt->GetCntnt(); + const SwFormatContent &rCnt = pFormat->GetContent(); - OSL_ENSURE( rCnt.GetCntntIdx(), "No content for Header." ); + OSL_ENSURE( rCnt.GetContentIdx(), "No content for Header." ); // Have the objects created right now for header and footer bool bOld = bObjsDirect; bObjsDirect = true; - sal_uLong nIndex = rCnt.GetCntntIdx()->GetIndex(); - ::_InsertCnt( this, pFmt->GetDoc(), ++nIndex ); + sal_uLong nIndex = rCnt.GetContentIdx()->GetIndex(); + ::_InsertCnt( this, pFormat->GetDoc(), ++nIndex ); bObjsDirect = bOld; } @@ -254,11 +254,11 @@ void SwHeadFootFrm::FormatSize(SwTwips nUL, const SwBorderAttrs * pAttrs) // #i46941# - frame has to be valid. // Note: frame could be invalid after calling its format, // if it's locked - OSL_ENSURE( StackHack::IsLocked() || !pFrm->IsTxtFrm() || + OSL_ENSURE( StackHack::IsLocked() || !pFrm->IsTextFrm() || pFrm->IsValid() || - static_cast<SwTxtFrm*>(pFrm)->IsJoinLocked(), + static_cast<SwTextFrm*>(pFrm)->IsJoinLocked(), "<SwHeadFootFrm::FormatSize(..)> - text frame invalid and not locked." ); - if ( pFrm->IsTxtFrm() && pFrm->IsValid() ) + if ( pFrm->IsTextFrm() && pFrm->IsValid() ) { if ( !SwObjectFormatter::FormatObjsAtFrm( *pFrm, *(pFrm->FindPageFrm()) ) ) @@ -277,10 +277,10 @@ void SwHeadFootFrm::FormatSize(SwTwips nUL, const SwBorderAttrs * pAttrs) { nRemaining += pFrm->Frm().Height(); - if( pFrm->IsTxtFrm() && - static_cast<SwTxtFrm*>(pFrm)->IsUndersized() ) - // This TxtFrm would like to be a bit bigger - nRemaining += static_cast<SwTxtFrm*>(pFrm)->GetParHeight() + if( pFrm->IsTextFrm() && + static_cast<SwTextFrm*>(pFrm)->IsUndersized() ) + // This TextFrm would like to be a bit bigger + nRemaining += static_cast<SwTextFrm*>(pFrm)->GetParHeight() - pFrm->Prt().Height(); else if( pFrm->IsSctFrm() && static_cast<SwSectionFrm*>(pFrm)->IsUndersized() ) @@ -323,9 +323,9 @@ void SwHeadFootFrm::FormatSize(SwTwips nUL, const SwBorderAttrs * pAttrs) while ( pFrm ) { - if( pFrm->IsTxtFrm()) + if( pFrm->IsTextFrm()) { - SwTxtFrm * pTmpFrm = static_cast<SwTxtFrm*>(pFrm); + SwTextFrm * pTmpFrm = static_cast<SwTextFrm*>(pFrm); if (pTmpFrm->IsUndersized() ) { pTmpFrm->InvalidateSize(); @@ -632,10 +632,10 @@ SwTwips SwHeadFootFrm::ShrinkFrm( SwTwips nDist, bool bTst, bool bInfo ) bool SwHeadFootFrm::GetEatSpacing() const { - const SwFrmFmt * pFmt = GetFmt(); - OSL_ENSURE(pFmt, "SwHeadFootFrm: no format?"); + const SwFrameFormat * pFormat = GetFormat(); + OSL_ENSURE(pFormat, "SwHeadFootFrm: no format?"); - if (pFmt->GetHeaderAndFooterEatSpacing().GetValue()) + if (pFormat->GetHeaderAndFooterEatSpacing().GetValue()) return true; return false; @@ -670,16 +670,16 @@ void SwPageFrm::PrepareHeader() if ( !pLay ) return; - const SwFmtHeader &rH = static_cast<SwFrmFmt*>(GetRegisteredIn())->GetHeader(); + const SwFormatHeader &rH = static_cast<SwFrameFormat*>(GetRegisteredIn())->GetHeader(); const SwViewShell *pSh = getRootFrm()->GetCurrShell(); const bool bOn = !(pSh && pSh->GetViewOptions()->getBrowseMode()); if ( bOn && rH.IsActive() ) { //Implant header, but remove first, if already present - OSL_ENSURE( rH.GetHeaderFmt(), "FrmFmt for Header not found." ); + OSL_ENSURE( rH.GetHeaderFormat(), "FrameFormat for Header not found." ); - if ( pLay->GetFmt() == rH.GetHeaderFmt() ) + if ( pLay->GetFormat() == rH.GetHeaderFormat() ) return; // Header is already the correct one. if ( pLay->IsHeaderFrm() ) @@ -690,7 +690,7 @@ void SwPageFrm::PrepareHeader() SwFrm::DestroyFrm(pDel); } OSL_ENSURE( pLay, "Where to with the Header?" ); - SwHeaderFrm *pH = new SwHeaderFrm( const_cast<SwFrmFmt*>(rH.GetHeaderFmt()), this ); + SwHeaderFrm *pH = new SwHeaderFrm( const_cast<SwFrameFormat*>(rH.GetHeaderFormat()), this ); pH->Paste( this, pLay ); if ( GetUpper() ) ::RegistFlys( this, pH ); @@ -710,7 +710,7 @@ void SwPageFrm::PrepareFooter() if ( !pLay ) return; - const SwFmtFooter &rF = static_cast<SwFrmFmt*>(GetRegisteredIn())->GetFooter(); + const SwFormatFooter &rF = static_cast<SwFrameFormat*>(GetRegisteredIn())->GetFooter(); while ( pLay->GetNext() ) pLay = static_cast<SwLayoutFrm*>(pLay->GetNext()); @@ -719,9 +719,9 @@ void SwPageFrm::PrepareFooter() if ( bOn && rF.IsActive() ) { //Implant footer, but remove first, if already present - OSL_ENSURE( rF.GetFooterFmt(), "FrmFmt for Footer not found." ); + OSL_ENSURE( rF.GetFooterFormat(), "FrameFormat for Footer not found." ); - if ( pLay->GetFmt() == rF.GetFooterFmt() ) + if ( pLay->GetFormat() == rF.GetFooterFormat() ) return; // Footer is already the correct one. if ( pLay->IsFooterFrm() ) @@ -730,7 +730,7 @@ void SwPageFrm::PrepareFooter() pLay->Cut(); SwFrm::DestroyFrm(pLay); } - SwFooterFrm *pF = new SwFooterFrm( const_cast<SwFrmFmt*>(rF.GetFooterFmt()), this ); + SwFooterFrm *pF = new SwFooterFrm( const_cast<SwFrameFormat*>(rF.GetFooterFormat()), this ); pF->Paste( this ); if ( GetUpper() ) ::RegistFlys( this, pF ); diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx index e8010ae3aec9..26f43eec8936 100644 --- a/sw/source/core/layout/layact.cxx +++ b/sw/source/core/layout/layact.cxx @@ -105,7 +105,7 @@ void SwLayAction::CheckWaitCrsr() if ( !IsWait() && IsWaitAllowed() && IsPaint() && ((std::clock() - GetStartTicks()) * 1000 / CLOCKS_PER_SEC >= CLOCKS_PER_SEC/2) ) { - pWait = new SwWait( *pRoot->GetFmt()->GetDoc()->GetDocShell(), true ); + pWait = new SwWait( *pRoot->GetFormat()->GetDoc()->GetDocShell(), true ); } } @@ -127,7 +127,7 @@ void SwLayAction::SetStatBar( bool bNew ) nEndPage = USHRT_MAX; } -bool SwLayAction::PaintWithoutFlys( const SwRect &rRect, const SwCntntFrm *pCnt, +bool SwLayAction::PaintWithoutFlys( const SwRect &rRect, const SwContentFrm *pCnt, const SwPageFrm *pPage ) { SwRegionRects aTmp( rRect ); @@ -141,7 +141,7 @@ bool SwLayAction::PaintWithoutFlys( const SwRect &rRect, const SwCntntFrm *pCnt, continue; // OD 2004-01-15 #110582# - do not consider invisible objects - const IDocumentDrawModelAccess* pIDDMA = pPage->GetFmt()->getIDocumentDrawModelAccess(); + const IDocumentDrawModelAccess* pIDDMA = pPage->GetFormat()->getIDocumentDrawModelAccess(); if ( !pIDDMA->IsVisibleLayerId( pO->GetLayer() ) ) { continue; @@ -170,7 +170,7 @@ bool SwLayAction::PaintWithoutFlys( const SwRect &rRect, const SwCntntFrm *pCnt, else { const bool bLowerOfSelf = pFly->IsLowerOf( pSelfFly ); - if ( !bLowerOfSelf && !pFly->GetFmt()->GetOpaque().GetValue() ) + if ( !bLowerOfSelf && !pFly->GetFormat()->GetOpaque().GetValue() ) // Things from other layers are only interesting to us if // they're not transparent or lie inwards continue; @@ -182,9 +182,9 @@ bool SwLayAction::PaintWithoutFlys( const SwRect &rRect, const SwCntntFrm *pCnt, // For checking, if fly frame contains transparent graphic or // has surrounded contour, assure that fly frame has a lower if ( pFly->Lower() && - pFly->Lower()->IsNoTxtFrm() && - ( static_cast<SwNoTxtFrm*>(pFly->Lower())->IsTransparent() || - pFly->GetFmt()->GetSurround().IsContour() ) + pFly->Lower()->IsNoTextFrm() && + ( static_cast<SwNoTextFrm*>(pFly->Lower())->IsTransparent() || + pFly->GetFormat()->GetSurround().IsContour() ) ) { continue; @@ -207,14 +207,14 @@ bool SwLayAction::PaintWithoutFlys( const SwRect &rRect, const SwCntntFrm *pCnt, return bRetPaint; } -inline bool SwLayAction::_PaintCntnt( const SwCntntFrm *pCntnt, +inline bool SwLayAction::_PaintContent( const SwContentFrm *pContent, const SwPageFrm *pPage, const SwRect &rRect ) { if ( rRect.HasArea() ) { if ( pPage->GetSortedObjs() ) - return PaintWithoutFlys( rRect, pCntnt, pPage ); + return PaintWithoutFlys( rRect, pContent, pPage ); else return pImp->GetShell()->AddPaintRect( rRect ); } @@ -222,20 +222,20 @@ inline bool SwLayAction::_PaintCntnt( const SwCntntFrm *pCntnt, } /** - * Depending of the type, the Cntnt is output according to it's changes, or the area + * Depending of the type, the Content is output according to it's changes, or the area * to be outputted is registered with the region, respectively. */ -void SwLayAction::PaintCntnt( const SwCntntFrm *pCnt, +void SwLayAction::PaintContent( const SwContentFrm *pCnt, const SwPageFrm *pPage, const SwRect &rOldRect, long nOldBottom ) { SWRECTFN( pCnt ) - if ( pCnt->IsCompletePaint() || !pCnt->IsTxtFrm() ) + if ( pCnt->IsCompletePaint() || !pCnt->IsTextFrm() ) { SwRect aPaint( pCnt->PaintArea() ); - if ( !_PaintCntnt( pCnt, pPage, aPaint ) ) + if ( !_PaintContent( pCnt, pPage, aPaint ) ) pCnt->ResetCompletePaint(); } else @@ -252,11 +252,11 @@ void SwLayAction::PaintCntnt( const SwCntntFrm *pCnt, if( nOldHeight > nNewHeight ) nOldBottom = (pCnt->*fnRect->fnGetPrtBottom)(); (aDrawRect.*fnRect->fnSetTop)( nOldBottom ); - _PaintCntnt( pCnt, pPage, aDrawRect ); + _PaintContent( pCnt, pPage, aDrawRect ); } // paint content area - SwRect aPaintRect = static_cast<SwTxtFrm*>(const_cast<SwCntntFrm*>(pCnt))->Paint(); - _PaintCntnt( pCnt, pPage, aPaintRect ); + SwRect aPaintRect = static_cast<SwTextFrm*>(const_cast<SwContentFrm*>(pCnt))->Paint(); + _PaintContent( pCnt, pPage, aPaintRect ); } if ( pCnt->IsRetouche() && !pCnt->GetNext() ) @@ -270,7 +270,7 @@ void SwLayAction::PaintCntnt( const SwCntntFrm *pCnt, } SwRect aRect( pTmp->GetUpper()->PaintArea() ); (aRect.*fnRect->fnSetTop)( (pTmp->*fnRect->fnGetPrtBottom)() ); - if ( !_PaintCntnt( pCnt, pPage, aRect ) ) + if ( !_PaintContent( pCnt, pPage, aRect ) ) pCnt->ResetRetouche(); } } @@ -289,9 +289,9 @@ SwLayAction::SwLayAction( SwRootFrm *pRt, SwViewShellImp *pI ) : bPaintExtraData = ::IsExtraData( pImp->GetShell()->GetDoc() ); bPaint = bComplete = bWaitAllowed = bCheckPages = true; bInput = bAgain = bNextCycle = bCalcLayout = bIdle = bReschedule = - bUpdateExpFlds = bBrowseActionStop = bActionInProgress = false; - // OD 14.04.2003 #106346# - init new flag <mbFormatCntntOnInterrupt>. - mbFormatCntntOnInterrupt = false; + bUpdateExpFields = bBrowseActionStop = bActionInProgress = false; + // OD 14.04.2003 #106346# - init new flag <mbFormatContentOnInterrupt>. + mbFormatContentOnInterrupt = false; assert(!pImp->pLayAct); // there can be only one SwLayAction pImp->pLayAct = this; // register there @@ -311,7 +311,7 @@ void SwLayAction::Reset() nEndPage = nPreInvaPage = nCheckPageNum = USHRT_MAX; bPaint = bComplete = bWaitAllowed = bCheckPages = true; bInput = bAgain = bNextCycle = bCalcLayout = bIdle = bReschedule = - bUpdateExpFlds = bBrowseActionStop = false; + bUpdateExpFields = bBrowseActionStop = false; } bool SwLayAction::RemoveEmptyBrowserPages() @@ -326,7 +326,7 @@ bool SwLayAction::RemoveEmptyBrowserPages() do { if ( (pPage->GetSortedObjs() && pPage->GetSortedObjs()->size()) || - pPage->ContainsCntnt() ) + pPage->ContainsContent() ) pPage = static_cast<SwPageFrm*>(pPage->GetNext()); else { @@ -389,25 +389,25 @@ void SwLayAction::Action() SwPageFrm* SwLayAction::CheckFirstVisPage( SwPageFrm *pPage ) { - SwCntntFrm *pCnt = pPage->FindFirstBodyCntnt(); - SwCntntFrm *pChk = pCnt; + SwContentFrm *pCnt = pPage->FindFirstBodyContent(); + SwContentFrm *pChk = pCnt; bool bPageChgd = false; while ( pCnt && pCnt->IsFollow() ) - pCnt = static_cast<SwCntntFrm*>(pCnt)->FindMaster(); + pCnt = static_cast<SwContentFrm*>(pCnt)->FindMaster(); if ( pCnt && pChk != pCnt ) { bPageChgd = true; pPage = pCnt->FindPageFrm(); } - if ( !pPage->GetFmt()->GetDoc()->GetFtnIdxs().empty() ) + if ( !pPage->GetFormat()->GetDoc()->GetFootnoteIdxs().empty() ) { - SwFtnContFrm *pCont = pPage->FindFtnCont(); + SwFootnoteContFrm *pCont = pPage->FindFootnoteCont(); if ( pCont ) { - pCnt = pCont->ContainsCntnt(); + pCnt = pCont->ContainsContent(); pChk = pCnt; while ( pCnt && pCnt->IsFollow() ) - pCnt = static_cast<SwCntntFrm*>(pCnt->FindPrev()); + pCnt = static_cast<SwContentFrm*>(pCnt->FindPrev()); if ( pCnt && pCnt != pChk ) { if ( bPageChgd ) @@ -458,8 +458,8 @@ void SwLayAction::InternalAction() if ( !pPage ) pPage = static_cast<SwPageFrm*>(pRoot->Lower()); - // If there's a first-flow-Cntnt in the first visible page that's also a Follow, - // we switch the page back to the original master of that Cntnt. + // If there's a first-flow-Content in the first visible page that's also a Follow, + // we switch the page back to the original master of that Content. if ( !IsComplete() ) pPage = CheckFirstVisPage( pPage ); sal_uInt16 nFirstPageNum = pPage->GetPhyPageNum(); @@ -467,8 +467,8 @@ void SwLayAction::InternalAction() while ( pPage && !pPage->IsInvalid() && !pPage->IsInvalidFly() ) pPage = static_cast<SwPageFrm*>(pPage->GetNext()); - IDocumentLayoutAccess *pLayoutAccess = pRoot->GetFmt()->getIDocumentLayoutAccess(); - bool bNoLoop = pPage && SwLayouter::StartLoopControl( pRoot->GetFmt()->GetDoc(), pPage ); + IDocumentLayoutAccess *pLayoutAccess = pRoot->GetFormat()->getIDocumentLayoutAccess(); + bool bNoLoop = pPage && SwLayouter::StartLoopControl( pRoot->GetFormat()->GetDoc(), pPage ); sal_uInt16 nPercentPageNum = 0; while ( (pPage && !IsInterrupt()) || nCheckPageNum != USHRT_MAX ) { @@ -548,7 +548,7 @@ void SwLayAction::InternalAction() { // If there are no (more) Flys, the flags are superfluous. pPage->ValidateFlyLayout(); - pPage->ValidateFlyCntnt(); + pPage->ValidateFlyContent(); } // #i28701# - change condition while ( !IsInterrupt() && !IsNextCycle() && @@ -577,22 +577,22 @@ void SwLayAction::InternalAction() } // #i28701# - change condition if ( !IsNextCycle() && - ( pPage->IsInvalidCntnt() || + ( pPage->IsInvalidContent() || (IS_FLYS && IS_INVAFLY) ) ) { pPage->ValidateFlyInCnt(); - pPage->ValidateCntnt(); + pPage->ValidateContent(); // #i28701# pPage->ValidateFlyLayout(); - pPage->ValidateFlyCntnt(); - if ( !FormatCntnt( pPage ) ) + pPage->ValidateFlyContent(); + if ( !FormatContent( pPage ) ) { XCHECKPAGE; - pPage->InvalidateCntnt(); + pPage->InvalidateContent(); pPage->InvalidateFlyInCnt(); // #i28701# pPage->InvalidateFlyLayout(); - pPage->InvalidateFlyCntnt(); + pPage->InvalidateFlyContent(); if ( IsBrowseActionStop() ) bInput = true; } @@ -610,7 +610,7 @@ void SwLayAction::InternalAction() { // If there are no (more) Flys, the flags are superfluous. pPage->ValidateFlyLayout(); - pPage->ValidateFlyCntnt(); + pPage->ValidateFlyContent(); } if ( !IsInterrupt() ) { @@ -708,7 +708,7 @@ void SwLayAction::InternalAction() pPg = pPg ? static_cast<SwPageFrm*>(pPg->GetPrev()) : pPage; // set flag for interrupt content formatting - mbFormatCntntOnInterrupt = IsInput(); + mbFormatContentOnInterrupt = IsInput(); long nBottom = rVis.Bottom(); // #i42586# - format current page, if idle action is active // This is an optimization for the case that the interrupt is created by @@ -728,10 +728,10 @@ void SwLayAction::InternalAction() // #i28701# - conditions are incorrect (macros IS_FLYS and IS_INVAFLY only // works for <pPage>) and are too strict. // #i50432# - adjust interrupt formatting to normal page formatting - see above. - while ( ( mbFormatCntntOnInterrupt && + while ( ( mbFormatContentOnInterrupt && ( pPg->IsInvalid() || ( pPg->GetSortedObjs() && pPg->IsInvalidFly() ) ) ) || - ( !mbFormatCntntOnInterrupt && pPg->IsInvalidLayout() ) ) + ( !mbFormatContentOnInterrupt && pPg->IsInvalidLayout() ) ) { XCHECKPAGE; // #i50432# - format also at-page anchored objects @@ -739,7 +739,7 @@ void SwLayAction::InternalAction() if ( !pPg->GetSortedObjs() ) { pPg->ValidateFlyLayout(); - pPg->ValidateFlyCntnt(); + pPg->ValidateFlyContent(); } // #i81146# new loop control @@ -760,15 +760,15 @@ void SwLayAction::InternalAction() } // #i50432# - if ( mbFormatCntntOnInterrupt && - ( pPg->IsInvalidCntnt() || + if ( mbFormatContentOnInterrupt && + ( pPg->IsInvalidContent() || ( pPg->GetSortedObjs() && pPg->IsInvalidFly() ) ) ) { pPg->ValidateFlyInCnt(); - pPg->ValidateCntnt(); + pPg->ValidateContent(); // #i26945# pPg->ValidateFlyLayout(); - pPg->ValidateFlyCntnt(); + pPg->ValidateFlyContent(); if ( ++nLoopControlRuns_2 > nLoopControlMax ) { @@ -776,14 +776,14 @@ void SwLayAction::InternalAction() break; } - if ( !FormatCntnt( pPg ) ) + if ( !FormatContent( pPg ) ) { XCHECKPAGE; - pPg->InvalidateCntnt(); + pPg->InvalidateContent(); pPg->InvalidateFlyInCnt(); // #i26945# pPg->InvalidateFlyLayout(); - pPg->InvalidateFlyCntnt(); + pPg->InvalidateFlyContent(); } // #i46807# - we are statisfied, if the content is formatted once complete. else @@ -797,14 +797,14 @@ void SwLayAction::InternalAction() pPg = static_cast<SwPageFrm*>(pPg->GetNext()); } // reset flag for special interrupt content formatting. - mbFormatCntntOnInterrupt = false; + mbFormatContentOnInterrupt = false; } pOptTab = 0; if( bNoLoop ) pLayoutAccess->GetLayouter()->EndLoopControl(); } -bool SwLayAction::_TurboAction( const SwCntntFrm *pCnt ) +bool SwLayAction::_TurboAction( const SwContentFrm *pCnt ) { const SwPageFrm *pPage = 0; @@ -817,13 +817,13 @@ bool SwLayAction::_TurboAction( const SwCntntFrm *pCnt ) pCnt->SetRetouche(); pPage = pCnt->FindPageFrm(); - PaintCntnt( pCnt, pPage, aOldRect, nOldBottom ); + PaintContent( pCnt, pPage, aOldRect, nOldBottom ); - if ( !pCnt->GetValidLineNumFlag() && pCnt->IsTxtFrm() ) + if ( !pCnt->GetValidLineNumFlag() && pCnt->IsTextFrm() ) { - const sal_uLong nAllLines = static_cast<const SwTxtFrm*>(pCnt)->GetAllLines(); - const_cast<SwTxtFrm*>(static_cast<const SwTxtFrm*>(pCnt))->RecalcAllLines(); - if ( nAllLines != static_cast<const SwTxtFrm*>(pCnt)->GetAllLines() ) + const sal_uLong nAllLines = static_cast<const SwTextFrm*>(pCnt)->GetAllLines(); + const_cast<SwTextFrm*>(static_cast<const SwTextFrm*>(pCnt))->RecalcAllLines(); + if ( nAllLines != static_cast<const SwTextFrm*>(pCnt)->GetAllLines() ) { if ( IsPaintExtraData() ) pImp->GetShell()->AddPaintRect( pCnt->Frm() ); @@ -831,10 +831,10 @@ bool SwLayAction::_TurboAction( const SwCntntFrm *pCnt ) // and we don't stop processing here. To perform this inside RecalcAllLines // would be expensive, because we would have to notify the page even // in unnecessary cases (normal actions). - const SwCntntFrm *pNxt = pCnt->GetNextCntntFrm(); + const SwContentFrm *pNxt = pCnt->GetNextContentFrm(); while ( pNxt && (pNxt->IsInTab() || pNxt->IsInDocBody() != pCnt->IsInDocBody()) ) - pNxt = pNxt->GetNextCntntFrm(); + pNxt = pNxt->GetNextContentFrm(); if ( pNxt ) pNxt->InvalidatePage(); } @@ -848,14 +848,14 @@ bool SwLayAction::_TurboAction( const SwCntntFrm *pCnt ) pPage = pCnt->FindPageFrm(); // OD 2004-05-10 #i28701# - format floating screen objects at content frame. - if ( pCnt->IsTxtFrm() && - !SwObjectFormatter::FormatObjsAtFrm( *(const_cast<SwCntntFrm*>(pCnt)), + if ( pCnt->IsTextFrm() && + !SwObjectFormatter::FormatObjsAtFrm( *(const_cast<SwContentFrm*>(pCnt)), *pPage, this ) ) { return false; } - if ( pPage->IsInvalidCntnt() ) + if ( pPage->IsInvalidContent() ) return false; return true; } @@ -912,11 +912,11 @@ static const SwFrm *lcl_FindFirstInvaLay( const SwFrm *pFrm, long nBottom ) return 0; } -static const SwFrm *lcl_FindFirstInvaCntnt( const SwLayoutFrm *pLay, long nBottom, - const SwCntntFrm *pFirst ) +static const SwFrm *lcl_FindFirstInvaContent( const SwLayoutFrm *pLay, long nBottom, + const SwContentFrm *pFirst ) { - const SwCntntFrm *pCnt = pFirst ? pFirst->GetNextCntntFrm() : - pLay->ContainsCntnt(); + const SwContentFrm *pCnt = pFirst ? pFirst->GetNextContentFrm() : + pLay->ContainsContent(); while ( pCnt ) { if ( !pCnt->IsValid() || pCnt->IsCompletePaint() ) @@ -942,7 +942,7 @@ static const SwFrm *lcl_FindFirstInvaCntnt( const SwLayoutFrm *pLay, long nBotto if ( pFly->Frm().Top() <= nBottom ) return pFly; } - const SwFrm *pFrm = lcl_FindFirstInvaCntnt( pFly, nBottom, 0 ); + const SwFrm *pFrm = lcl_FindFirstInvaContent( pFly, nBottom, 0 ); if ( pFrm && pFrm->Frm().Bottom() <= nBottom ) return pFrm; } @@ -951,7 +951,7 @@ static const SwFrm *lcl_FindFirstInvaCntnt( const SwLayoutFrm *pLay, long nBotto } if ( pCnt->Frm().Top() > nBottom && !pCnt->IsInTab() ) return 0; - pCnt = pCnt->GetNextCntntFrm(); + pCnt = pCnt->GetNextContentFrm(); if ( !pLay->IsAnLower( pCnt ) ) break; } @@ -976,7 +976,7 @@ static const SwAnchoredObject* lcl_FindFirstInvaObj( const SwPageFrm* _pPage, return pFly; const SwFrm* pTmp; - if ( 0 != (pTmp = lcl_FindFirstInvaCntnt( pFly, _nBottom, 0 )) && + if ( 0 != (pTmp = lcl_FindFirstInvaContent( pFly, _nBottom, 0 )) && pTmp->Frm().Top() <= _nBottom ) return pFly; } @@ -1037,11 +1037,11 @@ bool SwLayAction::IsShortCut( SwPageFrm *&prPage ) { bRet = true; - // This is going to be a bit nasty: The first CntntFrm of this + // This is going to be a bit nasty: The first ContentFrm of this // page in the Body text needs formatting; if it changes the page during // that process, I need to start over a page further back, because we // have been processing a PageBreak. - // Even more uncomfortable: The next CntntFrm must be formatted, + // Even more uncomfortable: The next ContentFrm must be formatted, // because it's possible for empty pages to exist temporarily (for example // a paragraph across multiple pages gets deleted or reduced in size). @@ -1049,33 +1049,33 @@ bool SwLayAction::IsShortCut( SwPageFrm *&prPage ) // isn't visible anymore. const SwPageFrm *p2ndPage = prPage; - const SwCntntFrm *pCntnt; + const SwContentFrm *pContent; const SwLayoutFrm* pBody = p2ndPage->FindBodyCont(); - if( p2ndPage->IsFtnPage() && pBody ) + if( p2ndPage->IsFootnotePage() && pBody ) pBody = static_cast<const SwLayoutFrm*>(pBody->GetNext()); - pCntnt = pBody ? pBody->ContainsCntnt() : 0; - while ( p2ndPage && !pCntnt ) + pContent = pBody ? pBody->ContainsContent() : 0; + while ( p2ndPage && !pContent ) { p2ndPage = static_cast<const SwPageFrm*>(p2ndPage->GetNext()); if( p2ndPage ) { pBody = p2ndPage->FindBodyCont(); - if( p2ndPage->IsFtnPage() && pBody ) + if( p2ndPage->IsFootnotePage() && pBody ) pBody = static_cast<const SwLayoutFrm*>(pBody->GetNext()); - pCntnt = pBody ? pBody->ContainsCntnt() : 0; + pContent = pBody ? pBody->ContainsContent() : 0; } } - if ( pCntnt ) + if ( pContent ) { bool bTstCnt = true; if ( bBrowse ) { // Is the Cnt before already invisible? - const SwFrm *pLst = pCntnt; + const SwFrm *pLst = pContent; if ( pLst->IsInTab() ) - pLst = pCntnt->FindTabFrm(); + pLst = pContent->FindTabFrm(); if ( pLst->IsInSct() ) - pLst = pCntnt->FindSctFrm(); + pLst = pContent->FindSctFrm(); pLst = pLst->FindPrev(); if ( pLst && (pLst->Frm().Top() >= rVis.Bottom() || @@ -1092,9 +1092,9 @@ bool SwLayAction::IsShortCut( SwPageFrm *&prPage ) // frame calculation is performed bool bPageChg = false; - if ( pCntnt->IsInSct() ) + if ( pContent->IsInSct() ) { - const SwSectionFrm *pSct = ((SwFrm*)pCntnt)->ImplFindSctFrm(); + const SwSectionFrm *pSct = ((SwFrm*)pContent)->ImplFindSctFrm(); if ( !pSct->IsValid() ) { pSct->Calc(); @@ -1102,25 +1102,25 @@ bool SwLayAction::IsShortCut( SwPageFrm *&prPage ) if ( IsAgain() ) return false; // #i27756# - bPageChg = pCntnt->FindPageFrm() != p2ndPage && + bPageChg = pContent->FindPageFrm() != p2ndPage && prPage->GetPrev(); } } - if ( !bPageChg && !pCntnt->IsValid() ) + if ( !bPageChg && !pContent->IsValid() ) { - pCntnt->Calc(); - pCntnt->SetCompletePaint(); + pContent->Calc(); + pContent->SetCompletePaint(); if ( IsAgain() ) return false; // #i27756# - bPageChg = pCntnt->FindPageFrm() != p2ndPage && + bPageChg = pContent->FindPageFrm() != p2ndPage && prPage->GetPrev(); } - if ( !bPageChg && pCntnt->IsInTab() ) + if ( !bPageChg && pContent->IsInTab() ) { - const SwTabFrm *pTab = ((SwFrm*)pCntnt)->ImplFindTabFrm(); + const SwTabFrm *pTab = ((SwFrm*)pContent)->ImplFindTabFrm(); if ( !pTab->IsValid() ) { pTab->Calc(); @@ -1128,14 +1128,14 @@ bool SwLayAction::IsShortCut( SwPageFrm *&prPage ) if ( IsAgain() ) return false; // #i27756# - bPageChg = pCntnt->FindPageFrm() != p2ndPage && + bPageChg = pContent->FindPageFrm() != p2ndPage && prPage->GetPrev(); } } - if ( !bPageChg && pCntnt->IsInSct() ) + if ( !bPageChg && pContent->IsInSct() ) { - const SwSectionFrm *pSct = ((SwFrm*)pCntnt)->ImplFindSctFrm(); + const SwSectionFrm *pSct = ((SwFrm*)pContent)->ImplFindSctFrm(); if ( !pSct->IsValid() ) { pSct->Calc(); @@ -1143,7 +1143,7 @@ bool SwLayAction::IsShortCut( SwPageFrm *&prPage ) if ( IsAgain() ) return false; // #i27756# - bPageChg = pCntnt->FindPageFrm() != p2ndPage && + bPageChg = pContent->FindPageFrm() != p2ndPage && prPage->GetPrev(); } } @@ -1152,7 +1152,7 @@ bool SwLayAction::IsShortCut( SwPageFrm *&prPage ) if ( bPageChg ) { bRet = false; - const SwPageFrm* pTmp = pCntnt->FindPageFrm(); + const SwPageFrm* pTmp = pContent->FindPageFrm(); if ( pTmp->GetPhyPageNum() < prPage->GetPhyPageNum() && pTmp->IsInvalid() ) { @@ -1164,7 +1164,7 @@ bool SwLayAction::IsShortCut( SwPageFrm *&prPage ) } } // #121980# - no shortcut, if at previous page - // an anchored object is registered, whose anchor is <pCntnt>. + // an anchored object is registered, whose anchor is <pContent>. else if ( prPage->GetPrev() ) { SwSortedObjs* pObjs = @@ -1174,7 +1174,7 @@ bool SwLayAction::IsShortCut( SwPageFrm *&prPage ) for ( size_t i = 0; i < pObjs->size(); ++i ) { SwAnchoredObject* pObj = (*pObjs)[i]; - if ( pObj->GetAnchorFrmContainingAnchPos() == pCntnt ) + if ( pObj->GetAnchorFrmContainingAnchPos() == pContent ) { bRet = false; break; @@ -1191,7 +1191,7 @@ bool SwLayAction::IsShortCut( SwPageFrm *&prPage ) const long nBottom = rVis.Bottom(); const SwAnchoredObject* pObj( 0L ); if ( prPage->GetSortedObjs() && - (prPage->IsInvalidFlyLayout() || prPage->IsInvalidFlyCntnt()) && + (prPage->IsInvalidFlyLayout() || prPage->IsInvalidFlyContent()) && 0 != (pObj = lcl_FindFirstInvaObj( prPage, nBottom )) && pObj->GetObjRect().Top() <= nBottom ) { @@ -1204,8 +1204,8 @@ bool SwLayAction::IsShortCut( SwPageFrm *&prPage ) { return false; } - if ( (prPage->IsInvalidCntnt() || prPage->IsInvalidFlyInCnt()) && - 0 != (pFrm = lcl_FindFirstInvaCntnt( prPage, nBottom, 0 )) && + if ( (prPage->IsInvalidContent() || prPage->IsInvalidFlyInCnt()) && + 0 != (pFrm = lcl_FindFirstInvaContent( prPage, nBottom, 0 )) && pFrm->Frm().Top() <= nBottom ) { return false; @@ -1257,7 +1257,7 @@ bool SwLayAction::FormatLayout( SwLayoutFrm *pLay, bool bAddRect ) const SwViewShell *pSh = pLay->getRootFrm()->GetCurrShell(); // Limitations because of headers / footers if( pSh && pSh->GetViewOptions()->getBrowseMode() && - !( pLay->IsCompletePaint() && pLay->FindPageFrm()->FindFtnCont() ) ) + !( pLay->IsCompletePaint() && pLay->FindPageFrm()->FindFootnoteCont() ) ) bNoPaint = true; } @@ -1390,7 +1390,7 @@ bool SwLayAction::FormatLayout( SwLayoutFrm *pLay, bool bAddRect ) // Now, deal with the lowers that are LayoutFrms - if ( pLay->IsFtnFrm() ) // no LayFrms as Lower + if ( pLay->IsFootnoteFrm() ) // no LayFrms as Lower return bChanged; SwFrm *pLow = pLay->Lower(); @@ -1486,7 +1486,7 @@ bool SwLayAction::FormatLayoutTab( SwTabFrm *pTab, bool bAddRect ) if ( IsAgain() || !pTab->Lower() ) return false; - IDocumentTimerAccess *pTimerAccess = pRoot->GetFmt()->getIDocumentTimerAccess(); + IDocumentTimerAccess *pTimerAccess = pRoot->GetFormat()->getIDocumentTimerAccess(); pTimerAccess->BlockIdling(); bool bChanged = false; @@ -1628,30 +1628,30 @@ bool SwLayAction::FormatLayoutTab( SwTabFrm *pTab, bool bAddRect ) return bChanged; } -bool SwLayAction::FormatCntnt( const SwPageFrm *pPage ) +bool SwLayAction::FormatContent( const SwPageFrm *pPage ) { - const SwCntntFrm *pCntnt = pPage->ContainsCntnt(); + const SwContentFrm *pContent = pPage->ContainsContent(); const SwViewShell *pSh = pRoot->GetCurrShell(); const bool bBrowse = pSh && pSh->GetViewOptions()->getBrowseMode(); - while ( pCntnt && pPage->IsAnLower( pCntnt ) ) + while ( pContent && pPage->IsAnLower( pContent ) ) { - // If the Cntnt didn't change, we can use a few shortcuts. - const bool bFull = !pCntnt->IsValid() || pCntnt->IsCompletePaint() || - pCntnt->IsRetouche() || pCntnt->GetDrawObjs(); + // If the Content didn't change, we can use a few shortcuts. + const bool bFull = !pContent->IsValid() || pContent->IsCompletePaint() || + pContent->IsRetouche() || pContent->GetDrawObjs(); if ( bFull ) { // We do this so we don't have to search later on. - const bool bNxtCnt = IsCalcLayout() && !pCntnt->GetFollow(); - const SwCntntFrm *pCntntNext = bNxtCnt ? pCntnt->GetNextCntntFrm() : 0; - const SwCntntFrm *pCntntPrev = pCntnt->GetPrev() ? pCntnt->GetPrevCntntFrm() : 0; + const bool bNxtCnt = IsCalcLayout() && !pContent->GetFollow(); + const SwContentFrm *pContentNext = bNxtCnt ? pContent->GetNextContentFrm() : 0; + const SwContentFrm *pContentPrev = pContent->GetPrev() ? pContent->GetPrevContentFrm() : 0; - const SwLayoutFrm*pOldUpper = pCntnt->GetUpper(); - const SwTabFrm *pTab = pCntnt->FindTabFrm(); - const bool bInValid = !pCntnt->IsValid() || pCntnt->IsCompletePaint(); + const SwLayoutFrm*pOldUpper = pContent->GetUpper(); + const SwTabFrm *pTab = pContent->FindTabFrm(); + const bool bInValid = !pContent->IsValid() || pContent->IsCompletePaint(); const bool bOldPaint = IsPaint(); bPaint = bOldPaint && !(pTab && pTab == pOptTab); - _FormatCntnt( pCntnt, pPage ); + _FormatContent( pContent, pPage ); // #i26945# - reset <bPaint> before format objects bPaint = bOldPaint; @@ -1662,21 +1662,21 @@ bool SwLayAction::FormatCntnt( const SwPageFrm *pPage ) // #i23129#, #i36347# - pass correct page frame // to the object formatter. if ( !IsAgain() && - ( !IsInterrupt() || mbFormatCntntOnInterrupt ) && - pCntnt->IsTxtFrm() && - !SwObjectFormatter::FormatObjsAtFrm( *(const_cast<SwCntntFrm*>(pCntnt)), - *(pCntnt->FindPageFrm()), this ) ) + ( !IsInterrupt() || mbFormatContentOnInterrupt ) && + pContent->IsTextFrm() && + !SwObjectFormatter::FormatObjsAtFrm( *(const_cast<SwContentFrm*>(pContent)), + *(pContent->FindPageFrm()), this ) ) { return false; } - if ( !pCntnt->GetValidLineNumFlag() && pCntnt->IsTxtFrm() ) + if ( !pContent->GetValidLineNumFlag() && pContent->IsTextFrm() ) { - const sal_uLong nAllLines = static_cast<const SwTxtFrm*>(pCntnt)->GetAllLines(); - const_cast<SwTxtFrm*>(static_cast<const SwTxtFrm*>(pCntnt))->RecalcAllLines(); + const sal_uLong nAllLines = static_cast<const SwTextFrm*>(pContent)->GetAllLines(); + const_cast<SwTextFrm*>(static_cast<const SwTextFrm*>(pContent))->RecalcAllLines(); if ( IsPaintExtraData() && IsPaint() && - nAllLines != static_cast<const SwTxtFrm*>(pCntnt)->GetAllLines() ) - pImp->GetShell()->AddPaintRect( pCntnt->Frm() ); + nAllLines != static_cast<const SwTextFrm*>(pContent)->GetAllLines() ) + pImp->GetShell()->AddPaintRect( pContent->Frm() ); } if ( IsAgain() ) @@ -1691,16 +1691,16 @@ bool SwLayAction::FormatCntnt( const SwPageFrm *pPage ) { CheckIdleEnd(); // OD 14.04.2003 #106346# - consider interrupt formatting. - if ( ( IsInterrupt() && !mbFormatCntntOnInterrupt ) || + if ( ( IsInterrupt() && !mbFormatContentOnInterrupt ) || ( !bBrowse && pPage->IsInvalidLayout() ) || // OD 07.05.2003 #109435# - consider interrupt formatting - ( IS_FLYS && IS_INVAFLY && !mbFormatCntntOnInterrupt ) + ( IS_FLYS && IS_INVAFLY && !mbFormatContentOnInterrupt ) ) return false; } - if ( pOldUpper != pCntnt->GetUpper() ) + if ( pOldUpper != pContent->GetUpper() ) { - const sal_uInt16 nCurNum = pCntnt->FindPageFrm()->GetPhyPageNum(); + const sal_uInt16 nCurNum = pContent->FindPageFrm()->GetPhyPageNum(); if ( nCurNum < pPage->GetPhyPageNum() ) nPreInvaPage = nCurNum; @@ -1710,7 +1710,7 @@ bool SwLayAction::FormatCntnt( const SwPageFrm *pPage ) { SetNextCycle( true ); // OD 07.05.2003 #109435# - consider interrupt formatting - if ( !mbFormatCntntOnInterrupt ) + if ( !mbFormatContentOnInterrupt ) { return false; } @@ -1720,26 +1720,26 @@ bool SwLayAction::FormatCntnt( const SwPageFrm *pPage ) // the predecessor. // This way, we catch predecessors which are now responsible for // retouching, but the footers will be touched also. - bool bSetCntnt = true; - if ( pCntntPrev ) + bool bSetContent = true; + if ( pContentPrev ) { - if ( !pCntntPrev->IsValid() && pPage->IsAnLower( pCntntPrev ) ) - pPage->InvalidateCntnt(); - if ( pOldUpper != pCntnt->GetUpper() && - pPage->GetPhyPageNum() < pCntnt->FindPageFrm()->GetPhyPageNum() ) + if ( !pContentPrev->IsValid() && pPage->IsAnLower( pContentPrev ) ) + pPage->InvalidateContent(); + if ( pOldUpper != pContent->GetUpper() && + pPage->GetPhyPageNum() < pContent->FindPageFrm()->GetPhyPageNum() ) { - pCntnt = pCntntPrev; - bSetCntnt = false; + pContent = pContentPrev; + bSetContent = false; } } - if ( bSetCntnt ) + if ( bSetContent ) { if ( bBrowse && !IsIdle() && !IsCalcLayout() && !IsComplete() && - pCntnt->Frm().Top() > pImp->GetShell()->VisArea().Bottom()) + pContent->Frm().Top() > pImp->GetShell()->VisArea().Bottom()) { const long nBottom = pImp->GetShell()->VisArea().Bottom(); - const SwFrm *pTmp = lcl_FindFirstInvaCntnt( pPage, - nBottom, pCntnt ); + const SwFrm *pTmp = lcl_FindFirstInvaContent( pPage, + nBottom, pContent ); if ( !pTmp ) { if ( (!(IS_FLYS && IS_INVAFLY) || @@ -1748,45 +1748,45 @@ bool SwLayAction::FormatCntnt( const SwPageFrm *pPage ) !lcl_FindFirstInvaLay( pPage, nBottom ))) SetBrowseActionStop( true ); // OD 14.04.2003 #106346# - consider interrupt formatting. - if ( !mbFormatCntntOnInterrupt ) + if ( !mbFormatContentOnInterrupt ) { return false; } } } - pCntnt = bNxtCnt ? pCntntNext : pCntnt->GetNextCntntFrm(); + pContent = bNxtCnt ? pContentNext : pContent->GetNextContentFrm(); } RESCHEDULE; } else { - if ( !pCntnt->GetValidLineNumFlag() && pCntnt->IsTxtFrm() ) + if ( !pContent->GetValidLineNumFlag() && pContent->IsTextFrm() ) { - const sal_uLong nAllLines = static_cast<const SwTxtFrm*>(pCntnt)->GetAllLines(); - const_cast<SwTxtFrm*>(static_cast<const SwTxtFrm*>(pCntnt))->RecalcAllLines(); + const sal_uLong nAllLines = static_cast<const SwTextFrm*>(pContent)->GetAllLines(); + const_cast<SwTextFrm*>(static_cast<const SwTextFrm*>(pContent))->RecalcAllLines(); if ( IsPaintExtraData() && IsPaint() && - nAllLines != static_cast<const SwTxtFrm*>(pCntnt)->GetAllLines() ) - pImp->GetShell()->AddPaintRect( pCntnt->Frm() ); + nAllLines != static_cast<const SwTextFrm*>(pContent)->GetAllLines() ) + pImp->GetShell()->AddPaintRect( pContent->Frm() ); } // Do this if the Frm has been formatted before. - if ( pCntnt->IsTxtFrm() && static_cast<const SwTxtFrm*>(pCntnt)->HasRepaint() && + if ( pContent->IsTextFrm() && static_cast<const SwTextFrm*>(pContent)->HasRepaint() && IsPaint() ) - PaintCntnt( pCntnt, pPage, pCntnt->Frm(), pCntnt->Frm().Bottom()); + PaintContent( pContent, pPage, pContent->Frm(), pContent->Frm().Bottom()); if ( IsIdle() ) { CheckIdleEnd(); // OD 14.04.2003 #106346# - consider interrupt formatting. - if ( IsInterrupt() && !mbFormatCntntOnInterrupt ) + if ( IsInterrupt() && !mbFormatContentOnInterrupt ) return false; } if ( bBrowse && !IsIdle() && !IsCalcLayout() && !IsComplete() && - pCntnt->Frm().Top() > pImp->GetShell()->VisArea().Bottom()) + pContent->Frm().Top() > pImp->GetShell()->VisArea().Bottom()) { const long nBottom = pImp->GetShell()->VisArea().Bottom(); - const SwFrm *pTmp = lcl_FindFirstInvaCntnt( pPage, - nBottom, pCntnt ); + const SwFrm *pTmp = lcl_FindFirstInvaContent( pPage, + nBottom, pContent ); if ( !pTmp ) { if ( (!(IS_FLYS && IS_INVAFLY) || @@ -1795,82 +1795,82 @@ bool SwLayAction::FormatCntnt( const SwPageFrm *pPage ) !lcl_FindFirstInvaLay( pPage, nBottom ))) SetBrowseActionStop( true ); // OD 14.04.2003 #106346# - consider interrupt formatting. - if ( !mbFormatCntntOnInterrupt ) + if ( !mbFormatContentOnInterrupt ) { return false; } } } - pCntnt = pCntnt->GetNextCntntFrm(); + pContent = pContent->GetNextContentFrm(); } } CheckWaitCrsr(); // OD 14.04.2003 #106346# - consider interrupt formatting. - return !IsInterrupt() || mbFormatCntntOnInterrupt; + return !IsInterrupt() || mbFormatContentOnInterrupt; } -void SwLayAction::_FormatCntnt( const SwCntntFrm *pCntnt, +void SwLayAction::_FormatContent( const SwContentFrm *pContent, const SwPageFrm *pPage ) { - // We probably only ended up here because the Cntnt holds DrawObjects. - const bool bDrawObjsOnly = pCntnt->IsValid() && !pCntnt->IsCompletePaint() && - !pCntnt->IsRetouche(); - SWRECTFN( pCntnt ) + // We probably only ended up here because the Content holds DrawObjects. + const bool bDrawObjsOnly = pContent->IsValid() && !pContent->IsCompletePaint() && + !pContent->IsRetouche(); + SWRECTFN( pContent ) if ( !bDrawObjsOnly && IsPaint() ) { - const SwRect aOldRect( pCntnt->UnionFrm() ); - const long nOldBottom = (pCntnt->*fnRect->fnGetPrtBottom)(); - pCntnt->OptCalc(); + const SwRect aOldRect( pContent->UnionFrm() ); + const long nOldBottom = (pContent->*fnRect->fnGetPrtBottom)(); + pContent->OptCalc(); if( IsAgain() ) return; - if( (*fnRect->fnYDiff)( (pCntnt->Frm().*fnRect->fnGetBottom)(), + if( (*fnRect->fnYDiff)( (pContent->Frm().*fnRect->fnGetBottom)(), (aOldRect.*fnRect->fnGetBottom)() ) < 0 ) { - pCntnt->SetRetouche(); + pContent->SetRetouche(); } - PaintCntnt( pCntnt, pCntnt->FindPageFrm(), aOldRect, nOldBottom); + PaintContent( pContent, pContent->FindPageFrm(), aOldRect, nOldBottom); } else { - if ( IsPaint() && pCntnt->IsTxtFrm() && static_cast<const SwTxtFrm*>(pCntnt)->HasRepaint() ) - PaintCntnt( pCntnt, pPage, pCntnt->Frm(), - (pCntnt->Frm().*fnRect->fnGetBottom)() ); - pCntnt->OptCalc(); + if ( IsPaint() && pContent->IsTextFrm() && static_cast<const SwTextFrm*>(pContent)->HasRepaint() ) + PaintContent( pContent, pPage, pContent->Frm(), + (pContent->Frm().*fnRect->fnGetBottom)() ); + pContent->OptCalc(); } } -/// Returns true if all Cntnts of the Fly have been processed completely. +/// Returns true if all Contents of the Fly have been processed completely. /// Returns false if processing has been interrupted prematurely. -bool SwLayAction::_FormatFlyCntnt( const SwFlyFrm *pFly ) +bool SwLayAction::_FormatFlyContent( const SwFlyFrm *pFly ) { - const SwCntntFrm *pCntnt = pFly->ContainsCntnt(); + const SwContentFrm *pContent = pFly->ContainsContent(); - while ( pCntnt ) + while ( pContent ) { // OD 2004-05-10 #i28701# - _FormatCntnt( pCntnt, pCntnt->FindPageFrm() ); + _FormatContent( pContent, pContent->FindPageFrm() ); // #i28701# - format floating screen objects // at content text frame // #i23129#, #i36347# - pass correct page frame // to the object formatter. - if ( pCntnt->IsTxtFrm() && + if ( pContent->IsTextFrm() && !SwObjectFormatter::FormatObjsAtFrm( - *(const_cast<SwCntntFrm*>(pCntnt)), - *(pCntnt->FindPageFrm()), this ) ) + *(const_cast<SwContentFrm*>(pContent)), + *(pContent->FindPageFrm()), this ) ) { // restart format with first content - pCntnt = pFly->ContainsCntnt(); + pContent = pFly->ContainsContent(); continue; } - if ( !pCntnt->GetValidLineNumFlag() && pCntnt->IsTxtFrm() ) + if ( !pContent->GetValidLineNumFlag() && pContent->IsTextFrm() ) { - const sal_uLong nAllLines = static_cast<const SwTxtFrm*>(pCntnt)->GetAllLines(); - const_cast<SwTxtFrm*>(static_cast<const SwTxtFrm*>(pCntnt))->RecalcAllLines(); + const sal_uLong nAllLines = static_cast<const SwTextFrm*>(pContent)->GetAllLines(); + const_cast<SwTextFrm*>(static_cast<const SwTextFrm*>(pContent))->RecalcAllLines(); if ( IsPaintExtraData() && IsPaint() && - nAllLines != static_cast<const SwTxtFrm*>(pCntnt)->GetAllLines() ) - pImp->GetShell()->AddPaintRect( pCntnt->Frm() ); + nAllLines != static_cast<const SwTextFrm*>(pContent)->GetAllLines() ) + pImp->GetShell()->AddPaintRect( pContent->Frm() ); } if ( IsAgain() ) @@ -1881,51 +1881,51 @@ bool SwLayAction::_FormatFlyCntnt( const SwFlyFrm *pFly ) { CheckIdleEnd(); // OD 14.04.2003 #106346# - consider interrupt formatting. - if ( IsInterrupt() && !mbFormatCntntOnInterrupt ) + if ( IsInterrupt() && !mbFormatContentOnInterrupt ) return false; } - pCntnt = pCntnt->GetNextCntntFrm(); + pContent = pContent->GetNextContentFrm(); } CheckWaitCrsr(); // OD 14.04.2003 #106346# - consider interrupt formatting. - return !(IsInterrupt() && !mbFormatCntntOnInterrupt); + return !(IsInterrupt() && !mbFormatContentOnInterrupt); } -bool SwLayIdle::_DoIdleJob( const SwCntntFrm *pCnt, IdleJobType eJob ) +bool SwLayIdle::_DoIdleJob( const SwContentFrm *pCnt, IdleJobType eJob ) { - OSL_ENSURE( pCnt->IsTxtFrm(), "NoTxt neighbour of Txt" ); + OSL_ENSURE( pCnt->IsTextFrm(), "NoText neighbour of Text" ); // robust against misuse by e.g. #i52542# - if( !pCnt->IsTxtFrm() ) + if( !pCnt->IsTextFrm() ) return false; - const SwTxtNode* pTxtNode = pCnt->GetNode()->GetTxtNode(); + const SwTextNode* pTextNode = pCnt->GetNode()->GetTextNode(); bool bProcess = false; switch ( eJob ) { case ONLINE_SPELLING : - bProcess = pTxtNode->IsWrongDirty(); break; + bProcess = pTextNode->IsWrongDirty(); break; case AUTOCOMPLETE_WORDS : - bProcess = pTxtNode->IsAutoCompleteWordDirty(); break; + bProcess = pTextNode->IsAutoCompleteWordDirty(); break; case WORD_COUNT : - bProcess = pTxtNode->IsWordCountDirty(); break; + bProcess = pTextNode->IsWordCountDirty(); break; case SMART_TAGS : - bProcess = pTxtNode->IsSmartTagDirty(); break; + bProcess = pTextNode->IsSmartTagDirty(); break; } if( bProcess ) { SwViewShell *pSh = pImp->GetShell(); - if( COMPLETE_STRING == nTxtPos ) + if( COMPLETE_STRING == nTextPos ) { - --nTxtPos; + --nTextPos; if( pSh->ISA(SwCrsrShell) && !static_cast<SwCrsrShell*>(pSh)->IsTableMode() ) { SwPaM *pCrsr = static_cast<SwCrsrShell*>(pSh)->GetCrsr(); if( !pCrsr->HasMark() && !pCrsr->IsMultiSelection() ) { - pCntntNode = pCrsr->GetCntntNode(); - nTxtPos = pCrsr->GetPoint()->nContent.GetIndex(); + pContentNode = pCrsr->GetContentNode(); + nTextPos = pCrsr->GetPoint()->nContent.GetIndex(); } } } @@ -1934,8 +1934,8 @@ bool SwLayIdle::_DoIdleJob( const SwCntntFrm *pCnt, IdleJobType eJob ) { case ONLINE_SPELLING : { - SwRect aRepaint( const_cast<SwTxtFrm*>(static_cast<const SwTxtFrm*>(pCnt))->_AutoSpell( pCntntNode, nTxtPos ) ); - bPageValid = bPageValid && !pTxtNode->IsWrongDirty(); + SwRect aRepaint( const_cast<SwTextFrm*>(static_cast<const SwTextFrm*>(pCnt))->_AutoSpell( pContentNode, nTextPos ) ); + bPageValid = bPageValid && !pTextNode->IsWrongDirty(); if( !bPageValid ) bAllValid = false; if ( aRepaint.HasArea() ) @@ -1945,15 +1945,15 @@ bool SwLayIdle::_DoIdleJob( const SwCntntFrm *pCnt, IdleJobType eJob ) break; } case AUTOCOMPLETE_WORDS : - const_cast<SwTxtFrm*>(static_cast<const SwTxtFrm*>(pCnt))->CollectAutoCmplWrds( pCntntNode, nTxtPos ); + const_cast<SwTextFrm*>(static_cast<const SwTextFrm*>(pCnt))->CollectAutoCmplWrds( pContentNode, nTextPos ); if ( Application::AnyInput( VCL_INPUT_ANY ) ) return true; break; case WORD_COUNT : { - const sal_Int32 nEnd = pTxtNode->GetTxt().getLength(); + const sal_Int32 nEnd = pTextNode->GetText().getLength(); SwDocStat aStat; - pTxtNode->CountWords( aStat, 0, nEnd ); + pTextNode->CountWords( aStat, 0, nEnd ); if ( Application::AnyInput( VCL_INPUT_ANY ) ) return true; break; @@ -1961,8 +1961,8 @@ bool SwLayIdle::_DoIdleJob( const SwCntntFrm *pCnt, IdleJobType eJob ) case SMART_TAGS : { try { - const SwRect aRepaint( const_cast<SwTxtFrm*>(static_cast<const SwTxtFrm*>(pCnt))->SmartTagScan( pCntntNode, nTxtPos ) ); - bPageValid = bPageValid && !pTxtNode->IsSmartTagDirty(); + const SwRect aRepaint( const_cast<SwTextFrm*>(static_cast<const SwTextFrm*>(pCnt))->SmartTagScan( pContentNode, nTextPos ) ); + bPageValid = bPageValid && !pTextNode->IsSmartTagDirty(); if( !bPageValid ) bAllValid = false; if ( aRepaint.HasArea() ) @@ -1990,15 +1990,15 @@ bool SwLayIdle::_DoIdleJob( const SwCntntFrm *pCnt, IdleJobType eJob ) SwFlyFrm* pFly = static_cast<SwFlyFrm*>(pObj); if ( pFly->IsFlyInCntFrm() ) { - const SwCntntFrm *pC = pFly->ContainsCntnt(); + const SwContentFrm *pC = pFly->ContainsContent(); while( pC ) { - if ( pC->IsTxtFrm() ) + if ( pC->IsTextFrm() ) { if ( _DoIdleJob( pC, eJob ) ) return true; } - pC = pC->GetNextCntntFrm(); + pC = pC->GetNextContentFrm(); } } } @@ -2045,18 +2045,18 @@ bool SwLayIdle::DoIdleJob( IdleJobType eJob, bool bVisAreaOnly ) else pPage = static_cast<SwPageFrm*>(pRoot->Lower()); - pCntntNode = NULL; - nTxtPos = COMPLETE_STRING; + pContentNode = NULL; + nTextPos = COMPLETE_STRING; while ( pPage ) { bPageValid = true; - const SwCntntFrm *pCnt = pPage->ContainsCntnt(); + const SwContentFrm *pCnt = pPage->ContainsContent(); while( pCnt && pPage->IsAnLower( pCnt ) ) { if ( _DoIdleJob( pCnt, eJob ) ) return true; - pCnt = pCnt->GetNextCntntFrm(); + pCnt = pCnt->GetNextContentFrm(); } if ( pPage->GetSortedObjs() ) { @@ -2067,15 +2067,15 @@ bool SwLayIdle::DoIdleJob( IdleJobType eJob, bool bVisAreaOnly ) if ( pObj->ISA(SwFlyFrm) ) { const SwFlyFrm *pFly = static_cast<const SwFlyFrm*>(pObj); - const SwCntntFrm *pC = pFly->ContainsCntnt(); + const SwContentFrm *pC = pFly->ContainsContent(); while( pC ) { - if ( pC->IsTxtFrm() ) + if ( pC->IsTextFrm() ) { if ( _DoIdleJob( pC, eJob ) ) return true; } - pC = pC->GetNextCntntFrm(); + pC = pC->GetNextContentFrm(); } } } @@ -2282,8 +2282,8 @@ SwLayIdle::SwLayIdle( SwRootFrm *pRt, SwViewShellImp *pI ) : SwPageFrm *pPg = static_cast<SwPageFrm*>(pRoot->Lower()); do { - bInValid = pPg->IsInvalidCntnt() || pPg->IsInvalidLayout() || - pPg->IsInvalidFlyCntnt() || pPg->IsInvalidFlyLayout() || + bInValid = pPg->IsInvalidContent() || pPg->IsInvalidLayout() || + pPg->IsInvalidFlyContent() || pPg->IsInvalidFlyLayout() || pPg->IsInvalidFlyInCnt() || (bSpell && pPg->IsInvalidSpelling()) || (bACmplWrd && pPg->IsInvalidAutoCompleteWords()) || diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx index c91f22c81872..fed24be3feef 100644 --- a/sw/source/core/layout/laycache.cxx +++ b/sw/source/core/layout/laycache.cxx @@ -182,20 +182,20 @@ void SwLayoutCache::Write( SvStream &rStream, const SwDoc& rDoc ) if( pTmp ) // any content { - if( pTmp->IsTxtFrm() ) + if( pTmp->IsTextFrm() ) { - sal_uLong nNdIdx = static_cast<SwTxtFrm*>(pTmp)->GetNode()->GetIndex(); + sal_uLong nNdIdx = static_cast<SwTextFrm*>(pTmp)->GetNode()->GetIndex(); if( nNdIdx > nStartOfContent ) { /* Open Paragraph Record */ aIo.OpenRec( SW_LAYCACHE_IO_REC_PARA ); - bool bFollow = static_cast<SwTxtFrm*>(pTmp)->IsFollow(); + bool bFollow = static_cast<SwTextFrm*>(pTmp)->IsFollow(); aIo.OpenFlagRec( bFollow ? 0x01 : 0x00, bFollow ? 8 : 4 ); nNdIdx -= nStartOfContent; aIo.GetStream().WriteUInt32( nNdIdx ); if( bFollow ) - aIo.GetStream().WriteUInt32( static_cast<SwTxtFrm*>(pTmp)->GetOfst() ); + aIo.GetStream().WriteUInt32( static_cast<SwTextFrm*>(pTmp)->GetOfst() ); aIo.CloseFlagRec(); /* Close Paragraph Record */ aIo.CloseRec( SW_LAYCACHE_IO_REC_PARA ); @@ -340,17 +340,17 @@ bool SwLayoutCache::CompareLayout( const SwDoc& rDoc ) const pTmp = static_cast<const SwSectionFrm*>(pTmp)->ContainsAny(); if( pTmp ) { - if( pTmp->IsTxtFrm() ) + if( pTmp->IsTextFrm() ) { - sal_uLong nNdIdx = static_cast<const SwTxtFrm*>(pTmp)->GetNode()->GetIndex(); + sal_uLong nNdIdx = static_cast<const SwTextFrm*>(pTmp)->GetNode()->GetIndex(); if( nNdIdx > nStartOfContent ) { - bool bFollow = static_cast<const SwTxtFrm*>(pTmp)->IsFollow(); + bool bFollow = static_cast<const SwTextFrm*>(pTmp)->IsFollow(); nNdIdx -= nStartOfContent; if( pImpl->GetBreakIndex( nIndex ) != nNdIdx || SW_LAYCACHE_IO_REC_PARA != pImpl->GetBreakType( nIndex ) || - ( bFollow ? static_cast<const SwTxtFrm*>(pTmp)->GetOfst() + ( bFollow ? static_cast<const SwTextFrm*>(pTmp)->GetOfst() : COMPLETE_STRING ) != pImpl->GetBreakOfst( nIndex ) ) { return false; @@ -452,7 +452,7 @@ SwActualSection::SwActualSection( SwActualSection *pUp, { if ( !pSectNode ) { - const SwNodeIndex *pIndex = pSect->GetFmt()->GetCntnt().GetCntntIdx(); + const SwNodeIndex *pIndex = pSect->GetFormat()->GetContent().GetContentIdx(); pSectNode = pIndex->GetNode().FindSectionNode(); } } @@ -538,7 +538,7 @@ sal_uLong SwLayHelper::CalcPageCount() sal_uLong nTmp = pDoc->GetNodes().GetEndOfContent().GetIndex() - pDoc->GetNodes().GetEndOfExtras().GetIndex(); //Tables have a little overhead.. - nTmp -= pDoc->GetTblFrmFmts()->size() * 25; + nTmp -= pDoc->GetTableFrameFormats()->size() * 25; //Fly frames, too .. nTmp -= (pDoc->GetNodes().GetEndOfAutotext().GetIndex() - pDoc->GetNodes().GetEndOfInserts().GetIndex()) / 3 * 5; @@ -582,8 +582,8 @@ bool SwLayHelper::CheckInsertPage() { bool bEnd = 0 == rpPage->GetNext(); const SwAttrSet* pAttr = rpFrm->GetAttrSet(); - const SvxFmtBreakItem& rBrk = pAttr->GetBreak(); - const SwFmtPageDesc& rDesc = pAttr->GetPageDesc(); + const SvxFormatBreakItem& rBrk = pAttr->GetBreak(); + const SwFormatPageDesc& rDesc = pAttr->GetPageDesc(); // #118195# Do not evaluate page description if frame // is a follow frame! const SwPageDesc* pDesc = rpFrm->IsFlowFrm() && @@ -605,7 +605,7 @@ bool SwLayHelper::CheckInsertPage() { pDesc = rpPage->GetPageDesc()->GetFollow(); - SwFmtPageDesc aFollowDesc( pDesc ); + SwFormatPageDesc aFollowDesc( pDesc ); oPgNum = aFollowDesc.GetNumOffset(); if ( oPgNum ) static_cast<SwRootFrm*>(rpPage->GetUpper())->SetVirtPageNum(true); @@ -758,9 +758,9 @@ bool SwLayHelper::CheckInsert( sal_uLong nNodeIndex ) { bool bSplit = false; sal_uInt16 nRepeat( 0 ); - if( !bLongTab && rpFrm->IsTxtFrm() && + if( !bLongTab && rpFrm->IsTextFrm() && SW_LAYCACHE_IO_REC_PARA == nType && - nOfst < static_cast<SwTxtFrm*>(rpFrm)->GetTxtNode()->GetTxt().getLength()) + nOfst < static_cast<SwTextFrm*>(rpFrm)->GetTextNode()->GetText().getLength()) bSplit = true; else if( rpFrm->IsTabFrm() && nRowCount < nOfst && ( bLongTab || SW_LAYCACHE_IO_REC_TABLE == nType ) ) @@ -827,12 +827,12 @@ bool SwLayHelper::CheckInsert( sal_uLong nNodeIndex ) } else { - SwTxtFrm *const pNew = static_cast<SwTxtFrm*>( - static_cast<SwTxtFrm*>(rpFrm) - ->GetTxtNode()->MakeFrm(rpFrm)); + SwTextFrm *const pNew = static_cast<SwTextFrm*>( + static_cast<SwTextFrm*>(rpFrm) + ->GetTextNode()->MakeFrm(rpFrm)); pNew->ManipOfst( nOfst ); - pNew->SetFollow( static_cast<SwTxtFrm*>(rpFrm)->GetFollow() ); - static_cast<SwTxtFrm*>(rpFrm)->SetFollow( pNew ); + pNew->SetFollow( static_cast<SwTextFrm*>(rpFrm)->GetFollow() ); + static_cast<SwTextFrm*>(rpFrm)->SetFollow( pNew ); rpFrm = pNew; } } @@ -843,7 +843,7 @@ bool SwLayHelper::CheckInsert( sal_uLong nNodeIndex ) if( CheckInsertPage() ) { _CheckFlyCache( pLastPage ); - if( rpPrv && rpPrv->IsTxtFrm() && !rpPrv->GetValidSizeFlag() ) + if( rpPrv && rpPrv->IsTextFrm() && !rpPrv->GetValidSizeFlag() ) rpPrv->Frm().Height( rpPrv->GetUpper()->Prt().Height() ); bRet = true; @@ -856,7 +856,7 @@ bool SwLayHelper::CheckInsert( sal_uLong nNodeIndex ) //directly put it somewhere else SwSectionFrm *pSct; bool bInit = false; - if ( !rpActualSection->GetSectionFrm()->ContainsCntnt()) + if ( !rpActualSection->GetSectionFrm()->ContainsContent()) { pSct = rpActualSection->GetSectionFrm(); pSct->RemoveFromLayout(); diff --git a/sw/source/core/layout/layouter.cxx b/sw/source/core/layout/layouter.cxx index ec265342f896..54f95feba332 100644 --- a/sw/source/core/layout/layouter.cxx +++ b/sw/source/core/layout/layouter.cxx @@ -47,13 +47,13 @@ class SwEndnoter { SwLayouter* pMaster; SwSectionFrm* pSect; - SwFtnFrms* pEndArr; + SwFootnoteFrms* pEndArr; public: SwEndnoter( SwLayouter* pLay ) : pMaster( pLay ), pSect( NULL ), pEndArr( NULL ) {} ~SwEndnoter() { delete pEndArr; } void CollectEndnotes( SwSectionFrm* pSct ); - void CollectEndnote( SwFtnFrm* pFtn ); + void CollectEndnote( SwFootnoteFrm* pFootnote ); const SwSectionFrm* GetSect() const { return pSect; } void InsertEndnotes(); bool HasEndnotes() const { return pEndArr && !pEndArr->empty(); } @@ -69,15 +69,15 @@ void SwEndnoter::CollectEndnotes( SwSectionFrm* pSct ) pSect->CollectEndnotes( pMaster ); } -void SwEndnoter::CollectEndnote( SwFtnFrm* pFtn ) +void SwEndnoter::CollectEndnote( SwFootnoteFrm* pFootnote ) { - if( pEndArr && pEndArr->end() != std::find( pEndArr->begin(), pEndArr->end(), pFtn ) ) + if( pEndArr && pEndArr->end() != std::find( pEndArr->begin(), pEndArr->end(), pFootnote ) ) return; - if( pFtn->GetUpper() ) + if( pFootnote->GetUpper() ) { - // pFtn is the master, he incorporates its follows - SwFtnFrm *pNxt = pFtn->GetFollow(); + // pFootnote is the master, he incorporates its follows + SwFootnoteFrm *pNxt = pFootnote->GetFollow(); while ( pNxt ) { SwFrm *pCnt = pNxt->ContainsAny(); @@ -86,7 +86,7 @@ void SwEndnoter::CollectEndnote( SwFtnFrm* pFtn ) do { SwFrm *pNxtCnt = pCnt->GetNext(); pCnt->Cut(); - pCnt->Paste( pFtn ); + pCnt->Paste( pFootnote ); pCnt = pNxtCnt; } while ( pCnt ); } @@ -96,27 +96,27 @@ void SwEndnoter::CollectEndnote( SwFtnFrm* pFtn ) pNxt->Cut(); SwFrm::DestroyFrm(pNxt); } - pNxt = pFtn->GetFollow(); + pNxt = pFootnote->GetFollow(); } - if( pFtn->GetMaster() ) + if( pFootnote->GetMaster() ) return; - pFtn->Cut(); + pFootnote->Cut(); } else if( pEndArr ) { for ( size_t i = 0; i < pEndArr->size(); ++i ) { - SwFtnFrm *pEndFtn = (*pEndArr)[i]; - if( pEndFtn->GetAttr() == pFtn->GetAttr() ) + SwFootnoteFrm *pEndFootnote = (*pEndArr)[i]; + if( pEndFootnote->GetAttr() == pFootnote->GetAttr() ) { - SwFrm::DestroyFrm(pFtn); + SwFrm::DestroyFrm(pFootnote); return; } } } if( !pEndArr ) - pEndArr = new SwFtnFrms; // deleted from the SwLayouter - pEndArr->push_back( pFtn ); + pEndArr = new SwFootnoteFrms; // deleted from the SwLayouter + pEndArr->push_back( pFootnote ); } void SwEndnoter::InsertEndnotes() @@ -128,12 +128,12 @@ void SwEndnoter::InsertEndnotes() pSect = NULL; return; } - OSL_ENSURE( pSect->Lower() && pSect->Lower()->IsFtnBossFrm(), + OSL_ENSURE( pSect->Lower() && pSect->Lower()->IsFootnoteBossFrm(), "InsertEndnotes: Where's my column?" ); - SwFrm* pRef = pSect->FindLastCntnt( FINDMODE_MYLAST ); - SwFtnBossFrm *pBoss = pRef ? pRef->FindFtnBossFrm() - : static_cast<SwFtnBossFrm*>(pSect->Lower()); - pBoss->_MoveFtns( *pEndArr ); + SwFrm* pRef = pSect->FindLastContent( FINDMODE_MYLAST ); + SwFootnoteBossFrm *pBoss = pRef ? pRef->FindFootnoteBossFrm() + : static_cast<SwFootnoteBossFrm*>(pSect->Lower()); + pBoss->_MoveFootnotes( *pEndArr ); delete pEndArr; pEndArr = NULL; pSect = NULL; @@ -236,9 +236,9 @@ bool SwLayouter::HasEndnotes() const return mpEndnoter->HasEndnotes(); } -void SwLayouter::CollectEndnote( SwFtnFrm* pFtn ) +void SwLayouter::CollectEndnote( SwFootnoteFrm* pFootnote ) { - mpEndnoter->CollectEndnote( pFtn ); + mpEndnoter->CollectEndnote( pFootnote ); } void SwLayouter::InsertEndnotes( SwSectionFrm* pSect ) @@ -254,7 +254,7 @@ void SwLayouter::LoopControl( SwPageFrm* pPage, sal_uInt8 ) mpLooping->Control( pPage ); } -void SwLayouter::LoopingLouieLight( const SwDoc& rDoc, const SwTxtFrm& rFrm ) +void SwLayouter::LoopingLouieLight( const SwDoc& rDoc, const SwTextFrm& rFrm ) { if ( mpLooping && mpLooping->IsLoopingLouieLight() ) { @@ -287,7 +287,7 @@ void SwLayouter::CollectEndnotes( SwDoc* pDoc, SwSectionFrm* pSect ) pDoc->getIDocumentLayoutAccess().GetLayouter()->_CollectEndnotes( pSect ); } -bool SwLayouter::Collecting( SwDoc* pDoc, SwSectionFrm* pSect, SwFtnFrm* pFtn ) +bool SwLayouter::Collecting( SwDoc* pDoc, SwSectionFrm* pSect, SwFootnoteFrm* pFootnote ) { if( !pDoc->getIDocumentLayoutAccess().GetLayouter() ) return false; @@ -296,8 +296,8 @@ bool SwLayouter::Collecting( SwDoc* pDoc, SwSectionFrm* pSect, SwFtnFrm* pFtn ) ( pLayouter->mpEndnoter->GetSect()->IsAnFollow( pSect ) || pSect->IsAnFollow( pLayouter->mpEndnoter->GetSect() ) ) ) { - if( pFtn ) - pLayouter->CollectEndnote( pFtn ); + if( pFootnote ) + pLayouter->CollectEndnote( pFootnote ); return true; } return false; @@ -325,7 +325,7 @@ void SwLayouter::ClearMovedFwdFrms( const SwDoc& _rDoc ) } void SwLayouter::InsertMovedFwdFrm( const SwDoc& _rDoc, - const SwTxtFrm& _rMovedFwdFrmByObjPos, + const SwTextFrm& _rMovedFwdFrmByObjPos, const sal_uInt32 _nToPageNum ) { if ( !_rDoc.getIDocumentLayoutAccess().GetLayouter() ) @@ -345,17 +345,17 @@ void SwLayouter::InsertMovedFwdFrm( const SwDoc& _rDoc, // #i40155# void SwLayouter::RemoveMovedFwdFrm( const SwDoc& _rDoc, - const SwTxtFrm& _rTxtFrm ) + const SwTextFrm& _rTextFrm ) { sal_uInt32 nDummy; - if ( SwLayouter::FrmMovedFwdByObjPos( _rDoc, _rTxtFrm, nDummy ) ) + if ( SwLayouter::FrmMovedFwdByObjPos( _rDoc, _rTextFrm, nDummy ) ) { - _rDoc.getIDocumentLayoutAccess().GetLayouter()->mpMovedFwdFrms->Remove( _rTxtFrm ); + _rDoc.getIDocumentLayoutAccess().GetLayouter()->mpMovedFwdFrms->Remove( _rTextFrm ); } } bool SwLayouter::FrmMovedFwdByObjPos( const SwDoc& _rDoc, - const SwTxtFrm& _rTxtFrm, + const SwTextFrm& _rTextFrm, sal_uInt32& _ornToPageNum ) { if ( !_rDoc.getIDocumentLayoutAccess().GetLayouter() ) @@ -371,7 +371,7 @@ bool SwLayouter::FrmMovedFwdByObjPos( const SwDoc& _rDoc, else { return _rDoc.getIDocumentLayoutAccess().GetLayouter()->mpMovedFwdFrms-> - FrmMovedFwdByObjPos( _rTxtFrm, _ornToPageNum ); + FrmMovedFwdByObjPos( _rTextFrm, _ornToPageNum ); } } @@ -421,14 +421,14 @@ void SwLayouter::InsertObjForTmpConsiderWrapInfluence( _rDoc.getIDocumentLayoutAccess().GetLayouter()->mpObjsTmpConsiderWrapInfl->Insert( _rAnchoredObj ); } -void LOOPING_LOUIE_LIGHT( bool bCondition, const SwTxtFrm& rTxtFrm ) +void LOOPING_LOUIE_LIGHT( bool bCondition, const SwTextFrm& rTextFrm ) { if ( bCondition ) { - const SwDoc& rDoc = *rTxtFrm.GetAttrSet()->GetDoc(); + const SwDoc& rDoc = *rTextFrm.GetAttrSet()->GetDoc(); if ( rDoc.getIDocumentLayoutAccess().GetLayouter() ) { - const_cast<SwDoc&>(rDoc).getIDocumentLayoutAccess().GetLayouter()->LoopingLouieLight( rDoc, rTxtFrm ); + const_cast<SwDoc&>(rDoc).getIDocumentLayoutAccess().GetLayouter()->LoopingLouieLight( rDoc, rTextFrm ); } } } diff --git a/sw/source/core/layout/movedfwdfrmsbyobjpos.cxx b/sw/source/core/layout/movedfwdfrmsbyobjpos.cxx index 60774d71f2b3..233c37906f64 100644 --- a/sw/source/core/layout/movedfwdfrmsbyobjpos.cxx +++ b/sw/source/core/layout/movedfwdfrmsbyobjpos.cxx @@ -32,26 +32,26 @@ SwMovedFwdFrmsByObjPos::~SwMovedFwdFrmsByObjPos() Clear(); } -void SwMovedFwdFrmsByObjPos::Insert( const SwTxtFrm& _rMovedFwdFrmByObjPos, +void SwMovedFwdFrmsByObjPos::Insert( const SwTextFrm& _rMovedFwdFrmByObjPos, const sal_uInt32 _nToPageNum ) { if ( maMovedFwdFrms.end() == - maMovedFwdFrms.find( _rMovedFwdFrmByObjPos.GetTxtNode() ) ) + maMovedFwdFrms.find( _rMovedFwdFrmByObjPos.GetTextNode() ) ) { - const NodeMapEntry aEntry( _rMovedFwdFrmByObjPos.GetTxtNode(), _nToPageNum ); + const NodeMapEntry aEntry( _rMovedFwdFrmByObjPos.GetTextNode(), _nToPageNum ); maMovedFwdFrms.insert( aEntry ); } } -void SwMovedFwdFrmsByObjPos::Remove( const SwTxtFrm& _rTxtFrm ) +void SwMovedFwdFrmsByObjPos::Remove( const SwTextFrm& _rTextFrm ) { - maMovedFwdFrms.erase( _rTxtFrm.GetTxtNode() ); + maMovedFwdFrms.erase( _rTextFrm.GetTextNode() ); } -bool SwMovedFwdFrmsByObjPos::FrmMovedFwdByObjPos( const SwTxtFrm& _rTxtFrm, +bool SwMovedFwdFrmsByObjPos::FrmMovedFwdByObjPos( const SwTextFrm& _rTextFrm, sal_uInt32& _ornToPageNum ) const { - NodeMapIter aIter = maMovedFwdFrms.find( _rTxtFrm.GetTxtNode() ); + NodeMapIter aIter = maMovedFwdFrms.find( _rTextFrm.GetTextNode() ); if ( maMovedFwdFrms.end() != aIter ) { _ornToPageNum = (*aIter).second; @@ -74,12 +74,12 @@ bool SwMovedFwdFrmsByObjPos::DoesRowContainMovedFwdFrm( const SwRowFrm& _rRowFrm const NodeMapEntry& rEntry = *(aIter); if ( rEntry.second >= nPageNumOfRow ) { - SwIterator<SwTxtFrm,SwTxtNode> aFrmIter( *rEntry.first ); - for( SwTxtFrm* pTxtFrm = aFrmIter.First(); pTxtFrm; pTxtFrm = (SwTxtFrm*)aFrmIter.Next() ) + SwIterator<SwTextFrm,SwTextNode> aFrmIter( *rEntry.first ); + for( SwTextFrm* pTextFrm = aFrmIter.First(); pTextFrm; pTextFrm = (SwTextFrm*)aFrmIter.Next() ) { // #115759# - assure that found text frame // is the first one. - if ( _rRowFrm.IsAnLower( pTxtFrm ) && !pTxtFrm->GetIndPrev() ) + if ( _rRowFrm.IsAnLower( pTextFrm ) && !pTextFrm->GetIndPrev() ) { bDoesRowContainMovedFwdFrm = true; break; diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx index c0be33a222ae..e71ea11ee688 100644 --- a/sw/source/core/layout/newfrm.cxx +++ b/sw/source/core/layout/newfrm.cxx @@ -341,7 +341,7 @@ SwRectFn fnRectVL2R = &aVerticalRightToLeft; sal_uInt32 SwFrm::mnLastFrmId=0; TYPEINIT1(SwFrm,SwClient); //rtti for SwFrm -TYPEINIT1(SwCntntFrm,SwFrm); //rtti for SwCntntFrm +TYPEINIT1(SwContentFrm,SwFrm); //rtti for SwContentFrm void _FrmInit() { @@ -446,13 +446,13 @@ void InitCurrShells( SwRootFrm *pRoot ) } /* -|* The RootFrm requests an own FrmFmt from the document, which it is -|* going to delete again in the dtor. The own FrmFmt is derived from -|* the passed FrmFmt. +|* The RootFrm requests an own FrameFormat from the document, which it is +|* going to delete again in the dtor. The own FrameFormat is derived from +|* the passed FrameFormat. |*/ -SwRootFrm::SwRootFrm( SwFrmFmt *pFmt, SwViewShell * pSh ) : - SwLayoutFrm( pFmt->GetDoc()->MakeFrmFmt( - OUString("Root"), pFmt ), 0 ), +SwRootFrm::SwRootFrm( SwFrameFormat *pFormat, SwViewShell * pSh ) : + SwLayoutFrm( pFormat->GetDoc()->MakeFrameFormat( + OUString("Root"), pFormat ), 0 ), maPagesArea(), mnViewWidth( -1 ), mnColumns( 0 ), @@ -483,20 +483,20 @@ SwRootFrm::SwRootFrm( SwFrmFmt *pFmt, SwViewShell * pSh ) : setRootFrm( this ); } -void SwRootFrm::Init( SwFrmFmt* pFmt ) +void SwRootFrm::Init( SwFrameFormat* pFormat ) { InitCurrShells( this ); - IDocumentTimerAccess *pTimerAccess = pFmt->getIDocumentTimerAccess(); - IDocumentLayoutAccess *pLayoutAccess = pFmt->getIDocumentLayoutAccess(); - IDocumentFieldsAccess *pFieldsAccess = pFmt->getIDocumentFieldsAccess(); - const IDocumentSettingAccess *pSettingAccess = pFmt->getIDocumentSettingAccess(); + IDocumentTimerAccess *pTimerAccess = pFormat->getIDocumentTimerAccess(); + IDocumentLayoutAccess *pLayoutAccess = pFormat->getIDocumentLayoutAccess(); + IDocumentFieldsAccess *pFieldsAccess = pFormat->getIDocumentFieldsAccess(); + const IDocumentSettingAccess *pSettingAccess = pFormat->getIDocumentSettingAccess(); pTimerAccess->StopIdling(); // For creating the Flys by MakeFrms() pLayoutAccess->SetCurrentViewShell( this->GetCurrShell() ); mbCallbackActionEnabled = false; // needs to be set to true before leaving! - SwDrawModel* pMd = pFmt->getIDocumentDrawModelAccess()->GetDrawModel(); + SwDrawModel* pMd = pFormat->getIDocumentDrawModelAccess()->GetDrawModel(); if ( pMd ) { // Disable "multiple layout" @@ -505,23 +505,23 @@ void SwRootFrm::Init( SwFrmFmt* pFmt ) mpDrawPage->SetSize( Frm().SSize() ); } - // Initialize the layout: create pages, link content with Cntnt etc. + // Initialize the layout: create pages, link content with Content etc. // First, initialize some stuff, then get hold of the first // node (which will be needed for the PageDesc). - SwDoc* pDoc = pFmt->GetDoc(); + SwDoc* pDoc = pFormat->GetDoc(); SwNodeIndex aIndex( *pDoc->GetNodes().GetEndOfContent().StartOfSectionNode() ); - SwCntntNode *pNode = pDoc->GetNodes().GoNextSection( &aIndex, true, false ); + SwContentNode *pNode = pDoc->GetNodes().GoNextSection( &aIndex, true, false ); // #123067# pNode = 0 can really happen - SwTableNode *pTblNd= pNode ? pNode->FindTableNode() : 0; + SwTableNode *pTableNd= pNode ? pNode->FindTableNode() : 0; - // Get hold of PageDesc (either via FrmFmt of the first node or the initial one). + // Get hold of PageDesc (either via FrameFormat of the first node or the initial one). SwPageDesc *pDesc = 0; ::boost::optional<sal_uInt16> oPgNum; - if ( pTblNd ) + if ( pTableNd ) { - const SwFmtPageDesc &rDesc = pTblNd->GetTable().GetFrmFmt()->GetPageDesc(); + const SwFormatPageDesc &rDesc = pTableNd->GetTable().GetFrameFormat()->GetPageDesc(); pDesc = const_cast<SwPageDesc*>(rDesc.GetPageDesc()); //#19104# respect the page number offset!! oPgNum = rDesc.GetNumOffset(); @@ -530,7 +530,7 @@ void SwRootFrm::Init( SwFrmFmt* pFmt ) } else if ( pNode ) { - const SwFmtPageDesc &rDesc = pNode->GetSwAttrSet().GetPageDesc(); + const SwFormatPageDesc &rDesc = pNode->GetSwAttrSet().GetPageDesc(); pDesc = const_cast<SwPageDesc*>(rDesc.GetPageDesc()); //#19104# respect the page number offset!! oPgNum = rDesc.GetNumOffset(); @@ -557,12 +557,12 @@ void SwRootFrm::Init( SwFrmFmt* pFmt ) //Remove masters that haven't been replaced yet from the list. RemoveMasterObjs( mpDrawPage ); if( pSettingAccess->get(DocumentSettingId::GLOBAL_DOCUMENT) ) - pFieldsAccess->UpdateRefFlds( NULL ); + pFieldsAccess->UpdateRefFields( NULL ); //b6433357: Update page fields after loading - if ( !mpCurrShell || !mpCurrShell->Imp()->IsUpdateExpFlds() ) + if ( !mpCurrShell || !mpCurrShell->Imp()->IsUpdateExpFields() ) { - SwDocPosUpdate aMsgHnt( pPage->Frm().Top() ); - pFieldsAccess->UpdatePageFlds( &aMsgHnt ); + SwDocPosUpdate aMsgHint( pPage->Frm().Top() ); + pFieldsAccess->UpdatePageFields( &aMsgHint ); } pTimerAccess->StartIdling(); @@ -582,19 +582,19 @@ void SwRootFrm::DestroyImpl() // document/layout split SwDoc and SwRootFrm were essentially one object // and magically/uncleanly worked around their common destruction by call // to SwDoc::IsInDtor() -- even from the layout. As of now destuction of - // the layout proceeds forward through the frames. Since SwTxtFtn::DelFrms + // the layout proceeds forward through the frames. Since SwTextFootnote::DelFrms // also searches backwards to find the master of footnotes, they must be // considered to be owned by the SwRootFrm and also be destroyed here, // before tearing down the (now footnote free) rest of the layout. - RemoveFtns(0, false, true); + RemoveFootnotes(0, false, true); if(pBlink) pBlink->FrmDelete( this ); - SwFrmFmt *pRegisteredInNonConst = static_cast<SwFrmFmt*>(GetRegisteredInNonConst()); + SwFrameFormat *pRegisteredInNonConst = static_cast<SwFrameFormat*>(GetRegisteredInNonConst()); if ( pRegisteredInNonConst ) { SwDoc *pDoc = pRegisteredInNonConst->GetDoc(); - pDoc->DelFrmFmt( pRegisteredInNonConst ); + pDoc->DelFrameFormat( pRegisteredInNonConst ); pDoc->GetDocumentLayoutManager().ClearSwLayouterEntries(); } delete mpDestroy; @@ -649,9 +649,9 @@ void SwRootFrm::AllAddPaintRect() const GetCurrShell()->AddPaintRect( this->Frm() ); } -void SwRootFrm::AllRemoveFtns() +void SwRootFrm::AllRemoveFootnotes() { - RemoveFtns(); + RemoveFootnotes(); } void SwRootFrm::AllInvalidateSmartTagsOrSpelling(bool bSmartTags) const diff --git a/sw/source/core/layout/objectformatter.cxx b/sw/source/core/layout/objectformatter.cxx index 55861f365304..24afe55f9adb 100644 --- a/sw/source/core/layout/objectformatter.cxx +++ b/sw/source/core/layout/objectformatter.cxx @@ -76,7 +76,7 @@ class SwPageNumAndTypeOfAnchors pNewEntry->mnPageNumOfAnchor = 0; } // --> #i26945# - collect type of anchor - SwTxtFrm* pAnchorCharFrm = _rAnchoredObj.FindAnchorCharFrm(); + SwTextFrm* pAnchorCharFrm = _rAnchoredObj.FindAnchorCharFrm(); if ( pAnchorCharFrm ) { pNewEntry->mbAnchoredAtMaster = !pAnchorCharFrm->IsFollow(); @@ -136,7 +136,7 @@ SwObjectFormatter::SwObjectFormatter( const SwPageFrm& _rPageFrm, const bool _bCollectPgNumOfAnchors ) : mrPageFrm( _rPageFrm ), mbFormatOnlyAsCharAnchored( false ), - mbConsiderWrapOnObjPos( _rPageFrm.GetFmt()->getIDocumentSettingAccess()->get(DocumentSettingId::CONSIDER_WRAP_ON_OBJECT_POSITION) ), + mbConsiderWrapOnObjPos( _rPageFrm.GetFormat()->getIDocumentSettingAccess()->get(DocumentSettingId::CONSIDER_WRAP_ON_OBJECT_POSITION) ), mpLayAction( _pLayAction ), // --> #i26945# mpPgNumAndTypeOfAnchors( _bCollectPgNumOfAnchors ? new SwPageNumAndTypeOfAnchors() : 0L ) @@ -154,10 +154,10 @@ SwObjectFormatter* SwObjectFormatter::CreateObjFormatter( SwLayAction* _pLayAction ) { SwObjectFormatter* pObjFormatter = 0L; - if ( _rAnchorFrm.IsTxtFrm() ) + if ( _rAnchorFrm.IsTextFrm() ) { - pObjFormatter = SwObjectFormatterTxtFrm::CreateObjFormatter( - static_cast<SwTxtFrm&>(_rAnchorFrm), + pObjFormatter = SwObjectFormatterTextFrm::CreateObjFormatter( + static_cast<SwTextFrm&>(_rAnchorFrm), _rPageFrm, _pLayAction ); } else if ( _rAnchorFrm.IsLayoutFrm() ) @@ -257,7 +257,7 @@ void SwObjectFormatter::_FormatLayout( SwLayoutFrm& _rLayoutFrm ) #i28701# */ -void SwObjectFormatter::_FormatObjCntnt( SwAnchoredObject& _rAnchoredObj ) +void SwObjectFormatter::_FormatObjContent( SwAnchoredObject& _rAnchoredObj ) { if ( !_rAnchoredObj.ISA(SwFlyFrm) ) { @@ -266,28 +266,28 @@ void SwObjectFormatter::_FormatObjCntnt( SwAnchoredObject& _rAnchoredObj ) } SwFlyFrm& rFlyFrm = static_cast<SwFlyFrm&>(_rAnchoredObj); - SwCntntFrm* pCntnt = rFlyFrm.ContainsCntnt(); + SwContentFrm* pContent = rFlyFrm.ContainsContent(); - while ( pCntnt ) + while ( pContent ) { // format content - pCntnt->OptCalc(); + pContent->OptCalc(); // format floating screen objects at content text frame // #i23129#, #i36347# - pass correct page frame to // the object formatter - if ( pCntnt->IsTxtFrm() && - !SwObjectFormatter::FormatObjsAtFrm( *pCntnt, - *(pCntnt->FindPageFrm()), + if ( pContent->IsTextFrm() && + !SwObjectFormatter::FormatObjsAtFrm( *pContent, + *(pContent->FindPageFrm()), GetLayAction() ) ) { // restart format with first content - pCntnt = rFlyFrm.ContainsCntnt(); + pContent = rFlyFrm.ContainsContent(); continue; } // continue with next content - pCntnt = pCntnt->GetNextCntntFrm(); + pContent = pContent->GetNextContentFrm(); } } @@ -300,7 +300,7 @@ void SwObjectFormatter::_FormatObj( SwAnchoredObject& _rAnchoredObj ) // check, if only as-character anchored object have to be formatted, and // check the anchor type if ( FormatOnlyAsCharAnchored() && - !(_rAnchoredObj.GetFrmFmt().GetAnchor().GetAnchorId() == FLY_AS_CHAR) ) + !(_rAnchoredObj.GetFrameFormat().GetAnchor().GetAnchorId() == FLY_AS_CHAR) ) { return; } @@ -352,7 +352,7 @@ void SwObjectFormatter::_FormatObj( SwAnchoredObject& _rAnchoredObj ) mpLayAction ); if ( mpLayAction ) { - mpLayAction->_FormatFlyCntnt( &rFlyFrm ); + mpLayAction->_FormatFlyContent( &rFlyFrm ); // --> consider, if the layout action // has to be restarted due to a delete of a page frame. if ( mpLayAction->IsAgain() ) @@ -362,7 +362,7 @@ void SwObjectFormatter::_FormatObj( SwAnchoredObject& _rAnchoredObj ) } else { - _FormatObjCntnt( rFlyFrm ); + _FormatObjContent( rFlyFrm ); } if ( ++nLoopControlRuns >= nLoopControlMax ) @@ -393,15 +393,15 @@ void SwObjectFormatter::_FormatObj( SwAnchoredObject& _rAnchoredObj ) Thus, the objects, whose anchor character is inside the follow text frame can be formatted. */ -bool SwObjectFormatter::_FormatObjsAtFrm( SwTxtFrm* _pMasterTxtFrm ) +bool SwObjectFormatter::_FormatObjsAtFrm( SwTextFrm* _pMasterTextFrm ) { // --> #i26945# SwFrm* pAnchorFrm( 0L ); - if ( GetAnchorFrm().IsTxtFrm() && - static_cast<SwTxtFrm&>(GetAnchorFrm()).IsFollow() && - _pMasterTxtFrm ) + if ( GetAnchorFrm().IsTextFrm() && + static_cast<SwTextFrm&>(GetAnchorFrm()).IsFollow() && + _pMasterTextFrm ) { - pAnchorFrm = _pMasterTxtFrm; + pAnchorFrm = _pMasterTextFrm; } else { @@ -428,12 +428,12 @@ bool SwObjectFormatter::_FormatObjsAtFrm( SwTxtFrm* _pMasterTxtFrm ) // If the anchor follow text frame is in the same body as its 'master' // text frame, do not format the anchored object. // E.g., this situation can occur during the table row splitting algorithm. - SwTxtFrm* pAnchorCharFrm = pAnchoredObj->FindAnchorCharFrm(); + SwTextFrm* pAnchorCharFrm = pAnchoredObj->FindAnchorCharFrm(); const bool bAnchoredAtFollowInSameBodyAsMaster = pAnchorCharFrm && pAnchorCharFrm->IsFollow() && pAnchorCharFrm != pAnchoredObj->GetAnchorFrm() && pAnchorCharFrm->FindBodyFrm() == - static_cast<SwTxtFrm*>(pAnchoredObj->AnchorFrm())->FindBodyFrm(); + static_cast<SwTextFrm*>(pAnchoredObj->AnchorFrm())->FindBodyFrm(); if ( bAnchoredAtFollowInSameBodyAsMaster ) { continue; diff --git a/sw/source/core/layout/objectformattertxtfrm.cxx b/sw/source/core/layout/objectformattertxtfrm.cxx index 4b4a994fb03b..dc6eee0863c4 100644 --- a/sw/source/core/layout/objectformattertxtfrm.cxx +++ b/sw/source/core/layout/objectformattertxtfrm.cxx @@ -35,52 +35,52 @@ using namespace ::com::sun::star; class SwForbidFollowFormat { private: - SwTxtFrm& mrTxtFrm; + SwTextFrm& mrTextFrm; const bool bOldFollowFormatAllowed; public: - SwForbidFollowFormat( SwTxtFrm& _rTxtFrm ) - : mrTxtFrm( _rTxtFrm ), - bOldFollowFormatAllowed( _rTxtFrm.FollowFormatAllowed() ) + SwForbidFollowFormat( SwTextFrm& _rTextFrm ) + : mrTextFrm( _rTextFrm ), + bOldFollowFormatAllowed( _rTextFrm.FollowFormatAllowed() ) { - mrTxtFrm.ForbidFollowFormat(); + mrTextFrm.ForbidFollowFormat(); } ~SwForbidFollowFormat() { if ( bOldFollowFormatAllowed ) { - mrTxtFrm.AllowFollowFormat(); + mrTextFrm.AllowFollowFormat(); } } }; -SwObjectFormatterTxtFrm::SwObjectFormatterTxtFrm( SwTxtFrm& _rAnchorTxtFrm, +SwObjectFormatterTextFrm::SwObjectFormatterTextFrm( SwTextFrm& _rAnchorTextFrm, const SwPageFrm& _rPageFrm, - SwTxtFrm* _pMasterAnchorTxtFrm, + SwTextFrm* _pMasterAnchorTextFrm, SwLayAction* _pLayAction ) : SwObjectFormatter( _rPageFrm, _pLayAction, true ), - mrAnchorTxtFrm( _rAnchorTxtFrm ), - mpMasterAnchorTxtFrm( _pMasterAnchorTxtFrm ) + mrAnchorTextFrm( _rAnchorTextFrm ), + mpMasterAnchorTextFrm( _pMasterAnchorTextFrm ) { } -SwObjectFormatterTxtFrm::~SwObjectFormatterTxtFrm() +SwObjectFormatterTextFrm::~SwObjectFormatterTextFrm() { } -SwObjectFormatterTxtFrm* SwObjectFormatterTxtFrm::CreateObjFormatter( - SwTxtFrm& _rAnchorTxtFrm, +SwObjectFormatterTextFrm* SwObjectFormatterTextFrm::CreateObjFormatter( + SwTextFrm& _rAnchorTextFrm, const SwPageFrm& _rPageFrm, SwLayAction* _pLayAction ) { - SwObjectFormatterTxtFrm* pObjFormatter = 0L; + SwObjectFormatterTextFrm* pObjFormatter = 0L; - // determine 'master' of <_rAnchorTxtFrm>, if anchor frame is a follow text frame. - SwTxtFrm* pMasterOfAnchorFrm = 0L; - if ( _rAnchorTxtFrm.IsFollow() ) + // determine 'master' of <_rAnchorTextFrm>, if anchor frame is a follow text frame. + SwTextFrm* pMasterOfAnchorFrm = 0L; + if ( _rAnchorTextFrm.IsFollow() ) { - pMasterOfAnchorFrm = _rAnchorTxtFrm.FindMaster(); + pMasterOfAnchorFrm = _rAnchorTextFrm.FindMaster(); while ( pMasterOfAnchorFrm && pMasterOfAnchorFrm->IsFollow() ) { pMasterOfAnchorFrm = pMasterOfAnchorFrm->FindMaster(); @@ -89,30 +89,30 @@ SwObjectFormatterTxtFrm* SwObjectFormatterTxtFrm::CreateObjFormatter( // create object formatter, if floating screen objects are registered // at anchor frame (or at 'master' anchor frame) - if ( _rAnchorTxtFrm.GetDrawObjs() || + if ( _rAnchorTextFrm.GetDrawObjs() || ( pMasterOfAnchorFrm && pMasterOfAnchorFrm->GetDrawObjs() ) ) { pObjFormatter = - new SwObjectFormatterTxtFrm( _rAnchorTxtFrm, _rPageFrm, + new SwObjectFormatterTextFrm( _rAnchorTextFrm, _rPageFrm, pMasterOfAnchorFrm, _pLayAction ); } return pObjFormatter; } -SwFrm& SwObjectFormatterTxtFrm::GetAnchorFrm() +SwFrm& SwObjectFormatterTextFrm::GetAnchorFrm() { - return mrAnchorTxtFrm; + return mrAnchorTextFrm; } // #i40147# - add parameter <_bCheckForMovedFwd>. -bool SwObjectFormatterTxtFrm::DoFormatObj( SwAnchoredObject& _rAnchoredObj, +bool SwObjectFormatterTextFrm::DoFormatObj( SwAnchoredObject& _rAnchoredObj, const bool _bCheckForMovedFwd ) { // check, if only as-character anchored object have to be formatted, and // check the anchor type if ( FormatOnlyAsCharAnchored() && - !(_rAnchoredObj.GetFrmFmt().GetAnchor().GetAnchorId() == FLY_AS_CHAR) ) + !(_rAnchoredObj.GetFrameFormat().GetAnchor().GetAnchorId() == FLY_AS_CHAR) ) { return true; } @@ -148,7 +148,7 @@ bool SwObjectFormatterTxtFrm::DoFormatObj( SwAnchoredObject& _rAnchoredObj, _rAnchoredObj.RestartLayoutProcess() && !( _rAnchoredObj.PositionLocked() && _rAnchoredObj.GetAnchorFrm()->IsInFly() && - _rAnchoredObj.GetFrmFmt().GetFollowTextFlow().GetValue() ); + _rAnchoredObj.GetFrameFormat().GetFollowTextFlow().GetValue() ); if ( bRestart ) { bSuccess = false; @@ -164,11 +164,11 @@ bool SwObjectFormatterTxtFrm::DoFormatObj( SwAnchoredObject& _rAnchoredObj, // whose the check of a moved forward anchor frame is requested. // revise decision made for i3317: // anchored objects, whose wrapping style influence is temporarly considered, - // have to be considered in method <SwObjectFormatterTxtFrm::DoFormatObjs()> + // have to be considered in method <SwObjectFormatterTextFrm::DoFormatObjs()> if ( bSuccess && _rAnchoredObj.ConsiderObjWrapInfluenceOnObjPos() && ( _bCheckForMovedFwd || - _rAnchoredObj.GetFrmFmt().GetWrapInfluenceOnObjPos(). + _rAnchoredObj.GetFrameFormat().GetWrapInfluenceOnObjPos(). // #i35017# - handle ITERATIVE as ONCE_SUCCESSIVE GetWrapInfluenceOnObjPos( true ) == // #i35017# - constant name has changed @@ -177,7 +177,7 @@ bool SwObjectFormatterTxtFrm::DoFormatObj( SwAnchoredObject& _rAnchoredObj, // #i26945# - check conditions for move forward of // anchor text frame // determine, if anchor text frame has previous frame - const bool bDoesAnchorHadPrev = ( mrAnchorTxtFrm.GetIndPrev() != 0 ); + const bool bDoesAnchorHadPrev = ( mrAnchorTextFrm.GetIndPrev() != 0 ); // #i40141# - use new method - it also formats the // section the anchor frame is in. @@ -189,49 +189,49 @@ bool SwObjectFormatterTxtFrm::DoFormatObj( SwAnchoredObject& _rAnchoredObj, _rAnchoredObj.SetClearedEnvironment( true ); // #i44049# - consider, that anchor frame // could already been marked to move forward. - SwPageFrm* pAnchorPageFrm( mrAnchorTxtFrm.FindPageFrm() ); + SwPageFrm* pAnchorPageFrm( mrAnchorTextFrm.FindPageFrm() ); if ( pAnchorPageFrm != _rAnchoredObj.GetPageFrm() ) { bool bInsert( true ); sal_uInt32 nToPageNum( 0L ); - const SwDoc& rDoc = *(GetPageFrm().GetFmt()->GetDoc()); + const SwDoc& rDoc = *(GetPageFrm().GetFormat()->GetDoc()); if ( SwLayouter::FrmMovedFwdByObjPos( - rDoc, mrAnchorTxtFrm, nToPageNum ) ) + rDoc, mrAnchorTextFrm, nToPageNum ) ) { if ( nToPageNum < pAnchorPageFrm->GetPhyPageNum() ) - SwLayouter::RemoveMovedFwdFrm( rDoc, mrAnchorTxtFrm ); + SwLayouter::RemoveMovedFwdFrm( rDoc, mrAnchorTextFrm ); else bInsert = false; } if ( bInsert ) { - SwLayouter::InsertMovedFwdFrm( rDoc, mrAnchorTxtFrm, + SwLayouter::InsertMovedFwdFrm( rDoc, mrAnchorTextFrm, pAnchorPageFrm->GetPhyPageNum() ); - mrAnchorTxtFrm.InvalidatePos(); + mrAnchorTextFrm.InvalidatePos(); bSuccess = false; _InvalidatePrevObjs( _rAnchoredObj ); _InvalidateFollowObjs( _rAnchoredObj, true ); } else { - OSL_FAIL( "<SwObjectFormatterTxtFrm::DoFormatObj(..)> - anchor frame not marked to move forward" ); + OSL_FAIL( "<SwObjectFormatterTextFrm::DoFormatObj(..)> - anchor frame not marked to move forward" ); } } } - else if ( !mrAnchorTxtFrm.IsFollow() && bDoesAnchorHadPrev ) + else if ( !mrAnchorTextFrm.IsFollow() && bDoesAnchorHadPrev ) { // index of anchored object in collection of page numbers and // anchor types sal_uInt32 nIdx( CountOfCollected() ); OSL_ENSURE( nIdx > 0, - "<SwObjectFormatterTxtFrm::DoFormatObj(..)> - anchored object not collected!?" ); + "<SwObjectFormatterTextFrm::DoFormatObj(..)> - anchored object not collected!?" ); --nIdx; sal_uInt32 nToPageNum( 0L ); // #i43913# bool bDummy( false ); // #i58182# - consider new method signature - if ( SwObjectFormatterTxtFrm::CheckMovedFwdCondition( *GetCollectedObj( nIdx ), + if ( SwObjectFormatterTextFrm::CheckMovedFwdCondition( *GetCollectedObj( nIdx ), GetPgNumOfCollected( nIdx ), IsCollectedAnchoredAtMaster( nIdx ), nToPageNum, bDummy ) ) @@ -240,12 +240,12 @@ bool SwObjectFormatterTxtFrm::DoFormatObj( SwAnchoredObject& _rAnchoredObj, // could already been marked to move forward. bool bInsert( true ); sal_uInt32 nMovedFwdToPageNum( 0L ); - const SwDoc& rDoc = *(GetPageFrm().GetFmt()->GetDoc()); + const SwDoc& rDoc = *(GetPageFrm().GetFormat()->GetDoc()); if ( SwLayouter::FrmMovedFwdByObjPos( - rDoc, mrAnchorTxtFrm, nMovedFwdToPageNum ) ) + rDoc, mrAnchorTextFrm, nMovedFwdToPageNum ) ) { if ( nMovedFwdToPageNum < nToPageNum ) - SwLayouter::RemoveMovedFwdFrm( rDoc, mrAnchorTxtFrm ); + SwLayouter::RemoveMovedFwdFrm( rDoc, mrAnchorTextFrm ); else bInsert = false; } @@ -253,9 +253,9 @@ bool SwObjectFormatterTxtFrm::DoFormatObj( SwAnchoredObject& _rAnchoredObj, { // Indicate that anchor text frame has to move forward and // invalidate its position to force a re-format. - SwLayouter::InsertMovedFwdFrm( rDoc, mrAnchorTxtFrm, + SwLayouter::InsertMovedFwdFrm( rDoc, mrAnchorTextFrm, nToPageNum ); - mrAnchorTxtFrm.InvalidatePos(); + mrAnchorTextFrm.InvalidatePos(); // Indicate restart of the layout process bSuccess = false; @@ -270,19 +270,19 @@ bool SwObjectFormatterTxtFrm::DoFormatObj( SwAnchoredObject& _rAnchoredObj, } else { - OSL_FAIL( "<SwObjectFormatterTxtFrm::DoFormatObj(..)> - anchor frame not marked to move forward" ); + OSL_FAIL( "<SwObjectFormatterTextFrm::DoFormatObj(..)> - anchor frame not marked to move forward" ); } } } // i40155# - mark anchor frame not to wrap around // objects under the condition, that its follow contains all its text. - else if ( !mrAnchorTxtFrm.IsFollow() && - mrAnchorTxtFrm.GetFollow() && - mrAnchorTxtFrm.GetFollow()->GetOfst() == 0 ) + else if ( !mrAnchorTextFrm.IsFollow() && + mrAnchorTextFrm.GetFollow() && + mrAnchorTextFrm.GetFollow()->GetOfst() == 0 ) { SwLayouter::RemoveMovedFwdFrm( - *(mrAnchorTxtFrm.FindPageFrm()->GetFmt()->GetDoc()), - mrAnchorTxtFrm ); + *(mrAnchorTextFrm.FindPageFrm()->GetFormat()->GetDoc()), + mrAnchorTextFrm ); } } } @@ -290,12 +290,12 @@ bool SwObjectFormatterTxtFrm::DoFormatObj( SwAnchoredObject& _rAnchoredObj, return bSuccess; } -bool SwObjectFormatterTxtFrm::DoFormatObjs() +bool SwObjectFormatterTextFrm::DoFormatObjs() { - if ( !mrAnchorTxtFrm.IsValid() ) + if ( !mrAnchorTextFrm.IsValid() ) { if ( GetLayAction() && - mrAnchorTxtFrm.FindPageFrm() != &GetPageFrm() ) + mrAnchorTextFrm.FindPageFrm() != &GetPageFrm() ) { // notify layout action, thus is can restart the layout process on // a previous page. @@ -304,7 +304,7 @@ bool SwObjectFormatterTxtFrm::DoFormatObjs() else { // the anchor text frame has to be valid, thus assert. - OSL_FAIL( "<SwObjectFormatterTxtFrm::DoFormatObjs()> called for invalidate anchor text frame." ); + OSL_FAIL( "<SwObjectFormatterTextFrm::DoFormatObjs()> called for invalidate anchor text frame." ); } return false; @@ -312,16 +312,16 @@ bool SwObjectFormatterTxtFrm::DoFormatObjs() bool bSuccess( true ); - if ( mrAnchorTxtFrm.IsFollow() ) + if ( mrAnchorTextFrm.IsFollow() ) { // Only floating screen objects anchored as-character are directly // registered at a follow text frame. The other floating screen objects // are registered at the 'master' anchor text frame. // Thus, format the other floating screen objects through the 'master' // anchor text frame - OSL_ENSURE( mpMasterAnchorTxtFrm, - "SwObjectFormatterTxtFrm::DoFormatObjs() - missing 'master' anchor text frame" ); - bSuccess = _FormatObjsAtFrm( mpMasterAnchorTxtFrm ); + OSL_ENSURE( mpMasterAnchorTextFrm, + "SwObjectFormatterTextFrm::DoFormatObjs() - missing 'master' anchor text frame" ); + bSuccess = _FormatObjsAtFrm( mpMasterAnchorTextFrm ); if ( bSuccess ) { @@ -339,10 +339,10 @@ bool SwObjectFormatterTxtFrm::DoFormatObjs() // considered. if ( bSuccess && ( ConsiderWrapOnObjPos() || - ( !mrAnchorTxtFrm.IsFollow() && + ( !mrAnchorTextFrm.IsFollow() && _AtLeastOneObjIsTmpConsiderWrapInfluence() ) ) ) { - const bool bDoesAnchorHadPrev = ( mrAnchorTxtFrm.GetIndPrev() != 0 ); + const bool bDoesAnchorHadPrev = ( mrAnchorTextFrm.GetIndPrev() != 0 ); // Format anchor text frame after its objects are formatted. // Note: The format of the anchor frame also formats the invalid @@ -357,7 +357,7 @@ bool SwObjectFormatterTxtFrm::DoFormatObjs() // #i43913# bool bInFollow( false ); SwAnchoredObject* pObj = 0L; - if ( !mrAnchorTxtFrm.IsFollow() ) + if ( !mrAnchorTextFrm.IsFollow() ) { pObj = _GetFirstObjWithMovedFwdAnchor( // #i35017# - constant name has changed @@ -370,7 +370,7 @@ bool SwObjectFormatterTxtFrm::DoFormatObjs() pObj->SetClearedEnvironment( true ); // #i44049# - consider, that anchor frame // could already been marked to move forward. - SwPageFrm* pAnchorPageFrm( mrAnchorTxtFrm.FindPageFrm() ); + SwPageFrm* pAnchorPageFrm( mrAnchorTextFrm.FindPageFrm() ); // #i43913# - consider, that anchor frame // is a follow or is in a follow row, which will move forward. if ( pAnchorPageFrm != pObj->GetPageFrm() || @@ -378,27 +378,27 @@ bool SwObjectFormatterTxtFrm::DoFormatObjs() { bool bInsert( true ); sal_uInt32 nTmpToPageNum( 0L ); - const SwDoc& rDoc = *(GetPageFrm().GetFmt()->GetDoc()); + const SwDoc& rDoc = *(GetPageFrm().GetFormat()->GetDoc()); if ( SwLayouter::FrmMovedFwdByObjPos( - rDoc, mrAnchorTxtFrm, nTmpToPageNum ) ) + rDoc, mrAnchorTextFrm, nTmpToPageNum ) ) { if ( nTmpToPageNum < pAnchorPageFrm->GetPhyPageNum() ) - SwLayouter::RemoveMovedFwdFrm( rDoc, mrAnchorTxtFrm ); + SwLayouter::RemoveMovedFwdFrm( rDoc, mrAnchorTextFrm ); else bInsert = false; } if ( bInsert ) { - SwLayouter::InsertMovedFwdFrm( rDoc, mrAnchorTxtFrm, + SwLayouter::InsertMovedFwdFrm( rDoc, mrAnchorTextFrm, pAnchorPageFrm->GetPhyPageNum() ); - mrAnchorTxtFrm.InvalidatePos(); + mrAnchorTextFrm.InvalidatePos(); bSuccess = false; _InvalidatePrevObjs( *pObj ); _InvalidateFollowObjs( *pObj, true ); } else { - OSL_FAIL( "<SwObjectFormatterTxtFrm::DoFormatObjs(..)> - anchor frame not marked to move forward" ); + OSL_FAIL( "<SwObjectFormatterTextFrm::DoFormatObjs(..)> - anchor frame not marked to move forward" ); } } } @@ -410,12 +410,12 @@ bool SwObjectFormatterTxtFrm::DoFormatObjs() // could already been marked to move forward. bool bInsert( true ); sal_uInt32 nMovedFwdToPageNum( 0L ); - const SwDoc& rDoc = *(GetPageFrm().GetFmt()->GetDoc()); + const SwDoc& rDoc = *(GetPageFrm().GetFormat()->GetDoc()); if ( SwLayouter::FrmMovedFwdByObjPos( - rDoc, mrAnchorTxtFrm, nMovedFwdToPageNum ) ) + rDoc, mrAnchorTextFrm, nMovedFwdToPageNum ) ) { if ( nMovedFwdToPageNum < nToPageNum ) - SwLayouter::RemoveMovedFwdFrm( rDoc, mrAnchorTxtFrm ); + SwLayouter::RemoveMovedFwdFrm( rDoc, mrAnchorTextFrm ); else bInsert = false; } @@ -423,8 +423,8 @@ bool SwObjectFormatterTxtFrm::DoFormatObjs() { // Indicate that anchor text frame has to move forward and // invalidate its position to force a re-format. - SwLayouter::InsertMovedFwdFrm( rDoc, mrAnchorTxtFrm, nToPageNum ); - mrAnchorTxtFrm.InvalidatePos(); + SwLayouter::InsertMovedFwdFrm( rDoc, mrAnchorTextFrm, nToPageNum ); + mrAnchorTextFrm.InvalidatePos(); // Indicate restart of the layout process bSuccess = false; @@ -439,30 +439,30 @@ bool SwObjectFormatterTxtFrm::DoFormatObjs() } else { - OSL_FAIL( "<SwObjectFormatterTxtFrm::DoFormatObjs(..)> - anchor frame not marked to move forward" ); + OSL_FAIL( "<SwObjectFormatterTextFrm::DoFormatObjs(..)> - anchor frame not marked to move forward" ); } } // #i40155# - mark anchor frame not to wrap around // objects under the condition, that its follow contains all its text. - else if ( !mrAnchorTxtFrm.IsFollow() && - mrAnchorTxtFrm.GetFollow() && - mrAnchorTxtFrm.GetFollow()->GetOfst() == 0 ) + else if ( !mrAnchorTextFrm.IsFollow() && + mrAnchorTextFrm.GetFollow() && + mrAnchorTextFrm.GetFollow()->GetOfst() == 0 ) { SwLayouter::RemoveMovedFwdFrm( - *(mrAnchorTxtFrm.FindPageFrm()->GetFmt()->GetDoc()), - mrAnchorTxtFrm ); + *(mrAnchorTextFrm.FindPageFrm()->GetFormat()->GetDoc()), + mrAnchorTextFrm ); } } return bSuccess; } -void SwObjectFormatterTxtFrm::_InvalidatePrevObjs( SwAnchoredObject& _rAnchoredObj ) +void SwObjectFormatterTextFrm::_InvalidatePrevObjs( SwAnchoredObject& _rAnchoredObj ) { // invalidate all previous objects, whose wrapping influence on the object // positioning is <NONE_CONCURRENT_POSIITIONED>. // Note: list of objects at anchor frame is sorted by this property. - if ( _rAnchoredObj.GetFrmFmt().GetWrapInfluenceOnObjPos(). + if ( _rAnchoredObj.GetFrameFormat().GetWrapInfluenceOnObjPos(). // #i35017# - handle ITERATIVE as ONCE_SUCCESSIVE GetWrapInfluenceOnObjPos( true ) == // #i35017# - constant name has changed @@ -477,7 +477,7 @@ void SwObjectFormatterTxtFrm::_InvalidatePrevObjs( SwAnchoredObject& _rAnchoredO { --i; SwAnchoredObject* pAnchoredObj = (*pObjs)[i]; - if ( pAnchoredObj->GetFrmFmt().GetWrapInfluenceOnObjPos(). + if ( pAnchoredObj->GetFrameFormat().GetWrapInfluenceOnObjPos(). // #i35017# - handle ITERATIVE as ONCE_SUCCESSIVE GetWrapInfluenceOnObjPos( true ) == // #i35017# - constant name has changed @@ -490,7 +490,7 @@ void SwObjectFormatterTxtFrm::_InvalidatePrevObjs( SwAnchoredObject& _rAnchoredO } } -void SwObjectFormatterTxtFrm::_InvalidateFollowObjs( SwAnchoredObject& _rAnchoredObj, +void SwObjectFormatterTextFrm::_InvalidateFollowObjs( SwAnchoredObject& _rAnchoredObj, const bool _bInclObj ) { if ( _bInclObj ) @@ -510,7 +510,7 @@ void SwObjectFormatterTxtFrm::_InvalidateFollowObjs( SwAnchoredObject& _rAnchore } } -SwAnchoredObject* SwObjectFormatterTxtFrm::_GetFirstObjWithMovedFwdAnchor( +SwAnchoredObject* SwObjectFormatterTextFrm::_GetFirstObjWithMovedFwdAnchor( const sal_Int16 _nWrapInfluenceOnPosition, sal_uInt32& _noToPageNum, bool& _boInFollow ) @@ -518,7 +518,7 @@ SwAnchoredObject* SwObjectFormatterTxtFrm::_GetFirstObjWithMovedFwdAnchor( // #i35017# - constant names have changed OSL_ENSURE( _nWrapInfluenceOnPosition == text::WrapInfluenceOnPosition::ONCE_SUCCESSIVE || _nWrapInfluenceOnPosition == text::WrapInfluenceOnPosition::ONCE_CONCURRENT, - "<SwObjectFormatterTxtFrm::_GetFirstObjWithMovedFwdAnchor(..)> - invalid value for parameter <_nWrapInfluenceOnPosition>" ); + "<SwObjectFormatterTextFrm::_GetFirstObjWithMovedFwdAnchor(..)> - invalid value for parameter <_nWrapInfluenceOnPosition>" ); SwAnchoredObject* pRetAnchoredObj = 0L; @@ -527,14 +527,14 @@ SwAnchoredObject* SwObjectFormatterTxtFrm::_GetFirstObjWithMovedFwdAnchor( { SwAnchoredObject* pAnchoredObj = GetCollectedObj(i); if ( pAnchoredObj->ConsiderObjWrapInfluenceOnObjPos() && - pAnchoredObj->GetFrmFmt().GetWrapInfluenceOnObjPos(). + pAnchoredObj->GetFrameFormat().GetWrapInfluenceOnObjPos(). // #i35017# - handle ITERATIVE as ONCE_SUCCESSIVE GetWrapInfluenceOnObjPos( true ) == _nWrapInfluenceOnPosition ) { // #i26945# - use new method <_CheckMovedFwdCondition(..)> // #i43913# // #i58182# - consider new method signature - if ( SwObjectFormatterTxtFrm::CheckMovedFwdCondition( *GetCollectedObj( i ), + if ( SwObjectFormatterTextFrm::CheckMovedFwdCondition( *GetCollectedObj( i ), GetPgNumOfCollected( i ), IsCollectedAnchoredAtMaster( i ), _noToPageNum, _boInFollow ) ) @@ -550,7 +550,7 @@ SwAnchoredObject* SwObjectFormatterTxtFrm::_GetFirstObjWithMovedFwdAnchor( // #i58182# // - replace private method by corresponding static public method -bool SwObjectFormatterTxtFrm::CheckMovedFwdCondition( +bool SwObjectFormatterTextFrm::CheckMovedFwdCondition( SwAnchoredObject& _rAnchoredObj, const sal_uInt32 _nFromPageNum, const bool _bAnchoredAtMasterBeforeFormatAnchor, @@ -591,21 +591,21 @@ bool SwObjectFormatterTxtFrm::CheckMovedFwdCondition( // which will be on the next page. if ( !bAnchorIsMovedForward && _bAnchoredAtMasterBeforeFormatAnchor && - ((_rAnchoredObj.GetFrmFmt().GetAnchor().GetAnchorId() == FLY_AT_CHAR) || - (_rAnchoredObj.GetFrmFmt().GetAnchor().GetAnchorId() == FLY_AT_PARA))) + ((_rAnchoredObj.GetFrameFormat().GetAnchor().GetAnchorId() == FLY_AT_CHAR) || + (_rAnchoredObj.GetFrameFormat().GetAnchor().GetAnchorId() == FLY_AT_PARA))) { SwFrm* pAnchorFrm = _rAnchoredObj.GetAnchorFrmContainingAnchPos(); - OSL_ENSURE( pAnchorFrm->IsTxtFrm(), - "<SwObjectFormatterTxtFrm::CheckMovedFwdCondition(..) - wrong type of anchor frame>" ); - SwTxtFrm* pAnchorTxtFrm = static_cast<SwTxtFrm*>(pAnchorFrm); + OSL_ENSURE( pAnchorFrm->IsTextFrm(), + "<SwObjectFormatterTextFrm::CheckMovedFwdCondition(..) - wrong type of anchor frame>" ); + SwTextFrm* pAnchorTextFrm = static_cast<SwTextFrm*>(pAnchorFrm); bool bCheck( false ); - if ( pAnchorTxtFrm->IsFollow() ) + if ( pAnchorTextFrm->IsFollow() ) { bCheck = true; } - else if( pAnchorTxtFrm->IsInTab() ) + else if( pAnchorTextFrm->IsInTab() ) { - const SwRowFrm* pMasterRow = pAnchorTxtFrm->IsInFollowFlowRow(); + const SwRowFrm* pMasterRow = pAnchorTextFrm->IsInFollowFlowRow(); if ( pMasterRow && pMasterRow->FindPageFrm() == pPageFrmOfAnchor ) { @@ -616,7 +616,7 @@ bool SwObjectFormatterTxtFrm::CheckMovedFwdCondition( { // check, if found text frame will be on the next page // by checking, if it's in a column, which has no next. - SwFrm* pColFrm = pAnchorTxtFrm->FindColFrm(); + SwFrm* pColFrm = pAnchorTextFrm->FindColFrm(); while ( pColFrm && !pColFrm->GetNext() ) { pColFrm = pColFrm->FindColFrm(); @@ -635,9 +635,9 @@ bool SwObjectFormatterTxtFrm::CheckMovedFwdCondition( } // #i40140# - helper method to format layout frames used by -// method <SwObjectFormatterTxtFrm::_FormatAnchorFrmForCheckMoveFwd()> +// method <SwObjectFormatterTextFrm::_FormatAnchorFrmForCheckMoveFwd()> // #i44049# - format till a certain lower frame, if provided. -static void lcl_FormatCntntOfLayoutFrm( SwLayoutFrm* pLayFrm, +static void lcl_FormatContentOfLayoutFrm( SwLayoutFrm* pLayFrm, SwFrm* pLastLowerFrm = 0L ) { SwFrm* pLowerFrm = pLayFrm->GetLower(); @@ -649,7 +649,7 @@ static void lcl_FormatCntntOfLayoutFrm( SwLayoutFrm* pLayFrm, break; } if ( pLowerFrm->IsLayoutFrm() ) - lcl_FormatCntntOfLayoutFrm( static_cast<SwLayoutFrm*>(pLowerFrm), + lcl_FormatContentOfLayoutFrm( static_cast<SwLayoutFrm*>(pLowerFrm), pLastLowerFrm ); else pLowerFrm->Calc(); @@ -666,18 +666,18 @@ static void lcl_FormatCntntOfLayoutFrm( SwLayoutFrm* pLayFrm, to format the frames, which have become invalid due to the anchored object formatting in the iterative object positioning algorithm */ -void SwObjectFormatterTxtFrm::FormatAnchorFrmAndItsPrevs( SwTxtFrm& _rAnchorTxtFrm ) +void SwObjectFormatterTextFrm::FormatAnchorFrmAndItsPrevs( SwTextFrm& _rAnchorTextFrm ) { // #i47014# - no format of section and previous columns // for follow text frames. - if ( !_rAnchorTxtFrm.IsFollow() ) + if ( !_rAnchorTextFrm.IsFollow() ) { // if anchor frame is directly inside a section, format this section and // its previous frames. // Note: It's a very simple format without formatting objects. - if ( _rAnchorTxtFrm.IsInSct() ) + if ( _rAnchorTextFrm.IsInSct() ) { - SwFrm* pSectFrm = _rAnchorTxtFrm.GetUpper(); + SwFrm* pSectFrm = _rAnchorTextFrm.GetUpper(); while ( pSectFrm ) { if ( pSectFrm->IsSctFrm() || pSectFrm->IsCellFrm() ) @@ -689,7 +689,7 @@ void SwObjectFormatterTxtFrm::FormatAnchorFrmAndItsPrevs( SwTxtFrm& _rAnchorTxtF if ( pSectFrm && pSectFrm->IsSctFrm() ) { // #i44049# - _rAnchorTxtFrm.LockJoin(); + _rAnchorTextFrm.LockJoin(); SwFrm* pFrm = pSectFrm->GetUpper()->GetLower(); // #i49605# - section frame could move forward // by the format of its previous frame. @@ -697,27 +697,27 @@ void SwObjectFormatterTxtFrm::FormatAnchorFrmAndItsPrevs( SwTxtFrm& _rAnchorTxtF while ( pFrm && pFrm != pSectFrm ) { if ( pFrm->IsLayoutFrm() ) - lcl_FormatCntntOfLayoutFrm( static_cast<SwLayoutFrm*>(pFrm) ); + lcl_FormatContentOfLayoutFrm( static_cast<SwLayoutFrm*>(pFrm) ); else pFrm->Calc(); pFrm = pFrm->GetNext(); } - lcl_FormatCntntOfLayoutFrm( static_cast<SwLayoutFrm*>(pSectFrm), - &_rAnchorTxtFrm ); + lcl_FormatContentOfLayoutFrm( static_cast<SwLayoutFrm*>(pSectFrm), + &_rAnchorTextFrm ); // #i44049# - _rAnchorTxtFrm.UnlockJoin(); + _rAnchorTextFrm.UnlockJoin(); } } // #i40140# - if anchor frame is inside a column, // format the content of the previous columns. // Note: It's a very simple format without formatting objects. - SwFrm* pColFrmOfAnchor = _rAnchorTxtFrm.FindColFrm(); + SwFrm* pColFrmOfAnchor = _rAnchorTextFrm.FindColFrm(); if ( pColFrmOfAnchor ) { // #i44049# - _rAnchorTxtFrm.LockJoin(); + _rAnchorTextFrm.LockJoin(); SwFrm* pColFrm = pColFrmOfAnchor->GetUpper()->GetLower(); while ( pColFrm != pColFrmOfAnchor ) { @@ -725,7 +725,7 @@ void SwObjectFormatterTxtFrm::FormatAnchorFrmAndItsPrevs( SwTxtFrm& _rAnchorTxtF while ( pFrm ) { if ( pFrm->IsLayoutFrm() ) - lcl_FormatCntntOfLayoutFrm( static_cast<SwLayoutFrm*>(pFrm) ); + lcl_FormatContentOfLayoutFrm( static_cast<SwLayoutFrm*>(pFrm) ); else pFrm->Calc(); @@ -735,21 +735,21 @@ void SwObjectFormatterTxtFrm::FormatAnchorFrmAndItsPrevs( SwTxtFrm& _rAnchorTxtF pColFrm = pColFrm->GetNext(); } // #i44049# - _rAnchorTxtFrm.UnlockJoin(); + _rAnchorTextFrm.UnlockJoin(); } } // format anchor frame - format of its follow not needed // #i43255# - forbid follow format, only if anchor text // frame is in table - if ( _rAnchorTxtFrm.IsInTab() ) + if ( _rAnchorTextFrm.IsInTab() ) { - SwForbidFollowFormat aForbidFollowFormat( _rAnchorTxtFrm ); - _rAnchorTxtFrm.Calc(); + SwForbidFollowFormat aForbidFollowFormat( _rAnchorTextFrm ); + _rAnchorTextFrm.Calc(); } else { - _rAnchorTxtFrm.Calc(); + _rAnchorTextFrm.Calc(); } } @@ -757,15 +757,15 @@ void SwObjectFormatterTxtFrm::FormatAnchorFrmAndItsPrevs( SwTxtFrm& _rAnchorTxtF #i40141# */ -void SwObjectFormatterTxtFrm::_FormatAnchorFrmForCheckMoveFwd() +void SwObjectFormatterTextFrm::_FormatAnchorFrmForCheckMoveFwd() { - SwObjectFormatterTxtFrm::FormatAnchorFrmAndItsPrevs( mrAnchorTxtFrm ); + SwObjectFormatterTextFrm::FormatAnchorFrmAndItsPrevs( mrAnchorTextFrm ); } /** method to determine if at least one anchored object has state <temporarly consider wrapping style influence> set. */ -bool SwObjectFormatterTxtFrm::_AtLeastOneObjIsTmpConsiderWrapInfluence() +bool SwObjectFormatterTextFrm::_AtLeastOneObjIsTmpConsiderWrapInfluence() { bool bRet( false ); diff --git a/sw/source/core/layout/objectformattertxtfrm.hxx b/sw/source/core/layout/objectformattertxtfrm.hxx index b29fcadb4b95..4caa869bce3b 100644 --- a/sw/source/core/layout/objectformattertxtfrm.hxx +++ b/sw/source/core/layout/objectformattertxtfrm.hxx @@ -22,23 +22,23 @@ #include <objectformatter.hxx> #include <sal/types.h> -class SwTxtFrm; +class SwTextFrm; // #i28701# // Format floating screen objects, which are anchored at a given anchor text frame // and registered at the given page frame. -class SwObjectFormatterTxtFrm : public SwObjectFormatter +class SwObjectFormatterTextFrm : public SwObjectFormatter { private: // anchor text frame - SwTxtFrm& mrAnchorTxtFrm; + SwTextFrm& mrAnchorTextFrm; // 'master' anchor text frame - SwTxtFrm* mpMasterAnchorTxtFrm; + SwTextFrm* mpMasterAnchorTextFrm; - SwObjectFormatterTxtFrm( SwTxtFrm& _rAnchorTxtFrm, + SwObjectFormatterTextFrm( SwTextFrm& _rAnchorTextFrm, const SwPageFrm& _rPageFrm, - SwTxtFrm* _pMasterAnchorTxtFrm, + SwTextFrm* _pMasterAnchorTextFrm, SwLayAction* _pLayAction ); /** method to invalidate objects, anchored previous to given object at @@ -119,18 +119,18 @@ class SwObjectFormatterTxtFrm : public SwObjectFormatter virtual SwFrm& GetAnchorFrm() SAL_OVERRIDE; public: - virtual ~SwObjectFormatterTxtFrm(); + virtual ~SwObjectFormatterTextFrm(); // #i40147# - add parameter <_bCheckForMovedFwd>. virtual bool DoFormatObj( SwAnchoredObject& _rAnchoredObj, const bool _bCheckForMovedFwd = false ) SAL_OVERRIDE; virtual bool DoFormatObjs() SAL_OVERRIDE; - /** method to create an instance of <SwObjectFormatterTxtFrm> is + /** method to create an instance of <SwObjectFormatterTextFrm> is necessary. */ - static SwObjectFormatterTxtFrm* CreateObjFormatter( - SwTxtFrm& _rAnchorTxtFrm, + static SwObjectFormatterTextFrm* CreateObjFormatter( + SwTextFrm& _rAnchorTextFrm, const SwPageFrm& _rPageFrm, SwLayAction* _pLayAction ); @@ -142,11 +142,11 @@ class SwObjectFormatterTxtFrm : public SwObjectFormatter to format the frames, which have become invalid due to the anchored object formatting in the iterative object positioning algorithm - @param _rAnchorTxtFrm + @param _rAnchorTextFrm input parameter - reference to anchor text frame, which has to be formatted including its previous frames of the page. */ - static void FormatAnchorFrmAndItsPrevs( SwTxtFrm& _rAnchorTxtFrm ); + static void FormatAnchorFrmAndItsPrevs( SwTextFrm& _rAnchorTextFrm ); /** method to check the conditions, if 'anchor is moved forward' diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx index 85bbbf2eb700..4dd76a03e7bf 100644 --- a/sw/source/core/layout/pagechg.cxx +++ b/sw/source/core/layout/pagechg.cxx @@ -59,8 +59,8 @@ using namespace ::com::sun::star; -SwBodyFrm::SwBodyFrm( SwFrmFmt *pFmt, SwFrm* pSib ): - SwLayoutFrm( pFmt, pSib ) +SwBodyFrm::SwBodyFrm( SwFrameFormat *pFormat, SwFrm* pSib ): + SwLayoutFrm( pFormat, pSib ) { mnFrmType = FRM_BODY; } @@ -113,7 +113,7 @@ void SwBodyFrm::Format( const SwBorderAttrs * ) if( GRID_LINES_CHARS == pGrid->GetGridType() ) { //for textgrid refactor - SwDoc *pDoc = GetFmt()->GetDoc(); + SwDoc *pDoc = GetFormat()->GetDoc(); nBorder = nSize % (GetGridWidth(*pGrid, *pDoc)); nSize -= nBorder; nBorder /= 2; @@ -135,8 +135,8 @@ void SwBodyFrm::Format( const SwBorderAttrs * ) nBorder /= 2; // #i21774# Footnotes and centering the grid does not work together: - const bool bAdjust = static_cast<SwPageFrm*>(GetUpper())->GetFmt()->GetDoc()-> - GetFtnIdxs().empty(); + const bool bAdjust = static_cast<SwPageFrm*>(GetUpper())->GetFormat()->GetDoc()-> + GetFootnoteIdxs().empty(); (Prt().*fnRect->fnSetPosY)( bAdjust ? nBorder : 0 ); (Prt().*fnRect->fnSetHeight)( nSize ); @@ -152,8 +152,8 @@ void SwBodyFrm::Format( const SwBorderAttrs * ) mbValidSize = mbValidPrtArea = true; } -SwPageFrm::SwPageFrm( SwFrmFmt *pFmt, SwFrm* pSib, SwPageDesc *pPgDsc ) : - SwFtnBossFrm( pFmt, pSib ), +SwPageFrm::SwPageFrm( SwFrameFormat *pFormat, SwFrm* pSib, SwPageDesc *pPgDsc ) : + SwFootnoteBossFrm( pFormat, pSib ), pSortedObjs( 0 ), pDesc( pPgDsc ), nPhyPageNum( 0 ) @@ -169,11 +169,11 @@ SwPageFrm::SwPageFrm( SwFrmFmt *pFmt, SwFrm* pSib, SwPageDesc *pPgDsc ) : } else bHasGrid = false; - SetMaxFtnHeight( pPgDsc->GetFtnInfo().GetHeight() ? - pPgDsc->GetFtnInfo().GetHeight() : LONG_MAX ), + SetMaxFootnoteHeight( pPgDsc->GetFootnoteInfo().GetHeight() ? + pPgDsc->GetFootnoteInfo().GetHeight() : LONG_MAX ), mnFrmType = FRM_PAGE; - bInvalidLayout = bInvalidCntnt = bInvalidSpelling = bInvalidSmartTags = bInvalidAutoCmplWrds = bInvalidWordCount = true; - bInvalidFlyLayout = bInvalidFlyCntnt = bInvalidFlyInCnt = bFtnPage = bEndNotePage = false; + bInvalidLayout = bInvalidContent = bInvalidSpelling = bInvalidSmartTags = bInvalidAutoCmplWrds = bInvalidWordCount = true; + bInvalidFlyLayout = bInvalidFlyContent = bInvalidFlyInCnt = bFootnotePage = bEndNotePage = false; SwViewShell *pSh = getRootFrm()->GetCurrShell(); const bool bBrowseMode = pSh && pSh->GetViewOptions()->getBrowseMode(); @@ -186,15 +186,15 @@ SwPageFrm::SwPageFrm( SwFrmFmt *pFmt, SwFrm* pSib, SwPageDesc *pPgDsc ) : Frm().Width ( nWidth ); } else - Frm().SSize( pFmt->GetFrmSize().GetSize() ); + Frm().SSize( pFormat->GetFrmSize().GetSize() ); // create and insert body area if it is not a blank page - SwDoc *pDoc = pFmt->GetDoc(); - if ( !(bEmptyPage = (pFmt == pDoc->GetEmptyPageFmt())) ) + SwDoc *pDoc = pFormat->GetDoc(); + if ( !(bEmptyPage = (pFormat == pDoc->GetEmptyPageFormat())) ) { bEmptyPage = false; Calc(); // so that the PrtArea is correct - SwBodyFrm *pBodyFrm = new SwBodyFrm( pDoc->GetDfltFrmFmt(), this ); + SwBodyFrm *pBodyFrm = new SwBodyFrm( pDoc->GetDfltFrameFormat(), this ); pBodyFrm->ChgSize( Prt().SSize() ); pBodyFrm->Paste( this ); pBodyFrm->Calc(); // so that the columns can be inserted correctly @@ -204,15 +204,15 @@ SwPageFrm::SwPageFrm( SwFrmFmt *pFmt, SwFrm* pSib, SwPageDesc *pPgDsc ) : _InvalidateSize(); // insert header/footer,, but only if active. - if ( pFmt->GetHeader().IsActive() ) + if ( pFormat->GetHeader().IsActive() ) PrepareHeader(); - if ( pFmt->GetFooter().IsActive() ) + if ( pFormat->GetFooter().IsActive() ) PrepareFooter(); - const SwFmtCol &rCol = pFmt->GetCol(); + const SwFormatCol &rCol = pFormat->GetCol(); if ( rCol.GetNumCols() > 1 ) { - const SwFmtCol aOld; //ChgColumns() needs an old value + const SwFormatCol aOld; //ChgColumns() needs an old value pBodyFrm->ChgColumns( aOld, rCol ); } } @@ -246,7 +246,7 @@ void SwPageFrm::DestroyImpl() if ( !IsEmptyPage() ) //#59184# unnessesary for empty pages { // prevent access to destroyed pages - SwDoc *pDoc = GetFmt() ? GetFmt()->GetDoc() : NULL; + SwDoc *pDoc = GetFormat() ? GetFormat()->GetDoc() : NULL; if( pDoc && !pDoc->IsInDtor() ) { if ( pSh ) @@ -265,7 +265,7 @@ void SwPageFrm::DestroyImpl() } } - SwFtnBossFrm::DestroyImpl(); + SwFootnoteBossFrm::DestroyImpl(); } SwPageFrm::~SwPageFrm() @@ -284,11 +284,11 @@ void SwPageFrm::CheckGrid( bool bInvalidate ) if( pBody ) { pBody->InvalidatePrt(); - SwCntntFrm* pFrm = pBody->ContainsCntnt(); + SwContentFrm* pFrm = pBody->ContainsContent(); while( pBody->IsAnLower( pFrm ) ) { - static_cast<SwTxtFrm*>(pFrm)->Prepare( PREP_CLEAR ); - pFrm = pFrm->GetNextCntntFrm(); + static_cast<SwTextFrm*>(pFrm)->Prepare( PREP_CLEAR ); + pFrm = pFrm->GetNextContentFrm(); } } SetCompletePaint(); @@ -298,7 +298,7 @@ void SwPageFrm::CheckGrid( bool bInvalidate ) void SwPageFrm::CheckDirection( bool bVert ) { sal_uInt16 nDir = - static_cast<const SvxFrameDirectionItem&>(GetFmt()->GetFmtAttr( RES_FRAMEDIR )).GetValue(); + static_cast<const SvxFrameDirectionItem&>(GetFormat()->GetFormatAttr( RES_FRAMEDIR )).GetValue(); if( bVert ) { if( FRMDIR_HORI_LEFT_TOP == nDir || FRMDIR_HORI_RIGHT_TOP == nDir ) @@ -355,35 +355,35 @@ static void lcl_FormatLay( SwLayoutFrm *pLay ) } /// Create Flys or register draw objects -static void lcl_MakeObjs( const SwFrmFmts &rTbl, SwPageFrm *pPage ) +static void lcl_MakeObjs( const SwFrameFormats &rTable, SwPageFrm *pPage ) { // formats are in the special table of the document - for ( size_t i = 0; i < rTbl.size(); ++i ) + for ( size_t i = 0; i < rTable.size(); ++i ) { - SwFrmFmt *pFmt = rTbl[i]; - const SwFmtAnchor &rAnch = pFmt->GetAnchor(); + SwFrameFormat *pFormat = rTable[i]; + const SwFormatAnchor &rAnch = pFormat->GetAnchor(); if ( rAnch.GetPageNum() == pPage->GetPhyPageNum() ) { - if( rAnch.GetCntntAnchor() ) + if( rAnch.GetContentAnchor() ) { if (FLY_AT_PAGE == rAnch.GetAnchorId()) { - SwFmtAnchor aAnch( rAnch ); + SwFormatAnchor aAnch( rAnch ); aAnch.SetAnchor( 0 ); - pFmt->SetFmtAttr( aAnch ); + pFormat->SetFormatAttr( aAnch ); } else continue; } // is it a border or a SdrObject? - bool bSdrObj = RES_DRAWFRMFMT == pFmt->Which(); + bool bSdrObj = RES_DRAWFRMFMT == pFormat->Which(); SdrObject *pSdrObj = 0; - if ( bSdrObj && 0 == (pSdrObj = pFmt->FindSdrObject()) ) + if ( bSdrObj && 0 == (pSdrObj = pFormat->FindSdrObject()) ) { OSL_FAIL( "DrawObject not found." ); - pFmt->GetDoc()->DelFrmFmt( pFmt ); + pFormat->GetDoc()->DelFrameFormat( pFormat ); --i; continue; } @@ -417,7 +417,7 @@ static void lcl_MakeObjs( const SwFrmFmts &rTbl, SwPageFrm *pPage ) } else { - SwIterator<SwFlyFrm,SwFmt> aIter( *pFmt ); + SwIterator<SwFlyFrm,SwFormat> aIter( *pFormat ); SwFlyFrm *pFly = aIter.First(); if ( pFly) { @@ -425,7 +425,7 @@ static void lcl_MakeObjs( const SwFrmFmts &rTbl, SwPageFrm *pPage ) pFly->AnchorFrm()->RemoveFly( pFly ); } else - pFly = new SwFlyLayFrm( static_cast<SwFlyFrmFmt*>(pFmt), pPg, pPg ); + pFly = new SwFlyLayFrm( static_cast<SwFlyFrameFormat*>(pFormat), pPg, pPg ); pPg->AppendFly( pFly ); ::RegistFlys( pPg, pFly ); } @@ -433,9 +433,9 @@ static void lcl_MakeObjs( const SwFrmFmts &rTbl, SwPageFrm *pPage ) } } -void SwPageFrm::PreparePage( bool bFtn ) +void SwPageFrm::PreparePage( bool bFootnote ) { - SetFtnPage( bFtn ); + SetFootnotePage( bFootnote ); // #i82258# // Due to made change on OOo 2.0 code line, method <::lcl_FormatLay(..)> has @@ -455,13 +455,13 @@ void SwPageFrm::PreparePage( bool bFtn ) // There might be Flys or draw objects that want to be placed on // empty pages, however, the empty pages ignore that and the following // pages take care of them. - if ( !bFtn && !IsEmptyPage() ) + if ( !bFootnote && !IsEmptyPage() ) { - SwDoc *pDoc = GetFmt()->GetDoc(); + SwDoc *pDoc = GetFormat()->GetDoc(); if ( GetPrev() && static_cast<SwPageFrm*>(GetPrev())->IsEmptyPage() ) - lcl_MakeObjs( *pDoc->GetSpzFrmFmts(), static_cast<SwPageFrm*>(GetPrev()) ); - lcl_MakeObjs( *pDoc->GetSpzFrmFmts(), this ); + lcl_MakeObjs( *pDoc->GetSpzFrameFormats(), static_cast<SwPageFrm*>(GetPrev()) ); + lcl_MakeObjs( *pDoc->GetSpzFrameFormats(), this ); // format footer/ header SwLayoutFrm *pLow = static_cast<SwLayoutFrm*>(Lower()); @@ -469,11 +469,11 @@ void SwPageFrm::PreparePage( bool bFtn ) { if ( pLow->GetType() & (FRM_HEADER|FRM_FOOTER) ) { - SwCntntFrm *pCntnt = pLow->ContainsCntnt(); - while ( pCntnt && pLow->IsAnLower( pCntnt ) ) + SwContentFrm *pContent = pLow->ContainsContent(); + while ( pContent && pLow->IsAnLower( pContent ) ) { - pCntnt->OptCalc(); // not the predecessors - pCntnt = pCntnt->GetNextCntntFrm(); + pContent->OptCalc(); // not the predecessors + pContent = pContent->GetNextContentFrm(); } } pLow = static_cast<SwLayoutFrm*>(pLow->GetNext()); @@ -535,12 +535,12 @@ void SwPageFrm::SwClientNotify(const SwModify& rModify, const SfxHint& rHint) { // currently the savest way: static_cast<SwRootFrm*>(GetUpper())->SetSuperfluous(); - SetMaxFtnHeight(pDesc->GetFtnInfo().GetHeight()); - if(!GetMaxFtnHeight()) - SetMaxFtnHeight(LONG_MAX); - SetColMaxFtnHeight(); + SetMaxFootnoteHeight(pDesc->GetFootnoteInfo().GetHeight()); + if(!GetMaxFootnoteHeight()) + SetMaxFootnoteHeight(LONG_MAX); + SetColMaxFootnoteHeight(); // here, the page might be destroyed: - static_cast<SwRootFrm*>(GetUpper())->RemoveFtns(0, false, true); + static_cast<SwRootFrm*>(GetUpper())->RemoveFootnotes(0, false, true); } else SwClient::SwClientNotify(rModify, rHint); @@ -559,11 +559,11 @@ void SwPageFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew, // If the frame format is changed, several things might also change: // 1. columns: assert(pOld && pNew); //FMT_CHG Missing Format - const SwFmt *const pOldFmt = static_cast<const SwFmtChg*>(pOld)->pChangedFmt; - const SwFmt *const pNewFmt = static_cast<const SwFmtChg*>(pNew)->pChangedFmt; - assert(pOldFmt && pNewFmt); //FMT_CHG Missing Format - const SwFmtCol &rOldCol = pOldFmt->GetCol(); - const SwFmtCol &rNewCol = pNewFmt->GetCol(); + const SwFormat *const pOldFormat = static_cast<const SwFormatChg*>(pOld)->pChangedFormat; + const SwFormat *const pNewFormat = static_cast<const SwFormatChg*>(pNew)->pChangedFormat; + assert(pOldFormat && pNewFormat); //FMT_CHG Missing Format + const SwFormatCol &rOldCol = pOldFormat->GetCol(); + const SwFormatCol &rNewCol = pNewFormat->GetCol(); if( rOldCol != rNewCol ) { SwLayoutFrm *pB = FindBodyCont(); @@ -573,13 +573,13 @@ void SwPageFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew, } // 2. header and footer: - const SwFmtHeader &rOldH = pOldFmt->GetHeader(); - const SwFmtHeader &rNewH = pNewFmt->GetHeader(); + const SwFormatHeader &rOldH = pOldFormat->GetHeader(); + const SwFormatHeader &rNewH = pNewFormat->GetHeader(); if( rOldH != rNewH ) rInvFlags |= 0x08; - const SwFmtFooter &rOldF = pOldFmt->GetFooter(); - const SwFmtFooter &rNewF = pNewFmt->GetFooter(); + const SwFormatFooter &rOldF = pOldFormat->GetFooter(); + const SwFormatFooter &rNewF = pNewFormat->GetFooter(); if( rOldF != rNewF ) rInvFlags |= 0x10; CheckDirChange(); @@ -605,9 +605,9 @@ void SwPageFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew, } else if (pNew) { - const SwFmtFrmSize &rSz = nWhich == RES_FMT_CHG ? - static_cast<const SwFmtChg*>(pNew)->pChangedFmt->GetFrmSize() : - static_cast<const SwFmtFrmSize&>(*pNew); + const SwFormatFrmSize &rSz = nWhich == RES_FMT_CHG ? + static_cast<const SwFormatChg*>(pNew)->pChangedFormat->GetFrmSize() : + static_cast<const SwFormatFrmSize&>(*pNew); Frm().Height( std::max( rSz.GetHeight(), long(MINLAY) ) ); Frm().Width ( std::max( rSz.GetWidth(), long(MINLAY) ) ); @@ -638,7 +638,7 @@ void SwPageFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew, { SwLayoutFrm *pB = FindBodyCont(); assert(pB); //page without body - pB->ChgColumns( *static_cast<const SwFmtCol*>(pOld), *static_cast<const SwFmtCol*>(pNew) ); + pB->ChgColumns( *static_cast<const SwFormatCol*>(pOld), *static_cast<const SwFormatCol*>(pNew) ); rInvFlags |= 0x22; } break; @@ -685,16 +685,16 @@ bool SwPageFrm::GetInfo( SfxPoolItem & rInfo ) const return true; // continue searching } -void SwPageFrm::SetPageDesc( SwPageDesc *pNew, SwFrmFmt *pFmt ) +void SwPageFrm::SetPageDesc( SwPageDesc *pNew, SwFrameFormat *pFormat ) { pDesc = pNew; - if ( pFmt ) - SetFrmFmt( pFmt ); + if ( pFormat ) + SetFrameFormat( pFormat ); } /* determine the right PageDesc: * 0. from the document for footnote and endnote pages - * 1. from the first BodyCntnt below a page + * 1. from the first BodyContent below a page * 2. from PageDesc of the predecessor page * 3. from PageDesc of the previous page if blank page * 3.1 from PageDesc of the next page if no predecessor exists @@ -704,13 +704,13 @@ void SwPageFrm::SetPageDesc( SwPageDesc *pNew, SwFrmFmt *pFmt ) SwPageDesc *SwPageFrm::FindPageDesc() { // 0. - if ( IsFtnPage() ) + if ( IsFootnotePage() ) { - SwDoc *pDoc = GetFmt()->GetDoc(); + SwDoc *pDoc = GetFormat()->GetDoc(); if ( IsEndNotePage() ) return pDoc->GetEndNoteInfo().GetPageDesc( *pDoc ); else - return pDoc->GetFtnInfo().GetPageDesc( *pDoc ); + return pDoc->GetFootnoteInfo().GetPageDesc( *pDoc ); } SwPageDesc *pRet = 0; @@ -719,9 +719,9 @@ SwPageDesc *SwPageFrm::FindPageDesc() const SwViewShell *pSh = getRootFrm()->GetCurrShell(); if( pSh && pSh->GetViewOptions()->getBrowseMode() ) { - SwCntntFrm *pFrm = GetUpper()->ContainsCntnt(); + SwContentFrm *pFrm = GetUpper()->ContainsContent(); while (pFrm && !pFrm->IsInDocBody()) - pFrm = pFrm->GetNextCntntFrm(); + pFrm = pFrm->GetNextContentFrm(); if (pFrm) { SwFrm *pFlow = pFrm; @@ -730,11 +730,11 @@ SwPageDesc *SwPageFrm::FindPageDesc() pRet = const_cast<SwPageDesc*>(pFlow->GetAttrSet()->GetPageDesc().GetPageDesc()); } if ( !pRet ) - pRet = &GetFmt()->GetDoc()->GetPageDesc( 0 ); + pRet = &GetFormat()->GetDoc()->GetPageDesc( 0 ); return pRet; } - SwFrm *pFlow = FindFirstBodyCntnt(); + SwFrm *pFlow = FindFirstBodyContent(); if ( pFlow && pFlow->IsInTab() ) pFlow = pFlow->FindTabFrm(); @@ -761,7 +761,7 @@ SwPageDesc *SwPageFrm::FindPageDesc() //4. if ( !pRet ) - pRet = &GetFmt()->GetDoc()->GetPageDesc( 0 ); + pRet = &GetFormat()->GetDoc()->GetPageDesc( 0 ); OSL_ENSURE( pRet, "could not find page descriptor." ); return pRet; @@ -898,7 +898,7 @@ void SwPageFrm::Paste( SwFrm* pParent, SwFrm* pSibling ) getRootFrm()->CheckViewLayout( 0, 0 ); } -static void lcl_PrepFlyInCntRegister( SwCntntFrm *pFrm ) +static void lcl_PrepFlyInCntRegister( SwContentFrm *pFrm ) { pFrm->Prepare( PREP_REGISTER ); if( pFrm->GetDrawObjs() ) @@ -910,11 +910,11 @@ static void lcl_PrepFlyInCntRegister( SwCntntFrm *pFrm ) if ( pAnchoredObj->ISA(SwFlyInCntFrm) ) { SwFlyFrm* pFly = static_cast<SwFlyInCntFrm*>(pAnchoredObj); - SwCntntFrm *pCnt = pFly->ContainsCntnt(); + SwContentFrm *pCnt = pFly->ContainsContent(); while ( pCnt ) { lcl_PrepFlyInCntRegister( pCnt ); - pCnt = pCnt->GetNextCntntFrm(); + pCnt = pCnt->GetNextContentFrm(); } } } @@ -923,11 +923,11 @@ static void lcl_PrepFlyInCntRegister( SwCntntFrm *pFrm ) void SwPageFrm::PrepareRegisterChg() { - SwCntntFrm *pFrm = FindFirstBodyCntnt(); + SwContentFrm *pFrm = FindFirstBodyContent(); while( pFrm ) { lcl_PrepFlyInCntRegister( pFrm ); - pFrm = pFrm->GetNextCntntFrm(); + pFrm = pFrm->GetNextContentFrm(); if( !IsAnLower( pFrm ) ) break; } @@ -940,11 +940,11 @@ void SwPageFrm::PrepareRegisterChg() if ( pAnchoredObj->ISA(SwFlyFrm) ) { SwFlyFrm *pFly = static_cast<SwFlyFrm*>(pAnchoredObj); - pFrm = pFly->ContainsCntnt(); + pFrm = pFly->ContainsContent(); while ( pFrm ) { ::lcl_PrepFlyInCntRegister( pFrm ); - pFrm = pFrm->GetNextCntntFrm(); + pFrm = pFrm->GetNextContentFrm(); } } } @@ -978,27 +978,27 @@ void SwFrm::CheckPageDescs( SwPageFrm *pStart, bool bNotifyFields, SwPageFrm** p SwTwips nDocPos = LONG_MAX; SwRootFrm *pRoot = static_cast<SwRootFrm*>(pStart->GetUpper()); - SwDoc* pDoc = pStart->GetFmt()->GetDoc(); - const bool bFtns = !pDoc->GetFtnIdxs().empty(); + SwDoc* pDoc = pStart->GetFormat()->GetDoc(); + const bool bFootnotes = !pDoc->GetFootnoteIdxs().empty(); SwPageFrm *pPage = pStart; if( pPage->GetPrev() && static_cast<SwPageFrm*>(pPage->GetPrev())->IsEmptyPage() ) pPage = static_cast<SwPageFrm*>(pPage->GetPrev()); while ( pPage ) { - // obtain PageDesc and FrmFmt + // obtain PageDesc and FrameFormat SwPageDesc *pDesc = pPage->FindPageDesc(); bool bCheckEmpty = pPage->IsEmptyPage(); bool bActOdd = pPage->OnRightPage(); bool bOdd = pPage->WannaRightPage(); bool bFirst = pPage->OnFirstPage(); - SwFrmFmt *pFmtWish = (bOdd) - ? pDesc->GetRightFmt(bFirst) : pDesc->GetLeftFmt(bFirst); + SwFrameFormat *pFormatWish = (bOdd) + ? pDesc->GetRightFormat(bFirst) : pDesc->GetLeftFormat(bFirst); if ( bActOdd != bOdd || pDesc != pPage->GetPageDesc() || // wrong Desc - ( pFmtWish != pPage->GetFmt() && // wrong format and - ( !pPage->IsEmptyPage() || pFmtWish ) // not blank /empty + ( pFormatWish != pPage->GetFormat() && // wrong format and + ( !pPage->IsEmptyPage() || pFormatWish ) // not blank /empty ) ) { @@ -1020,7 +1020,7 @@ void SwFrm::CheckPageDescs( SwPageFrm *pStart, bool bNotifyFields, SwPageFrm** p // 5. Normal page should have different format -> change // 6. No "wish" format provided -> take the "other" format (left/right) of the PageDesc - if ( pPage->IsEmptyPage() && ( pFmtWish || //1. + if ( pPage->IsEmptyPage() && ( pFormatWish || //1. ( !bOdd && !pPage->GetPrev() ) ) ) { SwPageFrm *pTmp = static_cast<SwPageFrm*>(pPage->GetNext()); @@ -1036,7 +1036,7 @@ void SwFrm::CheckPageDescs( SwPageFrm *pStart, bool bNotifyFields, SwPageFrm** p *ppPrev = pTmp; continue; } - else if ( pPage->IsEmptyPage() && !pFmtWish && //2. + else if ( pPage->IsEmptyPage() && !pFormatWish && //2. pDesc != pPage->GetPageDesc() ) { pPage->SetPageDesc( pDesc, 0 ); @@ -1051,7 +1051,7 @@ void SwFrm::CheckPageDescs( SwPageFrm *pStart, bool bNotifyFields, SwPageFrm** p { if ( pPage->GetPrev() ) pDesc = static_cast<SwPageFrm*>(pPage->GetPrev())->GetPageDesc(); - SwPageFrm *pTmp = new SwPageFrm( pDoc->GetEmptyPageFmt(),pRoot,pDesc); + SwPageFrm *pTmp = new SwPageFrm( pDoc->GetEmptyPageFormat(),pRoot,pDesc); pTmp->Paste( pRoot, pPage ); pTmp->PreparePage( false ); pPage = pTmp; @@ -1059,29 +1059,29 @@ void SwFrm::CheckPageDescs( SwPageFrm *pStart, bool bNotifyFields, SwPageFrm** p else if ( pPage->GetPageDesc() != pDesc ) //4. { SwPageDesc *pOld = pPage->GetPageDesc(); - pPage->SetPageDesc( pDesc, pFmtWish ); - if ( bFtns ) + pPage->SetPageDesc( pDesc, pFormatWish ); + if ( bFootnotes ) { - // If specific values of the FtnInfo are changed, something has to happen. + // If specific values of the FootnoteInfo are changed, something has to happen. // We try to limit the damage... - // If the page has no FtnCont it might be problematic. + // If the page has no FootnoteCont it might be problematic. // Let's hope that invalidation is enough. - SwFtnContFrm *pCont = pPage->FindFtnCont(); - if ( pCont && !(pOld->GetFtnInfo() == pDesc->GetFtnInfo()) ) + SwFootnoteContFrm *pCont = pPage->FindFootnoteCont(); + if ( pCont && !(pOld->GetFootnoteInfo() == pDesc->GetFootnoteInfo()) ) pCont->_InvalidateAll(); } } - else if ( pFmtWish && pPage->GetFmt() != pFmtWish ) //5. + else if ( pFormatWish && pPage->GetFormat() != pFormatWish ) //5. { - pPage->SetFrmFmt( pFmtWish ); + pPage->SetFrameFormat( pFormatWish ); } - else if ( !pFmtWish ) //6. + else if ( !pFormatWish ) //6. { // get format with inverted logic - if (!pFmtWish) - pFmtWish = bOdd ? pDesc->GetLeftFmt() : pDesc->GetRightFmt(); - if ( pPage->GetFmt() != pFmtWish ) - pPage->SetFrmFmt( pFmtWish ); + if (!pFormatWish) + pFormatWish = bOdd ? pDesc->GetLeftFormat() : pDesc->GetRightFormat(); + if ( pPage->GetFormat() != pFormatWish ) + pPage->SetFrameFormat( pFormatWish ); } #if OSL_DEBUG_LEVEL > 0 else @@ -1098,7 +1098,7 @@ void SwFrm::CheckPageDescs( SwPageFrm *pStart, bool bNotifyFields, SwPageFrm** p SwPageFrm *pPg = static_cast<SwPageFrm*>(pPage->GetNext()); if( !pPg || pPage->OnRightPage() == pPg->WannaRightPage() ) { - // The following page can find a FrmFmt or has no successor -> empty page not needed + // The following page can find a FrameFormat or has no successor -> empty page not needed SwPageFrm *pTmp = static_cast<SwPageFrm*>(pPage->GetNext()); pPage->Cut(); bool bUpdatePrev = false; @@ -1119,10 +1119,10 @@ void SwFrm::CheckPageDescs( SwPageFrm *pStart, bool bNotifyFields, SwPageFrm** p pRoot->SetAssertFlyPages(); SwRootFrm::AssertPageFlys( pStart ); - if ( bNotifyFields && (!pImp || !pImp->IsUpdateExpFlds()) ) + if ( bNotifyFields && (!pImp || !pImp->IsUpdateExpFields()) ) { - SwDocPosUpdate aMsgHnt( nDocPos ); - pDoc->getIDocumentFieldsAccess().UpdatePageFlds( &aMsgHnt ); + SwDocPosUpdate aMsgHint( nDocPos ); + pDoc->getIDocumentFieldsAccess().UpdatePageFields( &aMsgHint ); } #if OSL_DEBUG_LEVEL > 0 @@ -1148,7 +1148,7 @@ void SwFrm::CheckPageDescs( SwPageFrm *pStart, bool bNotifyFields, SwPageFrm** p #endif } -SwPageFrm *SwFrm::InsertPage( SwPageFrm *pPrevPage, bool bFtn ) +SwPageFrm *SwFrm::InsertPage( SwPageFrm *pPrevPage, bool bFootnote ) { SwRootFrm *pRoot = static_cast<SwRootFrm*>(pPrevPage->GetUpper()); SwPageFrm *pSibling = static_cast<SwPageFrm*>(pPrevPage->GetNext()); @@ -1159,10 +1159,10 @@ SwPageFrm *SwFrm::InsertPage( SwPageFrm *pPrevPage, bool bFtn ) bool bWishedOdd = bNextOdd; // Which PageDesc is relevant? - // For CntntFrm take the one from format if provided, + // For ContentFrm take the one from format if provided, // otherwise from the Follow of the PrevPage if ( IsFlowFrm() && !SwFlowFrm::CastFlowFrm( this )->IsFollow() ) - { SwFmtPageDesc &rDesc = (SwFmtPageDesc&)GetAttrSet()->GetPageDesc(); + { SwFormatPageDesc &rDesc = (SwFormatPageDesc&)GetAttrSet()->GetPageDesc(); pDesc = rDesc.GetPageDesc(); if ( rDesc.GetNumOffset() ) { @@ -1176,49 +1176,49 @@ SwPageFrm *SwFrm::InsertPage( SwPageFrm *pPrevPage, bool bFtn ) pDesc = pPrevPage->GetPageDesc()->GetFollow(); assert(pDesc && "Missing PageDesc"); - if( !(bWishedOdd ? pDesc->GetRightFmt() : pDesc->GetLeftFmt()) ) + if( !(bWishedOdd ? pDesc->GetRightFormat() : pDesc->GetLeftFormat()) ) bWishedOdd = !bWishedOdd; bool const bWishedFirst = pDesc != pPrevPage->GetPageDesc(); - SwDoc *pDoc = pPrevPage->GetFmt()->GetDoc(); + SwDoc *pDoc = pPrevPage->GetFormat()->GetDoc(); bool bCheckPages = false; - // If there is no FrmFmt for this page, create an empty page. + // If there is no FrameFormat for this page, create an empty page. if( bWishedOdd != bNextOdd ) { - SwFrmFmt *const pEmptyFmt = pDoc->GetEmptyPageFmt(); + SwFrameFormat *const pEmptyFormat = pDoc->GetEmptyPageFormat(); SwPageDesc *pTmpDesc = pPrevPage->GetPageDesc(); - SwPageFrm *pPage = new SwPageFrm(pEmptyFmt, pRoot, pTmpDesc); + SwPageFrm *pPage = new SwPageFrm(pEmptyFormat, pRoot, pTmpDesc); pPage->Paste( pRoot, pSibling ); - pPage->PreparePage( bFtn ); + pPage->PreparePage( bFootnote ); // If the sibling has no body text, destroy it as long as it is no footnote page. - if ( pSibling && !pSibling->IsFtnPage() && - !pSibling->FindFirstBodyCntnt() ) + if ( pSibling && !pSibling->IsFootnotePage() && + !pSibling->FindFirstBodyContent() ) { SwPageFrm *pDel = pSibling; pSibling = static_cast<SwPageFrm*>(pSibling->GetNext()); - if ( !pDoc->GetFtnIdxs().empty() ) - pRoot->RemoveFtns( pDel, true ); + if ( !pDoc->GetFootnoteIdxs().empty() ) + pRoot->RemoveFootnotes( pDel, true ); pDel->Cut(); SwFrm::DestroyFrm(pDel); } else bCheckPages = true; } - SwFrmFmt *const pFmt( (bWishedOdd) - ? pDesc->GetRightFmt(bWishedFirst) - : pDesc->GetLeftFmt(bWishedFirst) ); - assert(pFmt); - SwPageFrm *pPage = new SwPageFrm( pFmt, pRoot, pDesc ); + SwFrameFormat *const pFormat( (bWishedOdd) + ? pDesc->GetRightFormat(bWishedFirst) + : pDesc->GetLeftFormat(bWishedFirst) ); + assert(pFormat); + SwPageFrm *pPage = new SwPageFrm( pFormat, pRoot, pDesc ); pPage->Paste( pRoot, pSibling ); - pPage->PreparePage( bFtn ); + pPage->PreparePage( bFootnote ); // If the sibling has no body text, destroy it as long as it is no footnote page. - if ( pSibling && !pSibling->IsFtnPage() && - !pSibling->FindFirstBodyCntnt() ) + if ( pSibling && !pSibling->IsFootnotePage() && + !pSibling->FindFirstBodyContent() ) { SwPageFrm *pDel = pSibling; pSibling = static_cast<SwPageFrm*>(pSibling->GetNext()); - if ( !pDoc->GetFtnIdxs().empty() ) - pRoot->RemoveFtns( pDel, true ); + if ( !pDoc->GetFootnoteIdxs().empty() ) + pRoot->RemoveFootnotes( pDel, true ); pDel->Cut(); SwFrm::DestroyFrm(pDel); } @@ -1248,10 +1248,10 @@ SwPageFrm *SwFrm::InsertPage( SwPageFrm *pPrevPage, bool bFtn ) // For the update of page numbering fields, nDocPos provides // the page position from where invalidation should start. SwViewShell *pSh = getRootFrm()->GetCurrShell(); - if ( !pSh || !pSh->Imp()->IsUpdateExpFlds() ) + if ( !pSh || !pSh->Imp()->IsUpdateExpFields() ) { - SwDocPosUpdate aMsgHnt( pPrevPage->Frm().Top() ); - pDoc->getIDocumentFieldsAccess().UpdatePageFlds( &aMsgHnt ); + SwDocPosUpdate aMsgHint( pPrevPage->Frm().Top() ); + pDoc->getIDocumentFieldsAccess().UpdatePageFields( &aMsgHint ); } return pPage; } @@ -1295,7 +1295,7 @@ SwTwips SwRootFrm::ShrinkFrm( SwTwips nDist, bool bTst, bool ) /// remove pages that are not needed at all void SwRootFrm::RemoveSuperfluous() { - // A page is empty if the body text area has no CntntFrm, but not if there + // A page is empty if the body text area has no ContentFrm, but not if there // is at least one Fly or one footnote attached to the page. Two runs are // needed: one for endnote pages and one for the pages of the body text. @@ -1323,7 +1323,7 @@ void SwRootFrm::RemoveSuperfluous() // #i28701# SwAnchoredObject* pAnchoredObj = rObjs[i]; // OD 2004-01-19 #110582# - do not consider hidden objects - if ( pPage->GetFmt()->GetDoc()->getIDocumentDrawModelAccess().IsVisibleLayerId( + if ( pPage->GetFormat()->GetDoc()->getIDocumentDrawModelAccess().IsVisibleLayerId( pAnchoredObj->GetDrawObj()->GetLayer() ) && !pAnchoredObj->GetAnchorFrm()->FindFooterOrHeader() ) { @@ -1337,20 +1337,20 @@ void SwRootFrm::RemoveSuperfluous() // exists. const SwLayoutFrm* pBody = 0; if ( bExistEssentialObjs || - pPage->FindFtnCont() || + pPage->FindFootnoteCont() || ( 0 != ( pBody = pPage->FindBodyCont() ) && - ( pBody->ContainsCntnt() || + ( pBody->ContainsContent() || // #i47580# // Do not delete page if there's an empty tabframe // left. I think it might be correct to use ContainsAny() - // instead of ContainsCntnt() to cover the empty-table-case, + // instead of ContainsContent() to cover the empty-table-case, // but I'm not fully sure, since ContainsAny() also returns // SectionFrames. Therefore I prefer to do it the safe way: ( pBody->Lower() && pBody->Lower()->IsTabFrm() ) ) ) ) { - if ( pPage->IsFtnPage() ) + if ( pPage->IsFootnotePage() ) { - while ( pPage->IsFtnPage() ) + while ( pPage->IsFootnotePage() ) { pPage = static_cast<SwPageFrm*>(pPage->GetPrev()); OSL_ENSURE( pPage, "only endnote pages remain." ); @@ -1365,8 +1365,8 @@ void SwRootFrm::RemoveSuperfluous() { SwPageFrm *pEmpty = pPage; pPage = static_cast<SwPageFrm*>(pPage->GetPrev()); - if ( !GetFmt()->GetDoc()->GetFtnIdxs().empty() ) - RemoveFtns( pEmpty, true ); + if ( !GetFormat()->GetDoc()->GetFootnoteIdxs().empty() ) + RemoveFootnotes( pEmpty, true ); pEmpty->Cut(); SwFrm::DestroyFrm(pEmpty); nDocPos = pPage ? pPage->Frm().Top() : 0; @@ -1375,10 +1375,10 @@ void SwRootFrm::RemoveSuperfluous() SwViewShell *pSh = getRootFrm()->GetCurrShell(); if ( nDocPos != LONG_MAX && - (!pSh || !pSh->Imp()->IsUpdateExpFlds()) ) + (!pSh || !pSh->Imp()->IsUpdateExpFields()) ) { - SwDocPosUpdate aMsgHnt( nDocPos ); - GetFmt()->GetDoc()->getIDocumentFieldsAccess().UpdatePageFlds( &aMsgHnt ); + SwDocPosUpdate aMsgHint( nDocPos ); + GetFormat()->GetDoc()->getIDocumentFieldsAccess().UpdatePageFields( &aMsgHint ); } } @@ -1389,22 +1389,22 @@ void SwRootFrm::AssertFlyPages() return; mbAssertFlyPages = false; - SwDoc *pDoc = GetFmt()->GetDoc(); - const SwFrmFmts *pTbl = pDoc->GetSpzFrmFmts(); + SwDoc *pDoc = GetFormat()->GetDoc(); + const SwFrameFormats *pTable = pDoc->GetSpzFrameFormats(); // what page targets the "last" Fly? sal_uInt16 nMaxPg = 0; - for ( size_t i = 0; i < pTbl->size(); ++i ) + for ( size_t i = 0; i < pTable->size(); ++i ) { - const SwFmtAnchor &rAnch = (*pTbl)[i]->GetAnchor(); - if ( !rAnch.GetCntntAnchor() && nMaxPg < rAnch.GetPageNum() ) + const SwFormatAnchor &rAnch = (*pTable)[i]->GetAnchor(); + if ( !rAnch.GetContentAnchor() && nMaxPg < rAnch.GetPageNum() ) nMaxPg = rAnch.GetPageNum(); } // How many pages exist at the moment? SwPageFrm *pPage = static_cast<SwPageFrm*>(Lower()); while ( pPage && pPage->GetNext() && - !static_cast<SwPageFrm*>(pPage->GetNext())->IsFtnPage() ) + !static_cast<SwPageFrm*>(pPage->GetNext())->IsFootnotePage() ) { pPage = static_cast<SwPageFrm*>(pPage->GetNext()); } @@ -1417,37 +1417,37 @@ void SwRootFrm::AssertFlyPages() SwFrm *pSibling = pPage->GetNext(); for ( sal_uInt16 i = pPage->GetPhyPageNum(); i < nMaxPg; ++i ) { - if ( !(bOdd ? pDesc->GetRightFmt() : pDesc->GetLeftFmt()) ) + if ( !(bOdd ? pDesc->GetRightFormat() : pDesc->GetLeftFormat()) ) { // Insert empty page (but Flys will be stored in the next page) - pPage = new SwPageFrm( pDoc->GetEmptyPageFmt(), this, pDesc ); + pPage = new SwPageFrm( pDoc->GetEmptyPageFormat(), this, pDesc ); pPage->Paste( this, pSibling ); pPage->PreparePage( false ); bOdd = !bOdd; ++i; } pPage = new - SwPageFrm( (bOdd ? pDesc->GetRightFmt() : - pDesc->GetLeftFmt()), this, pDesc ); + SwPageFrm( (bOdd ? pDesc->GetRightFormat() : + pDesc->GetLeftFormat()), this, pDesc ); pPage->Paste( this, pSibling ); pPage->PreparePage( false ); bOdd = !bOdd; pDesc = pDesc->GetFollow(); } // If the endnote pages are now corrupt, destroy them. - if ( !pDoc->GetFtnIdxs().empty() ) + if ( !pDoc->GetFootnoteIdxs().empty() ) { pPage = static_cast<SwPageFrm*>(Lower()); - while ( pPage && !pPage->IsFtnPage() ) + while ( pPage && !pPage->IsFootnotePage() ) pPage = static_cast<SwPageFrm*>(pPage->GetNext()); if ( pPage ) { SwPageDesc *pTmpDesc = pPage->FindPageDesc(); bOdd = pPage->OnRightPage(); - if ( pPage->GetFmt() != - (bOdd ? pTmpDesc->GetRightFmt() : pTmpDesc->GetLeftFmt()) ) - RemoveFtns( pPage, false, true ); + if ( pPage->GetFormat() != + (bOdd ? pTmpDesc->GetRightFormat() : pTmpDesc->GetLeftFormat()) ) + RemoveFootnotes( pPage, false, true ); } } } @@ -1464,8 +1464,8 @@ void SwRootFrm::AssertPageFlys( SwPageFrm *pPage ) while ( pPage->GetSortedObjs() && i< pPage->GetSortedObjs()->size() ) { // #i28701# - SwFrmFmt& rFmt = (*pPage->GetSortedObjs())[i]->GetFrmFmt(); - const SwFmtAnchor &rAnch = rFmt.GetAnchor(); + SwFrameFormat& rFormat = (*pPage->GetSortedObjs())[i]->GetFrameFormat(); + const SwFormatAnchor &rAnch = rFormat.GetAnchor(); const sal_uInt16 nPg = rAnch.GetPageNum(); if ((rAnch.GetAnchorId() == FLY_AT_PAGE) && nPg != pPage->GetPhyPageNum() ) @@ -1477,12 +1477,12 @@ void SwRootFrm::AssertPageFlys( SwPageFrm *pPage ) // It can move by itself. Just send a modify to its anchor attribute. #if OSL_DEBUG_LEVEL > 1 const size_t nCnt = pPage->GetSortedObjs()->size(); - rFmt.NotifyClients( 0, (SwFmtAnchor*)&rAnch ); + rFormat.NotifyClients( 0, (SwFormatAnchor*)&rAnch ); OSL_ENSURE( !pPage->GetSortedObjs() || nCnt != pPage->GetSortedObjs()->size(), "Object couldn't be reattached!" ); #else - rFmt.NotifyClients( 0, &rAnch ); + rFormat.NotifyClients( 0, &rAnch ); #endif // Do not increment index, in this case continue; @@ -1543,9 +1543,9 @@ void SwRootFrm::ImplCalcBrowseWidth() // Frames and paint objects inside other objects (frames, tables) do not count. // Borders and columns are not taken into account. - SwFrm *pFrm = ContainsCntnt(); + SwFrm *pFrm = ContainsContent(); while ( pFrm && !pFrm->IsInDocBody() ) - pFrm = static_cast<SwCntntFrm*>(pFrm)->GetNextCntntFrm(); + pFrm = static_cast<SwContentFrm*>(pFrm)->GetNextContentFrm(); if ( !pFrm ) return; @@ -1561,11 +1561,11 @@ void SwRootFrm::ImplCalcBrowseWidth() pFrm = pFrm->FindTabFrm(); if ( pFrm->IsTabFrm() && - !static_cast<SwLayoutFrm*>(pFrm)->GetFmt()->GetFrmSize().GetWidthPercent() ) + !static_cast<SwLayoutFrm*>(pFrm)->GetFormat()->GetFrmSize().GetWidthPercent() ) { SwBorderAttrAccess aAccess( SwFrm::GetCache(), pFrm ); const SwBorderAttrs &rAttrs = *aAccess.Get(); - const SwFmtHoriOrient &rHori = rAttrs.GetAttrSet().GetHoriOrient(); + const SwFormatHoriOrient &rHori = rAttrs.GetAttrSet().GetHoriOrient(); long nWidth = rAttrs.GetSize().Width(); if ( nWidth < USHRT_MAX-2000 && //-2k, because USHRT_MAX gets missing while trying to resize! text::HoriOrientation::FULL != rHori.GetHoriOrient() ) @@ -1597,19 +1597,19 @@ void SwRootFrm::ImplCalcBrowseWidth() { // #i28701# SwAnchoredObject* pAnchoredObj = (*pFrm->GetDrawObjs())[i]; - const SwFrmFmt& rFmt = pAnchoredObj->GetFrmFmt(); + const SwFrameFormat& rFormat = pAnchoredObj->GetFrameFormat(); const bool bFly = pAnchoredObj->ISA(SwFlyFrm); if ((bFly && (FAR_AWAY == pAnchoredObj->GetObjRect().Width())) - || rFmt.GetFrmSize().GetWidthPercent()) + || rFormat.GetFrmSize().GetWidthPercent()) { continue; } long nWidth = 0; - switch ( rFmt.GetAnchor().GetAnchorId() ) + switch ( rFormat.GetAnchor().GetAnchorId() ) { case FLY_AS_CHAR: - nWidth = bFly ? rFmt.GetFrmSize().GetWidth() : + nWidth = bFly ? rFormat.GetFrmSize().GetWidth() : pAnchoredObj->GetObjRect().Width(); break; case FLY_AT_PARA: @@ -1621,8 +1621,8 @@ void SwRootFrm::ImplCalcBrowseWidth() // at position FAR_AWAY. if ( bFly ) { - nWidth = rFmt.GetFrmSize().GetWidth(); - const SwFmtHoriOrient &rHori = rFmt.GetHoriOrient(); + nWidth = rFormat.GetFrmSize().GetWidth(); + const SwFormatHoriOrient &rHori = rFormat.GetHoriOrient(); switch ( rHori.GetHoriOrient() ) { case text::HoriOrientation::NONE: @@ -1753,8 +1753,8 @@ static void lcl_MoveAllLowerObjs( SwFrm* pFrm, const Point& rOffset ) { SwAnchoredObject* pAnchoredObj = (*pSortedObj)[i]; - const SwFrmFmt& rObjFmt = pAnchoredObj->GetFrmFmt(); - const SwFmtAnchor& rAnchor = rObjFmt.GetAnchor(); + const SwFrameFormat& rObjFormat = pAnchoredObj->GetFrameFormat(); + const SwFormatAnchor& rAnchor = rObjFormat.GetAnchor(); // all except from the as character anchored objects are moved // when processing the page frame: @@ -1772,14 +1772,14 @@ static void lcl_MoveAllLowerObjs( SwFrm* pFrm, const Point& rOffset ) // --> let the active embedded object be moved if ( pFlyFrm->Lower() ) { - if ( pFlyFrm->Lower()->IsNoTxtFrm() ) + if ( pFlyFrm->Lower()->IsNoTextFrm() ) { - SwCntntFrm* pCntntFrm = static_cast<SwCntntFrm*>(pFlyFrm->Lower()); + SwContentFrm* pContentFrm = static_cast<SwContentFrm*>(pFlyFrm->Lower()); SwRootFrm* pRoot = pFlyFrm->Lower()->getRootFrm(); SwViewShell *pSh = pRoot ? pRoot->GetCurrShell() : 0; if ( pSh ) { - SwOLENode* pNode = pCntntFrm->GetNode()->GetOLENode(); + SwOLENode* pNode = pContentFrm->GetNode()->GetOLENode(); if ( pNode ) { svt::EmbeddedObjectRef& xObj = pNode->GetOLEObj().GetObject(); @@ -1812,7 +1812,7 @@ static void lcl_MoveAllLowerObjs( SwFrm* pFrm, const Point& rOffset ) pAnchoredDrawObj->SetLastObjRect( pAnchoredDrawObj->GetObjRect().SVRect() ); // clear contour cache - if ( pAnchoredDrawObj->GetFrmFmt().GetSurround().IsContour() ) + if ( pAnchoredDrawObj->GetFrameFormat().GetSurround().IsContour() ) ClrContourCache( pAnchoredDrawObj->GetDrawObj() ); } // #i92511# @@ -1893,7 +1893,7 @@ void SwRootFrm::CheckViewLayout( const SwViewOption* pViewOpt, const SwRect* pVi mbSidebarChanged = false; } - if( GetFmt()->getIDocumentSettingAccess()->get(DocumentSettingId::BROWSE_MODE ) ) + if( GetFormat()->getIDocumentSettingAccess()->get(DocumentSettingId::BROWSE_MODE ) ) { mnColumns = 1; mbBookMode = false; @@ -2241,7 +2241,7 @@ bool SwPageFrm::IsOverHeaderFooterArea( const Point& rPt, FrameControlType &rCon nUpperLimit = pFrm->Frm().Top(); nLowerLimit = pFrm->Frm().Bottom(); } - else if ( pFrm->IsFtnContFrm() ) + else if ( pFrm->IsFootnoteContFrm() ) nLowerLimit = pFrm->Frm().Bottom(); pFrm = pFrm->GetNext(); diff --git a/sw/source/core/layout/pagedesc.cxx b/sw/source/core/layout/pagedesc.cxx index 01a4a5a0d2d5..6ce689ca05ca 100644 --- a/sw/source/core/layout/pagedesc.cxx +++ b/sw/source/core/layout/pagedesc.cxx @@ -38,13 +38,13 @@ using namespace ::com::sun::star; -SwPageDesc::SwPageDesc(const OUString& rName, SwFrmFmt *pFmt, SwDoc *const pDoc) +SwPageDesc::SwPageDesc(const OUString& rName, SwFrameFormat *pFormat, SwDoc *const pDoc) : SwModify(nullptr) , m_StyleName( rName ) - , m_Master( pDoc->GetAttrPool(), rName, pFmt ) - , m_Left( pDoc->GetAttrPool(), rName, pFmt ) - , m_FirstMaster( pDoc->GetAttrPool(), rName, pFmt ) - , m_FirstLeft( pDoc->GetAttrPool(), rName, pFmt ) + , m_Master( pDoc->GetAttrPool(), rName, pFormat ) + , m_Left( pDoc->GetAttrPool(), rName, pFormat ) + , m_FirstMaster( pDoc->GetAttrPool(), rName, pFormat ) + , m_FirstLeft( pDoc->GetAttrPool(), rName, pFormat ) , m_Depend( this, 0 ) , m_pFollow( this ) , m_nRegHeight( 0 ) @@ -70,7 +70,7 @@ SwPageDesc::SwPageDesc( const SwPageDesc &rCpy ) , m_eUse( rCpy.ReadUseOn() ) , m_IsLandscape( rCpy.GetLandscape() ) , m_IsHidden( rCpy.IsHidden() ) - , m_IsFtnInfo( rCpy.GetFtnInfo() ) + , m_IsFootnoteInfo( rCpy.GetFootnoteInfo() ) { } @@ -120,16 +120,16 @@ void SwPageDesc::Mirror() aSet.Put( m_Master.GetShadow() ); aSet.Put( m_Master.GetCol() ); aSet.Put( m_Master.GetFrmDir() ); // #112217# - m_Left.SetFmtAttr( aSet ); + m_Left.SetFormatAttr( aSet ); } void SwPageDesc::ResetAllAttr( bool bLeft ) { - SwFrmFmt& rFmt = bLeft ? GetLeft() : GetMaster(); + SwFrameFormat& rFormat = bLeft ? GetLeft() : GetMaster(); // #i73790# - method renamed - rFmt.ResetAllFmtAttr(); - rFmt.SetFmtAttr( SvxFrameDirectionItem(FRMDIR_HORI_LEFT_TOP, RES_FRAMEDIR) ); + rFormat.ResetAllFormatAttr(); + rFormat.SetFormatAttr( SvxFrameDirectionItem(FRMDIR_HORI_LEFT_TOP, RES_FRAMEDIR) ); } // gets information from Modify @@ -145,24 +145,24 @@ bool SwPageDesc::GetInfo( SfxPoolItem & rInfo ) const } /// set the style for the grid alignment -void SwPageDesc::SetRegisterFmtColl( const SwTxtFmtColl* pFmt ) +void SwPageDesc::SetRegisterFormatColl( const SwTextFormatColl* pFormat ) { - if( pFmt != GetRegisterFmtColl() ) + if( pFormat != GetRegisterFormatColl() ) { - if( pFmt ) - const_cast<SwTxtFmtColl*>(pFmt)->Add(&m_Depend); + if( pFormat ) + const_cast<SwTextFormatColl*>(pFormat)->Add(&m_Depend); else - const_cast<SwTxtFmtColl*>(GetRegisterFmtColl())->Remove(&m_Depend); + const_cast<SwTextFormatColl*>(GetRegisterFormatColl())->Remove(&m_Depend); RegisterChange(); } } /// retrieve the style for the grid alignment -const SwTxtFmtColl* SwPageDesc::GetRegisterFmtColl() const +const SwTextFormatColl* SwPageDesc::GetRegisterFormatColl() const { const SwModify* pReg = m_Depend.GetRegisteredIn(); - return static_cast<const SwTxtFmtColl*>(pReg); + return static_cast<const SwTextFormatColl*>(pReg); } /// notifie all affected page frames @@ -184,7 +184,7 @@ void SwPageDesc::RegisterChange() m_nRegHeight = 0; { - SwIterator<SwFrm,SwFmt> aIter( GetMaster() ); + SwIterator<SwFrm,SwFormat> aIter( GetMaster() ); for( SwFrm* pLast = aIter.First(); pLast; pLast = aIter.Next() ) { if( pLast->IsPageFrm() ) @@ -192,7 +192,7 @@ void SwPageDesc::RegisterChange() } } { - SwIterator<SwFrm,SwFmt> aIter( GetLeft() ); + SwIterator<SwFrm,SwFormat> aIter( GetLeft() ); for( SwFrm* pLast = aIter.First(); pLast; pLast = aIter.Next() ) { if( pLast->IsPageFrm() ) @@ -200,7 +200,7 @@ void SwPageDesc::RegisterChange() } } { - SwIterator<SwFrm,SwFmt> aIter( GetFirstMaster() ); + SwIterator<SwFrm,SwFormat> aIter( GetFirstMaster() ); for( SwFrm* pLast = aIter.First(); pLast; pLast = aIter.Next() ) { if( pLast->IsPageFrm() ) @@ -208,7 +208,7 @@ void SwPageDesc::RegisterChange() } } { - SwIterator<SwFrm,SwFmt> aIter( GetFirstLeft() ); + SwIterator<SwFrm,SwFormat> aIter( GetFirstLeft() ); for( SwFrm* pLast = aIter.First(); pLast; pLast = aIter.Next() ) { if( pLast->IsPageFrm() ) @@ -235,13 +235,13 @@ static const SwFrm* lcl_GetFrmOfNode( const SwNode& rNd ) const SwModify* pMod; sal_uInt16 nFrmType = FRM_CNTNT; - if( rNd.IsCntntNode() ) + if( rNd.IsContentNode() ) { - pMod = &static_cast<const SwCntntNode&>(rNd); + pMod = &static_cast<const SwContentNode&>(rNd); } else if( rNd.IsTableNode() ) { - pMod = static_cast<const SwTableNode&>(rNd).GetTable().GetFrmFmt(); + pMod = static_cast<const SwTableNode&>(rNd).GetTable().GetFrameFormat(); nFrmType = FRM_TAB; } else @@ -261,11 +261,11 @@ const SwPageDesc* SwPageDesc::GetPageDescOfNode(const SwNode& rNd) return pRet; } -const SwFrmFmt* SwPageDesc::GetPageFmtOfNode( const SwNode& rNd, +const SwFrameFormat* SwPageDesc::GetPageFormatOfNode( const SwNode& rNd, bool bCheckForThisPgDc ) const { // which PageDescFormat is valid for this node? - const SwFrmFmt* pRet; + const SwFrameFormat* pRet; const SwFrm* pChkFrm = lcl_GetFrmOfNode( rNd ); if( pChkFrm && 0 != ( pChkFrm = pChkFrm->FindPageFrm() )) @@ -302,14 +302,14 @@ bool SwPageDesc::IsFollowNextPageOfNode( const SwNode& rNd ) const return bRet; } -SwFrmFmt *SwPageDesc::GetLeftFmt(bool const bFirst) +SwFrameFormat *SwPageDesc::GetLeftFormat(bool const bFirst) { return (nsUseOnPage::PD_LEFT & m_eUse) ? ((bFirst) ? &m_FirstLeft : &m_Left) : 0; } -SwFrmFmt *SwPageDesc::GetRightFmt(bool const bFirst) +SwFrameFormat *SwPageDesc::GetRightFormat(bool const bFirst) { return (nsUseOnPage::PD_RIGHT & m_eUse) ? ((bFirst) ? &m_FirstMaster : &m_Master) @@ -354,7 +354,7 @@ SwPageDesc* SwPageDesc::GetByName(SwDoc& rDoc, const OUString& rName) return 0; } -SwPageFtnInfo::SwPageFtnInfo() +SwPageFootnoteInfo::SwPageFootnoteInfo() : m_nMaxHeight( 0 ) , m_nLineWidth(10) , m_eLineStyle( table::BorderLineStyle::SOLID ) @@ -367,7 +367,7 @@ SwPageFtnInfo::SwPageFtnInfo() FTNADJ_LEFT; } -SwPageFtnInfo::SwPageFtnInfo( const SwPageFtnInfo &rCpy ) +SwPageFootnoteInfo::SwPageFootnoteInfo( const SwPageFootnoteInfo &rCpy ) : m_nMaxHeight(rCpy.GetHeight()) , m_nLineWidth(rCpy.m_nLineWidth) , m_eLineStyle(rCpy.m_eLineStyle) @@ -379,7 +379,7 @@ SwPageFtnInfo::SwPageFtnInfo( const SwPageFtnInfo &rCpy ) { } -SwPageFtnInfo &SwPageFtnInfo::operator=( const SwPageFtnInfo& rCpy ) +SwPageFootnoteInfo &SwPageFootnoteInfo::operator=( const SwPageFootnoteInfo& rCpy ) { m_nMaxHeight = rCpy.GetHeight(); m_nLineWidth = rCpy.m_nLineWidth; @@ -392,7 +392,7 @@ SwPageFtnInfo &SwPageFtnInfo::operator=( const SwPageFtnInfo& rCpy ) return *this; } -bool SwPageFtnInfo::operator==( const SwPageFtnInfo& rCmp ) const +bool SwPageFootnoteInfo::operator==( const SwPageFootnoteInfo& rCmp ) const { return m_nMaxHeight == rCmp.GetHeight() && m_nLineWidth == rCmp.m_nLineWidth diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 89eb1a326c28..6b9ab9c5cd02 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -1547,7 +1547,7 @@ static void lcl_SubtractFlys( const SwFrm *pFrm, const SwPageFrm *pPage, const SdrObject* pSdrObj = pAnchoredObj->GetDrawObj(); // Do not consider invisible objects - if (!pPage->GetFmt()->GetDoc()->getIDocumentDrawModelAccess().IsVisibleLayerId(pSdrObj->GetLayer())) + if (!pPage->GetFormat()->GetDoc()->getIDocumentDrawModelAccess().IsVisibleLayerId(pSdrObj->GetLayer())) continue; if (!pAnchoredObj->ISA(SwFlyFrm)) @@ -1558,7 +1558,7 @@ static void lcl_SubtractFlys( const SwFrm *pFrm, const SwPageFrm *pPage, if (pSelfFly == pFly || gProp.pSRetoucheFly == pFly || !rRect.IsOver(pFly->Frm())) continue; - if (!pFly->GetFmt()->GetPrint().GetValue() && + if (!pFly->GetFormat()->GetPrint().GetValue() && (OUTDEV_PRINTER == gProp.pSGlobalShell->GetOut()->GetOutDevType() || gProp.pSGlobalShell->IsPreview())) continue; @@ -1599,7 +1599,7 @@ static void lcl_SubtractFlys( const SwFrm *pFrm, const SwPageFrm *pPage, } else { - if (!bLowerOfSelf && !pFly->GetFmt()->GetOpaque().GetValue()) + if (!bLowerOfSelf && !pFly->GetFormat()->GetOpaque().GetValue()) //From other layers we are only interested in non //transparent ones or those that are internal continue; @@ -1617,7 +1617,7 @@ static void lcl_SubtractFlys( const SwFrm *pFrm, const SwPageFrm *pPage, } else { - if (!pFly->IsLowerOf( gProp.pSRetoucheFly ) && !pFly->GetFmt()->GetOpaque().GetValue()) + if (!pFly->IsLowerOf( gProp.pSRetoucheFly ) && !pFly->GetFormat()->GetOpaque().GetValue()) //From other layers we are only interested in non //transparent ones or those that are internal continue; @@ -1627,16 +1627,16 @@ static void lcl_SubtractFlys( const SwFrm *pFrm, const SwPageFrm *pPage, //If the content of the Fly is transparent, we subtract it only if it's //contained in the hell layer. - const IDocumentDrawModelAccess* pIDDMA = pFly->GetFmt()->getIDocumentDrawModelAccess(); + const IDocumentDrawModelAccess* pIDDMA = pFly->GetFormat()->getIDocumentDrawModelAccess(); bool bHell = pSdrObj->GetLayer() == pIDDMA->GetHellId(); if ( (bStopOnHell && bHell) || /// Change internal order of condition - /// first check "!bHell", then "..->Lower()" and "..->IsNoTxtFrm()" + /// first check "!bHell", then "..->Lower()" and "..->IsNoTextFrm()" /// have not to be performed, if frame is in "Hell" - ( !bHell && pFly->Lower() && pFly->Lower()->IsNoTxtFrm() && - (static_cast<SwNoTxtFrm const*>(pFly->Lower())->IsTransparent() || - static_cast<SwNoTxtFrm const*>(pFly->Lower())->HasAnimation() || - pFly->GetFmt()->GetSurround().IsContour() + ( !bHell && pFly->Lower() && pFly->Lower()->IsNoTextFrm() && + (static_cast<SwNoTextFrm const*>(pFly->Lower())->IsTransparent() || + static_cast<SwNoTextFrm const*>(pFly->Lower())->HasAnimation() || + pFly->GetFormat()->GetSurround().IsContour() ) ) ) @@ -1659,7 +1659,7 @@ static void lcl_SubtractFlys( const SwFrm *pFrm, const SwPageFrm *pPage, // parent fly frame. if (pFrm->IsFlyFrm() && (pFly->GetAnchorFrm()->FindFlyFrm() == pFrm) && - static_cast<const SwFlyFrmFmt*>(pFly->GetFmt())->IsBackgroundBrushInherited() + static_cast<const SwFlyFrameFormat*>(pFly->GetFormat())->IsBackgroundBrushInherited() ) { SwRect aRect; @@ -3245,7 +3245,7 @@ void SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) c SwRect aRect( rRect ); aRect.Intersection( pSh->VisArea() ); - const bool bExtraData = ::IsExtraData( GetFmt()->GetDoc() ); + const bool bExtraData = ::IsExtraData( GetFormat()->GetDoc() ); gProp.pSLines = new SwLineRects; //Container for borders. @@ -3378,7 +3378,7 @@ void SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) c } if ( pSh->GetDoc()->GetDocumentSettingManager().get( DocumentSettingId::BACKGROUND_PARA_OVER_DRAWINGS ) ) - pPage->PaintBaBo( aPaintRect, pPage, true, /*bOnlyTxtBackground=*/true ); + pPage->PaintBaBo( aPaintRect, pPage, true, /*bOnlyTextBackground=*/true ); if( pSh->GetWin() ) { @@ -3527,14 +3527,14 @@ void SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) c const_cast<SwRootFrm*>(this)->SetCallbackActionEnabled( bOldAction ); } -static void lcl_EmergencyFormatFtnCont( SwFtnContFrm *pCont ) +static void lcl_EmergencyFormatFootnoteCont( SwFootnoteContFrm *pCont ) { //It's possible that the Cont will get destroyed. - SwCntntFrm *pCnt = pCont->ContainsCntnt(); - while ( pCnt && pCnt->IsInFtn() ) + SwContentFrm *pCnt = pCont->ContainsContent(); + while ( pCnt && pCnt->IsInFootnote() ) { pCnt->Calc(); - pCnt = pCnt->GetNextCntntFrm(); + pCnt = pCnt->GetNextContentFrm(); } } @@ -3599,12 +3599,12 @@ void SwLayoutFrm::Paint(SwRect const& rRect, SwPrintData const*const) const SwShortCut aShortCut( *pFrm, rRect ); bool bCnt; - if ( (bCnt = pFrm->IsCntntFrm()) ) + if ( (bCnt = pFrm->IsContentFrm()) ) pFrm->Calc(); - if ( pFrm->IsFtnContFrm() ) + if ( pFrm->IsFootnoteContFrm() ) { - ::lcl_EmergencyFormatFtnCont( const_cast<SwFtnContFrm*>(static_cast<const SwFtnContFrm*>(pFrm)) ); + ::lcl_EmergencyFormatFootnoteCont( const_cast<SwFootnoteContFrm*>(static_cast<const SwFootnoteContFrm*>(pFrm)) ); pFrm = Lower(); } @@ -3661,7 +3661,7 @@ void SwLayoutFrm::Paint(SwRect const& rRect, SwPrintData const*const) const { gProp.pSGlobalShell->InvalidateWindows( aPaintRect ); pFrm = pFrm->GetNext(); - if ( pFrm && (bCnt = pFrm->IsCntntFrm()) ) + if ( pFrm && (bCnt = pFrm->IsContentFrm()) ) pFrm->Calc(); continue; } @@ -3675,10 +3675,10 @@ void SwLayoutFrm::Paint(SwRect const& rRect, SwPrintData const*const) const { //Paint the column separator line if needed. The page is //responsible for the page frame - not the upper. - const SwFrmFmt *pFmt = GetUpper() && GetUpper()->IsPageFrm() - ? GetUpper()->GetFmt() - : GetFmt(); - const SwFmtCol &rCol = pFmt->GetCol(); + const SwFrameFormat *pFormat = GetUpper() && GetUpper()->IsPageFrm() + ? GetUpper()->GetFormat() + : GetFormat(); + const SwFormatCol &rCol = pFormat->GetCol(); if ( rCol.GetLineAdj() != COLADJ_NONE ) { if ( !pPage ) @@ -3688,12 +3688,12 @@ void SwLayoutFrm::Paint(SwRect const& rRect, SwPrintData const*const) const } } } - if ( !bCnt && pFrm->GetNext() && pFrm->GetNext()->IsFtnContFrm() ) - ::lcl_EmergencyFormatFtnCont( const_cast<SwFtnContFrm*>(static_cast<const SwFtnContFrm*>(pFrm->GetNext())) ); + if ( !bCnt && pFrm->GetNext() && pFrm->GetNext()->IsFootnoteContFrm() ) + ::lcl_EmergencyFormatFootnoteCont( const_cast<SwFootnoteContFrm*>(static_cast<const SwFootnoteContFrm*>(pFrm->GetNext())) ); pFrm = pFrm->GetNext(); - if ( pFrm && (bCnt = pFrm->IsCntntFrm()) ) + if ( pFrm && (bCnt = pFrm->IsContentFrm()) ) pFrm->Calc(); } } @@ -3767,7 +3767,7 @@ void SwPageFrm::PaintBreak( ) const if ( pBodyFrm ) { const SwLayoutFrm* pLayBody = static_cast< const SwLayoutFrm* >( pBodyFrm ); - const SwFlowFrm *pFlowFrm = pLayBody->ContainsCntnt(); + const SwFlowFrm *pFlowFrm = pLayBody->ContainsContent(); // Test if the first node is a table const SwFrm* pFirstFrm = pLayBody->Lower(); @@ -3803,7 +3803,7 @@ void SwColumnFrm::PaintBreak( ) const if ( pBodyFrm ) { - const SwCntntFrm *pCnt = static_cast< const SwLayoutFrm* >( pBodyFrm )->ContainsCntnt(); + const SwContentFrm *pCnt = static_cast< const SwLayoutFrm* >( pBodyFrm )->ContainsContent(); if ( pCnt && pCnt->IsColBreak( true ) ) { // Paint the break only if: @@ -3928,12 +3928,12 @@ void SwPageFrm::PaintDecorators( ) const // Footer if ( gProp.pSGlobalShell->IsShowHeaderFooterSeparator( Footer ) ) { - const SwFrm* pFtnContFrm = Lower(); - while ( pFtnContFrm ) + const SwFrm* pFootnoteContFrm = Lower(); + while ( pFootnoteContFrm ) { - if ( pFtnContFrm->IsFtnContFrm() ) - aBodyRect.AddBottom( pFtnContFrm->Frm().Bottom() - aBodyRect.Bottom() ); - pFtnContFrm = pFtnContFrm->GetNext(); + if ( pFootnoteContFrm->IsFootnoteContFrm() ) + aBodyRect.AddBottom( pFootnoteContFrm->Frm().Bottom() - aBodyRect.Bottom() ); + pFootnoteContFrm = pFootnoteContFrm->GetNext(); } long nFooterYOff = aBodyRect.Bottom(); @@ -3960,9 +3960,9 @@ void SwPageFrm::PaintDecorators( ) const */ bool SwFlyFrm::IsBackgroundTransparent() const { - bool bBackgroundTransparent = GetFmt()->IsBackgroundTransparent(); + bool bBackgroundTransparent = GetFormat()->IsBackgroundTransparent(); if ( !bBackgroundTransparent && - static_cast<const SwFlyFrmFmt*>(GetFmt())->IsBackgroundBrushInherited() ) + static_cast<const SwFlyFrameFormat*>(GetFormat())->IsBackgroundBrushInherited() ) { const SvxBrushItem* pBackgrdBrush = 0; const Color* pSectionTOXColor = 0; @@ -4016,7 +4016,7 @@ bool SwFlyFrm::IsPaint( SdrObject *pObj, const SwViewShell *pSh ) //Attribute dependent, don't paint for printer or Preview bool bPaint = gProp.pSFlyOnlyDraw || - static_cast<SwContact*>(pUserCall)->GetFmt()->GetPrint().GetValue(); + static_cast<SwContact*>(pUserCall)->GetFormat()->GetPrint().GetValue(); if ( !bPaint ) bPaint = pSh->GetWin() && !pSh->IsPreview(); @@ -4141,14 +4141,14 @@ void SwFlyFrm::Paint(SwRect const& rRect, SwPrintData const*const) const pOut->SetClipRegion(); const SwPageFrm* pPage = FindPageFrm(); - const SwNoTxtFrm *pNoTxt = Lower() && Lower()->IsNoTxtFrm() - ? static_cast<const SwNoTxtFrm*>(Lower()) : 0; + const SwNoTextFrm *pNoText = Lower() && Lower()->IsNoTextFrm() + ? static_cast<const SwNoTextFrm*>(Lower()) : 0; bool bIsChart = false; //#i102950# don't paint additional borders for charts //check whether we have a chart - if(pNoTxt) + if(pNoText) { - const SwNoTxtNode* pNoTNd = dynamic_cast<const SwNoTxtNode*>(pNoTxt->GetNode()); + const SwNoTextNode* pNoTNd = dynamic_cast<const SwNoTextNode*>(pNoText->GetNode()); if( pNoTNd ) { SwOLENode* pOLENd = const_cast<SwOLENode*>(pNoTNd->GetOLENode()); @@ -4158,7 +4158,7 @@ void SwFlyFrm::Paint(SwRect const& rRect, SwPrintData const*const) const } { - bool bContour = GetFmt()->GetSurround().IsContour(); + bool bContour = GetFormat()->GetSurround().IsContour(); tools::PolyPolygon aPoly; if ( bContour ) { @@ -4171,19 +4171,19 @@ void SwFlyFrm::Paint(SwRect const& rRect, SwPrintData const*const) const // #i47804# - distinguish complete background paint // and margin paint. // paint complete background for Writer text fly frames - bool bPaintCompleteBack( !pNoTxt ); + bool bPaintCompleteBack( !pNoText ); // paint complete background for transparent graphic and contour, // if own background color exists. - const bool bIsGraphicTransparent = pNoTxt && pNoTxt->IsTransparent(); + const bool bIsGraphicTransparent = pNoText && pNoText->IsTransparent(); if ( !bPaintCompleteBack && ( bIsGraphicTransparent|| bContour ) ) { - const SwFrmFmt* pSwFrmFmt = dynamic_cast< const SwFrmFmt* >(GetFmt()); + const SwFrameFormat* pSwFrameFormat = dynamic_cast< const SwFrameFormat* >(GetFormat()); - if (pSwFrmFmt && pSwFrmFmt->supportsFullDrawingLayerFillAttributeSet()) + if (pSwFrameFormat && pSwFrameFormat->supportsFullDrawingLayerFillAttributeSet()) { //UUUU check for transparency - const drawinglayer::attribute::SdrAllFillAttributesHelperPtr aFillAttributes(pSwFrmFmt->getSdrAllFillAttributesHelper()); + const drawinglayer::attribute::SdrAllFillAttributesHelperPtr aFillAttributes(pSwFrameFormat->getSdrAllFillAttributesHelper()); // check if the new fill attributes are used if(aFillAttributes.get() && aFillAttributes->isUsed()) @@ -4193,7 +4193,7 @@ void SwFlyFrm::Paint(SwRect const& rRect, SwPrintData const*const) const } else { - SvxBrushItem aBack = GetFmt()->makeBackgroundBrushItem(); + SvxBrushItem aBack = GetFormat()->makeBackgroundBrushItem(); // OD 07.08.2002 #99657# #GetTransChg# // to determine, if background has to be painted, by checking, if // background color is not COL_TRANSPARENT ("no fill"/"auto fill") @@ -4210,10 +4210,10 @@ void SwFlyFrm::Paint(SwRect const& rRect, SwPrintData const*const) const // for transparent graphics in layer Hell, if parent fly frame isn't // in layer Hell. It's only painted the intersection between the // parent fly frame area and the paint area <aRect> - const IDocumentDrawModelAccess* pIDDMA = GetFmt()->getIDocumentDrawModelAccess(); + const IDocumentDrawModelAccess* pIDDMA = GetFormat()->getIDocumentDrawModelAccess(); if (bIsGraphicTransparent && - GetFmt()->GetDoc()->getIDocumentSettingAccess().get(DocumentSettingId::SUBTRACT_FLYS) && + GetFormat()->GetDoc()->getIDocumentSettingAccess().get(DocumentSettingId::SUBTRACT_FLYS) && GetVirtDrawObj()->GetLayer() == pIDDMA->GetHellId() && GetAnchorFrm()->FindFlyFrm() ) { @@ -4256,7 +4256,7 @@ void SwFlyFrm::Paint(SwRect const& rRect, SwPrintData const*const) const // suppress painting of background in printing area for // non-transparent graphics. if ( bPaintMarginOnly || - ( pNoTxt && !bIsGraphicTransparent ) ) + ( pNoText && !bIsGraphicTransparent ) ) { //What we actually want to paint is the small stripe between //PrtArea and outer border. @@ -4268,7 +4268,7 @@ void SwFlyFrm::Paint(SwRect const& rRect, SwPrintData const*const) const pOut->Push(); // #i80822# // apply clip region under the same conditions, which are - // used in <SwNoTxtFrm::Paint(..)> to set the clip region + // used in <SwNoTextFrm::Paint(..)> to set the clip region // for painting the graphic/OLE. Thus, the clip region is // also applied for the PDF export. SwViewShell *pSh = getRootFrm()->GetCurrShell(); @@ -4364,7 +4364,7 @@ void SwFlyFrm::Paint(SwRect const& rRect, SwPrintData const*const) const pOut->Pop(); - if ( gProp.pSProgress && pNoTxt ) + if ( gProp.pSProgress && pNoText ) gProp.pSProgress->Reschedule(); } @@ -4634,7 +4634,7 @@ void SwFrm::PaintShadow( const SwRect& rRect, SwRect& rOutRect, { SvxShadowItem rShadow = rAttrs.GetShadow(); - const bool bCnt = IsCntntFrm(); + const bool bCnt = IsContentFrm(); const bool bTop = !bCnt || rAttrs.GetTopLine ( *(this) ); const bool bBottom = !bCnt || rAttrs.GetBottomLine( *(this) ); @@ -4658,7 +4658,7 @@ void SwFrm::PaintShadow( const SwRect& rRect, SwRect& rOutRect, // "asked" their frame format. const bool bDrawFullShadowRectangle = ( IsLayoutFrm() && - (static_cast<const SwLayoutFrm*>(this))->GetFmt()->IsBackgroundTransparent() + (static_cast<const SwLayoutFrm*>(this))->GetFormat()->IsBackgroundTransparent() ); SWRECTFN( this ); @@ -4690,7 +4690,7 @@ void SwFrm::PaintBorderLine( const SwRect& rRect, } if (pPage->GetSortedObjs() && - pPage->GetFmt()->GetDoc()->getIDocumentSettingAccess().get(DocumentSettingId::SUBTRACT_FLYS)) + pPage->GetFormat()->GetDoc()->getIDocumentSettingAccess().get(DocumentSettingId::SUBTRACT_FLYS)) { SwRegionRects aRegion( aOut, 4 ); ::lcl_SubtractFlys( this, pPage, aOut, aRegion, gProp ); @@ -4719,7 +4719,7 @@ static void lcl_SubTopBottom( SwRect& _iorRect, const bool _bPrtOutputDev, SwPaintProperties& properties ) { - const bool bCnt = _rFrm.IsCntntFrm(); + const bool bCnt = _rFrm.IsContentFrm(); if ( _rBox.GetTop() && _rBox.GetTop()->GetInWidth() && ( !bCnt || _rAttrs.GetTopLine( _rFrm ) ) ) @@ -4980,7 +4980,7 @@ static void lcl_PaintLeftRightLine( const bool _bLeft, (aRect.*_rRectFn->fnGetWidth)() ); } - if ( _rFrm.IsCntntFrm() ) + if ( _rFrm.IsContentFrm() ) { ::lcl_ExtendLeftAndRight( aRect, _rFrm, _rAttrs, _rRectFn ); @@ -5422,7 +5422,7 @@ void SwFrm::ProcessPrimitives( const drawinglayer::primitive2d::Primitive2DSeque void SwFrm::PaintBorder( const SwRect& rRect, const SwPageFrm *pPage, const SwBorderAttrs &rAttrs ) const { - // There's nothing (Row,Body,Ftn,Root,Column,NoTxt) need to do here + // There's nothing (Row,Body,Footnote,Root,Column,NoText) need to do here if ((GetType() & (FRM_NOTXT|FRM_ROW|FRM_BODY|FRM_FTN|FRM_COLUMN|FRM_ROOT))) return; @@ -5487,7 +5487,7 @@ void SwFrm::PaintBorder( const SwRect& rRect, const SwPageFrm *pPage, // drawing of border by setting <bDrawOnlyShadowForTransparentFrame> // to true. if ( IsLayoutFrm() && - static_cast<const SwLayoutFrm*>(this)->GetFmt()->IsBackgroundTransparent() ) + static_cast<const SwLayoutFrm*>(this)->GetFormat()->IsBackgroundTransparent() ) { bDrawOnlyShadowForTransparentFrame = true; } @@ -5515,7 +5515,7 @@ void SwFrm::PaintBorder( const SwRect& rRect, const SwPageFrm *pPage, SWRECTFN( pDirRefFrm ) ::lcl_PaintLeftRightLine ( true, *(this), *(pPage), aRect, rRect, rAttrs, fnRect, gProp); ::lcl_PaintLeftRightLine ( false, *(this), *(pPage), aRect, rRect, rAttrs, fnRect, gProp); - if ( !IsCntntFrm() || rAttrs.GetTopLine( *(this) ) ) + if ( !IsContentFrm() || rAttrs.GetTopLine( *(this) ) ) { // - //-hack @@ -5532,7 +5532,7 @@ void SwFrm::PaintBorder( const SwRect& rRect, const SwPageFrm *pPage, ::lcl_PaintTopBottomLine( true, *(this), *(pPage), aRect, rRect, rAttrs, fnRect, gProp ); } } - if ( !IsCntntFrm() || rAttrs.GetBottomLine( *(this) ) ) + if ( !IsContentFrm() || rAttrs.GetBottomLine( *(this) ) ) { // - //-hack @@ -5560,7 +5560,7 @@ void SwFrm::PaintBorder( const SwRect& rRect, const SwPageFrm *pPage, * Currently only the top frame needs to be taken into account * Other lines and shadows are set aside */ -void SwFtnContFrm::PaintBorder( const SwRect& rRect, const SwPageFrm *pPage, +void SwFootnoteContFrm::PaintBorder( const SwRect& rRect, const SwPageFrm *pPage, const SwBorderAttrs & ) const { //If the rectangle is completely inside the PrtArea, no border needs to @@ -5572,7 +5572,7 @@ void SwFtnContFrm::PaintBorder( const SwRect& rRect, const SwPageFrm *pPage, } /// Paint footnote lines. -void SwFtnContFrm::PaintLine( const SwRect& rRect, +void SwFootnoteContFrm::PaintLine( const SwRect& rRect, const SwPageFrm *pPage ) const { //The length of the line is derived from the percentual indication on the @@ -5581,7 +5581,7 @@ void SwFtnContFrm::PaintLine( const SwRect& rRect, if ( !pPage ) pPage = FindPageFrm(); - const SwPageFtnInfo &rInf = pPage->GetPageDesc()->GetFtnInfo(); + const SwPageFootnoteInfo &rInf = pPage->GetPageDesc()->GetFootnoteInfo(); SWRECTFN( this ) SwTwips nPrtWidth = (Prt().*fnRect->fnGetWidth)(); @@ -5612,7 +5612,7 @@ void SwFtnContFrm::PaintLine( const SwRect& rRect, } /// Paints the separator line for inside columns -void SwLayoutFrm::PaintColLines( const SwRect &rRect, const SwFmtCol &rFmtCol, +void SwLayoutFrm::PaintColLines( const SwRect &rRect, const SwFormatCol &rFormatCol, const SwPageFrm *pPage ) const { const SwFrm *pCol = Lower(); @@ -5624,11 +5624,11 @@ void SwLayoutFrm::PaintColLines( const SwRect &rRect, const SwFmtCol &rFmtCol, SwRect aLineRect = Prt(); aLineRect += Frm().Pos(); - SwTwips nTop = ((aLineRect.*fnRect->fnGetHeight)()*rFmtCol.GetLineHeight()) + SwTwips nTop = ((aLineRect.*fnRect->fnGetHeight)()*rFormatCol.GetLineHeight()) / 100 - (aLineRect.*fnRect->fnGetHeight)(); SwTwips nBottom = 0; - switch ( rFmtCol.GetLineAdj() ) + switch ( rFormatCol.GetLineAdj() ) { case COLADJ_CENTER: nBottom = nTop / 2; nTop -= nBottom; break; @@ -5645,7 +5645,7 @@ void SwLayoutFrm::PaintColLines( const SwRect &rRect, const SwFmtCol &rFmtCol, if( nBottom ) (aLineRect.*fnRect->fnAddBottom)( nBottom ); - SwTwips nPenHalf = rFmtCol.GetLineWidth(); + SwTwips nPenHalf = rFormatCol.GetLineWidth(); (aLineRect.*fnRect->fnSetWidth)( nPenHalf ); nPenHalf /= 2; @@ -5659,8 +5659,8 @@ void SwLayoutFrm::PaintColLines( const SwRect &rRect, const SwFmtCol &rFmtCol, (aLineRect.*fnRect->fnSetPosX) ( (pCol->Frm().*fnGetX)() - nPenHalf ); if ( aRect.IsOver( aLineRect ) ) - PaintBorderLine( aRect, aLineRect , pPage, &rFmtCol.GetLineColor(), - rFmtCol.GetLineStyle() ); + PaintBorderLine( aRect, aLineRect , pPage, &rFormatCol.GetLineColor(), + rFormatCol.GetLineStyle() ); pCol = pCol->GetNext(); } } @@ -5686,7 +5686,7 @@ void SwPageFrm::PaintGrid( OutputDevice* pOut, SwRect &rRect ) const bool bGrid = pGrid->GetRubyTextBelow(); bool bCell = GRID_LINES_CHARS == pGrid->GetGridType(); long nGrid = pGrid->GetBaseHeight(); - const SwDoc* pDoc = GetFmt()->GetDoc(); + const SwDoc* pDoc = GetFormat()->GetDoc(); long nGridWidth = GetGridWidth(*pGrid, *pDoc); long nRuby = pGrid->GetRubyHeight(); long nSum = nGrid + nRuby; @@ -6419,7 +6419,7 @@ SwRect SwPageFrm::GetBoundRect() const } void SwFrm::PaintBaBo( const SwRect& rRect, const SwPageFrm *pPage, - const bool bLowerBorder, const bool bOnlyTxtBackground ) const + const bool bLowerBorder, const bool bOnlyTextBackground ) const { if ( !pPage ) pPage = FindPageFrm(); @@ -6439,19 +6439,19 @@ void SwFrm::PaintBaBo( const SwRect& rRect, const SwPageFrm *pPage, // OD 20.11.2002 #104598# - take care of page margin area // Note: code move from <SwFrm::PaintBackground(..)> to new method // <SwPageFrm::Paintmargin(..)>. - if ( IsPageFrm() && !bOnlyTxtBackground) + if ( IsPageFrm() && !bOnlyTextBackground) { static_cast<const SwPageFrm*>(this)->PaintMarginArea( rRect, gProp.pSGlobalShell ); } // paint background { - PaintBackground( rRect, pPage, rAttrs, false, bLowerBorder, bOnlyTxtBackground ); + PaintBackground( rRect, pPage, rAttrs, false, bLowerBorder, bOnlyTextBackground ); } // OD 06.08.2002 #99657# - paint border before painting background // paint grid for page frame and paint border - if (!bOnlyTxtBackground) + if (!bOnlyTextBackground) { SwRect aRect( rRect ); if( IsPageFrm() ) @@ -6478,7 +6478,7 @@ void SwFrm::PaintBackground( const SwRect &rRect, const SwPageFrm *pPage, const SwBorderAttrs & rAttrs, const bool bLowerMode, const bool bLowerBorder, - const bool bOnlyTxtBackground ) const + const bool bOnlyTextBackground ) const { // OD 20.01.2003 #i1837# - no paint of table background, if corresponding // option is *not* set. @@ -6555,7 +6555,7 @@ void SwFrm::PaintBackground( const SwRect &rRect, const SwPageFrm *pPage, } SwRect aPaintRect( Frm() ); - if( IsTxtFrm() || IsSctFrm() ) + if( IsTextFrm() || IsSctFrm() ) aPaintRect = UnionFrm( true ); if ( aPaintRect.IsOver( rRect ) ) @@ -6565,7 +6565,7 @@ void SwFrm::PaintBackground( const SwRect &rRect, const SwPageFrm *pPage, const bool bBrowse = pSh->GetViewOptions()->getBrowseMode(); SwRect aRect; if ( (bPageFrm && bBrowse) || - (IsTxtFrm() && Prt().SSize() == Frm().SSize()) ) + (IsTextFrm() && Prt().SSize() == Frm().SSize()) ) { aRect = Frm(); ::SwAlignRect( aRect, gProp.pSGlobalShell ); @@ -6573,7 +6573,7 @@ void SwFrm::PaintBackground( const SwRect &rRect, const SwPageFrm *pPage, else { ::lcl_CalcBorderRect( aRect, this, rAttrs, false, gProp); - if ( (IsTxtFrm() || IsTabFrm()) && GetPrev() ) + if ( (IsTextFrm() || IsTabFrm()) && GetPrev() ) { if ( GetPrev()->GetAttrSet()->GetBackground() == GetAttrSet()->GetBackground() && lcl_compareFillAttributes(GetPrev()->getSdrAllFillAttributesHelper(), getSdrAllFillAttributesHelper())) @@ -6652,7 +6652,7 @@ void SwFrm::PaintBackground( const SwRect &rRect, const SwPageFrm *pPage, // background transparency have to be considered // Set missing 5th parameter to the default value GRFNUM_NO // - see declaration in /core/inc/frmtool.hxx. - if (IsTxtFrm() || !bOnlyTxtBackground) + if (IsTextFrm() || !bOnlyTextBackground) ::DrawGraphic( pItem, pOut, @@ -6765,7 +6765,7 @@ void SwLayoutFrm::RefreshLaySubsidiary( const SwPageFrm *pPage, for ( size_t i = 0; i < rObjs.size(); ++i ) { const SwAnchoredObject* pAnchoredObj = rObjs[i]; - if ( pPage->GetFmt()->GetDoc()->getIDocumentDrawModelAccess().IsVisibleLayerId( + if ( pPage->GetFormat()->GetDoc()->getIDocumentDrawModelAccess().IsVisibleLayerId( pAnchoredObj->GetDrawObj()->GetLayer() ) && pAnchoredObj->ISA(SwFlyFrm) ) { @@ -6773,8 +6773,8 @@ void SwLayoutFrm::RefreshLaySubsidiary( const SwPageFrm *pPage, static_cast<const SwFlyFrm*>(pAnchoredObj); if ( pFly->IsFlyInCntFrm() && pFly->Frm().IsOver( rRect ) ) { - if ( !pFly->Lower() || !pFly->Lower()->IsNoTxtFrm() || - !static_cast<const SwNoTxtFrm*>(pFly->Lower())->HasAnimation()) + if ( !pFly->Lower() || !pFly->Lower()->IsNoTextFrm() || + !static_cast<const SwNoTextFrm*>(pFly->Lower())->HasAnimation()) pFly->RefreshLaySubsidiary( pPage, rRect ); } } @@ -6787,7 +6787,7 @@ void SwLayoutFrm::RefreshLaySubsidiary( const SwPageFrm *pPage, /** * Subsidiary lines to paint the PrtAreas - * Only the LayoutFrms which directly contain Cntnt + * Only the LayoutFrms which directly contain Content * Paints the desired line and pays attention to not overpaint any flys */ static void lcl_RefreshLine( const SwLayoutFrm *pLay, @@ -6856,7 +6856,7 @@ static void lcl_RefreshLine( const SwLayoutFrm *pLay, // OD 2004-02-12 #110582#-2 - do *not* consider fly frame, which // belongs to a invisible layer if ( pFly->IsBackgroundTransparent() || - !pFly->GetFmt()->GetDoc()->getIDocumentDrawModelAccess().IsVisibleLayerId( pObj->GetLayer() ) ) + !pFly->GetFormat()->GetDoc()->getIDocumentDrawModelAccess().IsVisibleLayerId( pObj->GetLayer() ) ) { aIter.Next(); continue; @@ -6993,20 +6993,20 @@ void SwPageFrm::PaintSubsidiaryLines( const SwPageFrm *, if ( !gProp.pSGlobalShell->IsHeaderFooterEdit() ) { const SwFrm* pLay = Lower(); - const SwFrm* pFtnCont = NULL; + const SwFrm* pFootnoteCont = NULL; const SwFrm* pPageBody = NULL; - while ( pLay && !( pFtnCont && pPageBody ) ) + while ( pLay && !( pFootnoteCont && pPageBody ) ) { - if ( pLay->IsFtnContFrm( ) ) - pFtnCont = pLay; + if ( pLay->IsFootnoteContFrm( ) ) + pFootnoteCont = pLay; if ( pLay->IsBodyFrm() ) pPageBody = pLay; pLay = pLay->GetNext(); } SwRect aArea( pPageBody->Frm() ); - if ( pFtnCont ) - aArea.AddBottom( pFtnCont->Frm().Bottom() - aArea.Bottom() ); + if ( pFootnoteCont ) + aArea.AddBottom( pFootnoteCont->Frm().Bottom() - aArea.Bottom() ); if ( !gProp.pSGlobalShell->GetViewOptions()->IsViewMetaChars( ) ) ProcessPrimitives( lcl_CreatePageAreaDelimiterPrimitives( aArea ) ); @@ -7019,12 +7019,12 @@ void SwColumnFrm::PaintSubsidiaryLines( const SwPageFrm *, const SwRect & ) const { const SwFrm* pLay = Lower(); - const SwFrm* pFtnCont = NULL; + const SwFrm* pFootnoteCont = NULL; const SwFrm* pColBody = NULL; - while ( pLay && !( pFtnCont && pColBody ) ) + while ( pLay && !( pFootnoteCont && pColBody ) ) { - if ( pLay->IsFtnContFrm( ) ) - pFtnCont = pLay; + if ( pLay->IsFootnoteContFrm( ) ) + pFootnoteCont = pLay; if ( pLay->IsBodyFrm() ) pColBody = pLay; pLay = pLay->GetNext(); @@ -7043,8 +7043,8 @@ void SwColumnFrm::PaintSubsidiaryLines( const SwPageFrm *, aArea.Top( GetUpper()->Frm().Top() ); } - if ( pFtnCont ) - aArea.AddBottom( pFtnCont->Frm().Bottom() - aArea.Bottom() ); + if ( pFootnoteCont ) + aArea.AddBottom( pFootnoteCont->Frm().Bottom() - aArea.Bottom() ); ::SwAlignRect( aArea, gProp.pSGlobalShell ); @@ -7090,7 +7090,7 @@ void SwHeadFootFrm::PaintSubsidiaryLines( const SwPageFrm *, const SwRect & ) co * This method is overridden in order to have no subsidiary lines * around the footnotes. */ -void SwFtnFrm::PaintSubsidiaryLines( const SwPageFrm *, +void SwFootnoteFrm::PaintSubsidiaryLines( const SwPageFrm *, const SwRect & ) const { } @@ -7099,7 +7099,7 @@ void SwFtnFrm::PaintSubsidiaryLines( const SwPageFrm *, * This method is overridden in order to have no subsidiary lines * around the footnotes containers. */ -void SwFtnContFrm::PaintSubsidiaryLines( const SwPageFrm *, +void SwFootnoteContFrm::PaintSubsidiaryLines( const SwPageFrm *, const SwRect & ) const { } @@ -7158,7 +7158,7 @@ void SwLayoutFrm::PaintSubsidiaryLines( const SwPageFrm *pPage, // OD 18.11.2002 #99672# - collect body, header, footer, footnote and section // sub-lines in <pSpecSubsLine> array. const bool bSpecialSublines = IsBodyFrm() || IsHeaderFrm() || IsFooterFrm() || - IsFtnFrm() || IsSctFrm(); + IsFootnoteFrm() || IsSctFrm(); SwLineRects* pUsedSubsLines = bSpecialSublines ? gProp.pSSpecSubsLines : gProp.pSSubsLines; // NOTE: for cell frames only left and right (horizontal layout) respectively @@ -7233,7 +7233,7 @@ void SwLayoutFrm::PaintSubsidiaryLines( const SwPageFrm *pPage, */ void SwPageFrm::RefreshExtraData( const SwRect &rRect ) const { - const SwLineNumberInfo &rInfo = GetFmt()->GetDoc()->GetLineNumberInfo(); + const SwLineNumberInfo &rInfo = GetFormat()->GetDoc()->GetLineNumberInfo(); bool bLineInFly = (rInfo.IsPaintLineNumbers() && rInfo.IsCountInFlys()) || (sal_Int16)SW_MOD()->GetRedlineMarkPos() != text::HoriOrientation::NONE; @@ -7261,22 +7261,22 @@ void SwPageFrm::RefreshExtraData( const SwRect &rRect ) const void SwLayoutFrm::RefreshExtraData( const SwRect &rRect ) const { - const SwLineNumberInfo &rInfo = GetFmt()->GetDoc()->GetLineNumberInfo(); + const SwLineNumberInfo &rInfo = GetFormat()->GetDoc()->GetLineNumberInfo(); bool bLineInBody = rInfo.IsPaintLineNumbers(), bLineInFly = bLineInBody && rInfo.IsCountInFlys(), bRedLine = (sal_Int16)SW_MOD()->GetRedlineMarkPos()!=text::HoriOrientation::NONE; - const SwCntntFrm *pCnt = ContainsCntnt(); + const SwContentFrm *pCnt = ContainsContent(); while ( pCnt && IsAnLower( pCnt ) ) { - if ( pCnt->IsTxtFrm() && ( bRedLine || + if ( pCnt->IsTextFrm() && ( bRedLine || ( !pCnt->IsInTab() && ((bLineInBody && pCnt->IsInDocBody()) || (bLineInFly && pCnt->IsInFly())) ) ) && pCnt->Frm().Top() <= rRect.Bottom() && pCnt->Frm().Bottom() >= rRect.Top() ) { - static_cast<const SwTxtFrm*>(pCnt)->PaintExtraData( rRect ); + static_cast<const SwTextFrm*>(pCnt)->PaintExtraData( rRect ); } if ( bLineInFly && pCnt->GetDrawObjs() ) for ( size_t i = 0; i < pCnt->GetDrawObjs()->size(); ++i ) @@ -7291,7 +7291,7 @@ void SwLayoutFrm::RefreshExtraData( const SwRect &rRect ) const pFly->RefreshExtraData( rRect ); } } - pCnt = pCnt->GetNextCntntFrm(); + pCnt = pCnt->GetNextContentFrm(); } } @@ -7634,16 +7634,16 @@ void SetOutDevAndWin( SwViewShell *pSh, OutputDevice *pO, pSh->mpOpt->SetZoom( nZoom ); } -Graphic SwFrmFmt::MakeGraphic( ImageMap* ) +Graphic SwFrameFormat::MakeGraphic( ImageMap* ) { return Graphic(); } -Graphic SwFlyFrmFmt::MakeGraphic( ImageMap* pMap ) +Graphic SwFlyFrameFormat::MakeGraphic( ImageMap* pMap ) { Graphic aRet; //search any Fly! - SwIterator<SwFrm,SwFmt> aIter( *this ); + SwIterator<SwFrm,SwFormat> aIter( *this ); SwFrm *pFirst = aIter.First(); SwViewShell *pSh; if ( pFirst && 0 != ( pSh = pFirst->getRootFrm()->GetCurrShell()) ) @@ -7745,7 +7745,7 @@ Graphic SwFlyFrmFmt::MakeGraphic( ImageMap* pMap ) return aRet; } -Graphic SwDrawFrmFmt::MakeGraphic( ImageMap* ) +Graphic SwDrawFrameFormat::MakeGraphic( ImageMap* ) { Graphic aRet; SwDrawModel* pMod = getIDocumentDrawModelAccess()->GetDrawModel(); diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx index cb8ccff8a4a8..aa2ba0e663ec 100644 --- a/sw/source/core/layout/sectfrm.cxx +++ b/sw/source/core/layout/sectfrm.cxx @@ -41,30 +41,30 @@ #include <sortedobjs.hxx> SwSectionFrm::SwSectionFrm( SwSection &rSect, SwFrm* pSib ) - : SwLayoutFrm( rSect.GetFmt(), pSib ) + : SwLayoutFrm( rSect.GetFormat(), pSib ) , SwFlowFrm( static_cast<SwFrm&>(*this) ) , pSection( &rSect ) - , bFtnAtEnd(false) + , bFootnoteAtEnd(false) , bEndnAtEnd(false) - , bCntntLock(false) - , bOwnFtnNum(false) - , bFtnLock(false) + , bContentLock(false) + , bOwnFootnoteNum(false) + , bFootnoteLock(false) { mnFrmType = FRM_SECTION; - CalcFtnAtEndFlag(); + CalcFootnoteAtEndFlag(); CalcEndAtEndFlag(); } SwSectionFrm::SwSectionFrm( SwSectionFrm &rSect, bool bMaster ) : - SwLayoutFrm( rSect.GetFmt(), rSect.getRootFrm() ), + SwLayoutFrm( rSect.GetFormat(), rSect.getRootFrm() ), SwFlowFrm( (SwFrm&)*this ), pSection( rSect.GetSection() ), - bFtnAtEnd( rSect.IsFtnAtEnd() ), + bFootnoteAtEnd( rSect.IsFootnoteAtEnd() ), bEndnAtEnd( rSect.IsEndnAtEnd() ), - bCntntLock( false ), - bOwnFtnNum( false ), - bFtnLock( false ) + bContentLock( false ), + bOwnFootnoteNum( false ), + bFootnoteLock( false ) { mnFrmType = FRM_SECTION; @@ -101,16 +101,16 @@ void SwSectionFrm::Init() (Frm().*fnRect->fnSetHeight)( 0 ); // #109700# LRSpace for sections - const SvxLRSpaceItem& rLRSpace = GetFmt()->GetLRSpace(); + const SvxLRSpaceItem& rLRSpace = GetFormat()->GetLRSpace(); (Prt().*fnRect->fnSetLeft)( rLRSpace.GetLeft() ); (Prt().*fnRect->fnSetWidth)( nWidth - rLRSpace.GetLeft() - rLRSpace.GetRight() ); (Prt().*fnRect->fnSetHeight)( 0 ); - const SwFmtCol &rCol = GetFmt()->GetCol(); - if( ( rCol.GetNumCols() > 1 || IsAnyNoteAtEnd() ) && !IsInFtn() ) + const SwFormatCol &rCol = GetFormat()->GetCol(); + if( ( rCol.GetNumCols() > 1 || IsAnyNoteAtEnd() ) && !IsInFootnote() ) { - const SwFmtCol *pOld = Lower() ? &rCol : new SwFmtCol; + const SwFormatCol *pOld = Lower() ? &rCol : new SwFormatCol; ChgColumns( *pOld, rCol, IsAnyNoteAtEnd() ); if( pOld != &rCol ) delete pOld; @@ -119,7 +119,7 @@ void SwSectionFrm::Init() void SwSectionFrm::DestroyImpl() { - if( GetFmt() && !GetFmt()->GetDoc()->IsInDtor() ) + if( GetFormat() && !GetFormat()->GetDoc()->IsInDtor() ) { SwRootFrm *pRootFrm = getRootFrm(); if( pRootFrm ) @@ -173,8 +173,8 @@ void SwSectionFrm::DelEmpty( bool bRemove ) pViewShell->GetLayout()->IsAnyShellAccessible() ) { pViewShell->InvalidateAccessibleParaFlowRelation( - dynamic_cast<SwTxtFrm*>(FindNextCnt( true )), - dynamic_cast<SwTxtFrm*>(FindPrevCnt( true )) ); + dynamic_cast<SwTextFrm*>(FindNextCnt( true )), + dynamic_cast<SwTextFrm*>(FindPrevCnt( true )) ); } } _Cut( bRemove ); @@ -233,10 +233,10 @@ void SwSectionFrm::_Cut( bool bRemove ) pFrm->_InvalidatePos(); if( pFrm->IsSctFrm() ) pFrm = static_cast<SwSectionFrm*>(pFrm)->ContainsAny(); - if ( pFrm && pFrm->IsCntntFrm() ) + if ( pFrm && pFrm->IsContentFrm() ) { pFrm->InvalidatePage( pPage ); - if( IsInFtn() && !GetIndPrev() ) + if( IsInFootnote() && !GetIndPrev() ) pPrepFrm = pFrm; } } @@ -247,7 +247,7 @@ void SwSectionFrm::_Cut( bool bRemove ) if ( 0 != (pFrm = GetPrev()) ) { pFrm->SetRetouche(); pFrm->Prepare( PREP_WIDOWS_ORPHANS ); - if ( pFrm->IsCntntFrm() ) + if ( pFrm->IsContentFrm() ) pFrm->InvalidatePage( pPage ); } // If I am (was) the only FlowFrm in my Upper, then he has to take over @@ -264,7 +264,7 @@ void SwSectionFrm::_Cut( bool bRemove ) if( bRemove ) { RemoveFromLayout(); - if( pUp && !pUp->Lower() && pUp->IsFtnFrm() && !pUp->IsColLocked() && + if( pUp && !pUp->Lower() && pUp->IsFootnoteFrm() && !pUp->IsColLocked() && pUp->GetUpper() ) { pUp->Cut(); @@ -293,7 +293,7 @@ void SwSectionFrm::_Cut( bool bRemove ) void SwSectionFrm::Paste( SwFrm* pParent, SwFrm* pSibling ) { OSL_ENSURE( pParent, "No parent for Paste()." ); - OSL_ENSURE( pParent->IsLayoutFrm(), "Parent is CntntFrm." ); + OSL_ENSURE( pParent->IsLayoutFrm(), "Parent is ContentFrm." ); OSL_ENSURE( pParent != this, "I'm my own parent." ); OSL_ENSURE( pSibling != this, "I'm my own neighbour." ); OSL_ENSURE( !GetPrev() && !GetUpper(), @@ -337,9 +337,9 @@ void SwSectionFrm::Paste( SwFrm* pParent, SwFrm* pSibling ) { while ( pTmp->GetNext() ) pTmp = pTmp->GetNext(); - SwFrm* pSave = ::SaveCntnt( pCol ); + SwFrm* pSave = ::SaveContent( pCol ); if (pSave) - ::RestoreCntnt( pSave, pSibling->GetUpper(), pTmp, true ); + ::RestoreContent( pSave, pSibling->GetUpper(), pTmp, true ); } } } @@ -360,7 +360,7 @@ void SwSectionFrm::Paste( SwFrm* pParent, SwFrm* pSibling ) } if( !static_cast<SwLayoutFrm*>(pParent)->Lower() ) { - SwSectionFrm::MoveCntntAndDelete( static_cast<SwSectionFrm*>(pParent), false ); + SwSectionFrm::MoveContentAndDelete( static_cast<SwSectionFrm*>(pParent), false ); pParent = this; } } @@ -375,7 +375,7 @@ void SwSectionFrm::Paste( SwFrm* pParent, SwFrm* pSibling ) { pSibling->_InvalidatePos(); pSibling->_InvalidatePrt(); - if ( pSibling->IsCntntFrm() ) + if ( pSibling->IsContentFrm() ) pSibling->InvalidatePage( pPage ); } @@ -388,7 +388,7 @@ void SwSectionFrm::Paste( SwFrm* pParent, SwFrm* pSibling ) if ( !IsFollow() ) { GetPrev()->InvalidateSize(); - if ( GetPrev()->IsCntntFrm() ) + if ( GetPrev()->IsContentFrm() ) GetPrev()->InvalidatePage( pPage ); } } @@ -405,15 +405,15 @@ bool SwSectionFrm::HasToBreak( const SwFrm* pFrm ) const if( !pFrm->IsSctFrm() ) return false; - const SwSectionFmt *pTmp = static_cast<const SwSectionFmt*>(GetFmt()); + const SwSectionFormat *pTmp = static_cast<const SwSectionFormat*>(GetFormat()); - const SwFrmFmt *pOtherFmt = static_cast<const SwSectionFrm*>(pFrm)->GetFmt(); + const SwFrameFormat *pOtherFormat = static_cast<const SwSectionFrm*>(pFrm)->GetFormat(); do { pTmp = pTmp->GetParent(); if( !pTmp ) return false; - if( pTmp == pOtherFmt ) + if( pTmp == pOtherFormat ) return true; } while( true ); // ( pTmp->GetSect().GetValue() ); } @@ -429,7 +429,7 @@ void SwSectionFrm::MergeNext( SwSectionFrm* pNxt ) { PROTOCOL( this, PROT_SECTION, ACT_MERGE, pNxt ) - SwFrm* pTmp = ::SaveCntnt( pNxt ); + SwFrm* pTmp = ::SaveContent( pNxt ); if( pTmp ) { SwFrm* pLast = Lower(); @@ -447,7 +447,7 @@ void SwSectionFrm::MergeNext( SwSectionFrm* pNxt ) pLast = pLast->GetNext(); } } - ::RestoreCntnt( pTmp, pLay, pLast, true ); + ::RestoreContent( pTmp, pLay, pLast, true ); } SetFollow( pNxt->GetFollow() ); pNxt->SetFollow( NULL ); @@ -473,7 +473,7 @@ bool SwSectionFrm::SplitSect( SwFrm* pFrm, bool bApres ) if( pSect != this ) return false; // Put the content aside - SwFrm* pSav = ::SaveCntnt( this, bApres ? pOther : pFrm ); + SwFrm* pSav = ::SaveContent( this, bApres ? pOther : pFrm ); OSL_ENSURE( pSav, "SplitSect: What's on?" ); if( pSav ) // be robust { // Create a new SctFrm, not as a Follower/master @@ -491,7 +491,7 @@ bool SwSectionFrm::SplitSect( SwFrm* pFrm, bool bApres ) // Search for last layout frame, e.g. for columned sections. while( pLay->Lower() && pLay->Lower()->IsLayoutFrm() ) pLay = static_cast<SwLayoutFrm*>(pLay->Lower()); - ::RestoreCntnt( pSav, pLay, NULL, true ); + ::RestoreContent( pSav, pLay, NULL, true ); } _InvalidateSize(); if( HasFollow() ) @@ -505,7 +505,7 @@ bool SwSectionFrm::SplitSect( SwFrm* pFrm, bool bApres ) } /** -|* MoveCntnt is called for destroying a SectionFrms, due to +|* MoveContent is called for destroying a SectionFrms, due to |* the cancellation or hiding of a section, to handle the content. |* If the SectionFrm hasn't broken up another one, then the content |* is moved to the Upper. Otherwise the content is moved to another @@ -530,23 +530,23 @@ static void lcl_InvalidateInfFlags( SwFrm* pFrm, bool bInva ) } } -// Works like SwCntntFrm::ImplGetNextCntntFrm, but starts with a LayoutFrm -static SwCntntFrm* lcl_GetNextCntntFrm( const SwLayoutFrm* pLay, bool bFwd ) +// Works like SwContentFrm::ImplGetNextContentFrm, but starts with a LayoutFrm +static SwContentFrm* lcl_GetNextContentFrm( const SwLayoutFrm* pLay, bool bFwd ) { if ( bFwd ) { - if ( pLay->GetNext() && pLay->GetNext()->IsCntntFrm() ) - return const_cast<SwCntntFrm*>(static_cast<const SwCntntFrm*>(pLay->GetNext())); + if ( pLay->GetNext() && pLay->GetNext()->IsContentFrm() ) + return const_cast<SwContentFrm*>(static_cast<const SwContentFrm*>(pLay->GetNext())); } else { - if ( pLay->GetPrev() && pLay->GetPrev()->IsCntntFrm() ) - return const_cast<SwCntntFrm*>(static_cast<const SwCntntFrm*>(pLay->GetPrev())); + if ( pLay->GetPrev() && pLay->GetPrev()->IsContentFrm() ) + return const_cast<SwContentFrm*>(static_cast<const SwContentFrm*>(pLay->GetPrev())); } // #100926# const SwFrm* pFrm = pLay; - SwCntntFrm *pCntntFrm = 0; + SwContentFrm *pContentFrm = 0; bool bGoingUp = true; do { const SwFrm *p = 0; @@ -573,16 +573,16 @@ static SwCntntFrm* lcl_GetNextCntntFrm( const SwLayoutFrm* pLay, bool bFwd ) p = p->GetNext(); pFrm = p; - } while ( 0 == (pCntntFrm = (pFrm->IsCntntFrm() ? const_cast<SwCntntFrm*>(static_cast<const SwCntntFrm*>(pFrm)) : 0) )); + } while ( 0 == (pContentFrm = (pFrm->IsContentFrm() ? const_cast<SwContentFrm*>(static_cast<const SwContentFrm*>(pFrm)) : 0) )); - return pCntntFrm; + return pContentFrm; } #define FIRSTLEAF( pLayFrm ) ( ( pLayFrm->Lower() && pLayFrm->Lower()->IsColumnFrm() )\ ? pLayFrm->GetNextLayoutLeaf() \ : pLayFrm ) -void SwSectionFrm::MoveCntntAndDelete( SwSectionFrm* pDel, bool bSave ) +void SwSectionFrm::MoveContentAndDelete( SwSectionFrm* pDel, bool bSave ) { bool bSize = pDel->Lower() && pDel->Lower()->IsColumnFrm(); SwFrm* pPrv = pDel->GetPrev(); @@ -590,27 +590,27 @@ void SwSectionFrm::MoveCntntAndDelete( SwSectionFrm* pDel, bool bSave ) // OD 27.03.2003 #i12711# - initialize local pointer variables. SwSectionFrm* pPrvSct = NULL; SwSectionFrm* pNxtSct = NULL; - SwSectionFmt* pParent = static_cast<SwSectionFmt*>(pDel->GetFmt())->GetParent(); + SwSectionFormat* pParent = static_cast<SwSectionFormat*>(pDel->GetFormat())->GetParent(); if( pDel->IsInTab() && pParent ) { SwTabFrm *pTab = pDel->FindTabFrm(); // If we are within a table, we can only have broken up sections that // are inside as well, but not a section that contains the whole table. - if( pTab->IsInSct() && pParent == pTab->FindSctFrm()->GetFmt() ) + if( pTab->IsInSct() && pParent == pTab->FindSctFrm()->GetFormat() ) pParent = NULL; } // If our Format has a parent, we have probably broken up another // SectionFrm, which has to be checked. To do so we first acquire the - // succeeding and the preceding CntntFrm, let's see if they + // succeeding and the preceding ContentFrm, let's see if they // lay in the SectionFrms. // OD 27.03.2003 #i12711# - check, if previous and next section belonging // together and can be joined, *not* only if deleted section contains content. if ( pParent ) { - SwFrm* pPrvCntnt = lcl_GetNextCntntFrm( pDel, false ); - pPrvSct = pPrvCntnt ? pPrvCntnt->FindSctFrm() : NULL; - SwFrm* pNxtCntnt = lcl_GetNextCntntFrm( pDel, true ); - pNxtSct = pNxtCntnt ? pNxtCntnt->FindSctFrm() : NULL; + SwFrm* pPrvContent = lcl_GetNextContentFrm( pDel, false ); + pPrvSct = pPrvContent ? pPrvContent->FindSctFrm() : NULL; + SwFrm* pNxtContent = lcl_GetNextContentFrm( pDel, true ); + pNxtSct = pNxtContent ? pNxtContent->FindSctFrm() : NULL; } else { @@ -619,25 +619,25 @@ void SwSectionFrm::MoveCntntAndDelete( SwSectionFrm* pDel, bool bSave ) } // Now the content is put aside and the frame is destroyed - SwFrm *pSave = bSave ? ::SaveCntnt( pDel ) : NULL; - bool bOldFtn = true; - if( pSave && pUp->IsFtnFrm() ) + SwFrm *pSave = bSave ? ::SaveContent( pDel ) : NULL; + bool bOldFootnote = true; + if( pSave && pUp->IsFootnoteFrm() ) { - bOldFtn = static_cast<SwFtnFrm*>(pUp)->IsColLocked(); - static_cast<SwFtnFrm*>(pUp)->ColLock(); + bOldFootnote = static_cast<SwFootnoteFrm*>(pUp)->IsColLocked(); + static_cast<SwFootnoteFrm*>(pUp)->ColLock(); } pDel->DelEmpty( true ); SwFrm::DestroyFrm(pDel); if( pParent ) { // Search for the appropriate insert position - if( pNxtSct && pNxtSct->GetFmt() == pParent ) + if( pNxtSct && pNxtSct->GetFormat() == pParent ) { // Here we can insert outselves at the beginning pUp = FIRSTLEAF( pNxtSct ); pPrv = NULL; - if( pPrvSct && !( pPrvSct->GetFmt() == pParent ) ) + if( pPrvSct && !( pPrvSct->GetFormat() == pParent ) ) pPrvSct = NULL; // In order that nothing is merged } - else if( pPrvSct && pPrvSct->GetFmt() == pParent ) + else if( pPrvSct && pPrvSct->GetFormat() == pParent ) { // Wonderful, here we can insert ourselves at the end pUp = pPrvSct; if( pUp->Lower() && pUp->Lower()->IsColumnFrm() ) @@ -674,15 +674,15 @@ void SwSectionFrm::MoveCntntAndDelete( SwSectionFrm* pDel, bool bSave ) if( pSave ) { lcl_InvalidateInfFlags( pSave, bSize ); - ::RestoreCntnt( pSave, pUp, pPrv, true ); - pUp->FindPageFrm()->InvalidateCntnt(); - if( !bOldFtn ) - static_cast<SwFtnFrm*>(pUp)->ColUnlock(); + ::RestoreContent( pSave, pUp, pPrv, true ); + pUp->FindPageFrm()->InvalidateContent(); + if( !bOldFootnote ) + static_cast<SwFootnoteFrm*>(pUp)->ColUnlock(); } // Now two parts of the superior section could possibly be merged if( pPrvSct && !pPrvSct->IsJoinLocked() ) { - OSL_ENSURE( pNxtSct, "MoveCntnt: No Merge" ); + OSL_ENSURE( pNxtSct, "MoveContent: No Merge" ); pPrvSct->MergeNext( pNxtSct ); } } @@ -738,7 +738,7 @@ void SwSectionFrm::MakeAll() mbValidSize = false; #if OSL_DEBUG_LEVEL > 1 - const SwFmtCol &rCol = GetFmt()->GetCol(); + const SwFormatCol &rCol = GetFormat()->GetCol(); (void)rCol; #endif SwLayoutFrm::MakeAll(); @@ -753,58 +753,58 @@ bool SwSectionFrm::ShouldBwdMoved( SwLayoutFrm *, bool , bool & ) return false; } -const SwSectionFmt* SwSectionFrm::_GetEndSectFmt() const +const SwSectionFormat* SwSectionFrm::_GetEndSectFormat() const { - const SwSectionFmt *pFmt = pSection->GetFmt(); - while( !pFmt->GetEndAtTxtEnd().IsAtEnd() ) + const SwSectionFormat *pFormat = pSection->GetFormat(); + while( !pFormat->GetEndAtTextEnd().IsAtEnd() ) { - if( pFmt->GetRegisteredIn()->ISA( SwSectionFmt ) ) - pFmt = static_cast<const SwSectionFmt*>(pFmt->GetRegisteredIn()); + if( pFormat->GetRegisteredIn()->ISA( SwSectionFormat ) ) + pFormat = static_cast<const SwSectionFormat*>(pFormat->GetRegisteredIn()); else return NULL; } - return pFmt; + return pFormat; } -static void lcl_FindCntntFrm( SwCntntFrm* &rpCntntFrm, SwFtnFrm* &rpFtnFrm, - SwFrm* pFrm, bool &rbChkFtn ) +static void lcl_FindContentFrm( SwContentFrm* &rpContentFrm, SwFootnoteFrm* &rpFootnoteFrm, + SwFrm* pFrm, bool &rbChkFootnote ) { if( pFrm ) { while( pFrm->GetNext() ) pFrm = pFrm->GetNext(); - while( !rpCntntFrm && pFrm ) + while( !rpContentFrm && pFrm ) { - if( pFrm->IsCntntFrm() ) - rpCntntFrm = static_cast<SwCntntFrm*>(pFrm); + if( pFrm->IsContentFrm() ) + rpContentFrm = static_cast<SwContentFrm*>(pFrm); else if( pFrm->IsLayoutFrm() ) { - if( pFrm->IsFtnFrm() ) + if( pFrm->IsFootnoteFrm() ) { - if( rbChkFtn ) + if( rbChkFootnote ) { - rpFtnFrm = static_cast<SwFtnFrm*>(pFrm); - rbChkFtn = rpFtnFrm->GetAttr()->GetFtn().IsEndNote(); + rpFootnoteFrm = static_cast<SwFootnoteFrm*>(pFrm); + rbChkFootnote = rpFootnoteFrm->GetAttr()->GetFootnote().IsEndNote(); } } else - lcl_FindCntntFrm( rpCntntFrm, rpFtnFrm, - static_cast<SwLayoutFrm*>(pFrm)->Lower(), rbChkFtn ); + lcl_FindContentFrm( rpContentFrm, rpFootnoteFrm, + static_cast<SwLayoutFrm*>(pFrm)->Lower(), rbChkFootnote ); } pFrm = pFrm->GetPrev(); } } } -SwCntntFrm *SwSectionFrm::FindLastCntnt( sal_uInt8 nMode ) +SwContentFrm *SwSectionFrm::FindLastContent( sal_uInt8 nMode ) { - SwCntntFrm *pRet = NULL; - SwFtnFrm *pFtnFrm = NULL; + SwContentFrm *pRet = NULL; + SwFootnoteFrm *pFootnoteFrm = NULL; SwSectionFrm *pSect = this; if( nMode ) { - const SwSectionFmt *pFmt = IsEndnAtEnd() ? GetEndSectFmt() : - pSection->GetFmt(); + const SwSectionFormat *pFormat = IsEndnAtEnd() ? GetEndSectFormat() : + pSection->GetFormat(); do { while( pSect->HasFollow() ) pSect = pSect->GetFollow(); @@ -813,23 +813,23 @@ SwCntntFrm *SwSectionFrm::FindLastCntnt( sal_uInt8 nMode ) !static_cast<SwSectionFrm*>(pTmp)->GetSection() ) pTmp = pTmp->FindNext(); if( pTmp && pTmp->IsSctFrm() && - static_cast<SwSectionFrm*>(pTmp)->IsDescendantFrom( pFmt ) ) + static_cast<SwSectionFrm*>(pTmp)->IsDescendantFrom( pFormat ) ) pSect = static_cast<SwSectionFrm*>(pTmp); else break; } while( true ); } - bool bFtnFound = nMode == FINDMODE_ENDNOTE; + bool bFootnoteFound = nMode == FINDMODE_ENDNOTE; do { - lcl_FindCntntFrm( pRet, pFtnFrm, pSect->Lower(), bFtnFound ); + lcl_FindContentFrm( pRet, pFootnoteFrm, pSect->Lower(), bFootnoteFound ); if( pRet || !pSect->IsFollow() || !nMode || ( FINDMODE_MYLAST == nMode && this == pSect ) ) break; pSect = pSect->FindMaster(); } while( pSect ); - if( ( nMode == FINDMODE_ENDNOTE ) && pFtnFrm ) - pRet = pFtnFrm->ContainsCntnt(); + if( ( nMode == FINDMODE_ENDNOTE ) && pFootnoteFrm ) + pRet = pFootnoteFrm->ContainsContent(); return pRet; } @@ -848,17 +848,17 @@ bool SwSectionFrm::CalcMinDiff( SwTwips& rMinDiff ) const /** * CollectEndnotes looks for endnotes in the sectionfrm and his follows, * the endnotes will cut off the layout and put into the array. - * If the first endnote is not a master-SwFtnFrm, the whole sectionfrm + * If the first endnote is not a master-SwFootnoteFrm, the whole sectionfrm * contains only endnotes and it is not necessary to collect them. */ -static SwFtnFrm* lcl_FindEndnote( SwSectionFrm* &rpSect, bool &rbEmpty, +static SwFootnoteFrm* lcl_FindEndnote( SwSectionFrm* &rpSect, bool &rbEmpty, SwLayouter *pLayouter ) { // if rEmpty is set, the rpSect is already searched SwSectionFrm* pSect = rbEmpty ? rpSect->GetFollow() : rpSect; while( pSect ) { - OSL_ENSURE( (pSect->Lower() && pSect->Lower()->IsColumnFrm()) || pSect->GetUpper()->IsFtnFrm(), + OSL_ENSURE( (pSect->Lower() && pSect->Lower()->IsColumnFrm()) || pSect->GetUpper()->IsFootnoteFrm(), "InsertEndnotes: Where's my column?" ); // i73332: Columned section in endnote @@ -868,17 +868,17 @@ static SwFtnFrm* lcl_FindEndnote( SwSectionFrm* &rpSect, bool &rbEmpty, while( pCol ) // check all columns { - SwFtnContFrm* pFtnCont = pCol->FindFtnCont(); - if( pFtnCont ) + SwFootnoteContFrm* pFootnoteCont = pCol->FindFootnoteCont(); + if( pFootnoteCont ) { - SwFtnFrm* pRet = static_cast<SwFtnFrm*>(pFtnCont->Lower()); + SwFootnoteFrm* pRet = static_cast<SwFootnoteFrm*>(pFootnoteCont->Lower()); while( pRet ) // look for endnotes { /* CollectEndNode can destroy pRet so we need to get the next early */ - SwFtnFrm* pRetNext = static_cast<SwFtnFrm*>(pRet->GetNext()); - if( pRet->GetAttr()->GetFtn().IsEndNote() ) + SwFootnoteFrm* pRetNext = static_cast<SwFootnoteFrm*>(pRet->GetNext()); + if( pRet->GetAttr()->GetFootnote().IsEndNote() ) { if( pRet->GetMaster() ) { @@ -933,16 +933,16 @@ void SwSectionFrm::CollectEndnotes( SwLayouter* pLayouter ) { OSL_ENSURE( IsColLocked(), "CollectEndnotes: You love the risk?" ); // i73332: Section in footnode does not have columns! - OSL_ENSURE( (Lower() && Lower()->IsColumnFrm()) || GetUpper()->IsFtnFrm(), "Where's my column?" ); + OSL_ENSURE( (Lower() && Lower()->IsColumnFrm()) || GetUpper()->IsFootnoteFrm(), "Where's my column?" ); SwSectionFrm* pSect = this; - SwFtnFrm* pFtn; + SwFootnoteFrm* pFootnote; bool bEmpty = false; // pSect is the last sectionfrm without endnotes or the this-pointer // the first sectionfrm with endnotes may be destroyed, when the endnotes // is cutted - while( 0 != (pFtn = lcl_FindEndnote( pSect, bEmpty, pLayouter )) ) - pLayouter->CollectEndnote( pFtn ); + while( 0 != (pFootnote = lcl_FindEndnote( pSect, bEmpty, pLayouter )) ) + pLayouter->CollectEndnote( pFootnote ); if( pLayouter->HasEndnotes() ) lcl_ColumnRefresh( this, true ); } @@ -985,18 +985,18 @@ void SwSectionFrm::_CheckClipping( bool bGrow, bool bMaximize ) // OD 03.11.2003 #i19737# - introduce local variable <bExtraCalc> to indicate // that a calculation has to be done beside the value of <bCalc>. bool bExtraCalc = false; - if( !bCalc && !bGrow && IsAnyNoteAtEnd() && !IsInFtn() ) + if( !bCalc && !bGrow && IsAnyNoteAtEnd() && !IsInFootnote() ) { SwSectionFrm *pSect = this; bool bEmpty = false; - SwLayoutFrm* pFtn = IsEndnAtEnd() ? + SwLayoutFrm* pFootnote = IsEndnAtEnd() ? lcl_FindEndnote( pSect, bEmpty, NULL ) : NULL; - if( pFtn ) + if( pFootnote ) { - pFtn = pFtn->FindFtnBossFrm(); - SwFrm* pTmp = FindLastCntnt( FINDMODE_LASTCNT ); + pFootnote = pFootnote->FindFootnoteBossFrm(); + SwFrm* pTmp = FindLastContent( FINDMODE_LASTCNT ); // OD 08.11.2002 #104840# - use <SwLayoutFrm::IsBefore(..)> - if ( pTmp && pFtn->IsBefore( pTmp->FindFtnBossFrm() ) ) + if ( pTmp && pFootnote->IsBefore( pTmp->FindFootnoteBossFrm() ) ) bExtraCalc = true; } else if( GetFollow() && !GetFollow()->ContainsAny() ) @@ -1033,13 +1033,13 @@ void SwSectionFrm::_CheckClipping( bool bGrow, bool bMaximize ) if( Lower()->IsColumnFrm() ) { lcl_ColumnRefresh( this, false ); - ::CalcCntnt( this ); + ::CalcContent( this ); } else { ChgLowersProp( aOldSz ); - if( !bMaximize && !IsCntntLocked() ) - ::CalcCntnt( this ); + if( !bMaximize && !IsContentLocked() ) + ::CalcContent( this ); } } } @@ -1182,8 +1182,8 @@ class ExtraFormatToPositionObjs // format content - first with collecting its foot-/endnotes before content // format, second without collecting its foot-/endnotes. - ::CalcCntnt( mpSectFrm ); - ::CalcCntnt( mpSectFrm, true ); + ::CalcContent( mpSectFrm ); + ::CalcContent( mpSectFrm, true ); // keep locked position of lower floating screen objects SwPageFrm* pPageFrm = mpSectFrm->FindPageFrm(); @@ -1225,7 +1225,7 @@ void SwSectionFrm::Format( const SwBorderAttrs *pAttr ) SwTwips nUpper = CalcUpperSpace(); // #109700# LRSpace for sections - const SvxLRSpaceItem& rLRSpace = GetFmt()->GetLRSpace(); + const SvxLRSpaceItem& rLRSpace = GetFormat()->GetLRSpace(); (this->*fnRect->fnSetXMargins)( rLRSpace.GetLeft(), rLRSpace.GetRight() ); if( nUpper != (this->*fnRect->fnGetTopMargin)() ) @@ -1261,8 +1261,8 @@ void SwSectionFrm::Format( const SwBorderAttrs *pAttr ) // and releases this position lock keeping on destruction. ExtraFormatToPositionObjs aExtraFormatToPosObjs( *this ); if ( !bMaximize && - GetFmt()->getIDocumentSettingAccess()->get(DocumentSettingId::CONSIDER_WRAP_ON_OBJECT_POSITION) && - !GetFmt()->GetBalancedColumns().GetValue() ) + GetFormat()->getIDocumentSettingAccess()->get(DocumentSettingId::CONSIDER_WRAP_ON_OBJECT_POSITION) && + !GetFormat()->GetBalancedColumns().GetValue() ) { aExtraFormatToPosObjs.FormatSectionToPositionObjs(); } @@ -1280,7 +1280,7 @@ void SwSectionFrm::Format( const SwBorderAttrs *pAttr ) (maFrm.*fnRect->fnSetWidth)( nWidth ); // #109700# LRSpace for sections - const SvxLRSpaceItem& rLRSpace = GetFmt()->GetLRSpace(); + const SvxLRSpaceItem& rLRSpace = GetFormat()->GetLRSpace(); (maPrt.*fnRect->fnSetWidth)( nWidth - rLRSpace.GetLeft() - rLRSpace.GetRight() ); @@ -1313,7 +1313,7 @@ void SwSectionFrm::Format( const SwBorderAttrs *pAttr ) } // #126020# - adjust check for empty section // #130797# - correct fix #126020# - while( HasFollow() && !GetFollow()->ContainsCntnt() && + while( HasFollow() && !GetFollow()->ContainsContent() && !GetFollow()->ContainsAny( true ) ) { SwFrm* pOld = GetFollow(); @@ -1332,13 +1332,13 @@ void SwSectionFrm::Format( const SwBorderAttrs *pAttr ) pFrm = static_cast<SwColumnFrm*>(pFrm)->Lower(); pFrm->Calc(); pFrm = static_cast<SwLayoutFrm*>(pFrm)->Lower(); - CalcFtnCntnt(); + CalcFootnoteContent(); } - // If we are in a columned frame which calls a CalcCntnt + // If we are in a columned frame which calls a CalcContent // in the FormatWidthCols, the content might need calculating if( pFrm && !pFrm->IsValid() && IsInFly() && FindFlyFrm()->IsColLocked() ) - ::CalcCntnt( this ); + ::CalcContent( this ); nRemaining += InnerHeight(); bMaximize = HasFollow(); } @@ -1385,20 +1385,20 @@ void SwSectionFrm::Format( const SwBorderAttrs *pAttr ) pFrm = static_cast<SwColumnFrm*>(pFrm)->Lower(); pFrm->Calc(); pFrm = static_cast<SwLayoutFrm*>(pFrm)->Lower(); - CalcFtnCntnt(); + CalcFootnoteContent(); } bool bUnderSz = false; while( pFrm ) { - if( pFrm->IsTxtFrm() && static_cast<SwTxtFrm*>(pFrm)->IsUndersized() ) + if( pFrm->IsTextFrm() && static_cast<SwTextFrm*>(pFrm)->IsUndersized() ) { pFrm->Prepare( PREP_ADJUST_FRM ); bUnderSz = true; } pFrm = pFrm->GetNext(); } - if( bUnderSz && !IsCntntLocked() ) - ::CalcCntnt( this ); + if( bUnderSz && !IsContentLocked() ) + ::CalcContent( this ); } } } @@ -1493,7 +1493,7 @@ SwLayoutFrm *SwFrm::GetNextSctLeaf( MakePageType eMakePage ) // Always end up in the same section: Body again inside Body etc. const bool bBody = IsInDocBody(); - const bool bFtnPage = FindPageFrm()->IsFtnPage(); + const bool bFootnotePage = FindPageFrm()->IsFootnotePage(); SwLayoutFrm *pLayLeaf; // A shortcut for TabFrms such that not all cells need to be visited @@ -1501,7 +1501,7 @@ SwLayoutFrm *SwFrm::GetNextSctLeaf( MakePageType eMakePage ) pLayLeaf = 0; else if( IsTabFrm() ) { - SwCntntFrm* pTmpCnt = static_cast<SwTabFrm*>(this)->FindLastCntnt(); + SwContentFrm* pTmpCnt = static_cast<SwTabFrm*>(this)->FindLastContent(); pLayLeaf = pTmpCnt ? pTmpCnt->GetUpper() : 0; } else @@ -1526,14 +1526,14 @@ SwLayoutFrm *SwFrm::GetNextSctLeaf( MakePageType eMakePage ) // another SectionFrm can be inserted here, or we have to continue // searching SwPageFrm* pNxtPg = pLayLeaf->FindPageFrm(); - if ( !bFtnPage && pNxtPg->IsFtnPage() ) + if ( !bFootnotePage && pNxtPg->IsFootnotePage() ) { // If I reached the end note pages it's over pLayLeaf = 0; continue; } // Once inBody always inBody, don't step into tables and not into other sections if ( (bBody && !pLayLeaf->IsInDocBody()) || - (IsInFtn() != pLayLeaf->IsInFtn() ) || + (IsInFootnote() != pLayLeaf->IsInFootnote() ) || pLayLeaf->IsInTab() || ( pLayLeaf->IsInSct() && ( !pSect->HasFollow() || pSect->GetFollow() != pLayLeaf->FindSctFrm() ) ) ) @@ -1597,15 +1597,15 @@ SwLayoutFrm *SwFrm::GetNextSctLeaf( MakePageType eMakePage ) if( pTmp && pTmp != pSect->GetFollow() ) { SwFlowFrm* pNxt; - SwCntntFrm* pNxtCntnt = NULL; - if( pTmp->IsCntntFrm() ) + SwContentFrm* pNxtContent = NULL; + if( pTmp->IsContentFrm() ) { - pNxt = static_cast<SwCntntFrm*>(pTmp); - pNxtCntnt = static_cast<SwCntntFrm*>(pTmp); + pNxt = static_cast<SwContentFrm*>(pTmp); + pNxtContent = static_cast<SwContentFrm*>(pTmp); } else { - pNxtCntnt = static_cast<SwLayoutFrm*>(pTmp)->ContainsCntnt(); + pNxtContent = static_cast<SwLayoutFrm*>(pTmp)->ContainsContent(); if( pTmp->IsSctFrm() ) pNxt = static_cast<SwSectionFrm*>(pTmp); else @@ -1613,23 +1613,23 @@ SwLayoutFrm *SwFrm::GetNextSctLeaf( MakePageType eMakePage ) OSL_ENSURE( pTmp->IsTabFrm(), "GetNextSctLeaf: Wrong Type" ); pNxt = static_cast<SwTabFrm*>(pTmp); } - while( !pNxtCntnt && 0 != ( pTmp = pTmp->GetNext() ) ) + while( !pNxtContent && 0 != ( pTmp = pTmp->GetNext() ) ) { - if( pTmp->IsCntntFrm() ) - pNxtCntnt = static_cast<SwCntntFrm*>(pTmp); + if( pTmp->IsContentFrm() ) + pNxtContent = static_cast<SwContentFrm*>(pTmp); else - pNxtCntnt = static_cast<SwLayoutFrm*>(pTmp)->ContainsCntnt(); + pNxtContent = static_cast<SwLayoutFrm*>(pTmp)->ContainsContent(); } } - if( pNxtCntnt ) + if( pNxtContent ) { - SwFtnBossFrm* pOldBoss = pSect->FindFtnBossFrm( true ); - if( pOldBoss == pNxtCntnt->FindFtnBossFrm( true ) ) + SwFootnoteBossFrm* pOldBoss = pSect->FindFootnoteBossFrm( true ); + if( pOldBoss == pNxtContent->FindFootnoteBossFrm( true ) ) { - SwSaveFtnHeight aHeight( pOldBoss, + SwSaveFootnoteHeight aHeight( pOldBoss, pOldBoss->Frm().Top() + pOldBoss->Frm().Height() ); - pSect->GetUpper()->MoveLowerFtns( pNxtCntnt, pOldBoss, - pLayLeaf->FindFtnBossFrm( true ), false ); + pSect->GetUpper()->MoveLowerFootnotes( pNxtContent, pOldBoss, + pLayLeaf->FindFootnoteBossFrm( true ), false ); } } pNxt->MoveSubTree( pLayLeaf, pNew->GetNext() ); @@ -1763,7 +1763,7 @@ SwLayoutFrm *SwFrm::GetPrevSctLeaf( MakePageType ) SwFlowFrm::SetMoveBwdJump( true ); } else if ( bFly ) - break; // Cntnts in Flys every layout sheet should be right. Why? + break; // Contents in Flys every layout sheet should be right. Why? else pLayLeaf = pLayLeaf->GetPrevLayoutLeaf(); } @@ -1874,10 +1874,10 @@ SwTwips SwSectionFrm::_Grow( SwTwips nDist, bool bTst ) if ( nDist <= 0L ) return 0L; - bool bInCalcCntnt = GetUpper() && IsInFly() && FindFlyFrm()->IsLocked(); + bool bInCalcContent = GetUpper() && IsInFly() && FindFlyFrm()->IsLocked(); // OD 2004-03-15 #116561# - allow grow in online layout bool bGrow = !Lower() || !Lower()->IsColumnFrm() || !Lower()->GetNext() || - GetSection()->GetFmt()->GetBalancedColumns().GetValue(); + GetSection()->GetFormat()->GetBalancedColumns().GetValue(); if( !bGrow ) { const SwViewShell *pSh = getRootFrm()->GetCurrShell(); @@ -1886,7 +1886,7 @@ SwTwips SwSectionFrm::_Grow( SwTwips nDist, bool bTst ) if( bGrow ) { SwTwips nGrow; - if( IsInFtn() ) + if( IsInFootnote() ) nGrow = 0; else { @@ -1895,7 +1895,7 @@ SwTwips SwSectionFrm::_Grow( SwTwips nDist, bool bTst ) (Frm().*fnRect->fnGetBottom)() ); } SwTwips nSpace = nGrow; - if( !bInCalcCntnt && nGrow < nDist && GetUpper() ) + if( !bInCalcContent && nGrow < nDist && GetUpper() ) nGrow += GetUpper()->Grow( LONG_MAX, true ); if( nGrow > nDist ) @@ -1905,7 +1905,7 @@ SwTwips SwSectionFrm::_Grow( SwTwips nDist, bool bTst ) nGrow = 0; if( nDist && !bTst ) { - if( bInCalcCntnt ) + if( bInCalcContent ) _InvalidateSize(); else InvalidateSize(); @@ -1913,7 +1913,7 @@ SwTwips SwSectionFrm::_Grow( SwTwips nDist, bool bTst ) } else if( !bTst ) { - if( bInCalcCntnt ) + if( bInCalcContent ) _InvalidateSize(); else if( nSpace < nGrow && nDist != nSpace + GetUpper()-> Grow( nGrow - nSpace, false ) ) @@ -1951,7 +1951,7 @@ SwTwips SwSectionFrm::_Grow( SwTwips nDist, bool bTst ) pFrm = pFrm->GetNext(); if( pFrm ) { - if( bInCalcCntnt ) + if( bInCalcContent ) pFrm->_InvalidatePos(); else pFrm->InvalidatePos(); @@ -1962,7 +1962,7 @@ SwTwips SwSectionFrm::_Grow( SwTwips nDist, bool bTst ) // was moved forward due to the positioning of its objects ). // Thus, invalivate this next frame, if document compatibility // option 'Consider wrapping style influence on object positioning' is ON. - else if ( GetFmt()->getIDocumentSettingAccess()->get(DocumentSettingId::CONSIDER_WRAP_ON_OBJECT_POSITION) ) + else if ( GetFormat()->getIDocumentSettingAccess()->get(DocumentSettingId::CONSIDER_WRAP_ON_OBJECT_POSITION) ) { InvalidateNextPos(); } @@ -1971,7 +1971,7 @@ SwTwips SwSectionFrm::_Grow( SwTwips nDist, bool bTst ) } if ( !bTst ) { - if( bInCalcCntnt ) + if( bInCalcContent ) _InvalidateSize(); else InvalidateSize(); @@ -1996,8 +1996,8 @@ SwTwips SwSectionFrm::_Shrink( SwTwips nDist, bool bTst ) if ( nDist > nFrmHeight ) nDist = nFrmHeight; - if ( Lower()->IsColumnFrm() && Lower()->GetNext() && // FtnAtEnd - !GetSection()->GetFmt()->GetBalancedColumns().GetValue() ) + if ( Lower()->IsColumnFrm() && Lower()->GetNext() && // FootnoteAtEnd + !GetSection()->GetFormat()->GetBalancedColumns().GetValue() ) { // With column bases the format takes over the control of the // growth (because of the balance) if ( !bTst ) @@ -2026,7 +2026,7 @@ SwTwips SwSectionFrm::_Shrink( SwTwips nDist, bool bTst ) // The footer frame does not grow in its FormatSize function // but during the calculation of the content of the section // frame. The section frame grows until some of its text is - // located on top of the fly frame. The next call of CalcCntnt + // located on top of the fly frame. The next call of CalcContent // tries to shrink the section and here it would also shrink // the footer. This may not happen, because shrinking the footer // would cause the top of the section frame to overlap with the @@ -2072,7 +2072,7 @@ SwTwips SwSectionFrm::_Shrink( SwTwips nDist, bool bTst ) |* GetNextLayout, in tables and headers/footers there is none, however in the |* DocBody and in foot notes there is always one. |* -|* This routine is used in the TxtFormatter to decided whether it's allowed to +|* This routine is used in the TextFormatter to decided whether it's allowed to |* create a (paragraph-)Follow or whether the paragraph has to stick together |*/ bool SwSectionFrm::MoveAllowed( const SwFrm* pFrm) const @@ -2081,9 +2081,9 @@ bool SwSectionFrm::MoveAllowed( const SwFrm* pFrm) const if( HasFollow() || ( pFrm->GetUpper()->IsColBodyFrm() && pFrm->GetUpper()->GetUpper()->GetNext() ) ) return true; - if( pFrm->IsInFtn() ) + if( pFrm->IsInFootnote() ) { - if( IsInFtn() ) + if( IsInFootnote() ) { if( GetUpper()->IsInSct() ) { @@ -2096,7 +2096,7 @@ bool SwSectionFrm::MoveAllowed( const SwFrm* pFrm) const } // The content of footnote inside a columned sectionfrm is moveable // except in the last column - const SwLayoutFrm *pLay = pFrm->FindFtnFrm()->GetUpper()->GetUpper(); + const SwLayoutFrm *pLay = pFrm->FindFootnoteFrm()->GetUpper()->GetUpper(); if( pLay->IsColumnFrm() && pLay->GetNext() ) { // The first paragraph in the first footnote in the first column @@ -2104,7 +2104,7 @@ bool SwSectionFrm::MoveAllowed( const SwFrm* pFrm) const // if the columnbody is empty. bool bRet = false; if( pLay->GetIndPrev() || pFrm->GetIndPrev() || - pFrm->FindFtnFrm()->GetPrev() ) + pFrm->FindFootnoteFrm()->GetPrev() ) bRet = true; else { @@ -2112,7 +2112,7 @@ bool SwSectionFrm::MoveAllowed( const SwFrm* pFrm) const if( pBody && pBody->Lower() ) bRet = true; } - if( bRet && ( IsFtnAtEnd() || !Growable() ) ) + if( bRet && ( IsFootnoteAtEnd() || !Growable() ) ) return true; } } @@ -2198,39 +2198,39 @@ SwFrm* SwFrm::_GetIndNext() return NULL; } -bool SwSectionFrm::IsDescendantFrom( const SwSectionFmt* pFmt ) const +bool SwSectionFrm::IsDescendantFrom( const SwSectionFormat* pFormat ) const { - if( !pSection || !pFmt ) + if( !pSection || !pFormat ) return false; - const SwSectionFmt *pMyFmt = pSection->GetFmt(); - while( pFmt != pMyFmt ) + const SwSectionFormat *pMyFormat = pSection->GetFormat(); + while( pFormat != pMyFormat ) { - if( pMyFmt->GetRegisteredIn()->ISA( SwSectionFmt ) ) - pMyFmt = static_cast<const SwSectionFmt*>(pMyFmt->GetRegisteredIn()); + if( pMyFormat->GetRegisteredIn()->ISA( SwSectionFormat ) ) + pMyFormat = static_cast<const SwSectionFormat*>(pMyFormat->GetRegisteredIn()); else return false; } return true; } -void SwSectionFrm::CalcFtnAtEndFlag() +void SwSectionFrm::CalcFootnoteAtEndFlag() { - SwSectionFmt *pFmt = GetSection()->GetFmt(); - sal_uInt16 nVal = pFmt->GetFtnAtTxtEnd( false ).GetValue(); - bFtnAtEnd = FTNEND_ATPGORDOCEND != nVal; - bOwnFtnNum = FTNEND_ATTXTEND_OWNNUMSEQ == nVal || + SwSectionFormat *pFormat = GetSection()->GetFormat(); + sal_uInt16 nVal = pFormat->GetFootnoteAtTextEnd( false ).GetValue(); + bFootnoteAtEnd = FTNEND_ATPGORDOCEND != nVal; + bOwnFootnoteNum = FTNEND_ATTXTEND_OWNNUMSEQ == nVal || FTNEND_ATTXTEND_OWNNUMANDFMT == nVal; - while( !bFtnAtEnd && !bOwnFtnNum ) + while( !bFootnoteAtEnd && !bOwnFootnoteNum ) { - if( pFmt->GetRegisteredIn()->ISA( SwSectionFmt ) ) - pFmt = static_cast<SwSectionFmt*>(pFmt->GetRegisteredIn()); + if( pFormat->GetRegisteredIn()->ISA( SwSectionFormat ) ) + pFormat = static_cast<SwSectionFormat*>(pFormat->GetRegisteredIn()); else break; - nVal = pFmt->GetFtnAtTxtEnd( false ).GetValue(); + nVal = pFormat->GetFootnoteAtTextEnd( false ).GetValue(); if( FTNEND_ATPGORDOCEND != nVal ) { - bFtnAtEnd = true; - bOwnFtnNum = bOwnFtnNum ||FTNEND_ATTXTEND_OWNNUMSEQ == nVal || + bFootnoteAtEnd = true; + bOwnFootnoteNum = bOwnFootnoteNum ||FTNEND_ATTXTEND_OWNNUMSEQ == nVal || FTNEND_ATTXTEND_OWNNUMANDFMT == nVal; } } @@ -2238,20 +2238,20 @@ void SwSectionFrm::CalcFtnAtEndFlag() bool SwSectionFrm::IsEndnoteAtMyEnd() const { - return pSection->GetFmt()->GetEndAtTxtEnd( false ).IsAtEnd(); + return pSection->GetFormat()->GetEndAtTextEnd( false ).IsAtEnd(); } void SwSectionFrm::CalcEndAtEndFlag() { - SwSectionFmt *pFmt = GetSection()->GetFmt(); - bEndnAtEnd = pFmt->GetEndAtTxtEnd( false ).IsAtEnd(); + SwSectionFormat *pFormat = GetSection()->GetFormat(); + bEndnAtEnd = pFormat->GetEndAtTextEnd( false ).IsAtEnd(); while( !bEndnAtEnd ) { - if( pFmt->GetRegisteredIn()->ISA( SwSectionFmt ) ) - pFmt = static_cast<SwSectionFmt*>(pFmt->GetRegisteredIn()); + if( pFormat->GetRegisteredIn()->ISA( SwSectionFormat ) ) + pFormat = static_cast<SwSectionFormat*>(pFormat->GetRegisteredIn()); else break; - bEndnAtEnd = pFmt->GetEndAtTxtEnd( false ).IsAtEnd(); + bEndnAtEnd = pFormat->GetEndAtTextEnd( false ).IsAtEnd(); } } @@ -2298,7 +2298,7 @@ void SwSectionFrm::SwClientNotify( const SwModify& rMod, const SfxHint& rHint ) dynamic_cast<const SwSectionFrmMoveAndDeleteHint*>(&rHint); if ( pHint && pHint->GetId() == SFX_HINT_DYING && &rMod == GetRegisteredIn() ) { - SwSectionFrm::MoveCntntAndDelete( this, pHint->IsSaveCntnt() ); + SwSectionFrm::MoveContentAndDelete( this, pHint->IsSaveContent() ); } } @@ -2312,13 +2312,13 @@ void SwSectionFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew { // Suppress multi columns in foot notes case RES_FMT_CHG: { - const SwFmtCol& rNewCol = GetFmt()->GetCol(); - if( !IsInFtn() ) + const SwFormatCol& rNewCol = GetFormat()->GetCol(); + if( !IsInFootnote() ) { // Nasty case. When allocating a template we can not count // on the old column attribute. We're left with creating a // temporary attribute here. - SwFmtCol aCol; + SwFormatCol aCol; if ( Lower() && Lower()->IsColumnFrm() ) { sal_uInt16 nCol = 0; @@ -2329,15 +2329,15 @@ void SwSectionFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew } while ( pTmp ); aCol.Init( nCol, 0, 1000 ); } - bool bChgFtn = IsFtnAtEnd(); + bool bChgFootnote = IsFootnoteAtEnd(); bool const bChgEndn = IsEndnAtEnd(); bool const bChgMyEndn = IsEndnoteAtMyEnd(); - CalcFtnAtEndFlag(); + CalcFootnoteAtEndFlag(); CalcEndAtEndFlag(); - bChgFtn = ( bChgFtn != IsFtnAtEnd() ) || + bChgFootnote = ( bChgFootnote != IsFootnoteAtEnd() ) || ( bChgEndn != IsEndnAtEnd() ) || ( bChgMyEndn != IsEndnoteAtMyEnd() ); - ChgColumns( aCol, rNewCol, bChgFtn ); + ChgColumns( aCol, rNewCol, bChgFootnote ); rInvFlags |= 0x10; } rInvFlags |= 0x01; @@ -2346,25 +2346,25 @@ void SwSectionFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew break; case RES_COL: - if( !IsInFtn() ) + if( !IsInFootnote() ) { assert(pOld && pNew); if (pOld && pNew) { - ChgColumns( *static_cast<const SwFmtCol*>(pOld), *static_cast<const SwFmtCol*>(pNew) ); + ChgColumns( *static_cast<const SwFormatCol*>(pOld), *static_cast<const SwFormatCol*>(pNew) ); rInvFlags |= 0x11; } } break; case RES_FTN_AT_TXTEND: - if( !IsInFtn() ) + if( !IsInFootnote() ) { - bool const bOld = IsFtnAtEnd(); - CalcFtnAtEndFlag(); - if (bOld != IsFtnAtEnd()) + bool const bOld = IsFootnoteAtEnd(); + CalcFootnoteAtEndFlag(); + if (bOld != IsFootnoteAtEnd()) { - const SwFmtCol& rNewCol = GetFmt()->GetCol(); + const SwFormatCol& rNewCol = GetFormat()->GetCol(); ChgColumns( rNewCol, rNewCol, true ); rInvFlags |= 0x01; } @@ -2372,14 +2372,14 @@ void SwSectionFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew break; case RES_END_AT_TXTEND: - if( !IsInFtn() ) + if( !IsInFootnote() ) { bool const bOld = IsEndnAtEnd(); bool const bMyOld = IsEndnoteAtMyEnd(); CalcEndAtEndFlag(); if (bOld != IsEndnAtEnd() || bMyOld != IsEndnoteAtMyEnd()) { - const SwFmtCol& rNewCol = GetFmt()->GetCol(); + const SwFormatCol& rNewCol = GetFormat()->GetCol(); ChgColumns( rNewCol, rNewCol, true ); rInvFlags |= 0x01; } @@ -2432,9 +2432,9 @@ bool SwSectionFrm::ToMaximize( bool bCheckFollow ) const if( pFoll ) return true; } - if( IsFtnAtEnd() ) + if( IsFootnoteAtEnd() ) return false; - const SwFtnContFrm* pCont = ContainsFtnCont(); + const SwFootnoteContFrm* pCont = ContainsFootnoteCont(); if( !IsEndnAtEnd() ) return 0 != pCont; bool bRet = false; @@ -2443,20 +2443,20 @@ bool SwSectionFrm::ToMaximize( bool bCheckFollow ) const if( pCont->FindFootNote() ) bRet = true; else - pCont = ContainsFtnCont( pCont ); + pCont = ContainsFootnoteCont( pCont ); } return bRet; } -/// Check every Column for FtnContFrms. -SwFtnContFrm* SwSectionFrm::ContainsFtnCont( const SwFtnContFrm* pCont ) const +/// Check every Column for FootnoteContFrms. +SwFootnoteContFrm* SwSectionFrm::ContainsFootnoteCont( const SwFootnoteContFrm* pCont ) const { - SwFtnContFrm* pRet = NULL; + SwFootnoteContFrm* pRet = NULL; const SwLayoutFrm* pLay; if( pCont ) { - pLay = pCont->FindFtnBossFrm( false ); - OSL_ENSURE( IsAnLower( pLay ), "ConatainsFtnCont: Wrong FtnContainer" ); + pLay = pCont->FindFootnoteBossFrm( false ); + OSL_ENSURE( IsAnLower( pLay ), "ConatainsFootnoteCont: Wrong FootnoteContainer" ); pLay = static_cast<const SwLayoutFrm*>(pLay->GetNext()); } else if( Lower() && Lower()->IsColumnFrm() ) @@ -2467,9 +2467,9 @@ SwFtnContFrm* SwSectionFrm::ContainsFtnCont( const SwFtnContFrm* pCont ) const { if( pLay->Lower() && pLay->Lower()->GetNext() ) { - OSL_ENSURE( pLay->Lower()->GetNext()->IsFtnContFrm(), + OSL_ENSURE( pLay->Lower()->GetNext()->IsFootnoteContFrm(), "ToMaximize: Unexpected Frame" ); - pRet = const_cast<SwFtnContFrm*>(static_cast<const SwFtnContFrm*>(pLay->Lower()->GetNext())); + pRet = const_cast<SwFootnoteContFrm*>(static_cast<const SwFootnoteContFrm*>(pLay->Lower()->GetNext())); } OSL_ENSURE( !pLay->GetNext() || pLay->GetNext()->IsLayoutFrm(), "ToMaximize: ColFrm expected" ); @@ -2478,19 +2478,19 @@ SwFtnContFrm* SwSectionFrm::ContainsFtnCont( const SwFtnContFrm* pCont ) const return pRet; } -void SwSectionFrm::InvalidateFtnPos() +void SwSectionFrm::InvalidateFootnotePos() { - SwFtnContFrm* pCont = ContainsFtnCont( NULL ); + SwFootnoteContFrm* pCont = ContainsFootnoteCont( NULL ); if( pCont ) { - SwFrm *pTmp = pCont->ContainsCntnt(); + SwFrm *pTmp = pCont->ContainsContent(); if( pTmp ) pTmp->_InvalidatePos(); } } /** Returns the value that the section would like to be - * greater if it has undersized TxtFrms in it, + * greater if it has undersized TextFrms in it, * otherwise Null. * If necessary the undersized-flag is corrected. */ @@ -2506,9 +2506,9 @@ long SwSectionFrm::Undersize( bool bOverSize ) return nRet; } -void SwSectionFrm::CalcFtnCntnt() +void SwSectionFrm::CalcFootnoteContent() { - SwFtnContFrm* pCont = ContainsFtnCont(); + SwFootnoteContFrm* pCont = ContainsFootnoteCont(); if( pCont ) { SwFrm* pFrm = pCont->ContainsAny(); @@ -2516,9 +2516,9 @@ void SwSectionFrm::CalcFtnCntnt() pCont->Calc(); while( pFrm && IsAnLower( pFrm ) ) { - SwFtnFrm* pFtn = pFrm->FindFtnFrm(); - if( pFtn ) - pFtn->Calc(); + SwFootnoteFrm* pFootnote = pFrm->FindFootnoteFrm(); + if( pFootnote ) + pFootnote->Calc(); pFrm->Calc(); if( pFrm->IsSctFrm() ) { @@ -2562,7 +2562,7 @@ void SwRootFrm::_DeleteEmptySct() mpDestroy->erase( mpDestroy->begin() ); OSL_ENSURE( !pSect->IsColLocked() && !pSect->IsJoinLocked(), "DeleteEmptySct: Locked SectionFrm" ); - if( !pSect->Frm().HasArea() && !pSect->ContainsCntnt() ) + if( !pSect->Frm().HasArea() && !pSect->ContainsContent() ) { SwLayoutFrm* pUp = pSect->GetUpper(); pSect->RemoveFromLayout(); @@ -2571,7 +2571,7 @@ void SwRootFrm::_DeleteEmptySct() { if( pUp->IsPageBodyFrm() ) pUp->getRootFrm()->SetSuperfluous(); - else if( pUp->IsFtnFrm() && !pUp->IsColLocked() && + else if( pUp->IsFootnoteFrm() && !pUp->IsColLocked() && pUp->GetUpper() ) { pUp->Cut(); @@ -2603,7 +2603,7 @@ bool SwSectionFrm::IsBalancedSection() const bool bRet = false; if ( GetSection() && Lower() && Lower()->IsColumnFrm() && Lower()->GetNext() ) { - bRet = !GetSection()->GetFmt()->GetBalancedColumns().GetValue(); + bRet = !GetSection()->GetFormat()->GetBalancedColumns().GetValue(); } return bRet; } diff --git a/sw/source/core/layout/softpagebreak.cxx b/sw/source/core/layout/softpagebreak.cxx index 96f91903ddfb..dcf25b321b21 100644 --- a/sw/source/core/layout/softpagebreak.cxx +++ b/sw/source/core/layout/softpagebreak.cxx @@ -25,10 +25,10 @@ #include "tabfrm.hxx" #include <calbck.hxx> -void SwTxtNode::fillSoftPageBreakList( SwSoftPageBreakList& rBreak ) const +void SwTextNode::fillSoftPageBreakList( SwSoftPageBreakList& rBreak ) const { - SwIterator<SwTxtFrm,SwTxtNode> aIter( *this ); - for( const SwTxtFrm *pFrm = aIter.First(); pFrm; pFrm = aIter.Next() ) + SwIterator<SwTextFrm,SwTextNode> aIter( *this ); + for( const SwTextFrm *pFrm = aIter.First(); pFrm; pFrm = aIter.Next() ) { // No soft page break in header or footer if( pFrm->FindFooterOrHeader() || pFrm->IsInFly() ) @@ -40,7 +40,7 @@ void SwTxtNode::fillSoftPageBreakList( SwSoftPageBreakList& rBreak ) const // No soft page break at the first page if( pPage && pPage->GetPrev() ) { - const SwCntntFrm* pFirst2 = pPage->FindFirstBodyCntnt(); + const SwContentFrm* pFirst2 = pPage->FindFirstBodyContent(); // Special handling for content frame in table frames if( pFrm->IsInTab() ) { @@ -75,7 +75,7 @@ void SwTxtNode::fillSoftPageBreakList( SwSoftPageBreakList& rBreak ) const const SwFrm* pCell = pRow->Lower(); while( pCell ) { - pFirst2 = static_cast<const SwLayoutFrm*>(pCell)->ContainsCntnt(); + pFirst2 = static_cast<const SwLayoutFrm*>(pCell)->ContainsContent(); if( pFirst2 == pFrm ) { // Here we are: a first content inside a cell // inside the splitted row => soft page break @@ -96,9 +96,9 @@ void SwTxtNode::fillSoftPageBreakList( SwSoftPageBreakList& rBreak ) const bool SwTableLine::hasSoftPageBreak() const { // No soft page break for sub tables - if( GetUpper() || !GetFrmFmt() ) + if( GetUpper() || !GetFrameFormat() ) return false; - SwIterator<SwRowFrm,SwFmt> aIter( *GetFrmFmt() ); + SwIterator<SwRowFrm,SwFormat> aIter( *GetFrameFormat() ); for( SwRowFrm* pLast = aIter.First(); pLast; pLast = aIter.Next() ) { if( pLast->GetTabLine() == this ) @@ -118,7 +118,7 @@ bool SwTableLine::hasSoftPageBreak() const // No soft page break at the first page of the document if( pPage && !pPage->GetPrev() ) return false; - const SwCntntFrm* pFirst = pPage ? pPage->FindFirstBodyCntnt() : NULL; + const SwContentFrm* pFirst = pPage ? pPage->FindFirstBodyContent() : NULL; // No soft page break for // tables which does not contain the first body content of the page if( !pFirst || !pTab->IsAnLower( pFirst->FindTabFrm() ) ) diff --git a/sw/source/core/layout/sortedobjs.cxx b/sw/source/core/layout/sortedobjs.cxx index 5893a4823822..ea26372c06f3 100644 --- a/sw/source/core/layout/sortedobjs.cxx +++ b/sw/source/core/layout/sortedobjs.cxx @@ -78,12 +78,12 @@ struct ObjAnchorOrder const SwAnchoredObject* _pNewAnchoredObj ) { // get attributes of listed object - const SwFrmFmt& rFmtListed = _pListedAnchoredObj->GetFrmFmt(); - const SwFmtAnchor* pAnchorListed = &(rFmtListed.GetAnchor()); + const SwFrameFormat& rFormatListed = _pListedAnchoredObj->GetFrameFormat(); + const SwFormatAnchor* pAnchorListed = &(rFormatListed.GetAnchor()); // get attributes of new object - const SwFrmFmt& rFmtNew = _pNewAnchoredObj->GetFrmFmt(); - const SwFmtAnchor* pAnchorNew = &(rFmtNew.GetAnchor()); + const SwFrameFormat& rFormatNew = _pNewAnchoredObj->GetFrameFormat(); + const SwFormatAnchor* pAnchorNew = &(rFormatNew.GetAnchor()); // check for to-page anchored objects if ((pAnchorListed->GetAnchorId() == FLY_AT_PAGE) && @@ -122,24 +122,24 @@ struct ObjAnchorOrder // Both objects aren't anchor to page or to fly // Thus, compare content anchor nodes, if existing. - const SwPosition* pCntntAnchorListed = pAnchorListed->GetCntntAnchor(); - const SwPosition* pCntntAnchorNew = pAnchorNew->GetCntntAnchor(); - if ( pCntntAnchorListed && pCntntAnchorNew && - pCntntAnchorListed->nNode != pCntntAnchorNew->nNode ) + const SwPosition* pContentAnchorListed = pAnchorListed->GetContentAnchor(); + const SwPosition* pContentAnchorNew = pAnchorNew->GetContentAnchor(); + if ( pContentAnchorListed && pContentAnchorNew && + pContentAnchorListed->nNode != pContentAnchorNew->nNode ) { - return pCntntAnchorListed->nNode < pCntntAnchorNew->nNode; + return pContentAnchorListed->nNode < pContentAnchorNew->nNode; } // objects anchored at the same content. // --> OD 2006-11-29 #???# - objects have to be ordered by anchor node position // Thus, compare content anchor node positions and anchor type, // if not anchored at-paragraph - if (pCntntAnchorListed && pCntntAnchorNew) + if (pContentAnchorListed && pContentAnchorNew) { sal_Int32 nListedIndex = pAnchorListed->GetAnchorId() != FLY_AT_PARA ? - pCntntAnchorListed->nContent.GetIndex() : 0; + pContentAnchorListed->nContent.GetIndex() : 0; sal_Int32 nNewIndex = pAnchorNew->GetAnchorId() != FLY_AT_PARA ? - pCntntAnchorNew->nContent.GetIndex() : 0; + pContentAnchorNew->nContent.GetIndex() : 0; if (nListedIndex != nNewIndex) { return nListedIndex < nNewIndex; @@ -156,15 +156,15 @@ struct ObjAnchorOrder // objects anchored at the same content and at the same content anchor // node position with the same anchor type // Thus, compare its wrapping style including its layer - const IDocumentDrawModelAccess* pIDDMA = rFmtListed.getIDocumentDrawModelAccess(); + const IDocumentDrawModelAccess* pIDDMA = rFormatListed.getIDocumentDrawModelAccess(); const SdrLayerID nHellId = pIDDMA->GetHellId(); const SdrLayerID nInvisibleHellId = pIDDMA->GetInvisibleHellId(); const bool bWrapThroughOrHellListed = - rFmtListed.GetSurround().GetSurround() == SURROUND_THROUGHT || + rFormatListed.GetSurround().GetSurround() == SURROUND_THROUGHT || _pListedAnchoredObj->GetDrawObj()->GetLayer() == nHellId || _pListedAnchoredObj->GetDrawObj()->GetLayer() == nInvisibleHellId; const bool bWrapThroughOrHellNew = - rFmtNew.GetSurround().GetSurround() == SURROUND_THROUGHT || + rFormatNew.GetSurround().GetSurround() == SURROUND_THROUGHT || _pNewAnchoredObj->GetDrawObj()->GetLayer() == nHellId || _pNewAnchoredObj->GetDrawObj()->GetLayer() == nInvisibleHellId; if ( bWrapThroughOrHellListed != bWrapThroughOrHellNew ) @@ -181,10 +181,10 @@ struct ObjAnchorOrder // objects anchored at the same content with a set text wrapping // Thus, compare wrap influences on object position - const SwFmtWrapInfluenceOnObjPos* pWrapInfluenceOnObjPosListed = - &(rFmtListed.GetWrapInfluenceOnObjPos()); - const SwFmtWrapInfluenceOnObjPos* pWrapInfluenceOnObjPosNew = - &(rFmtNew.GetWrapInfluenceOnObjPos()); + const SwFormatWrapInfluenceOnObjPos* pWrapInfluenceOnObjPosListed = + &(rFormatListed.GetWrapInfluenceOnObjPos()); + const SwFormatWrapInfluenceOnObjPos* pWrapInfluenceOnObjPosNew = + &(rFormatNew.GetWrapInfluenceOnObjPos()); // #i35017# - handle ITERATIVE as ONCE_SUCCESSIVE if ( pWrapInfluenceOnObjPosListed->GetWrapInfluenceOnObjPos( true ) != pWrapInfluenceOnObjPosNew->GetWrapInfluenceOnObjPos( true ) ) diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx index 8844a386c3a3..a29b09ea844d 100644 --- a/sw/source/core/layout/ssfrm.cxx +++ b/sw/source/core/layout/ssfrm.cxx @@ -214,19 +214,19 @@ void SwFrm::CheckDirChange() }; SwTableLine* pLine = const_cast<SwTableLine*>(static_cast<SwCellFrm*>(this)->GetTabBox()->GetUpper()); - SwFrmFmt* pFrmFmt = pLine->GetFrmFmt(); - SwFmtFrmSize aNew( pFrmFmt->GetFrmSize() ); + SwFrameFormat* pFrameFormat = pLine->GetFrameFormat(); + SwFormatFrmSize aNew( pFrameFormat->GetFrmSize() ); if ( ATT_FIX_SIZE != aNew.GetHeightSizeType() ) aNew.SetHeightSizeType( ATT_MIN_SIZE ); if ( aNew.GetHeight() < MIN_VERT_CELL_HEIGHT ) aNew.SetHeight( MIN_VERT_CELL_HEIGHT ); - SwDoc* pDoc = pFrmFmt->GetDoc(); - pDoc->SetAttr( aNew, *pLine->ClaimFrmFmt() ); + SwDoc* pDoc = pFrameFormat->GetDoc(); + pDoc->SetAttr( aNew, *pLine->ClaimFrameFormat() ); } } SwFrm* pFrm = static_cast<SwLayoutFrm*>(this)->Lower(); - const SwFmtCol* pCol = NULL; + const SwFormatCol* pCol = NULL; SwLayoutFrm* pBody = 0; if( pFrm ) { @@ -236,14 +236,14 @@ void SwFrm::CheckDirChange() // we have to look for columns and rearrange them. pBody = static_cast<SwPageFrm*>(this)->FindBodyCont(); if(pBody && pBody->Lower() && pBody->Lower()->IsColumnFrm()) - pCol = &static_cast<SwPageFrm*>(this)->GetFmt()->GetCol(); + pCol = &static_cast<SwPageFrm*>(this)->GetFormat()->GetCol(); } else if( pFrm->IsColumnFrm() ) { pBody = static_cast<SwLayoutFrm*>(this); - const SwFrmFmt *pFmt = pBody->GetFmt(); - if( pFmt ) - pCol = &pFmt->GetCol(); + const SwFrameFormat *pFormat = pBody->GetFormat(); + if( pFormat ) + pCol = &pFormat->GetCol(); } } while( pFrm ) @@ -254,8 +254,8 @@ void SwFrm::CheckDirChange() if( pCol ) pBody->AdjustColumns( pCol, true ); } - else if( IsTxtFrm() ) - static_cast<SwTxtFrm*>(this)->Prepare( PREP_CLEAR ); + else if( IsTextFrm() ) + static_cast<SwTextFrm*>(this)->Prepare( PREP_CLEAR ); // #i31698# - notify anchored objects also for page frames. // Remove code above for special handling of page frames @@ -296,10 +296,10 @@ Point SwFrm::GetFrmAnchorPos( bool bIgnoreFlysAnchoredAtThisFrame ) const if ( ( IsVertical() && !IsVertLR() ) || IsRightToLeft() ) aAnchor.X() += Frm().Width(); - if ( IsTxtFrm() ) + if ( IsTextFrm() ) { SwTwips nBaseOfstForFly = - static_cast<const SwTxtFrm*>(this)->GetBaseOfstForFly( bIgnoreFlysAnchoredAtThisFrame ); + static_cast<const SwTextFrm*>(this)->GetBaseOfstForFly( bIgnoreFlysAnchoredAtThisFrame ); if ( IsVertical() ) aAnchor.Y() += nBaseOfstForFly; else @@ -308,9 +308,9 @@ Point SwFrm::GetFrmAnchorPos( bool bIgnoreFlysAnchoredAtThisFrame ) const // OD 2004-03-10 #i11860# - if option 'Use former object positioning' // is OFF, consider the lower space and the line spacing of the // previous frame and the spacing considered for the page grid - const SwTxtFrm* pThisTxtFrm = static_cast<const SwTxtFrm*>(this); + const SwTextFrm* pThisTextFrm = static_cast<const SwTextFrm*>(this); const SwTwips nUpperSpaceAmountConsideredForPrevFrmAndPageGrid = - pThisTxtFrm->GetUpperSpaceAmountConsideredForPrevFrmAndPageGrid(); + pThisTextFrm->GetUpperSpaceAmountConsideredForPrevFrmAndPageGrid(); if ( IsVertical() ) { aAnchor.X() -= nUpperSpaceAmountConsideredForPrevFrmAndPageGrid; @@ -391,37 +391,37 @@ void SwFrm::DestroyFrm(SwFrm *const pFrm) } } -const SwFrmFmt * SwLayoutFrm::GetFmt() const +const SwFrameFormat * SwLayoutFrm::GetFormat() const { - return static_cast< const SwFrmFmt * >( GetDep() ); + return static_cast< const SwFrameFormat * >( GetDep() ); } -SwFrmFmt * SwLayoutFrm::GetFmt() +SwFrameFormat * SwLayoutFrm::GetFormat() { - return static_cast< SwFrmFmt * >( GetDep() ); + return static_cast< SwFrameFormat * >( GetDep() ); } -void SwLayoutFrm::SetFrmFmt( SwFrmFmt *pNew ) +void SwLayoutFrm::SetFrameFormat( SwFrameFormat *pNew ) { - if ( pNew != GetFmt() ) + if ( pNew != GetFormat() ) { - SwFmtChg aOldFmt( GetFmt() ); + SwFormatChg aOldFormat( GetFormat() ); pNew->Add( this ); - SwFmtChg aNewFmt( pNew ); - ModifyNotification( &aOldFmt, &aNewFmt ); + SwFormatChg aNewFormat( pNew ); + ModifyNotification( &aOldFormat, &aNewFormat ); } } -SwCntntFrm::SwCntntFrm( SwCntntNode * const pCntnt, SwFrm* pSib ) : - SwFrm( pCntnt, pSib ), +SwContentFrm::SwContentFrm( SwContentNode * const pContent, SwFrm* pSib ) : + SwFrm( pContent, pSib ), SwFlowFrm( (SwFrm&)*this ) { } -void SwCntntFrm::DestroyImpl() +void SwContentFrm::DestroyImpl() { - const SwCntntNode* pCNd; - if( 0 != ( pCNd = PTR_CAST( SwCntntNode, GetRegisteredIn() )) && + const SwContentNode* pCNd; + if( 0 != ( pCNd = PTR_CAST( SwContentNode, GetRegisteredIn() )) && !pCNd->GetDoc()->IsInDtor() ) { //Unregister from root if I'm still in turbo there. @@ -436,11 +436,11 @@ void SwCntntFrm::DestroyImpl() SwFrm::DestroyImpl(); } -SwCntntFrm::~SwCntntFrm() +SwContentFrm::~SwContentFrm() { } -void SwCntntFrm::RegisterToNode( SwCntntNode& rNode ) +void SwContentFrm::RegisterToNode( SwContentNode& rNode ) { rNode.Add( this ); } @@ -457,7 +457,7 @@ void SwLayoutFrm::DestroyImpl() SwFrm *pFrm = m_pLower; - if( GetFmt() && !GetFmt()->GetDoc()->IsInDtor() ) + if( GetFormat() && !GetFormat()->GetDoc()->IsInDtor() ) { while ( pFrm ) { @@ -683,9 +683,9 @@ const SwRect SwFrm::UnionFrm( bool bBorder ) const nAdd += rShadow.CalcShadowSpace( SvxShadowItemSide::RIGHT ); } } - if( IsTxtFrm() && static_cast<const SwTxtFrm*>(this)->HasPara() ) + if( IsTextFrm() && static_cast<const SwTextFrm*>(this)->HasPara() ) { - long nTmp = static_cast<const SwTxtFrm*>(this)->HangingMargin(); + long nTmp = static_cast<const SwTextFrm*>(this)->HangingMargin(); if( nTmp > nAdd ) nAdd = nTmp; } diff --git a/sw/source/core/layout/swselectionlist.cxx b/sw/source/core/layout/swselectionlist.cxx index a3613f20cb2c..ac71d89c2841 100644 --- a/sw/source/core/layout/swselectionlist.cxx +++ b/sw/source/core/layout/swselectionlist.cxx @@ -33,7 +33,7 @@ namespace { - the SwRootFrm if the frame is part of a page body - the SwHeaderFrm if the frame is part of a page header - the SwFooterFrm if the frame is part of a page footer - - the (master) SwFtnFrm if the frame is part of footnote + - the (master) SwFootnoteFrm if the frame is part of footnote - the (first) SwFlyFrm if the frame is part of a (linked) fly frame @param pFrm @@ -54,11 +54,11 @@ namespace { pFly = pFly->GetPrevLink(); break; } - if( pFrm->IsFtnFrm() ) + if( pFrm->IsFootnoteFrm() ) { - const SwFtnFrm* pFtn = static_cast<const SwFtnFrm*>( pFrm ); - while( pFtn->GetMaster() ) - pFtn = pFtn->GetMaster(); + const SwFootnoteFrm* pFootnote = static_cast<const SwFootnoteFrm*>( pFrm ); + while( pFootnote->GetMaster() ) + pFootnote = pFootnote->GetMaster(); break; } pFrm = pFrm->GetUpper(); diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx index fe60fdad4316..879bdff06afd 100644 --- a/sw/source/core/layout/tabfrm.cxx +++ b/sw/source/core/layout/tabfrm.cxx @@ -59,7 +59,7 @@ using namespace ::com::sun::star; SwTabFrm::SwTabFrm( SwTable &rTab, SwFrm* pSib ) - : SwLayoutFrm( rTab.GetFrmFmt(), pSib ) + : SwLayoutFrm( rTab.GetFrameFormat(), pSib ) , SwFlowFrm( static_cast<SwFrm&>(*this) ) , m_pTable( &rTab ) , m_bComplete(false) @@ -97,7 +97,7 @@ SwTabFrm::SwTabFrm( SwTable &rTab, SwFrm* pSib ) } SwTabFrm::SwTabFrm( SwTabFrm &rTab ) - : SwLayoutFrm( rTab.GetFmt(), &rTab ) + : SwLayoutFrm( rTab.GetFormat(), &rTab ) , SwFlowFrm( static_cast<SwFrm&>(*this) ) , m_pTable( rTab.GetTable() ) , m_bComplete(false) @@ -297,12 +297,12 @@ static void lcl_InvalidateLowerObjs( SwLayoutFrm& _rLayoutFrm, // that anchored object is correctly positioned. pAnchoredObj->ClearCharRectAndTopOfLine(); pAnchoredObj->SetCurrRelPos( Point( 0, 0 ) ); - if ( pAnchoredObj->GetFrmFmt().GetAnchor().GetAnchorId() + if ( pAnchoredObj->GetFrameFormat().GetAnchor().GetAnchorId() == FLY_AS_CHAR ) { pAnchoredObj->AnchorFrm() ->Prepare( PREP_FLY_ATTR_CHG, - &(pAnchoredObj->GetFrmFmt()) ); + &(pAnchoredObj->GetFrameFormat()) ); } if ( pAnchoredObj->ISA(SwFlyFrm) ) { @@ -434,7 +434,7 @@ static void lcl_MoveRowContent( SwRowFrm& rSourceLine, SwRowFrm& rDestLine ) } else { - SwFrm *pTmp = ::SaveCntnt( pCurrSourceCell ); + SwFrm *pTmp = ::SaveContent( pCurrSourceCell ); if ( pTmp ) { // NEW TABLES @@ -444,7 +444,7 @@ static void lcl_MoveRowContent( SwRowFrm& rSourceLine, SwRowFrm& rDestLine ) // Find last content SwFrm* pFrm = pDestCell->GetLastLower(); - ::RestoreCntnt( pTmp, pDestCell, pFrm, true ); + ::RestoreContent( pTmp, pDestCell, pFrm, true ); } } pCurrDestCell = static_cast<SwCellFrm*>(pCurrDestCell->GetNext()); @@ -456,11 +456,11 @@ static void lcl_MoveRowContent( SwRowFrm& rSourceLine, SwRowFrm& rDestLine ) // the footnote boss of rSource to the footnote boss of rDest. static void lcl_MoveFootnotes( SwTabFrm& rSource, SwTabFrm& rDest, SwLayoutFrm& rRowFrm ) { - if ( !rSource.GetFmt()->GetDoc()->GetFtnIdxs().empty() ) + if ( !rSource.GetFormat()->GetDoc()->GetFootnoteIdxs().empty() ) { - SwFtnBossFrm* pOldBoss = rSource.FindFtnBossFrm( true ); - SwFtnBossFrm* pNewBoss = rDest.FindFtnBossFrm( true ); - rRowFrm.MoveLowerFtns( 0, pOldBoss, pNewBoss, true ); + SwFootnoteBossFrm* pOldBoss = rSource.FindFootnoteBossFrm( true ); + SwFootnoteBossFrm* pNewBoss = rDest.FindFootnoteBossFrm( true ); + rRowFrm.MoveLowerFootnotes( 0, pOldBoss, pNewBoss, true ); } } @@ -525,7 +525,7 @@ static void lcl_PreprocessRowsInCells( SwTabFrm& rTab, SwRowFrm& rLastLine, pCell = pCell->GetNext(); } - const SwFmtFrmSize &rSz = pTmpLastLineRow->GetFmt()->GetFrmSize(); + const SwFormatFrmSize &rSz = pTmpLastLineRow->GetFormat()->GetFrmSize(); if ( rSz.GetHeightSizeType() == ATT_MIN_SIZE ) nMinHeight = std::max( nMinHeight, rSz.GetHeight() ); } @@ -580,7 +580,7 @@ static void lcl_PostprocessRowsInCells( SwTabFrm& rTab, SwRowFrm& rLastLine ) { SwRowFrm* pRowFrm = static_cast<SwRowFrm*>(pCurrMasterCell->GetLastLower()); - if ( NULL != pRowFrm->GetPrev() && !pRowFrm->ContainsCntnt() ) + if ( NULL != pRowFrm->GetPrev() && !pRowFrm->ContainsContent() ) { OSL_ENSURE( pRowFrm->GetFollowRow(), "Deleting row frame without follow" ); @@ -692,7 +692,7 @@ static bool lcl_RecalcSplitLine( SwRowFrm& rLastLine, SwRowFrm& rFollowLine, SwCellFrm* pCurrMasterCell = static_cast<SwCellFrm*>(rLastLine.Lower()); while ( pCurrMasterCell ) { - if ( !pCurrMasterCell->ContainsCntnt() && pCurrMasterCell->GetTabBox()->getRowSpan() >= 1 ) + if ( !pCurrMasterCell->ContainsContent() && pCurrMasterCell->GetTabBox()->getRowSpan() >= 1 ) { bRet = false; break; @@ -705,7 +705,7 @@ static bool lcl_RecalcSplitLine( SwRowFrm& rLastLine, SwRowFrm& rFollowLine, // 3. Check if last line does not contain any content: if ( bRet ) { - if ( !rLastLine.ContainsCntnt() ) + if ( !rLastLine.ContainsContent() ) { bRet = false; } @@ -714,7 +714,7 @@ static bool lcl_RecalcSplitLine( SwRowFrm& rLastLine, SwRowFrm& rFollowLine, // 4. Check if follow flow line does not contain content: if ( bRet ) { - if ( !rFollowLine.IsRowSpanLine() && !rFollowLine.ContainsCntnt() ) + if ( !rFollowLine.IsRowSpanLine() && !rFollowLine.ContainsContent() ) { bRet = false; } @@ -1103,16 +1103,16 @@ bool SwTabFrm::Split( const SwTwips nCutPos, bool bTryToSplit, bool bTableRowKee pHeadline->InsertBefore( pFoll, 0 ); SwPageFrm *pPage = pHeadline->FindPageFrm(); - const SwFrmFmts *pTbl = GetFmt()->GetDoc()->GetSpzFrmFmts(); - if( !pTbl->empty() ) + const SwFrameFormats *pTable = GetFormat()->GetDoc()->GetSpzFrameFormats(); + if( !pTable->empty() ) { sal_uLong nIndex; - SwCntntFrm* pFrm = pHeadline->ContainsCntnt(); + SwContentFrm* pFrm = pHeadline->ContainsContent(); while( pFrm ) { nIndex = pFrm->GetNode()->GetIndex(); - AppendObjs( pTbl, nIndex, pFrm, pPage, GetFmt()->GetDoc()); - pFrm = pFrm->GetNextCntntFrm(); + AppendObjs( pTable, nIndex, pFrm, pPage, GetFormat()->GetDoc()); + pFrm = pFrm->GetNextContentFrm(); if( !pHeadline->IsAnLower( pFrm ) ) break; } @@ -1349,7 +1349,7 @@ static void lcl_InvalidateAllLowersPrt( SwLayoutFrm* pLayFrm ) } } -bool SwCntntFrm::CalcLowers( SwLayoutFrm* pLay, const SwLayoutFrm* pDontLeave, +bool SwContentFrm::CalcLowers( SwLayoutFrm* pLay, const SwLayoutFrm* pDontLeave, long nBottom, bool bSkipRowSpanCells ) { if ( !pLay ) @@ -1358,7 +1358,7 @@ bool SwCntntFrm::CalcLowers( SwLayoutFrm* pLay, const SwLayoutFrm* pDontLeave, // LONG_MAX == nBottom means we have to calculate all bool bAll = LONG_MAX == nBottom; bool bRet = false; - SwCntntFrm *pCnt = pLay->ContainsCntnt(); + SwContentFrm *pCnt = pLay->ContainsContent(); SWRECTFN( pLay ) // FME 2007-08-30 #i81146# new loop control @@ -1370,10 +1370,10 @@ bool SwCntntFrm::CalcLowers( SwLayoutFrm* pLay, const SwLayoutFrm* pDontLeave, { // #115759# - check, if a format of content frame is // possible. Thus, 'copy' conditions, found at the beginning of - // <SwCntntFrm::MakeAll(..)>, and check these. + // <SwContentFrm::MakeAll(..)>, and check these. const bool bFormatPossible = !pCnt->IsJoinLocked() && - ( !pCnt->IsTxtFrm() || - !static_cast<SwTxtFrm*>(pCnt)->IsLocked() ) && + ( !pCnt->IsTextFrm() || + !static_cast<SwTextFrm*>(pCnt)->IsLocked() ) && ( pCnt->IsFollow() || !StackHack::IsLocked() ); // NEW TABLES @@ -1398,11 +1398,11 @@ bool SwCntntFrm::CalcLowers( SwLayoutFrm* pLay, const SwLayoutFrm* pDontLeave, // to format the floating screen objects // #i46941# - frame has to be valid // Note: frame could be invalid after calling its format, if it's locked. - OSL_ENSURE( !pCnt->IsTxtFrm() || + OSL_ENSURE( !pCnt->IsTextFrm() || pCnt->IsValid() || - static_cast<SwTxtFrm*>(pCnt)->IsJoinLocked(), - "<SwCntntFrm::CalcLowers(..)> - text frame invalid and not locked." ); - if ( pCnt->IsTxtFrm() && pCnt->IsValid() ) + static_cast<SwTextFrm*>(pCnt)->IsJoinLocked(), + "<SwContentFrm::CalcLowers(..)> - text frame invalid and not locked." ); + if ( pCnt->IsTextFrm() && pCnt->IsValid() ) { // #i23129#, #i36347# - pass correct page frame to // the object formatter @@ -1420,12 +1420,12 @@ bool SwCntntFrm::CalcLowers( SwLayoutFrm* pLay, const SwLayoutFrm* pDontLeave, if ( nLoopControlRuns < nLoopControlMax ) { // restart format with first content - pCnt = pLay->ContainsCntnt(); + pCnt = pLay->ContainsContent(); continue; } #if OSL_DEBUG_LEVEL > 1 - OSL_FAIL( "LoopControl in SwCntntFrm::CalcLowers" ); + OSL_FAIL( "LoopControl in SwContentFrm::CalcLowers" ); #endif } } @@ -1433,7 +1433,7 @@ bool SwCntntFrm::CalcLowers( SwLayoutFrm* pLay, const SwLayoutFrm* pDontLeave, } if( ! bAll && (*fnRect->fnYDiff)((pCnt->Frm().*fnRect->fnGetTop)(), nBottom) > 0 ) break; - pCnt = pCnt->GetNextCntntFrm(); + pCnt = pCnt->GetNextContentFrm(); } return bRet; } @@ -1519,7 +1519,7 @@ static void lcl_RecalcRow( SwRowFrm& rRow, long nBottom ) { // #115759# - force another format of the // lowers, if at least one of it was invalid. - bCheck = SwCntntFrm::CalcLowers( &rRow, rRow.GetUpper(), nBottom, true ); + bCheck = SwContentFrm::CalcLowers( &rRow, rRow.GetUpper(), nBottom, true ); // NEW TABLES // First we calculate the cells with row span of < 1, afterwards @@ -1538,7 +1538,7 @@ static void lcl_RecalcRow( SwRowFrm& rRow, long nBottom ) SwCellFrm& rToRecalc = 0 == i ? const_cast<SwCellFrm&>(pCellFrm->FindStartEndOfRowSpanCell( true, true )) : *pCellFrm; - bCheck |= SwCntntFrm::CalcLowers( &rToRecalc, &rToRecalc, nBottom, false ); + bCheck |= SwContentFrm::CalcLowers( &rToRecalc, &rToRecalc, nBottom, false ); } pCellFrm = static_cast<SwCellFrm*>(pCellFrm->GetNext()); @@ -1641,7 +1641,7 @@ static bool lcl_NoPrev( const SwFrm& rFrm ) // a table frame and format it to assure keep attribute. // method return true, if a next content frame is formatted. // Precondition: The given table frame hasn't a follow and isn't a follow. -SwFrm* sw_FormatNextCntntForKeep( SwTabFrm* pTabFrm ) +SwFrm* sw_FormatNextContentForKeep( SwTabFrm* pTabFrm ) { // find next content, table or section SwFrm* pNxt = pTabFrm->FindNext(); @@ -1753,7 +1753,7 @@ void SwTabFrm::MakeAll() bool bMovedFwd = false; // gets set to true when the Frm is split bool bSplit = false; - const bool bFtnsInDoc = !GetFmt()->GetDoc()->GetFtnIdxs().empty(); + const bool bFootnotesInDoc = !GetFormat()->GetDoc()->GetFootnoteIdxs().empty(); const bool bFly = IsInFly(); SwBorderAttrAccess *pAccess= new SwBorderAttrAccess( SwFrm::GetCache(), this ); @@ -1765,7 +1765,7 @@ void SwTabFrm::MakeAll() // All rows should keep together // OD 2004-05-25 #i21478# - don't split table, if it has to keep with next const bool bDontSplit = !IsFollow() && - ( !GetFmt()->GetLayoutSplit().GetValue() || bKeep ); + ( !GetFormat()->GetLayoutSplit().GetValue() || bKeep ); // The number of repeated headlines const sal_uInt16 nRepeat = GetTable()->GetRowsToRepeat(); @@ -1777,7 +1777,7 @@ void SwTabFrm::MakeAll() // #131283# // Indicates that two individual rows may keep together, based on the keep // attribute set at the first paragraph in the first cell. - const bool bTableRowKeep = !bDontSplit && GetFmt()->GetDoc()->GetDocumentSettingManager().get(DocumentSettingId::TABLE_ROW_KEEP); + const bool bTableRowKeep = !bDontSplit && GetFormat()->GetDoc()->GetDocumentSettingManager().get(DocumentSettingId::TABLE_ROW_KEEP); // The Magic Move: Used for the table row keep feature. // If only the last row of the table wants to keep (implicitly by setting @@ -1935,15 +1935,15 @@ void SwTabFrm::MakeAll() pMaster->InvalidatePos(); } } - SwFtnBossFrm *pOldBoss = bFtnsInDoc ? FindFtnBossFrm( true ) : 0; + SwFootnoteBossFrm *pOldBoss = bFootnotesInDoc ? FindFootnoteBossFrm( true ) : 0; bool bReformat; if ( MoveBwd( bReformat ) ) { SWREFRESHFN( this ) bMovedBwd = true; aNotify.SetLowersComplete( false ); - if ( bFtnsInDoc ) - MoveLowerFtns( 0, pOldBoss, 0, true ); + if ( bFootnotesInDoc ) + MoveLowerFootnotes( 0, pOldBoss, 0, true ); if ( bReformat || bKeep ) { long nOldTop = (Frm().*fnRect->fnGetTop)(); @@ -1977,7 +1977,7 @@ void SwTabFrm::MakeAll() // Thus, find next content, table or section // and, if a section is found, get its first // content. - if ( 0 != sw_FormatNextCntntForKeep( this ) && !GetNext() ) + if ( 0 != sw_FormatNextContentForKeep( this ) && !GetNext() ) { mbValidPos = false; } @@ -2070,11 +2070,11 @@ void SwTabFrm::MakeAll() while ( pRowToMove && nRowsToMove-- > 0 ) { - const bool bMoveFtns = bFtnsInDoc && !GetFollow()->IsJoinLocked(); + const bool bMoveFootnotes = bFootnotesInDoc && !GetFollow()->IsJoinLocked(); - SwFtnBossFrm *pOldBoss = 0; - if ( bMoveFtns ) - pOldBoss = pRowToMove->FindFtnBossFrm( true ); + SwFootnoteBossFrm *pOldBoss = 0; + if ( bMoveFootnotes ) + pOldBoss = pRowToMove->FindFootnoteBossFrm( true ); SwFrm* pNextRow = pRowToMove->GetNext(); @@ -2090,8 +2090,8 @@ void SwTabFrm::MakeAll() } //Displace the footnotes! - if ( bMoveFtns ) - if ( static_cast<SwLayoutFrm*>(pRowToMove)->MoveLowerFtns( 0, pOldBoss, FindFtnBossFrm( true ), true ) ) + if ( bMoveFootnotes ) + if ( static_cast<SwLayoutFrm*>(pRowToMove)->MoveLowerFootnotes( 0, pOldBoss, FindFootnoteBossFrm( true ), true ) ) GetUpper()->Calc(); pRowToMove = pNextRow; @@ -2137,7 +2137,7 @@ void SwTabFrm::MakeAll() // it has to be avoided, that superior table is formatted. // Thus, find next content, table or section and, if a section // is found, get its first content. - const SwFrm* pTmpNxt = sw_FormatNextCntntForKeep( this ); + const SwFrm* pTmpNxt = sw_FormatNextContentForKeep( this ); pAccess= new SwBorderAttrAccess( SwFrm::GetCache(), this ); pAttrs = pAccess->Get(); @@ -2533,9 +2533,9 @@ bool SwTabFrm::CalcFlyOffsets( SwTwips& rUpper, // --> #108724# Page header/footer content doesn't have to wrap around // floating screen objects - const IDocumentSettingAccess* pIDSA = GetFmt()->getIDocumentSettingAccess(); + const IDocumentSettingAccess* pIDSA = GetFormat()->getIDocumentSettingAccess(); const bool bWrapAllowed = pIDSA->get(DocumentSettingId::USE_FORMER_TEXT_WRAPPING) || - ( !IsInFtn() && 0 == FindFooterOrHeader() ); + ( !IsInFootnote() && 0 == FindFooterOrHeader() ); if ( pPage->GetSortedObjs() && bWrapAllowed ) { @@ -2570,7 +2570,7 @@ bool SwTabFrm::CalcFlyOffsets( SwTwips& rUpper, // E.g., it could happen, that the fly frame is still registered // at the page frame, the table is on, but it's anchor character // text frame has already changed its page. - const SwTxtFrm* pAnchorCharFrm = pFly->FindAnchorCharFrm(); + const SwTextFrm* pAnchorCharFrm = pFly->FindAnchorCharFrm(); bool bConsiderFly = // #i46807# - do not consider invalid // Writer fly frames. @@ -2616,8 +2616,8 @@ bool SwTabFrm::CalcFlyOffsets( SwTwips& rUpper, if ( bConsiderFly ) { - const SwFmtSurround &rSur = pFly->GetFmt()->GetSurround(); - const SwFmtHoriOrient &rHori= pFly->GetFmt()->GetHoriOrient(); + const SwFormatSurround &rSur = pFly->GetFormat()->GetSurround(); + const SwFormatHoriOrient &rHori= pFly->GetFormat()->GetHoriOrient(); if ( SURROUND_NONE == rSur.GetSurround() ) { long nBottom = (aFlyRect.*fnRect->fnGetBottom)(); @@ -2693,7 +2693,7 @@ void SwTabFrm::Format( const SwBorderAttrs *pAttrs ) if ( !mbValidPrtArea ) { mbValidPrtArea = true; - //The width of the PrtArea is given by the FrmFmt, the borders have to + //The width of the PrtArea is given by the FrameFormat, the borders have to //be set accordingly. //Minimum borders are determined depending on margins and shadows. //The borders are adjusted so that the PrtArea is aligned into the Frm @@ -2711,7 +2711,7 @@ void SwTabFrm::Format( const SwBorderAttrs *pAttrs ) //The width possibly is a percentage value. If the table is inside //something else, the value applies to the surrounding. If it's the body //the value applies to the screen width in the BrowseView. - const SwFmtFrmSize &rSz = GetFmt()->GetFrmSize(); + const SwFormatFrmSize &rSz = GetFormat()->GetFrmSize(); // OD 14.03.2003 #i9040# - adjust variable name. const SwTwips nWishedTableWidth = CalcRel( rSz, true ); @@ -2720,7 +2720,7 @@ void SwTabFrm::Format( const SwBorderAttrs *pAttrs ) // OD 14.03.2003 #i9040# - insert new variables for left/right spacing. SwTwips nLeftSpacing = 0; SwTwips nRightSpacing = 0; - switch ( GetFmt()->GetHoriOrient().GetHoriOrient() ) + switch ( GetFormat()->GetHoriOrient().GetHoriOrient() ) { case text::HoriOrientation::LEFT: { @@ -2861,7 +2861,7 @@ void SwTabFrm::Format( const SwBorderAttrs *pAttrs ) // #i26250# - extend bottom printing area, if table // is last content inside a table cell. - if ( GetFmt()->getIDocumentSettingAccess()->get(DocumentSettingId::ADD_PARA_SPACING_TO_TABLE_CELLS) && + if ( GetFormat()->getIDocumentSettingAccess()->get(DocumentSettingId::ADD_PARA_SPACING_TO_TABLE_CELLS) && GetUpper()->IsInTab() && !GetIndNext() ) { nLower += pAttrs->GetULSpace().GetLower(); @@ -2968,7 +2968,7 @@ SwTwips SwTabFrm::GrowFrm( SwTwips nDist, bool bTst, bool bInfo ) if ( GetNext() ) { GetNext()->_InvalidatePos(); - if ( GetNext()->IsCntntFrm() ) + if ( GetNext()->IsContentFrm() ) GetNext()->InvalidatePage( pPage ); } // #i28701# - Due to the new object positioning the @@ -2976,7 +2976,7 @@ SwTwips SwTabFrm::GrowFrm( SwTwips nDist, bool bTst, bool bInfo ) // forward due to the positioning of its objects ). Thus, invalivate this // next frame, if document compatibility option 'Consider wrapping style // influence on object positioning' is ON. - else if ( GetFmt()->getIDocumentSettingAccess()->get(DocumentSettingId::CONSIDER_WRAP_ON_OBJECT_POSITION) ) + else if ( GetFormat()->getIDocumentSettingAccess()->get(DocumentSettingId::CONSIDER_WRAP_ON_OBJECT_POSITION) ) { InvalidateNextPos(); } @@ -2984,7 +2984,7 @@ SwTwips SwTabFrm::GrowFrm( SwTwips nDist, bool bTst, bool bInfo ) InvalidatePage( pPage ); SetComplete(); - SvxBrushItem aBack = GetFmt()->makeBackgroundBrushItem(); + SvxBrushItem aBack = GetFormat()->makeBackgroundBrushItem(); const SvxGraphicPosition ePos = aBack.GetGraphicPos(); if ( GPOS_NONE != ePos && GPOS_TILED != ePos ) SetCompletePaint(); @@ -3034,7 +3034,7 @@ void SwTabFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew ) if ( nInvFlags & 0x04 ) { pTmp->_InvalidatePrt(); - if ( pTmp->IsCntntFrm() ) + if ( pTmp->IsContentFrm() ) pTmp->InvalidatePage( pPage ); } if ( nInvFlags & 0x10 ) @@ -3043,7 +3043,7 @@ void SwTabFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew ) if ( nInvFlags & 0x08 && 0 != (pTmp = GetPrev()) ) { pTmp->_InvalidatePrt(); - if ( pTmp->IsCntntFrm() ) + if ( pTmp->IsContentFrm() ) pTmp->InvalidatePage( pPage ); } if ( nInvFlags & 0x20 ) @@ -3103,10 +3103,10 @@ void SwTabFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew, { if ( !GetPrev() ) CheckPageDescs( pPage ); - if (GetFmt()->GetPageDesc().GetNumOffset()) + if (GetFormat()->GetPageDesc().GetNumOffset()) static_cast<SwRootFrm*>(pPage->GetUpper())->SetVirtPageNum( true ); - SwDocPosUpdate aMsgHnt( pPage->Frm().Top() ); - GetFmt()->GetDoc()->getIDocumentFieldsAccess().UpdatePageFlds( &aMsgHnt ); + SwDocPosUpdate aMsgHint( pPage->Frm().Top() ); + GetFormat()->GetDoc()->getIDocumentFieldsAccess().UpdatePageFields( &aMsgHint ); } } break; @@ -3148,11 +3148,11 @@ void SwTabFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew, } } -bool SwTabFrm::GetInfo( SfxPoolItem &rHnt ) const +bool SwTabFrm::GetInfo( SfxPoolItem &rHint ) const { - if ( RES_VIRTPAGENUM_INFO == rHnt.Which() && IsInDocBody() && !IsFollow() ) + if ( RES_VIRTPAGENUM_INFO == rHint.Which() && IsInDocBody() && !IsFollow() ) { - SwVirtPageNumInfo &rInfo = static_cast<SwVirtPageNumInfo&>(rHnt); + SwVirtPageNumInfo &rInfo = static_cast<SwVirtPageNumInfo&>(rHint); const SwPageFrm *pPage = FindPageFrm(); if ( pPage ) { @@ -3174,11 +3174,11 @@ bool SwTabFrm::GetInfo( SfxPoolItem &rHnt ) const return true; } -SwCntntFrm *SwTabFrm::FindLastCntnt() +SwContentFrm *SwTabFrm::FindLastContent() { SwFrm *pRet = m_pLower; - while ( pRet && !pRet->IsCntntFrm() ) + while ( pRet && !pRet->IsContentFrm() ) { SwFrm *pOld = pRet; @@ -3197,7 +3197,7 @@ SwCntntFrm *SwTabFrm::FindLastCntnt() { // Check all other columns if there is a column based section with // an empty last column at the end of the last line - this is done - // by SwSectionFrm::FindLastCntnt + // by SwSectionFrm::FindLastContent if( pRet->IsColBodyFrm() ) { #if OSL_DEBUG_LEVEL > 0 @@ -3205,23 +3205,23 @@ SwCntntFrm *SwTabFrm::FindLastCntnt() OSL_ENSURE( pSect, "Where does this column come fron?"); OSL_ENSURE( IsAnLower( pSect ), "Splited cell?" ); #endif - return pRet->FindSctFrm()->FindLastCntnt(); + return pRet->FindSctFrm()->FindLastContent(); } // pRet may be a cell frame without a lower (cell has been split). // We have to find the last content the hard way: - OSL_ENSURE( pRet->IsCellFrm(), "SwTabFrm::FindLastCntnt failed" ); + OSL_ENSURE( pRet->IsCellFrm(), "SwTabFrm::FindLastContent failed" ); const SwFrm* pRow = pRet->GetUpper(); while ( pRow && !pRow->GetUpper()->IsTabFrm() ) pRow = pRow->GetUpper(); - const SwCntntFrm* pCntntFrm = pRow ? static_cast<const SwLayoutFrm*>(pRow)->ContainsCntnt() : NULL; + const SwContentFrm* pContentFrm = pRow ? static_cast<const SwLayoutFrm*>(pRow)->ContainsContent() : NULL; pRet = 0; - while ( pCntntFrm && static_cast<const SwLayoutFrm*>(pRow)->IsAnLower( pCntntFrm ) ) + while ( pContentFrm && static_cast<const SwLayoutFrm*>(pRow)->IsAnLower( pContentFrm ) ) { - pRet = const_cast<SwCntntFrm*>(pCntntFrm); - pCntntFrm = pCntntFrm->GetNextCntntFrm(); + pRet = const_cast<SwContentFrm*>(pContentFrm); + pContentFrm = pContentFrm->GetNextContentFrm(); } } } @@ -3237,10 +3237,10 @@ SwCntntFrm *SwTabFrm::FindLastCntnt() pRet = pRet->GetNext(); if( pRet->IsSctFrm() ) - pRet = static_cast<SwSectionFrm*>(pRet)->FindLastCntnt(); + pRet = static_cast<SwSectionFrm*>(pRet)->FindLastContent(); } - return static_cast<SwCntntFrm*>(pRet); + return static_cast<SwContentFrm*>(pRet); } /// Return value defines if the frm needs to be relocated @@ -3325,7 +3325,7 @@ bool SwTabFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool, bool &rReformat ) SwRowFrm* pFirstRow = GetFirstNonHeadlineRow(); if ( pFirstRow && pFirstRow->IsInFollowFlowRow() && SwLayouter::DoesRowContainMovedFwdFrm( - *(pFirstRow->GetFmt()->GetDoc()), + *(pFirstRow->GetFormat()->GetDoc()), *(pFirstRow) ) ) { return false; @@ -3356,7 +3356,7 @@ void SwTabFrm::Cut() //which is obsolete now as it became the first one pFrm->_InvalidatePrt(); pFrm->_InvalidatePos(); - if ( pFrm->IsCntntFrm() ) + if ( pFrm->IsContentFrm() ) pFrm->InvalidatePage( pPage ); if( IsInSct() && !GetPrev() ) { @@ -3376,7 +3376,7 @@ void SwTabFrm::Cut() { pFrm->SetRetouche(); pFrm->Prepare( PREP_WIDOWS_ORPHANS ); pFrm->_InvalidatePos(); - if ( pFrm->IsCntntFrm() ) + if ( pFrm->IsContentFrm() ) pFrm->InvalidatePage( pPage ); } //If I am (was) the only FlowFrm in my own upper, it has to do @@ -3403,12 +3403,12 @@ void SwTabFrm::Cut() RemoveFromLayout(); if ( pUp ) { - OSL_ENSURE( !pUp->IsFtnFrm(), "Table in Footnote." ); + OSL_ENSURE( !pUp->IsFootnoteFrm(), "Table in Footnote." ); SwSectionFrm *pSct = 0; // #126020# - adjust check for empty section // #130797# - correct fix #126020# if ( !pUp->Lower() && pUp->IsInSct() && - !(pSct = pUp->FindSctFrm())->ContainsCntnt() && + !(pSct = pUp->FindSctFrm())->ContainsContent() && !pSct->ContainsAny( true ) ) { if ( pUp->GetUpper() ) @@ -3432,7 +3432,7 @@ void SwTabFrm::Cut() void SwTabFrm::Paste( SwFrm* pParent, SwFrm* pSibling ) { OSL_ENSURE( pParent, "No parent for pasting." ); - OSL_ENSURE( pParent->IsLayoutFrm(), "Parent is CntntFrm." ); + OSL_ENSURE( pParent->IsLayoutFrm(), "Parent is ContentFrm." ); OSL_ENSURE( pParent != this, "I'm the parent myself." ); OSL_ENSURE( pSibling != this, "I'm my own neighbour." ); OSL_ENSURE( !GetPrev() && !GetNext() && !GetUpper(), @@ -3449,7 +3449,7 @@ void SwTabFrm::Paste( SwFrm* pParent, SwFrm* pSibling ) { GetNext()->_InvalidatePos(); GetNext()->_InvalidatePrt(); - if ( GetNext()->IsCntntFrm() ) + if ( GetNext()->IsContentFrm() ) GetNext()->InvalidatePage( pPage ); } @@ -3464,14 +3464,14 @@ void SwTabFrm::Paste( SwFrm* pParent, SwFrm* pSibling ) if ( !IsFollow() ) { GetPrev()->InvalidateSize(); - if ( GetPrev()->IsCntntFrm() ) + if ( GetPrev()->IsContentFrm() ) GetPrev()->InvalidatePage( pPage ); } } else if ( GetNext() ) - //Take the marging into account when dealing with CntntFrm's. There are + //Take the marging into account when dealing with ContentFrm's. There are //two situations (both always happen at once): - //a) The Cntnt becomes the first in a chain + //a) The Content becomes the first in a chain //b) The new follower was the first in a chain before GetNext()->_InvalidatePrt(); @@ -3482,9 +3482,9 @@ void SwTabFrm::Paste( SwFrm* pParent, SwFrm* pSibling ) if ( !GetPrev() )//At least needed for HTML with a table at the beginning. { - const SwPageDesc *pDesc = GetFmt()->GetPageDesc().GetPageDesc(); + const SwPageDesc *pDesc = GetFormat()->GetPageDesc().GetPageDesc(); if ( (pDesc && pDesc != pPage->GetPageDesc()) || - (!pDesc && pPage->GetPageDesc() != &GetFmt()->GetDoc()->GetPageDesc(0)) ) + (!pDesc && pPage->GetPageDesc() != &GetFormat()->GetDoc()->GetPageDesc(0)) ) CheckPageDescs( pPage, true ); } } @@ -3497,7 +3497,7 @@ void SwTabFrm::Prepare( const PrepareHint eHint, const void *, bool ) } SwRowFrm::SwRowFrm(const SwTableLine &rLine, SwFrm* pSib, bool bInsertContent) - : SwLayoutFrm( rLine.GetFrmFmt(), pSib ) + : SwLayoutFrm( rLine.GetFrameFormat(), pSib ) , m_pTabLine( &rLine ) , m_pFollowRow( 0 ) // #i29550# @@ -3525,7 +3525,7 @@ SwRowFrm::SwRowFrm(const SwTableLine &rLine, SwFrm* pSib, bool bInsertContent) void SwRowFrm::DestroyImpl() { - SwModify* pMod = GetFmt(); + SwModify* pMod = GetFormat(); if( pMod ) { pMod->Remove( this ); // remove, @@ -3593,29 +3593,29 @@ long CalcHeightWithFlys( const SwFrm *pFrm ) SWRECTFN( pFrm ) long nHeight = 0; const SwFrm* pTmp = pFrm->IsSctFrm() ? - static_cast<const SwSectionFrm*>(pFrm)->ContainsCntnt() : pFrm; + static_cast<const SwSectionFrm*>(pFrm)->ContainsContent() : pFrm; while( pTmp ) { // #i26945# - consider follow text frames const SwSortedObjs* pObjs( 0L ); bool bIsFollow( false ); - if ( pTmp->IsTxtFrm() && static_cast<const SwTxtFrm*>(pTmp)->IsFollow() ) + if ( pTmp->IsTextFrm() && static_cast<const SwTextFrm*>(pTmp)->IsFollow() ) { const SwFrm* pMaster; // #i46450# Master does not necessarily have // to exist if this function is called from JoinFrm() -> // Cut() -> Shrink() - const SwTxtFrm* pTmpFrm = static_cast<const SwTxtFrm*>(pTmp); - if ( pTmpFrm->GetPrev() && pTmpFrm->GetPrev()->IsTxtFrm() && - static_cast<const SwTxtFrm*>(pTmpFrm->GetPrev())->GetFollow() && - static_cast<const SwTxtFrm*>(pTmpFrm->GetPrev())->GetFollow() != pTmp ) + const SwTextFrm* pTmpFrm = static_cast<const SwTextFrm*>(pTmp); + if ( pTmpFrm->GetPrev() && pTmpFrm->GetPrev()->IsTextFrm() && + static_cast<const SwTextFrm*>(pTmpFrm->GetPrev())->GetFollow() && + static_cast<const SwTextFrm*>(pTmpFrm->GetPrev())->GetFollow() != pTmp ) pMaster = 0; else pMaster = pTmpFrm->FindMaster(); if ( pMaster ) { - pObjs = static_cast<const SwTxtFrm*>(pTmp)->FindMaster()->GetDrawObjs(); + pObjs = static_cast<const SwTextFrm*>(pTmp)->FindMaster()->GetDrawObjs(); bIsFollow = true; } } @@ -3639,15 +3639,15 @@ long CalcHeightWithFlys( const SwFrm *pFrm ) { // OD 30.09.2003 #i18732# - only objects, which follow // the text flow have to be considered. - const SwFrmFmt& rFrmFmt = pAnchoredObj->GetFrmFmt(); + const SwFrameFormat& rFrameFormat = pAnchoredObj->GetFrameFormat(); const bool bConsiderObj = - (rFrmFmt.GetAnchor().GetAnchorId() != FLY_AS_CHAR) && + (rFrameFormat.GetAnchor().GetAnchorId() != FLY_AS_CHAR) && pAnchoredObj->GetObjRect().Top() != FAR_AWAY && - rFrmFmt.GetFollowTextFlow().GetValue() && + rFrameFormat.GetFollowTextFlow().GetValue() && pAnchoredObj->GetPageFrm() == pTmp->FindPageFrm(); if ( bConsiderObj ) { - const SwFmtFrmSize &rSz = rFrmFmt.GetFrmSize(); + const SwFormatFrmSize &rSz = rFrameFormat.GetFrmSize(); if( !rSz.GetHeightPercent() ) { const SwTwips nDistOfFlyBottomToAnchorTop = @@ -3784,7 +3784,7 @@ static SwTwips lcl_CalcMinRowHeight( const SwRowFrm* _pRow, { SWRECTFN( _pRow ) - const SwFmtFrmSize &rSz = _pRow->GetFmt()->GetFrmSize(); + const SwFormatFrmSize &rSz = _pRow->GetFormat()->GetFrmSize(); if ( _pRow->HasFixSize() && !_pRow->IsRowSpanLine() ) { @@ -3848,7 +3848,7 @@ static sal_uInt16 lcl_GetTopSpace( const SwRowFrm& rRow ) nTmpTopSpace = lcl_GetTopSpace( *static_cast<const SwRowFrm*>(pCurrLower->Lower()) ); else { - const SwAttrSet& rSet = const_cast<SwCellFrm*>(pCurrLower)->GetFmt()->GetAttrSet(); + const SwAttrSet& rSet = const_cast<SwCellFrm*>(pCurrLower)->GetFormat()->GetAttrSet(); const SvxBoxItem& rBoxItem = rSet.GetBox(); nTmpTopSpace = rBoxItem.CalcLineSpace( SvxBoxItemLine::TOP, true ); } @@ -3869,7 +3869,7 @@ static sal_uInt16 lcl_GetTopLineDist( const SwRowFrm& rRow ) nTmpTopLineDist = lcl_GetTopLineDist( *static_cast<const SwRowFrm*>(pCurrLower->Lower()) ); else { - const SwAttrSet& rSet = const_cast<SwCellFrm*>(pCurrLower)->GetFmt()->GetAttrSet(); + const SwAttrSet& rSet = const_cast<SwCellFrm*>(pCurrLower)->GetFormat()->GetAttrSet(); const SvxBoxItem& rBoxItem = rSet.GetBox(); nTmpTopLineDist = rBoxItem.GetDistance( SvxBoxItemLine::TOP ); } @@ -3893,7 +3893,7 @@ static sal_uInt16 lcl_GetBottomLineSize( const SwRowFrm& rRow ) } else { - const SwAttrSet& rSet = const_cast<SwCellFrm*>(pCurrLower)->GetFmt()->GetAttrSet(); + const SwAttrSet& rSet = const_cast<SwCellFrm*>(pCurrLower)->GetFormat()->GetAttrSet(); const SvxBoxItem& rBoxItem = rSet.GetBox(); nTmpBottomLineSize = rBoxItem.CalcLineSpace( SvxBoxItemLine::BOTTOM, true ) - rBoxItem.GetDistance( SvxBoxItemLine::BOTTOM ); @@ -3918,7 +3918,7 @@ static sal_uInt16 lcl_GetBottomLineDist( const SwRowFrm& rRow ) } else { - const SwAttrSet& rSet = const_cast<SwCellFrm*>(pCurrLower)->GetFmt()->GetAttrSet(); + const SwAttrSet& rSet = const_cast<SwCellFrm*>(pCurrLower)->GetFormat()->GetAttrSet(); const SvxBoxItem& rBoxItem = rSet.GetBox(); nTmpBottomLineDist = rBoxItem.GetDistance( SvxBoxItemLine::BOTTOM ); } @@ -3995,7 +3995,7 @@ void SwRowFrm::Format( const SwBorderAttrs *pAttrs ) // If we found a 'previous' row, we look for the appropriate row frame: if ( pPrevTabLine ) { - SwIterator<SwRowFrm,SwFmt> aIter( *pPrevTabLine->GetFrmFmt() ); + SwIterator<SwRowFrm,SwFormat> aIter( *pPrevTabLine->GetFrameFormat() ); for ( SwRowFrm* pRow = aIter.First(); pRow; pRow = aIter.Next() ) { // #115759# - do *not* take repeated @@ -4051,7 +4051,7 @@ void SwRowFrm::Format( const SwBorderAttrs *pAttrs ) #if OSL_DEBUG_LEVEL > 0 if ( HasFixSize() ) { - const SwFmtFrmSize &rFrmSize = GetFmt()->GetFrmSize(); + const SwFormatFrmSize &rFrmSize = GetFormat()->GetFrmSize(); OSL_ENSURE( rFrmSize.GetSize().Height() > 0, "Hat ihn" ); } #endif @@ -4279,7 +4279,7 @@ SwTwips SwRowFrm::ShrinkFrm( SwTwips nDist, bool bTst, bool bInfo ) //Only shrink as much as the content of the biggest cell allows. SwTwips nRealDist = nDist; { - const SwFmtFrmSize &rSz = GetFmt()->GetFrmSize(); + const SwFormatFrmSize &rSz = GetFormat()->GetFrmSize(); SwTwips nMinHeight = rSz.GetHeightSizeType() == ATT_MIN_SIZE ? rSz.GetHeight() : 0; @@ -4361,7 +4361,7 @@ bool SwRowFrm::IsRowSplitAllowed() const // Fixed size rows are never allowed to split: if ( HasFixSize() ) { - OSL_ENSURE( ATT_FIX_SIZE == GetFmt()->GetFrmSize().GetHeightSizeType(), "pRow claims to have fixed size" ); + OSL_ENSURE( ATT_FIX_SIZE == GetFormat()->GetFrmSize().GetHeightSizeType(), "pRow claims to have fixed size" ); return false; } @@ -4371,8 +4371,8 @@ bool SwRowFrm::IsRowSplitAllowed() const pTabFrm->IsInHeadline( *this ) ) return false; - const SwTableLineFmt* pFrmFmt = static_cast<SwTableLineFmt*>(GetTabLine()->GetFrmFmt()); - const SwFmtRowSplit& rLP = pFrmFmt->GetRowSplit(); + const SwTableLineFormat* pFrameFormat = static_cast<SwTableLineFormat*>(GetTabLine()->GetFrameFormat()); + const SwFormatRowSplit& rLP = pFrameFormat->GetRowSplit(); return rLP.GetValue(); } @@ -4381,17 +4381,17 @@ bool SwRowFrm::ShouldRowKeepWithNext() const bool bRet = false; const SwCellFrm* pCell = static_cast<const SwCellFrm*>(Lower()); - const SwFrm* pTxt = pCell->Lower(); + const SwFrm* pText = pCell->Lower(); - if ( pTxt && pTxt->IsTxtFrm() ) + if ( pText && pText->IsTextFrm() ) { - bRet = static_cast<const SwTxtFrm*>(pTxt)->GetTxtNode()->GetSwAttrSet().GetKeep().GetValue(); + bRet = static_cast<const SwTextFrm*>(pText)->GetTextNode()->GetSwAttrSet().GetKeep().GetValue(); } return bRet; } SwCellFrm::SwCellFrm(const SwTableBox &rBox, SwFrm* pSib, bool bInsertContent) - : SwLayoutFrm( rBox.GetFrmFmt(), pSib ) + : SwLayoutFrm( rBox.GetFrameFormat(), pSib ) , m_pTabBox( &rBox ) { mnFrmType = FRM_CELL; @@ -4399,12 +4399,12 @@ SwCellFrm::SwCellFrm(const SwTableBox &rBox, SwFrm* pSib, bool bInsertContent) if ( !bInsertContent ) return; - //If a StartIdx is available, CntntFrms are added in the cell, otherwise + //If a StartIdx is available, ContentFrms are added in the cell, otherwise //Rows have to be present and those are added. if ( rBox.GetSttIdx() ) { sal_uLong nIndex = rBox.GetSttIdx(); - ::_InsertCnt( this, rBox.GetFrmFmt()->GetDoc(), ++nIndex ); + ::_InsertCnt( this, rBox.GetFrameFormat()->GetDoc(), ++nIndex ); } else { @@ -4421,7 +4421,7 @@ SwCellFrm::SwCellFrm(const SwTableBox &rBox, SwFrm* pSib, bool bInsertContent) void SwCellFrm::DestroyImpl() { - SwModify* pMod = GetFmt(); + SwModify* pMod = GetFormat(); if( pMod ) { // At this stage the lower frames aren't destroyed already, @@ -4488,7 +4488,7 @@ static bool lcl_ArrangeLowers( SwLayoutFrm *pLay, long lYStart, bool bInva ) // from its anchor frame. bool bVertPosDepOnAnchor( true ); { - SwFmtVertOrient aVert( pAnchoredObj->GetFrmFmt().GetVertOrient() ); + SwFormatVertOrient aVert( pAnchoredObj->GetFrameFormat().GetVertOrient() ); switch ( aVert.GetRelationOrient() ) { case text::RelOrientation::PAGE_FRAME: @@ -4589,7 +4589,7 @@ static bool lcl_ArrangeLowers( SwLayoutFrm *pLay, long lYStart, bool bInva ) if ( pTabFrm && !( pTabFrm->IsFollow() && pTabFrm->FindMaster()->IsRebuildLastLine() ) && - (pAnchoredObj->GetFrmFmt().GetAnchor().GetAnchorId() + (pAnchoredObj->GetFrameFormat().GetAnchor().GetAnchorId() != FLY_AS_CHAR)) { SwPageFrm* pPageFrm = pAnchoredObj->GetPageFrm(); @@ -4611,7 +4611,7 @@ static bool lcl_ArrangeLowers( SwLayoutFrm *pLay, long lYStart, bool bInva ) // #i52904# - re-introduce direct move // of drawing objects const bool bDirectMove = - static_cast<const SwDrawFrmFmt&>(pAnchoredObj->GetFrmFmt()).IsPosAttrSet() && + static_cast<const SwDrawFrameFormat&>(pAnchoredObj->GetFrameFormat()).IsPosAttrSet() && bVertPosDepOnAnchor && !pAnchoredObj->ConsiderObjWrapInfluenceOnObjPos(); if ( bDirectMove ) @@ -4654,8 +4654,8 @@ static bool lcl_ArrangeLowers( SwLayoutFrm *pLay, long lYStart, bool bInva ) // #i26945# - consider content inside fly frames if ( nDistanceToUpperPrtBottom < 0 && ( ( pFrm->IsInFly() && - ( !pFrm->IsTxtFrm() || - !static_cast<SwTxtFrm*>(pFrm)->IsUndersized() ) ) || + ( !pFrm->IsTextFrm() || + !static_cast<SwTextFrm*>(pFrm)->IsUndersized() ) ) || pFrm->IsInSplitTableRow() ) ) { pFrm->InvalidatePos(); @@ -4720,7 +4720,7 @@ void SwCellFrm::Format( const SwBorderAttrs *pAttrs ) SwTwips nWidth; if ( GetNext() ) { - const SwTwips nWish = pTab->GetFmt()->GetFrmSize().GetWidth(); + const SwTwips nWish = pTab->GetFormat()->GetFrmSize().GetWidth(); nWidth = pAttrs->GetSize().Width(); OSL_ENSURE( nWish, "Table without width?" ); @@ -4743,7 +4743,7 @@ void SwCellFrm::Format( const SwBorderAttrs *pAttrs ) do { pTmpBox = rBoxes[ i++ ]; - nSumWidth += pTmpBox->GetFrmFmt()->GetFrmSize().GetWidth(); + nSumWidth += pTmpBox->GetFrameFormat()->GetFrmSize().GetWidth(); } while ( pTmpBox != GetTabBox() ); @@ -4813,7 +4813,7 @@ void SwCellFrm::Format( const SwBorderAttrs *pAttrs ) } } } - const SwFmtVertOrient &rOri = pAttrs->GetAttrSet().GetVertOrient(); + const SwFormatVertOrient &rOri = pAttrs->GetAttrSet().GetVertOrient(); if ( !Lower() ) return; @@ -4828,7 +4828,7 @@ void SwCellFrm::Format( const SwBorderAttrs *pAttrs ) // #116532# Do not consider vertical alignment in grid mode !(pPg = FindPageFrm())->HasGrid() ) { - if ( !Lower()->IsCntntFrm() && !Lower()->IsSctFrm() && !Lower()->IsTabFrm() ) + if ( !Lower()->IsContentFrm() && !Lower()->IsSctFrm() && !Lower()->IsTabFrm() ) { // OSL_ENSURE(for HTML-import! OSL_ENSURE( false, "VAlign to cell without content" ); @@ -4838,7 +4838,7 @@ void SwCellFrm::Format( const SwBorderAttrs *pAttrs ) // #i43913# - no vertical alignment, if wrapping // style influence is considered on object positioning and // an object is anchored inside the cell. - const bool bConsiderWrapOnObjPos( GetFmt()->getIDocumentSettingAccess()->get(DocumentSettingId::CONSIDER_WRAP_ON_OBJECT_POSITION) ); + const bool bConsiderWrapOnObjPos( GetFormat()->getIDocumentSettingAccess()->get(DocumentSettingId::CONSIDER_WRAP_ON_OBJECT_POSITION) ); //No alignment if border with flow overlaps the cell. if ( pPg->GetSortedObjs() ) { @@ -4849,8 +4849,8 @@ void SwCellFrm::Format( const SwBorderAttrs *pAttrs ) SwRect aTmp( pAnchoredObj->GetObjRect() ); if ( aTmp.IsOver( aRect ) ) { - const SwFrmFmt& rAnchoredObjFrmFmt = pAnchoredObj->GetFrmFmt(); - const SwFmtSurround &rSur = rAnchoredObjFrmFmt.GetSurround(); + const SwFrameFormat& rAnchoredObjFrameFormat = pAnchoredObj->GetFrameFormat(); + const SwFormatSurround &rSur = rAnchoredObjFrameFormat.GetSurround(); if ( SURROUND_THROUGHT != rSur.GetSurround() ) { @@ -4873,7 +4873,7 @@ void SwCellFrm::Format( const SwBorderAttrs *pAttrs ) if ( bConsiderWrapOnObjPos || !IsAnLower( pAnch ) || pAnchoredObj->IsTmpConsiderWrapInfluence() || - !rAnchoredObjFrmFmt.GetFollowTextFlow().GetValue() ) + !rAnchoredObjFrameFormat.GetFollowTextFlow().GetValue() ) { bVertDir = false; break; @@ -4910,7 +4910,7 @@ void SwCellFrm::Format( const SwBorderAttrs *pAttrs ) else { //Was an old alignment taken into account? - if ( Lower()->IsCntntFrm() ) + if ( Lower()->IsContentFrm() ) { const long lYStart = (this->*fnRect->fnGetPrtTop)(); lcl_ArrangeLowers( this, lYStart, true ); @@ -4931,9 +4931,9 @@ void SwCellFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew ) if ( pItem ) { bool bInva = true; - if ( text::VertOrientation::NONE == static_cast<const SwFmtVertOrient*>(pItem)->GetVertOrient() && + if ( text::VertOrientation::NONE == static_cast<const SwFormatVertOrient*>(pItem)->GetVertOrient() && // OD 04.11.2003 #112910# - Lower() && Lower()->IsCntntFrm() ) + Lower() && Lower()->IsContentFrm() ) { SWRECTFN( this ) const long lYStart = (this->*fnRect->fnGetPrtTop)(); @@ -5075,7 +5075,7 @@ bool SwTable::IsHeadline( const SwTableLine& rLine ) const bool SwTabFrm::IsLayoutSplitAllowed() const { - return GetFmt()->GetLayoutSplit().GetValue(); + return GetFormat()->GetLayoutSplit().GetValue(); } // #i29550# @@ -5097,7 +5097,7 @@ sal_uInt16 SwTabFrm::GetBottomLineSize() const bool SwTabFrm::IsCollapsingBorders() const { - return static_cast<const SfxBoolItem&>(GetFmt()->GetAttrSet().Get( RES_COLLAPSING_BORDERS )).GetValue(); + return static_cast<const SfxBoolItem&>(GetFormat()->GetAttrSet().Get( RES_COLLAPSING_BORDERS )).GetValue(); } /// Local helper function to calculate height of first text row @@ -5143,11 +5143,11 @@ static SwTwips lcl_CalcHeightOfFirstContentLine( const SwRowFrm& rSourceLine ) { nTmpHeight = static_cast<const SwTabFrm*>(pTmp)->CalcHeightOfFirstContentLine(); } - else if ( pTmp->IsTxtFrm() ) + else if ( pTmp->IsTextFrm() ) { - SwTxtFrm* pTxtFrm = const_cast<SwTxtFrm*>(static_cast<const SwTxtFrm*>(pTmp)); - pTxtFrm->GetFormatted(); - nTmpHeight = pTxtFrm->FirstLineHeight(); + SwTextFrm* pTextFrm = const_cast<SwTextFrm*>(static_cast<const SwTextFrm*>(pTmp)); + pTextFrm->GetFormatted(); + nTmpHeight = pTextFrm->FirstLineHeight(); } if ( USHRT_MAX != nTmpHeight ) @@ -5173,8 +5173,8 @@ static SwTwips lcl_CalcHeightOfFirstContentLine( const SwRowFrm& rSourceLine ) // #115759# - do *not* consider the // additional lower space for 'master' text frames if ( pLast && pLast->IsFlowFrm() && - ( !pLast->IsTxtFrm() || - !static_cast<const SwTxtFrm*>(pLast)->GetFollow() ) ) + ( !pLast->IsTextFrm() || + !static_cast<const SwTextFrm*>(pLast)->GetFollow() ) ) { nReal += SwFlowFrm::CastFlowFrm(pLast)->CalcAddLowerSpaceAsLastInTableCell(); } @@ -5182,8 +5182,8 @@ static SwTwips lcl_CalcHeightOfFirstContentLine( const SwRowFrm& rSourceLine ) // #115759# - do *not* consider the upper // and the lower space for follow text frames. if ( pTmp->IsFlowFrm() && - ( !pTmp->IsTxtFrm() || - !static_cast<const SwTxtFrm*>(pTmp)->IsFollow() ) ) + ( !pTmp->IsTextFrm() || + !static_cast<const SwTextFrm*>(pTmp)->IsFollow() ) ) { nTmpHeight += SwFlowFrm::CastFlowFrm(pTmp)->CalcUpperSpace( NULL, pLast); nTmpHeight += SwFlowFrm::CastFlowFrm(pTmp)->CalcLowerSpace(); @@ -5192,8 +5192,8 @@ static SwTwips lcl_CalcHeightOfFirstContentLine( const SwRowFrm& rSourceLine ) // space of <pTmp>, if contains only one line. // In this case it would be the new last text frame, which // would have no follow and thus would add this space. - if ( pTmp->IsTxtFrm() && - const_cast<SwTxtFrm*>(static_cast<const SwTxtFrm*>(pTmp)) + if ( pTmp->IsTextFrm() && + const_cast<SwTextFrm*>(static_cast<const SwTextFrm*>(pTmp)) ->GetLineCount( COMPLETE_STRING ) == 1 ) { nTmpHeight += SwFlowFrm::CastFlowFrm(pTmp) @@ -5244,7 +5244,7 @@ SwTwips SwTabFrm::CalcHeightOfFirstContentLine() const { SWRECTFN( this ) - const bool bDontSplit = !IsFollow() && !GetFmt()->GetLayoutSplit().GetValue(); + const bool bDontSplit = !IsFollow() && !GetFormat()->GetLayoutSplit().GetValue(); if ( bDontSplit ) { @@ -5268,7 +5268,7 @@ SwTwips SwTabFrm::CalcHeightOfFirstContentLine() const // Calculate the height of the keeping lines // (headlines + following keeping lines): SwTwips nKeepHeight = nRepeatHeight; - if ( GetFmt()->GetDoc()->GetDocumentSettingManager().get(DocumentSettingId::TABLE_ROW_KEEP) ) + if ( GetFormat()->GetDoc()->GetDocumentSettingManager().get(DocumentSettingId::TABLE_ROW_KEEP) ) { sal_uInt16 nKeepRows = nRepeat; @@ -5343,7 +5343,7 @@ SwTwips SwTabFrm::CalcHeightOfFirstContentLine() const const SwTwips nHeightOfFirstContentLine = lcl_CalcHeightOfFirstContentLine( *pFirstRow ); // Consider minimum row height: - const SwFmtFrmSize &rSz = static_cast<const SwRowFrm*>(pFirstRow)->GetFmt()->GetFrmSize(); + const SwFormatFrmSize &rSz = static_cast<const SwRowFrm*>(pFirstRow)->GetFormat()->GetFrmSize(); const SwTwips nMinRowHeight = rSz.GetHeightSizeType() == ATT_MIN_SIZE ? rSz.GetHeight() : 0; diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx index 4e3766533c13..578192f54ec1 100644 --- a/sw/source/core/layout/trvlfrm.cxx +++ b/sw/source/core/layout/trvlfrm.cxx @@ -61,8 +61,8 @@ namespace { const SwVirtFlyDrawObj* pObj = static_cast<const SwVirtFlyDrawObj*>(aIter()); const SwAnchoredObject* pAnchoredObj = GetUserCall( aIter() )->GetAnchoredObj( aIter() ); - const SwFmtSurround& rSurround = pAnchoredObj->GetFrmFmt().GetSurround(); - const SvxOpaqueItem& rOpaque = pAnchoredObj->GetFrmFmt().GetOpaque(); + const SwFormatSurround& rSurround = pAnchoredObj->GetFrameFormat().GetSurround(); + const SvxOpaqueItem& rOpaque = pAnchoredObj->GetFrameFormat().GetOpaque(); bool bInBackground = ( rSurround.GetSurround() == SURROUND_THROUGHT ) && !rOpaque.GetValue(); bool bBackgroundMatches = ( bInBackground && bSearchBackground ) || @@ -138,7 +138,7 @@ public: static SwCrsrOszControl aOszCtrl = { 0, 0, 0 }; -/** Searches the CntntFrm owning the PrtArea containing the point. */ +/** Searches the ContentFrm owning the PrtArea containing the point. */ bool SwLayoutFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint, SwCrsrMoveState* pCMS, bool ) const { @@ -149,13 +149,13 @@ bool SwLayoutFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint, pFrm->Calc(); // #i43742# New function - const bool bCntntCheck = pFrm->IsTxtFrm() && pCMS && pCMS->bCntntCheck; - const SwRect aPaintRect( bCntntCheck ? + const bool bContentCheck = pFrm->IsTextFrm() && pCMS && pCMS->bContentCheck; + const SwRect aPaintRect( bContentCheck ? pFrm->UnionFrm() : pFrm->PaintArea() ); if ( aPaintRect.IsInside( rPoint ) && - ( bCntntCheck || pFrm->GetCrsrOfst( pPos, rPoint, pCMS ) ) ) + ( bContentCheck || pFrm->GetCrsrOfst( pPos, rPoint, pCMS ) ) ) bRet = true; else pFrm = pFrm->GetNext(); @@ -198,7 +198,7 @@ bool SwPageFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint, SwPosition aBackPos( *pPos ); SwPosition aTextPos( *pPos ); - //We fix the StartPoint if no Cntnt below the page 'answers' and then + //We fix the StartPoint if no Content below the page 'answers' and then //start all over again one page before the current one. //However we can't use Flys in such a case. if ( SwLayoutFrm::GetCrsrOfst( &aTextPos, aPoint, pCMS ) ) @@ -212,12 +212,12 @@ bool SwPageFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint, static_cast<SwCrsrMoveState*>(pCMS)->bStop = true; return false; } - const SwCntntFrm *pCnt = GetCntntPos( aPoint, false, false, false, pCMS, false ); + const SwContentFrm *pCnt = GetContentPos( aPoint, false, false, false, pCMS, false ); if ( pCMS && pCMS->bStop ) return false; OSL_ENSURE( pCnt, "Crsr is gone to a Black hole" ); - if( pCMS && pCMS->pFill && pCnt->IsTxtFrm() ) + if( pCMS && pCMS->pFill && pCnt->IsTextFrm() ) bTextRet = pCnt->GetCrsrOfst( &aTextPos, rPoint, pCMS ); else bTextRet = pCnt->GetCrsrOfst( &aTextPos, aPoint, pCMS ); @@ -226,21 +226,21 @@ bool SwPageFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint, { // Set point to pCnt, delete mark // this may happen, if pCnt is hidden - aTextPos = SwPosition( *pCnt->GetNode(), SwIndex( const_cast<SwTxtNode*>(static_cast<const SwTxtNode*>(pCnt->GetNode())), 0 ) ); + aTextPos = SwPosition( *pCnt->GetNode(), SwIndex( const_cast<SwTextNode*>(static_cast<const SwTextNode*>(pCnt->GetNode())), 0 ) ); bTextRet = true; } } - SwCntntNode* pContentNode = aTextPos.nNode.GetNode().GetCntntNode(); + SwContentNode* pContentNode = aTextPos.nNode.GetNode().GetContentNode(); bool bConsiderBackground = true; // If the text position is a clickable field, then that should have priority. - if (pContentNode && pContentNode->IsTxtNode()) + if (pContentNode && pContentNode->IsTextNode()) { - SwTxtNode* pTxtNd = pContentNode->GetTxtNode(); - SwTxtAttr* pTxtAttr = pTxtNd->GetTxtAttrForCharAt(aTextPos.nContent.GetIndex(), RES_TXTATR_FIELD); - if (pTxtAttr) + SwTextNode* pTextNd = pContentNode->GetTextNode(); + SwTextAttr* pTextAttr = pTextNd->GetTextAttrForCharAt(aTextPos.nContent.GetIndex(), RES_TXTATR_FIELD); + if (pTextAttr) { - const SwField* pField = pTxtAttr->GetFmtFld().GetField(); + const SwField* pField = pTextAttr->GetFormatField().GetField(); if (pField->IsClickable()) bConsiderBackground = false; } @@ -272,7 +272,7 @@ bool SwPageFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint, bool bValidTextDistance = false; if (pContentNode) { - SwCntntFrm* pTextFrm = pContentNode->getLayoutFrm( getRootFrm( ) ); + SwContentFrm* pTextFrm = pContentNode->getLayoutFrm( getRootFrm( ) ); // try this again but prefer the "previous" position SwCrsrMoveState aMoveState; @@ -320,11 +320,11 @@ bool SwPageFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint, double nBackDistance = 0; bool bValidBackDistance = false; - SwCntntNode* pBackNd = aBackPos.nNode.GetNode( ).GetCntntNode( ); + SwContentNode* pBackNd = aBackPos.nNode.GetNode( ).GetContentNode( ); if ( pBackNd && bConsiderBackground) { // FIXME There are still cases were we don't have the proper node here. - SwCntntFrm* pBackFrm = pBackNd->getLayoutFrm( getRootFrm( ) ); + SwContentFrm* pBackFrm = pBackNd->getLayoutFrm( getRootFrm( ) ); SwRect rBackRect; if (pBackFrm) { @@ -456,7 +456,7 @@ bool SwRootFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint, } /** - * If this is about a Cntnt-carrying cell the Crsr will be force inserted into one of the CntntFrms + * If this is about a Content-carrying cell the Crsr will be force inserted into one of the ContentFrms * if there are no other options. * * There is no entry for protected cells. @@ -469,7 +469,7 @@ bool SwCellFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint, return false; if ( !(pCMS && pCMS->bSetInReadOnly) && - GetFmt()->GetProtect().IsCntntProtected() ) + GetFormat()->GetProtect().IsContentProtected() ) return false; if ( pCMS && pCMS->eState == MV_TBLSEL ) @@ -507,8 +507,8 @@ bool SwCellFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint, { const bool bFill = pCMS && pCMS->pFill; Point aPoint( rPoint ); - const SwCntntFrm *pCnt = GetCntntPos( rPoint, true ); - if( bFill && pCnt->IsTxtFrm() ) + const SwContentFrm *pCnt = GetContentPos( rPoint, true ); + if( bFill && pCnt->IsTextFrm() ) { rPoint = aPoint; } @@ -543,7 +543,7 @@ bool SwFlyFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint, //If an Frm contains a graphic, but only text was requested, it basically //won't accept the Crsr. if ( bInside && pCMS && pCMS->eState == MV_SETONLYTEXT && - (!Lower() || Lower()->IsNoTxtFrm()) ) + (!Lower() || Lower()->IsNoTextFrm()) ) bInside = false; const SwPageFrm *pPage = FindPageFrm(); @@ -588,10 +588,10 @@ bool SwFlyFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint, { const bool bFill = pCMS && pCMS->pFill; Point aPoint( rPoint ); - const SwCntntFrm *pCnt = GetCntntPos( rPoint, true, false, false, pCMS ); + const SwContentFrm *pCnt = GetContentPos( rPoint, true, false, false, pCMS ); if ( pCMS && pCMS->bStop ) return false; - if( bFill && pCnt->IsTxtFrm() ) + if( bFill && pCnt->IsTextFrm() ) { rPoint = aPoint; } @@ -604,35 +604,35 @@ bool SwFlyFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint, } /** Layout dependent cursor travelling */ -bool SwCntntFrm::LeftMargin(SwPaM *pPam) const +bool SwContentFrm::LeftMargin(SwPaM *pPam) const { if( &pPam->GetNode() != GetNode() ) return false; - const_cast<SwCntntNode*>(GetNode())-> + const_cast<SwContentNode*>(GetNode())-> MakeStartIndex(&pPam->GetPoint()->nContent); return true; } -bool SwCntntFrm::RightMargin(SwPaM *pPam, bool) const +bool SwContentFrm::RightMargin(SwPaM *pPam, bool) const { if( &pPam->GetNode() != GetNode() ) return false; - const_cast<SwCntntNode*>(GetNode())-> + const_cast<SwContentNode*>(GetNode())-> MakeEndIndex(&pPam->GetPoint()->nContent); return true; } -static const SwCntntFrm *lcl_GetNxtCnt( const SwCntntFrm* pCnt ) +static const SwContentFrm *lcl_GetNxtCnt( const SwContentFrm* pCnt ) { - return pCnt->GetNextCntntFrm(); + return pCnt->GetNextContentFrm(); } -static const SwCntntFrm *lcl_GetPrvCnt( const SwCntntFrm* pCnt ) +static const SwContentFrm *lcl_GetPrvCnt( const SwContentFrm* pCnt ) { - return pCnt->GetPrevCntntFrm(); + return pCnt->GetPrevContentFrm(); } -typedef const SwCntntFrm *(*GetNxtPrvCnt)( const SwCntntFrm* ); +typedef const SwContentFrm *(*GetNxtPrvCnt)( const SwContentFrm* ); /// Frame in repeated headline? static bool lcl_IsInRepeatedHeadline( const SwFrm *pFrm, @@ -647,7 +647,7 @@ static bool lcl_IsInRepeatedHeadline( const SwFrm *pFrm, /// Skip protected table cells. Optionally also skip repeated headlines. //MA 1998-01-26: Chg also skip other protected areas //FME: Skip follow flow cells -static const SwCntntFrm * lcl_MissProtectedFrames( const SwCntntFrm *pCnt, +static const SwContentFrm * lcl_MissProtectedFrames( const SwContentFrm *pCnt, GetNxtPrvCnt fnNxtPrv, bool bMissHeadline, bool bInReadOnly, @@ -662,7 +662,7 @@ static const SwCntntFrm * lcl_MissProtectedFrames( const SwCntntFrm *pCnt, while ( pCell && !pCell->IsCellFrm() ) pCell = pCell->GetUpper(); if ( !pCell || - (( ( bInReadOnly || !pCell->GetFmt()->GetProtect().IsCntntProtected() ) && + (( ( bInReadOnly || !pCell->GetFormat()->GetProtect().IsContentProtected() ) && ( !bMissHeadline || !lcl_IsInRepeatedHeadline( pCell ) ) && ( !bMissFollowFlowLine || !pCell->IsInFollowFlowRow() ) && !pCell->IsCoveredCell()) ) ) @@ -678,23 +678,23 @@ static const SwCntntFrm * lcl_MissProtectedFrames( const SwCntntFrm *pCnt, return pCnt; } -static bool lcl_UpDown( SwPaM *pPam, const SwCntntFrm *pStart, +static bool lcl_UpDown( SwPaM *pPam, const SwContentFrm *pStart, GetNxtPrvCnt fnNxtPrv, bool bInReadOnly ) { OSL_ENSURE( &pPam->GetNode() == pStart->GetNode(), "lcl_UpDown doesn't work for others." ); - const SwCntntFrm *pCnt = 0; + const SwContentFrm *pCnt = 0; //We have to cheat a little bit during a table selection: Go to the //beginning of the cell while going up and go to the end of the cell while //going down. - bool bTblSel = false; + bool bTableSel = false; if ( pStart->IsInTab() && pPam->GetNode( true ).StartOfSectionNode() != pPam->GetNode( false ).StartOfSectionNode() ) { - bTblSel = true; + bTableSel = true; const SwLayoutFrm *pCell = pStart->GetUpper(); while ( !pCell->IsCellFrm() ) pCell = pCell->GetUpper(); @@ -705,15 +705,15 @@ static bool lcl_UpDown( SwPaM *pPam, const SwCntntFrm *pStart, static_cast<const SwCellFrm*>(pCell)->GetFollowCell() : static_cast<const SwCellFrm*>(pCell)->GetPreviousCell(); - const SwCntntFrm* pTmpStart = pStart; - while ( pTmpCell && 0 != ( pTmpStart = pTmpCell->ContainsCntnt() ) ) + const SwContentFrm* pTmpStart = pStart; + while ( pTmpCell && 0 != ( pTmpStart = pTmpCell->ContainsContent() ) ) { pCell = pTmpCell; pTmpCell = bFwd ? static_cast<const SwCellFrm*>(pCell)->GetFollowCell() : static_cast<const SwCellFrm*>(pCell)->GetPreviousCell(); } - const SwCntntFrm *pNxt = pCnt = pTmpStart; + const SwContentFrm *pNxt = pCnt = pTmpStart; while ( pCell->IsAnLower( pNxt ) ) { @@ -723,7 +723,7 @@ static bool lcl_UpDown( SwPaM *pPam, const SwCntntFrm *pStart, } pCnt = (*fnNxtPrv)( pCnt ? pCnt : pStart ); - pCnt = ::lcl_MissProtectedFrames( pCnt, fnNxtPrv, true, bInReadOnly, bTblSel ); + pCnt = ::lcl_MissProtectedFrames( pCnt, fnNxtPrv, true, bInReadOnly, bTableSel ); const SwTabFrm *pStTab = pStart->FindTabFrm(); const SwTabFrm *pTable = 0; @@ -731,7 +731,7 @@ static bool lcl_UpDown( SwPaM *pPam, const SwCntntFrm *pStart, bool bEnd = !bTab; const SwFrm* pVertRefFrm = pStart; - if ( bTblSel && pStTab ) + if ( bTableSel && pStTab ) pVertRefFrm = pStTab; SWRECTFN( pVertRefFrm ) @@ -796,32 +796,32 @@ static bool lcl_UpDown( SwPaM *pPam, const SwCntntFrm *pStart, if ( pStart->IsInDocBody() ) { while ( pCnt && (!pCnt->IsInDocBody() || - (pCnt->IsTxtFrm() && static_cast<const SwTxtFrm*>(pCnt)->IsHiddenNow()))) + (pCnt->IsTextFrm() && static_cast<const SwTextFrm*>(pCnt)->IsHiddenNow()))) { pCnt = (*fnNxtPrv)( pCnt ); - pCnt = ::lcl_MissProtectedFrames( pCnt, fnNxtPrv, true, bInReadOnly, bTblSel ); + pCnt = ::lcl_MissProtectedFrames( pCnt, fnNxtPrv, true, bInReadOnly, bTableSel ); } } //If I'm in the FootNoteArea, I try to reach the next FootNoteArea in //case of necessity. - else if ( pStart->IsInFtn() ) + else if ( pStart->IsInFootnote() ) { - while ( pCnt && (!pCnt->IsInFtn() || - (pCnt->IsTxtFrm() && static_cast<const SwTxtFrm*>(pCnt)->IsHiddenNow()))) + while ( pCnt && (!pCnt->IsInFootnote() || + (pCnt->IsTextFrm() && static_cast<const SwTextFrm*>(pCnt)->IsHiddenNow()))) { pCnt = (*fnNxtPrv)( pCnt ); - pCnt = ::lcl_MissProtectedFrames( pCnt, fnNxtPrv, true, bInReadOnly, bTblSel ); + pCnt = ::lcl_MissProtectedFrames( pCnt, fnNxtPrv, true, bInReadOnly, bTableSel ); } } - //In Flys we can go ahead blindly as long as we find a Cntnt. + //In Flys we can go ahead blindly as long as we find a Content. else if ( pStart->IsInFly() ) { - if ( pCnt && pCnt->IsTxtFrm() && static_cast<const SwTxtFrm*>(pCnt)->IsHiddenNow() ) + if ( pCnt && pCnt->IsTextFrm() && static_cast<const SwTextFrm*>(pCnt)->IsHiddenNow() ) { pCnt = (*fnNxtPrv)( pCnt ); - pCnt = ::lcl_MissProtectedFrames( pCnt, fnNxtPrv, true, bInReadOnly, bTblSel ); + pCnt = ::lcl_MissProtectedFrames( pCnt, fnNxtPrv, true, bInReadOnly, bTableSel ); } } @@ -842,10 +842,10 @@ static bool lcl_UpDown( SwPaM *pPam, const SwCntntFrm *pStart, } if ( !bSame ) pCnt = 0; - else if ( pCnt && pCnt->IsTxtFrm() && static_cast<const SwTxtFrm*>(pCnt)->IsHiddenNow() ) // i73332 + else if ( pCnt && pCnt->IsTextFrm() && static_cast<const SwTextFrm*>(pCnt)->IsHiddenNow() ) // i73332 { pCnt = (*fnNxtPrv)( pCnt ); - pCnt = ::lcl_MissProtectedFrames( pCnt, fnNxtPrv, true, bInReadOnly, bTblSel ); + pCnt = ::lcl_MissProtectedFrames( pCnt, fnNxtPrv, true, bInReadOnly, bTableSel ); } } @@ -905,13 +905,13 @@ static bool lcl_UpDown( SwPaM *pPam, const SwCntntFrm *pStart, if ( pCell && pCell->Frm().IsInside( aInsideCell ) ) { bEnd = true; - //Get the right Cntnt out of the cell. + //Get the right Content out of the cell. if ( !pCnt->Frm().IsInside( aInsideCnt ) ) { - pCnt = pCell->ContainsCntnt(); + pCnt = pCell->ContainsContent(); if ( fnNxtPrv == lcl_GetPrvCnt ) - while ( pCell->IsAnLower(pCnt->GetNextCntntFrm()) ) - pCnt = pCnt->GetNextCntntFrm(); + while ( pCell->IsAnLower(pCnt->GetNextContentFrm()) ) + pCnt = pCnt->GetNextContentFrm(); } } else if ( pCnt->Frm().IsInside( aInsideCnt ) ) @@ -921,16 +921,16 @@ static bool lcl_UpDown( SwPaM *pPam, const SwCntntFrm *pStart, if ( !bEnd ) { pCnt = (*fnNxtPrv)( pCnt ); - pCnt = ::lcl_MissProtectedFrames( pCnt, fnNxtPrv, true, bInReadOnly, bTblSel ); + pCnt = ::lcl_MissProtectedFrames( pCnt, fnNxtPrv, true, bInReadOnly, bTableSel ); } } } while ( !bEnd || - (pCnt && pCnt->IsTxtFrm() && static_cast<const SwTxtFrm*>(pCnt)->IsHiddenNow())); + (pCnt && pCnt->IsTextFrm() && static_cast<const SwTextFrm*>(pCnt)->IsHiddenNow())); if( pCnt ) { // set the Point on the Content-Node - SwCntntNode *pCNd = const_cast<SwCntntNode*>(pCnt->GetNode()); + SwContentNode *pCNd = const_cast<SwContentNode*>(pCnt->GetNode()); pPam->GetPoint()->nNode = *pCNd; if ( fnNxtPrv == lcl_GetPrvCnt ) pCNd->MakeEndIndex( &pPam->GetPoint()->nContent ); @@ -941,12 +941,12 @@ static bool lcl_UpDown( SwPaM *pPam, const SwCntntFrm *pStart, return false; } -bool SwCntntFrm::UnitUp( SwPaM* pPam, const SwTwips, bool bInReadOnly ) const +bool SwContentFrm::UnitUp( SwPaM* pPam, const SwTwips, bool bInReadOnly ) const { return ::lcl_UpDown( pPam, this, lcl_GetPrvCnt, bInReadOnly ); } -bool SwCntntFrm::UnitDown( SwPaM* pPam, const SwTwips, bool bInReadOnly ) const +bool SwContentFrm::UnitDown( SwPaM* pPam, const SwTwips, bool bInReadOnly ) const { return ::lcl_UpDown( pPam, this, lcl_GetNxtCnt, bInReadOnly ); } @@ -960,7 +960,7 @@ sal_uInt16 SwRootFrm::GetCurrPage( const SwPaM *pActualCrsr ) const { OSL_ENSURE( pActualCrsr, "got no page cursor" ); SwFrm const*const pActFrm = pActualCrsr->GetPoint()->nNode.GetNode(). - GetCntntNode()->getLayoutFrm( this, 0, + GetContentNode()->getLayoutFrm( this, 0, pActualCrsr->GetPoint(), false ); return pActFrm->FindPageFrm()->GetPhyPageNum(); @@ -983,13 +983,13 @@ sal_uInt16 SwRootFrm::SetCurrPage( SwCursor* pToSet, sal_uInt16 nPageNum ) { if ( pPage->GetNext() ) pPage = static_cast<SwPageFrm*>(pPage->GetNext()); else - { //Search the first CntntFrm and format until a new page is started - //or until the CntntFrm are all done. - const SwCntntFrm *pCntnt = pPage->ContainsCntnt(); - while ( pCntnt && pPage->IsAnLower( pCntnt ) ) + { //Search the first ContentFrm and format until a new page is started + //or until the ContentFrm are all done. + const SwContentFrm *pContent = pPage->ContainsContent(); + while ( pContent && pPage->IsAnLower( pContent ) ) { - pCntnt->Calc(); - pCntnt = pCntnt->GetNextCntntFrm(); + pContent->Calc(); + pContent = pContent->GetNextContentFrm(); } //Either this is a new page or we found the last page. if ( pPage->GetNext() ) @@ -999,42 +999,42 @@ sal_uInt16 SwRootFrm::SetCurrPage( SwCursor* pToSet, sal_uInt16 nPageNum ) } } //pPage now points to the 'requested' page. Now we have to create the PaM - //on the beginning of the first CntntFrm in the body-text. + //on the beginning of the first ContentFrm in the body-text. //If this is a footnote-page, the PaM will be set in the first footnote. - const SwCntntFrm *pCntnt = pPage->ContainsCntnt(); - if ( pPage->IsFtnPage() ) - while ( pCntnt && !pCntnt->IsInFtn() ) - pCntnt = pCntnt->GetNextCntntFrm(); + const SwContentFrm *pContent = pPage->ContainsContent(); + if ( pPage->IsFootnotePage() ) + while ( pContent && !pContent->IsInFootnote() ) + pContent = pContent->GetNextContentFrm(); else - while ( pCntnt && !pCntnt->IsInDocBody() ) - pCntnt = pCntnt->GetNextCntntFrm(); - if ( pCntnt ) + while ( pContent && !pContent->IsInDocBody() ) + pContent = pContent->GetNextContentFrm(); + if ( pContent ) { - SwCntntNode* pCNd = const_cast<SwCntntNode*>(pCntnt->GetNode()); + SwContentNode* pCNd = const_cast<SwContentNode*>(pContent->GetNode()); pToSet->GetPoint()->nNode = *pCNd; pCNd->MakeStartIndex( &pToSet->GetPoint()->nContent ); - pToSet->GetPoint()->nContent = static_cast<const SwTxtFrm*>(pCntnt)->GetOfst(); + pToSet->GetPoint()->nContent = static_cast<const SwTextFrm*>(pContent)->GetOfst(); SwShellCrsr* pSCrsr = dynamic_cast<SwShellCrsr*>(pToSet); if( pSCrsr ) { Point &rPt = pSCrsr->GetPtPos(); - rPt = pCntnt->Frm().Pos(); - rPt += pCntnt->Prt().Pos(); + rPt = pContent->Frm().Pos(); + rPt += pContent->Prt().Pos(); } return pPage->GetPhyPageNum(); } return 0; } -SwCntntFrm *GetFirstSub( const SwLayoutFrm *pLayout ) +SwContentFrm *GetFirstSub( const SwLayoutFrm *pLayout ) { - return const_cast<SwPageFrm*>(static_cast<const SwPageFrm*>(pLayout))->FindFirstBodyCntnt(); + return const_cast<SwPageFrm*>(static_cast<const SwPageFrm*>(pLayout))->FindFirstBodyContent(); } -SwCntntFrm *GetLastSub( const SwLayoutFrm *pLayout ) +SwContentFrm *GetLastSub( const SwLayoutFrm *pLayout ) { - return const_cast<SwPageFrm*>(static_cast<const SwPageFrm*>(pLayout))->FindLastBodyCntnt(); + return const_cast<SwPageFrm*>(static_cast<const SwPageFrm*>(pLayout))->FindLastBodyContent(); } SwLayoutFrm *GetNextFrm( const SwLayoutFrm *pFrm ) @@ -1043,7 +1043,7 @@ SwLayoutFrm *GetNextFrm( const SwLayoutFrm *pFrm ) (pFrm->GetNext() && pFrm->GetNext()->IsLayoutFrm()) ? const_cast<SwLayoutFrm*>(static_cast<const SwLayoutFrm*>(pFrm->GetNext())) : 0; // #i39402# in case of an empty page - if(pNext && !pNext->ContainsCntnt()) + if(pNext && !pNext->ContainsContent()) pNext = (pNext->GetNext() && pNext->GetNext()->IsLayoutFrm()) ? static_cast<SwLayoutFrm*>(pNext->GetNext()) : 0; return pNext; @@ -1060,7 +1060,7 @@ SwLayoutFrm *GetPrevFrm( const SwLayoutFrm *pFrm ) (pFrm->GetPrev() && pFrm->GetPrev()->IsLayoutFrm()) ? const_cast<SwLayoutFrm*>(static_cast<const SwLayoutFrm*>(pFrm->GetPrev())) : 0; // #i39402# in case of an empty page - if(pPrev && !pPrev->ContainsCntnt()) + if(pPrev && !pPrev->ContainsContent()) pPrev = (pPrev->GetPrev() && pPrev->GetPrev()->IsLayoutFrm()) ? static_cast<SwLayoutFrm*>(pPrev->GetPrev()) : 0; return pPrev; @@ -1078,7 +1078,7 @@ SwWhichPage fnPageNext = GetNextFrm; * Returns the first/last Contentframe (controlled using the parameter fnPosPage) * of the current/previous/next page (controlled using the parameter fnWhichPage). */ -bool GetFrmInPage( const SwCntntFrm *pCnt, SwWhichPage fnWhichPage, +bool GetFrmInPage( const SwContentFrm *pCnt, SwWhichPage fnWhichPage, SwPosPage fnPosPage, SwPaM *pPam ) { //First find the requested page, at first the current, then the one which @@ -1087,7 +1087,7 @@ bool GetFrmInPage( const SwCntntFrm *pCnt, SwWhichPage fnWhichPage, if ( !pLayoutFrm || (0 == (pLayoutFrm = (*fnWhichPage)(pLayoutFrm))) ) return false; - //Now the desired CntntFrm below the page + //Now the desired ContentFrm below the page if( 0 == (pCnt = (*fnPosPage)(pLayoutFrm)) ) return false; else @@ -1107,7 +1107,7 @@ bool GetFrmInPage( const SwCntntFrm *pCnt, SwWhichPage fnWhichPage, // with repeated headings. // To actually make a "real" move we take the first content // of the next row - pCnt = pRow->ContainsCntnt(); + pCnt = pRow->ContainsContent(); if ( ! pCnt ) return false; } @@ -1115,14 +1115,14 @@ bool GetFrmInPage( const SwCntntFrm *pCnt, SwWhichPage fnWhichPage, } } - SwCntntNode *pCNd = const_cast<SwCntntNode*>(pCnt->GetNode()); + SwContentNode *pCNd = const_cast<SwContentNode*>(pCnt->GetNode()); pPam->GetPoint()->nNode = *pCNd; sal_Int32 nIdx; if( fnPosPage == GetFirstSub ) - nIdx = static_cast<const SwTxtFrm*>(pCnt)->GetOfst(); + nIdx = static_cast<const SwTextFrm*>(pCnt)->GetOfst(); else nIdx = pCnt->GetFollow() ? - static_cast<const SwTxtFrm*>(pCnt)->GetFollow()->GetOfst()-1 : pCNd->Len(); + static_cast<const SwTextFrm*>(pCnt)->GetFollow()->GetOfst()-1 : pCNd->Len(); pPam->GetPoint()->nContent.Assign( pCNd, nIdx ); return true; } @@ -1139,13 +1139,13 @@ static sal_uInt64 CalcDiff(const Point &rPt1, const Point &rPt2) return (dX * dX) + (dY * dY); } -/** Check if the point lies inside the page part in which also the CntntFrame lies. +/** Check if the point lies inside the page part in which also the ContentFrame lies. * * In this context header, page body, footer and footnote-container count as page part. - * This will suit the purpose that the CntntFrm which lies in the "right" page part will be + * This will suit the purpose that the ContentFrm which lies in the "right" page part will be * accepted instead of one which doesn't lie there although his distance to the point is shorter. */ -static const SwLayoutFrm* lcl_Inside( const SwCntntFrm *pCnt, Point& rPt ) +static const SwLayoutFrm* lcl_Inside( const SwContentFrm *pCnt, Point& rPt ) { const SwLayoutFrm* pUp = pCnt->GetUpper(); while( pUp ) @@ -1156,40 +1156,40 @@ static const SwLayoutFrm* lcl_Inside( const SwCntntFrm *pCnt, Point& rPt ) return pUp; return NULL; } - if( pUp->IsFtnContFrm() ) + if( pUp->IsFootnoteContFrm() ) return pUp->Frm().IsInside( rPt ) ? pUp : NULL; pUp = pUp->GetUpper(); } return NULL; } -/** Search for the nearest Cntnt to pass. +/** Search for the nearest Content to pass. * * Considers the previous, the current and the next page. * If no content is found, the area gets expanded until one is found. * - * @return The 'semantically correct' position inside the PrtArea of the found CntntFrm. + * @return The 'semantically correct' position inside the PrtArea of the found ContentFrm. */ -const SwCntntFrm *SwLayoutFrm::GetCntntPos( Point& rPoint, +const SwContentFrm *SwLayoutFrm::GetContentPos( Point& rPoint, const bool bDontLeave, const bool bBodyOnly, const bool bCalc, const SwCrsrMoveState *pCMS, const bool bDefaultExpand ) const { - //Determine the first CntntFrm. + //Determine the first ContentFrm. const SwLayoutFrm *pStart = (!bDontLeave && bDefaultExpand && GetPrev()) ? static_cast<const SwLayoutFrm*>(GetPrev()) : this; - const SwCntntFrm *pCntnt = pStart->ContainsCntnt(); + const SwContentFrm *pContent = pStart->ContainsContent(); - if ( !pCntnt && (GetPrev() && !bDontLeave) ) - pCntnt = ContainsCntnt(); + if ( !pContent && (GetPrev() && !bDontLeave) ) + pContent = ContainsContent(); - if ( bBodyOnly && pCntnt && !pCntnt->IsInDocBody() ) - while ( pCntnt && !pCntnt->IsInDocBody() ) - pCntnt = pCntnt->GetNextCntntFrm(); + if ( bBodyOnly && pContent && !pContent->IsInDocBody() ) + while ( pContent && !pContent->IsInDocBody() ) + pContent = pContent->GetNextContentFrm(); - const SwCntntFrm *pActual= pCntnt; + const SwContentFrm *pActual= pContent; const SwLayoutFrm *pInside = NULL; sal_uInt16 nMaxPage = GetPhyPageNum() + (bDefaultExpand ? 1 : 0); Point aPoint = rPoint; @@ -1197,76 +1197,76 @@ const SwCntntFrm *SwLayoutFrm::GetCntntPos( Point& rPoint, while ( true ) //A loop to be sure we always find one. { - while ( pCntnt && - ((!bDontLeave || IsAnLower( pCntnt )) && - (pCntnt->GetPhyPageNum() <= nMaxPage)) ) + while ( pContent && + ((!bDontLeave || IsAnLower( pContent )) && + (pContent->GetPhyPageNum() <= nMaxPage)) ) { - if ( ( bCalc || pCntnt->Frm().Width() ) && - ( !bBodyOnly || pCntnt->IsInDocBody() ) ) + if ( ( bCalc || pContent->Frm().Width() ) && + ( !bBodyOnly || pContent->IsInDocBody() ) ) { - //If the Cntnt lies in a protected area (cell, Ftn, section), - //we search the next Cntnt which is not protected. - const SwCntntFrm *pComp = pCntnt; - pCntnt = ::lcl_MissProtectedFrames( pCntnt, lcl_GetNxtCnt, false, + //If the Content lies in a protected area (cell, Footnote, section), + //we search the next Content which is not protected. + const SwContentFrm *pComp = pContent; + pContent = ::lcl_MissProtectedFrames( pContent, lcl_GetNxtCnt, false, pCMS && pCMS->bSetInReadOnly, false ); - if ( pComp != pCntnt ) + if ( pComp != pContent ) continue; - if ( !pCntnt->IsTxtFrm() || !static_cast<const SwTxtFrm*>(pCntnt)->IsHiddenNow() ) + if ( !pContent->IsTextFrm() || !static_cast<const SwTextFrm*>(pContent)->IsHiddenNow() ) { if ( bCalc ) - pCntnt->Calc(); + pContent->Calc(); - SwRect aCntFrm( pCntnt->UnionFrm() ); + SwRect aCntFrm( pContent->UnionFrm() ); if ( aCntFrm.IsInside( rPoint ) ) { - pActual = pCntnt; + pActual = pContent; aPoint = rPoint; break; } - //The distance from rPoint to the nearest Point of pCntnt + //The distance from rPoint to the nearest Point of pContent //will now be calculated. - Point aCntntPoint( rPoint ); + Point aContentPoint( rPoint ); //First set the vertical position - if ( aCntFrm.Top() > aCntntPoint.Y() ) - aCntntPoint.Y() = aCntFrm.Top(); - else if ( aCntFrm.Bottom() < aCntntPoint.Y() ) - aCntntPoint.Y() = aCntFrm.Bottom(); + if ( aCntFrm.Top() > aContentPoint.Y() ) + aContentPoint.Y() = aCntFrm.Top(); + else if ( aCntFrm.Bottom() < aContentPoint.Y() ) + aContentPoint.Y() = aCntFrm.Bottom(); //Now the horizontal position - if ( aCntFrm.Left() > aCntntPoint.X() ) - aCntntPoint.X() = aCntFrm.Left(); - else if ( aCntFrm.Right() < aCntntPoint.X() ) - aCntntPoint.X() = aCntFrm.Right(); + if ( aCntFrm.Left() > aContentPoint.X() ) + aContentPoint.X() = aCntFrm.Left(); + else if ( aCntFrm.Right() < aContentPoint.X() ) + aContentPoint.X() = aCntFrm.Right(); // pInside is a page area in which the point lies. As soon // as pInside != 0 only frames are accepted which are // placed inside. - if( !pInside || ( pInside->IsAnLower( pCntnt ) && - ( !pCntnt->IsInFtn() || pInside->IsFtnContFrm() ) ) ) + if( !pInside || ( pInside->IsAnLower( pContent ) && + ( !pContent->IsInFootnote() || pInside->IsFootnoteContFrm() ) ) ) { - const sal_uInt64 nDiff = ::CalcDiff(aCntntPoint, rPoint); + const sal_uInt64 nDiff = ::CalcDiff(aContentPoint, rPoint); bool bBetter = nDiff < nDistance; // This one is nearer if( !pInside ) { - pInside = lcl_Inside( pCntnt, rPoint ); + pInside = lcl_Inside( pContent, rPoint ); if( pInside ) // In the "right" page area bBetter = true; } if( bBetter ) { - aPoint = aCntntPoint; + aPoint = aContentPoint; nDistance = nDiff; - pActual = pCntnt; + pActual = pContent; } } } } - pCntnt = pCntnt->GetNextCntntFrm(); + pContent = pContent->GetNextContentFrm(); if ( bBodyOnly ) - while ( pCntnt && !pCntnt->IsInDocBody() ) - pCntnt = pCntnt->GetNextCntntFrm(); + while ( pContent && !pContent->IsInDocBody() ) + pContent = pContent->GetNextContentFrm(); } if ( !pActual ) { //If we not yet found one we have to expand the searched @@ -1275,22 +1275,22 @@ const SwCntntFrm *SwLayoutFrm::GetCntntPos( Point& rPoint, //the body, we can expand the searched area sufficiently in one step. if ( bBodyOnly ) { - while ( !pCntnt && pStart->GetPrev() ) + while ( !pContent && pStart->GetPrev() ) { ++nMaxPage; if( !pStart->GetPrev()->IsLayoutFrm() ) return 0; pStart = static_cast<const SwLayoutFrm*>(pStart->GetPrev()); - pCntnt = pStart->IsInDocBody() - ? pStart->ContainsCntnt() - : pStart->FindPageFrm()->FindFirstBodyCntnt(); + pContent = pStart->IsInDocBody() + ? pStart->ContainsContent() + : pStart->FindPageFrm()->FindFirstBodyContent(); } - if ( !pCntnt ) // Somewhere down the road we have to start with one! + if ( !pContent ) // Somewhere down the road we have to start with one! { - pCntnt = pStart->FindPageFrm()->GetUpper()->ContainsCntnt(); - while ( pCntnt && !pCntnt->IsInDocBody() ) - pCntnt = pCntnt->GetNextCntntFrm(); - if ( !pCntnt ) + pContent = pStart->FindPageFrm()->GetUpper()->ContainsContent(); + while ( pContent && !pContent->IsInDocBody() ) + pContent = pContent->GetNextContentFrm(); + if ( !pContent ) return 0; // There is no document content yet! } } @@ -1302,21 +1302,21 @@ const SwCntntFrm *SwLayoutFrm::GetCntntPos( Point& rPoint, if( !pStart->GetPrev()->IsLayoutFrm() ) return 0; pStart = static_cast<const SwLayoutFrm*>(pStart->GetPrev()); - pCntnt = pStart->ContainsCntnt(); + pContent = pStart->ContainsContent(); } else // Somewhere down the road we have to start with one! - pCntnt = pStart->FindPageFrm()->GetUpper()->ContainsCntnt(); + pContent = pStart->FindPageFrm()->GetUpper()->ContainsContent(); } - pActual = pCntnt; + pActual = pContent; } else break; } - OSL_ENSURE( pActual, "no Cntnt found." ); - OSL_ENSURE( !bBodyOnly || pActual->IsInDocBody(), "Cntnt not in Body." ); + OSL_ENSURE( pActual, "no Content found." ); + OSL_ENSURE( !bBodyOnly || pActual->IsInDocBody(), "Content not in Body." ); - //Special case for selecting tables not in repeated TblHeadlines. + //Special case for selecting tables not in repeated TableHeadlines. if ( pActual->IsInTab() && pCMS && pCMS->eState == MV_TBLSEL ) { const SwTabFrm *pTab = pActual->FindTabFrm(); @@ -1371,38 +1371,38 @@ const SwCntntFrm *SwLayoutFrm::GetCntntPos( Point& rPoint, return pActual; } -/** Same as SwLayoutFrm::GetCntntPos(). Specialized for fields and border. */ -void SwPageFrm::GetCntntPosition( const Point &rPt, SwPosition &rPos ) const +/** Same as SwLayoutFrm::GetContentPos(). Specialized for fields and border. */ +void SwPageFrm::GetContentPosition( const Point &rPt, SwPosition &rPos ) const { - //Determine the first CntntFrm. - const SwCntntFrm *pCntnt = ContainsCntnt(); - if ( pCntnt ) + //Determine the first ContentFrm. + const SwContentFrm *pContent = ContainsContent(); + if ( pContent ) { //Look back one more (if possible). - const SwCntntFrm *pTmp = pCntnt->GetPrevCntntFrm(); + const SwContentFrm *pTmp = pContent->GetPrevContentFrm(); while ( pTmp && !pTmp->IsInDocBody() ) - pTmp = pTmp->GetPrevCntntFrm(); + pTmp = pTmp->GetPrevContentFrm(); if ( pTmp ) - pCntnt = pTmp; + pContent = pTmp; } else - pCntnt = GetUpper()->ContainsCntnt(); + pContent = GetUpper()->ContainsContent(); - const SwCntntFrm *pAct = pCntnt; + const SwContentFrm *pAct = pContent; Point aAct = rPt; sal_uInt64 nDist = SAL_MAX_UINT64; - while ( pCntnt ) + while ( pContent ) { - SwRect aCntFrm( pCntnt->UnionFrm() ); + SwRect aCntFrm( pContent->UnionFrm() ); if ( aCntFrm.IsInside( rPt ) ) { //This is the nearest one. - pAct = pCntnt; + pAct = pContent; break; } - //Calculate the distance from rPt to the nearest point of pCntnt. + //Calculate the distance from rPt to the nearest point of pContent. Point aPoint( rPt ); //Calculate the vertical position first @@ -1422,15 +1422,15 @@ void SwPageFrm::GetCntntPosition( const Point &rPt, SwPosition &rPos ) const { aAct = aPoint; nDist = nDiff; - pAct = pCntnt; + pAct = pContent; } else if ( aCntFrm.Top() > Frm().Bottom() ) //In terms of fields, it's not possible to be closer any more! break; - pCntnt = pCntnt->GetNextCntntFrm(); - while ( pCntnt && !pCntnt->IsInDocBody() ) - pCntnt = pCntnt->GetNextCntntFrm(); + pContent = pContent->GetNextContentFrm(); + while ( pContent && !pContent->IsInDocBody() ) + pContent = pContent->GetNextContentFrm(); } //Bring the point into the PrtArea. @@ -1446,9 +1446,9 @@ void SwPageFrm::GetCntntPosition( const Point &rPt, SwPosition &rPos ) const if( !pAct->IsValid() ) { - // CntntFrm not formatted -> always on node-beginning - SwCntntNode* pCNd = const_cast<SwCntntNode*>(pAct->GetNode()); - OSL_ENSURE( pCNd, "Where is my CntntNode?" ); + // ContentFrm not formatted -> always on node-beginning + SwContentNode* pCNd = const_cast<SwContentNode*>(pAct->GetNode()); + OSL_ENSURE( pCNd, "Where is my ContentNode?" ); rPos.nNode = *pCNd; rPos.nContent.Assign( pCNd, 0 ); } @@ -1481,19 +1481,19 @@ class DisableCallbackAction } }; -/** Search the nearest Cntnt to the passed point. +/** Search the nearest Content to the passed point. * * Only search inside the BodyText. * @note Only the nearest vertically one will be searched. * @note JP 11.10.2001: only in tables we try to find the right column - Bug 72294 */ -Point SwRootFrm::GetNextPrevCntntPos( const Point& rPoint, bool bNext ) const +Point SwRootFrm::GetNextPrevContentPos( const Point& rPoint, bool bNext ) const { // #123110# - disable creation of an action by a callback // event during processing of this method. Needed because formatting is // triggered by this method. DisableCallbackAction aDisableCallbackAction( *this ); - //Search the first CntntFrm and his successor in the body area. + //Search the first ContentFrm and his successor in the body area. //To be efficient (and not formatting too much) we'll start at the correct //page. const SwLayoutFrm *pPage = static_cast<const SwLayoutFrm*>(Lower()); @@ -1501,9 +1501,9 @@ Point SwRootFrm::GetNextPrevCntntPos( const Point& rPoint, bool bNext ) const while( pPage->GetNext() && pPage->Frm().Bottom() < rPoint.Y() ) pPage = static_cast<const SwLayoutFrm*>(pPage->GetNext()); - const SwCntntFrm *pCnt = pPage ? pPage->ContainsCntnt() : ContainsCntnt(); + const SwContentFrm *pCnt = pPage ? pPage->ContainsContent() : ContainsContent(); while ( pCnt && !pCnt->IsInDocBody() ) - pCnt = pCnt->GetNextCntntFrm(); + pCnt = pCnt->GetNextContentFrm(); if ( !pCnt ) return Point( 0, 0 ); @@ -1511,32 +1511,32 @@ Point SwRootFrm::GetNextPrevCntntPos( const Point& rPoint, bool bNext ) const pCnt->Calc(); if( !bNext ) { - // As long as the point lies before the first CntntFrm and there are + // As long as the point lies before the first ContentFrm and there are // still precedent pages I'll go to the next page. while ( rPoint.Y() < pCnt->Frm().Top() && pPage->GetPrev() ) { pPage = static_cast<const SwLayoutFrm*>(pPage->GetPrev()); - pCnt = pPage->ContainsCntnt(); + pCnt = pPage->ContainsContent(); while ( !pCnt ) { pPage = static_cast<const SwLayoutFrm*>(pPage->GetPrev()); if ( pPage ) - pCnt = pPage->ContainsCntnt(); + pCnt = pPage->ContainsContent(); else - return ContainsCntnt()->UnionFrm().Pos(); + return ContainsContent()->UnionFrm().Pos(); } pCnt->Calc(); } } - //Does the point lie above the first CntntFrm? + //Does the point lie above the first ContentFrm? if ( rPoint.Y() < pCnt->Frm().Top() && !lcl_IsInRepeatedHeadline( pCnt ) ) return pCnt->UnionFrm().Pos(); Point aRet(0, 0); do { - //Does the point lie in the current CntntFrm? + //Does the point lie in the current ContentFrm? SwRect aCntFrm( pCnt->UnionFrm() ); if ( aCntFrm.IsInside( rPoint ) && !lcl_IsInRepeatedHeadline( pCnt )) { @@ -1544,21 +1544,21 @@ Point SwRootFrm::GetNextPrevCntntPos( const Point& rPoint, bool bNext ) const break; } - //Is the current one the last CntntFrm? - //If the next CntntFrm lies behind the point, then the current on is the + //Is the current one the last ContentFrm? + //If the next ContentFrm lies behind the point, then the current on is the //one we searched. - const SwCntntFrm *pNxt = pCnt->GetNextCntntFrm(); + const SwContentFrm *pNxt = pCnt->GetNextContentFrm(); while ( pNxt && !pNxt->IsInDocBody() ) - pNxt = pNxt->GetNextCntntFrm(); + pNxt = pNxt->GetNextContentFrm(); - //Does the point lie behind the last CntntFrm? + //Does the point lie behind the last ContentFrm? if ( !pNxt ) { aRet = Point( aCntFrm.Right(), aCntFrm.Bottom() ); break; } - //If the next CntntFrm lies behind the point then it is the one we + //If the next ContentFrm lies behind the point then it is the one we //searched. const SwTabFrm* pTFrm; pNxt->Calc(); @@ -1641,9 +1641,9 @@ bool SwRootFrm::IsDummyPage( sal_uInt16 nPageNum ) const */ bool SwFrm::IsProtected() const { - if (this->IsCntntFrm() && static_cast<const SwCntntFrm*>(this)->GetNode()) + if (this->IsContentFrm() && static_cast<const SwContentFrm*>(this)->GetNode()) { - const SwDoc *pDoc=static_cast<const SwCntntFrm*>(this)->GetNode()->GetDoc(); + const SwDoc *pDoc=static_cast<const SwContentFrm*>(this)->GetNode()->GetDoc(); bool isFormProtected=pDoc->GetDocumentSettingManager().get(DocumentSettingId::PROTECT_FORM ); if (isFormProtected) { @@ -1655,17 +1655,17 @@ bool SwFrm::IsProtected() const const SwFrm *pFrm = this; do { - if ( pFrm->IsCntntFrm() ) + if ( pFrm->IsContentFrm() ) { - if ( static_cast<const SwCntntFrm*>(pFrm)->GetNode() && - static_cast<const SwCntntFrm*>(pFrm)->GetNode()->IsInProtectSect() ) + if ( static_cast<const SwContentFrm*>(pFrm)->GetNode() && + static_cast<const SwContentFrm*>(pFrm)->GetNode()->IsInProtectSect() ) return true; } else { - if ( static_cast<const SwLayoutFrm*>(pFrm)->GetFmt() && - static_cast<const SwLayoutFrm*>(pFrm)->GetFmt()-> - GetProtect().IsCntntProtected() ) + if ( static_cast<const SwLayoutFrm*>(pFrm)->GetFormat() && + static_cast<const SwLayoutFrm*>(pFrm)->GetFormat()-> + GetProtect().IsContentProtected() ) return true; if ( pFrm->IsCoveredCell() ) return true; @@ -1685,8 +1685,8 @@ bool SwFrm::IsProtected() const } pFrm = static_cast<const SwFlyFrm*>(pFrm)->GetAnchorFrm(); } - else if ( pFrm->IsFtnFrm() ) - pFrm = static_cast<const SwFtnFrm*>(pFrm)->GetRef(); + else if ( pFrm->IsFootnoteFrm() ) + pFrm = static_cast<const SwFootnoteFrm*>(pFrm)->GetRef(); else pFrm = pFrm->GetUpper(); @@ -1719,7 +1719,7 @@ bool SwFrm::WannaRightPage() const if ( !pPage || !pPage->GetUpper() ) return true; - const SwFrm *pFlow = pPage->FindFirstBodyCntnt(); + const SwFrm *pFlow = pPage->FindFirstBodyContent(); const SwPageDesc *pDesc = 0; ::boost::optional<sal_uInt16> oPgNum; if ( pFlow ) @@ -1729,7 +1729,7 @@ bool SwFrm::WannaRightPage() const const SwFlowFrm *pTmp = SwFlowFrm::CastFlowFrm( pFlow ); if ( !pTmp->IsFollow() ) { - const SwFmtPageDesc& rPgDesc = pFlow->GetAttrSet()->GetPageDesc(); + const SwFormatPageDesc& rPgDesc = pFlow->GetAttrSet()->GetPageDesc(); pDesc = rPgDesc.GetPageDesc(); oPgNum = rPgDesc.GetNumOffset(); } @@ -1743,7 +1743,7 @@ bool SwFrm::WannaRightPage() const pDesc = pPrv->GetPageDesc()->GetFollow(); else { - const SwDoc* pDoc = pPage->GetFmt()->GetDoc(); + const SwDoc* pDoc = pPage->GetFormat()->GetDoc(); pDesc = &pDoc->GetPageDesc( 0 ); } } @@ -1759,9 +1759,9 @@ bool SwFrm::WannaRightPage() const } if( !pPage->IsEmptyPage() ) { - if( !pDesc->GetRightFmt() ) + if( !pDesc->GetRightFormat() ) bOdd = false; - else if( !pDesc->GetLeftFmt() ) + else if( !pDesc->GetLeftFormat() ) bOdd = true; } return bOdd; @@ -1812,7 +1812,7 @@ sal_uInt16 SwFrm::GetVirtPageNum() const //attributes we get the sections. const SwPageFrm *pVirtPage = 0; const SwFrm *pFrm = 0; - const SfxItemPool &rPool = pPage->GetFmt()->GetDoc()->GetAttrPool(); + const SfxItemPool &rPool = pPage->GetFormat()->GetDoc()->GetAttrPool(); sal_uInt32 nMaxItems = rPool.GetItemCount2( RES_PAGEDESC ); for( sal_uInt32 n = 0; n < nMaxItems; ++n ) { @@ -1820,7 +1820,7 @@ sal_uInt16 SwFrm::GetVirtPageNum() const if ( 0 == pItem ) continue; - const SwFmtPageDesc *pDesc = static_cast<const SwFmtPageDesc*>(pItem); + const SwFormatPageDesc *pDesc = static_cast<const SwFormatPageDesc*>(pItem); if ( pDesc->GetNumOffset() && pDesc->GetDefinedIn() ) { const SwModify *pMod = pDesc->GetDefinedIn(); @@ -1853,21 +1853,21 @@ sal_uInt16 SwFrm::GetVirtPageNum() const } /** Determines and sets those cells which are enclosed by the selection. */ -bool SwRootFrm::MakeTblCrsrs( SwTableCursor& rTblCrsr ) +bool SwRootFrm::MakeTableCrsrs( SwTableCursor& rTableCrsr ) { //Find Union-Rects and tables (Follows) of the selection. - OSL_ENSURE( rTblCrsr.GetCntntNode() && rTblCrsr.GetCntntNode( false ), + OSL_ENSURE( rTableCrsr.GetContentNode() && rTableCrsr.GetContentNode( false ), "Tabselection nicht auf Cnt." ); bool bRet = false; // For new table models there's no need to ask the layout.. - if( rTblCrsr.NewTableSelection() ) + if( rTableCrsr.NewTableSelection() ) return true; Point aPtPt, aMkPt; { - SwShellCrsr* pShCrsr = dynamic_cast<SwShellCrsr*>(&rTblCrsr); + SwShellCrsr* pShCrsr = dynamic_cast<SwShellCrsr*>(&rTableCrsr); if( pShCrsr ) { @@ -1877,8 +1877,8 @@ bool SwRootFrm::MakeTblCrsrs( SwTableCursor& rTblCrsr ) } // #151012# Made code robust here - const SwCntntNode* pTmpStartNode = rTblCrsr.GetCntntNode(); - const SwCntntNode* pTmpEndNode = rTblCrsr.GetCntntNode(false); + const SwContentNode* pTmpStartNode = rTableCrsr.GetContentNode(); + const SwContentNode* pTmpEndNode = rTableCrsr.GetContentNode(false); const SwFrm* pTmpStartFrm = pTmpStartNode ? pTmpStartNode->getLayoutFrm( this, &aPtPt, 0, false ) : 0; const SwFrm* pTmpEndFrm = pTmpEndNode ? pTmpEndNode->getLayoutFrm( this, &aMkPt, 0, false ) : 0; @@ -1886,7 +1886,7 @@ bool SwRootFrm::MakeTblCrsrs( SwTableCursor& rTblCrsr ) const SwLayoutFrm* pStart = pTmpStartFrm ? pTmpStartFrm->GetUpper() : 0; const SwLayoutFrm* pEnd = pTmpEndFrm ? pTmpEndFrm->GetUpper() : 0; - OSL_ENSURE( pStart && pEnd, "MakeTblCrsrs: Good to have the code robust here!" ); + OSL_ENSURE( pStart && pEnd, "MakeTableCrsrs: Good to have the code robust here!" ); /* #109590# Only change table boxes if the frames are valid. Needed because otherwise the table cursor after moving @@ -1898,7 +1898,7 @@ bool SwRootFrm::MakeTblCrsrs( SwTableCursor& rTblCrsr ) SwSelBoxes aNew; - const bool bReadOnlyAvailable = rTblCrsr.IsReadOnlyAvailable(); + const bool bReadOnlyAvailable = rTableCrsr.IsReadOnlyAvailable(); for ( size_t i = 0; i < aUnions.size(); ++i ) { @@ -1919,9 +1919,9 @@ bool SwRootFrm::MakeTblCrsrs( SwTableCursor& rTblCrsr ) while ( pCell && pRow->IsAnLower( pCell ) ) { OSL_ENSURE( pCell->IsCellFrm(), "Frame without cell" ); - if( IsFrmInTblSel( pUnion->GetUnion(), pCell ) && + if( IsFrmInTableSel( pUnion->GetUnion(), pCell ) && (bReadOnlyAvailable || - !pCell->GetFmt()->GetProtect().IsCntntProtected())) + !pCell->GetFormat()->GetProtect().IsContentProtected())) { SwTableBox* pInsBox = const_cast<SwTableBox*>( static_cast<const SwCellFrm*>(pCell)->GetTabBox()); @@ -1956,7 +1956,7 @@ bool SwRootFrm::MakeTblCrsrs( SwTableCursor& rTblCrsr ) } } - rTblCrsr.ActualizeSelection( aNew ); + rTableCrsr.ActualizeSelection( aNew ); bRet = true; } @@ -2015,24 +2015,24 @@ void SwRootFrm::CalcFrmRects(SwShellCrsr &rCrsr) SwRegionRects aRegion( !bIgnoreVisArea ? pSh->VisArea() : Frm() ); - if( !pStartPos->nNode.GetNode().IsCntntNode() || - !pStartPos->nNode.GetNode().GetCntntNode()->getLayoutFrm(this) || + if( !pStartPos->nNode.GetNode().IsContentNode() || + !pStartPos->nNode.GetNode().GetContentNode()->getLayoutFrm(this) || ( pStartPos->nNode != pEndPos->nNode && - ( !pEndPos->nNode.GetNode().IsCntntNode() || - !pEndPos->nNode.GetNode().GetCntntNode()->getLayoutFrm(this) ) ) ) + ( !pEndPos->nNode.GetNode().IsContentNode() || + !pEndPos->nNode.GetNode().GetContentNode()->getLayoutFrm(this) ) ) ) { return; } - //First obtain the CntntFrms for the start and the end - those are needed + //First obtain the ContentFrms for the start and the end - those are needed //anyway. - SwCntntFrm const* pStartFrm = pStartPos->nNode.GetNode(). - GetCntntNode()->getLayoutFrm( this, &rCrsr.GetSttPos(), pStartPos ); + SwContentFrm const* pStartFrm = pStartPos->nNode.GetNode(). + GetContentNode()->getLayoutFrm( this, &rCrsr.GetSttPos(), pStartPos ); - SwCntntFrm const* pEndFrm = pEndPos->nNode.GetNode(). - GetCntntNode()->getLayoutFrm( this, &rCrsr.GetEndPos(), pEndPos ); + SwContentFrm const* pEndFrm = pEndPos->nNode.GetNode(). + GetContentNode()->getLayoutFrm( this, &rCrsr.GetEndPos(), pEndPos ); - OSL_ENSURE( (pStartFrm && pEndFrm), "Keine CntntFrms gefunden." ); + OSL_ENSURE( (pStartFrm && pEndFrm), "Keine ContentFrms gefunden." ); //Do not subtract the FlyFrms in which selected Frames lie. SwSortedObjs aSortObjs; @@ -2053,15 +2053,15 @@ void SwRootFrm::CalcFrmRects(SwShellCrsr &rCrsr) // allowed (header/footer/table-headline) for two pages. do { // middle check loop const SwLayoutFrm* pSttLFrm = pStartFrm->GetUpper(); - const sal_uInt16 cHdFtTblHd = FRM_HEADER | FRM_FOOTER | FRM_TAB; + const sal_uInt16 cHdFtTableHd = FRM_HEADER | FRM_FOOTER | FRM_TAB; while( pSttLFrm && - ! (cHdFtTblHd & pSttLFrm->GetType() )) + ! (cHdFtTableHd & pSttLFrm->GetType() )) pSttLFrm = pSttLFrm->GetUpper(); if( !pSttLFrm ) break; const SwLayoutFrm* pEndLFrm = pEndFrm->GetUpper(); while( pEndLFrm && - ! (cHdFtTblHd & pEndLFrm->GetType() )) + ! (cHdFtTableHd & pEndLFrm->GetType() )) pEndLFrm = pEndLFrm->GetUpper(); if( !pEndLFrm ) break; @@ -2075,7 +2075,7 @@ void SwRootFrm::CalcFrmRects(SwShellCrsr &rCrsr) // On different pages? Then always on the start-page if( pEndLFrm->FindPageFrm() != pSttLFrm->FindPageFrm() ) { - // Set end- to the start-CntntFrame + // Set end- to the start-ContentFrame if( pStartPos == rCrsr.GetPoint() ) pEndFrm = pStartFrm; else @@ -2093,7 +2093,7 @@ void SwRootFrm::CalcFrmRects(SwShellCrsr &rCrsr) ( lcl_IsInRepeatedHeadline( pStartFrm ) || lcl_IsInRepeatedHeadline( pEndFrm ) ) ) { - // Set end- to the start-CntntFrame + // Set end- to the start-ContentFrame if( pStartPos == rCrsr.GetPoint() ) pEndFrm = pStartFrm; else @@ -2109,7 +2109,7 @@ void SwRootFrm::CalcFrmRects(SwShellCrsr &rCrsr) aTmpState.bNoScroll = true; aTmpState.nCursorBidiLevel = pStartFrm->IsRightToLeft() ? 1 : 0; - //CntntRects to Start- and EndFrms. + //ContentRects to Start- and EndFrms. SwRect aStRect, aEndRect; pStartFrm->GetCharRect( aStRect, *pStartPos, &aTmpState ); Sw2LinesPos *pSt2Pos = aTmpState.p2Lines; @@ -2478,31 +2478,31 @@ void SwRootFrm::CalcFrmRects(SwShellCrsr &rCrsr) if (pSh->IsSelectAll()) pCellBox = 0; - const SwCntntFrm *pCntnt = pStartFrm->GetNextCntntFrm(); + const SwContentFrm *pContent = pStartFrm->GetNextContentFrm(); SwRect aPrvRect; - OSL_ENSURE( pCntnt, + OSL_ENSURE( pContent, "<SwRootFrm::CalcFrmRects(..)> - no content frame. This is a serious defect -> please inform OD" ); - while ( pCntnt && pCntnt != pEndFrm ) + while ( pContent && pContent != pEndFrm ) { - if ( pCntnt->IsInFly() ) + if ( pContent->IsInFly() ) { - const SwAnchoredObject* pObj = pCntnt->FindFlyFrm(); + const SwAnchoredObject* pObj = pContent->FindFlyFrm(); aSortObjs.Insert( *(const_cast<SwAnchoredObject*>(pObj)) ); } // Consider only frames which have the same IsInDocBody value like pStartFrm // If pStartFrm is inside a SwCellFrm, consider only frames which are inside the // same cell frame (or its follow cell) - const SwTableBox* pTmpCellBox = pCntnt->GetUpper()->IsCellFrm() ? - static_cast<const SwCellFrm*>(pCntnt->GetUpper())->GetTabBox() : 0; + const SwTableBox* pTmpCellBox = pContent->GetUpper()->IsCellFrm() ? + static_cast<const SwCellFrm*>(pContent->GetUpper())->GetTabBox() : 0; if (pSh->IsSelectAll()) pTmpCellBox = 0; - if ( bBody == pCntnt->IsInDocBody() && + if ( bBody == pContent->IsInDocBody() && ( !pCellBox || pCellBox == pTmpCellBox ) ) { - SwRect aCRect( pCntnt->UnionFrm( true ) ); - aCRect.Intersection( pCntnt->PaintArea() ); + SwRect aCRect( pContent->UnionFrm( true ) ); + aCRect.Intersection( pContent->PaintArea() ); if( aCRect.IsOver( aRegion.GetOrigin() )) { SwRect aTmp( aPrvRect ); @@ -2521,8 +2521,8 @@ void SwRootFrm::CalcFrmRects(SwShellCrsr &rCrsr) } } } - pCntnt = pCntnt->GetNextCntntFrm(); - OSL_ENSURE( pCntnt, + pContent = pContent->GetNextContentFrm(); + OSL_ENSURE( pContent, "<SwRootFrm::CalcFrmRects(..)> - no content frame. This is a serious defect!" ); } if ( aPrvRect.HasArea() ) @@ -2573,8 +2573,8 @@ void SwRootFrm::CalcFrmRects(SwShellCrsr &rCrsr) continue; const SwFlyFrm* pFly = static_cast<const SwFlyFrm*>(pAnchoredObj); const SwVirtFlyDrawObj* pObj = pFly->GetVirtDrawObj(); - const SwFmtSurround &rSur = pFly->GetFmt()->GetSurround(); - const SwPosition* anchoredAt = pAnchoredObj->GetFrmFmt().GetAnchor().GetCntntAnchor(); + const SwFormatSurround &rSur = pFly->GetFormat()->GetSurround(); + const SwPosition* anchoredAt = pAnchoredObj->GetFrameFormat().GetAnchor().GetContentAnchor(); bool inSelection = ( anchoredAt != NULL && *pStartPos <= *anchoredAt && *anchoredAt < *pEndPos ); if( anchoredAt != NULL && *anchoredAt == *pEndPos ) { @@ -2584,7 +2584,7 @@ void SwRootFrm::CalcFrmRects(SwShellCrsr &rCrsr) else { SwNodeIndex idx( nodes.GetEndOfContent()); - if( SwCntntNode* last = SwNodes::GoPrevious( &idx )) + if( SwContentNode* last = SwNodes::GoPrevious( &idx )) inSelection = *pEndPos == SwPosition( *last, last->Len()); } } @@ -2629,14 +2629,14 @@ void SwRootFrm::CalcFrmRects(SwShellCrsr &rCrsr) //Because it looks better, we close the DropCaps. SwRect aDropRect; - if ( pStartFrm->IsTxtFrm() ) + if ( pStartFrm->IsTextFrm() ) { - if ( static_cast<const SwTxtFrm*>(pStartFrm)->GetDropRect( aDropRect ) ) + if ( static_cast<const SwTextFrm*>(pStartFrm)->GetDropRect( aDropRect ) ) Sub( aRegion, aDropRect ); } - if ( pEndFrm != pStartFrm && pEndFrm->IsTxtFrm() ) + if ( pEndFrm != pStartFrm && pEndFrm->IsTextFrm() ) { - if ( static_cast<const SwTxtFrm*>(pEndFrm)->GetDropRect( aDropRect ) ) + if ( static_cast<const SwTextFrm*>(pEndFrm)->GetDropRect( aDropRect ) ) Sub( aRegion, aDropRect ); } diff --git a/sw/source/core/layout/unusedf.cxx b/sw/source/core/layout/unusedf.cxx index 5603fe0833f1..3561928d4ac4 100644 --- a/sw/source/core/layout/unusedf.cxx +++ b/sw/source/core/layout/unusedf.cxx @@ -31,9 +31,9 @@ void SwFrm::Paint(SwRect const&, SwPrintData const*const) const OSL_FAIL( "Paint() of the base class called." ); } -bool SwCntntFrm::WouldFit( SwTwips &, bool&, bool ) +bool SwContentFrm::WouldFit( SwTwips &, bool&, bool ) { - OSL_FAIL( "WouldFit of CntntFrm called." ); + OSL_FAIL( "WouldFit of ContentFrm called." ); return false; } diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx index 505e225bf48b..6ab254e6b9aa 100644 --- a/sw/source/core/layout/wsfrm.cxx +++ b/sw/source/core/layout/wsfrm.cxx @@ -67,7 +67,7 @@ SwFrm::SwFrm( SwModify *pMod, SwFrm* pSib ) : mbInfBody( false ), mbInfTab ( false ), mbInfFly ( false ), - mbInfFtn ( false ), + mbInfFootnote ( false ), mbInfSct ( false ) , m_isInDestroy(false) { @@ -83,17 +83,17 @@ SwFrm::SwFrm( SwModify *pMod, SwFrm* pSib ) : const IDocumentDrawModelAccess* SwFrm::getIDocumentDrawModelAccess() { - return GetUpper()->GetFmt()->getIDocumentDrawModelAccess(); + return GetUpper()->GetFormat()->getIDocumentDrawModelAccess(); } -bool SwFrm::KnowsFormat( const SwFmt& rFmt ) const +bool SwFrm::KnowsFormat( const SwFormat& rFormat ) const { - return GetRegisteredIn() == &rFmt; + return GetRegisteredIn() == &rFormat; } -void SwFrm::RegisterToFormat( SwFmt& rFmt ) +void SwFrm::RegisterToFormat( SwFormat& rFormat ) { - rFmt.Add( this ); + rFormat.Add( this ); } void SwFrm::CheckDir( sal_uInt16 nDir, bool bVert, bool bOnlyBiDi, bool bBrowse ) @@ -152,12 +152,12 @@ void SwFrm::CheckDirection( bool bVert ) void SwSectionFrm::CheckDirection( bool bVert ) { - const SwFrmFmt* pFmt = GetFmt(); - if( pFmt ) + const SwFrameFormat* pFormat = GetFormat(); + if( pFormat ) { const SwViewShell *pSh = getRootFrm()->GetCurrShell(); const bool bBrowseMode = pSh && pSh->GetViewOptions()->getBrowseMode(); - CheckDir(static_cast<const SvxFrameDirectionItem&>(pFmt->GetFmtAttr(RES_FRAMEDIR)).GetValue(), + CheckDir(static_cast<const SvxFrameDirectionItem&>(pFormat->GetFormatAttr(RES_FRAMEDIR)).GetValue(), bVert, true, bBrowseMode ); } else @@ -166,12 +166,12 @@ void SwSectionFrm::CheckDirection( bool bVert ) void SwFlyFrm::CheckDirection( bool bVert ) { - const SwFrmFmt* pFmt = GetFmt(); - if( pFmt ) + const SwFrameFormat* pFormat = GetFormat(); + if( pFormat ) { const SwViewShell *pSh = getRootFrm()->GetCurrShell(); const bool bBrowseMode = pSh && pSh->GetViewOptions()->getBrowseMode(); - CheckDir(static_cast<const SvxFrameDirectionItem&>(pFmt->GetFmtAttr(RES_FRAMEDIR)).GetValue(), + CheckDir(static_cast<const SvxFrameDirectionItem&>(pFormat->GetFormatAttr(RES_FRAMEDIR)).GetValue(), bVert, false, bBrowseMode ); } else @@ -180,12 +180,12 @@ void SwFlyFrm::CheckDirection( bool bVert ) void SwTabFrm::CheckDirection( bool bVert ) { - const SwFrmFmt* pFmt = GetFmt(); - if( pFmt ) + const SwFrameFormat* pFormat = GetFormat(); + if( pFormat ) { const SwViewShell *pSh = getRootFrm()->GetCurrShell(); const bool bBrowseMode = pSh && pSh->GetViewOptions()->getBrowseMode(); - CheckDir(static_cast<const SvxFrameDirectionItem&>(pFmt->GetFmtAttr(RES_FRAMEDIR)).GetValue(), + CheckDir(static_cast<const SvxFrameDirectionItem&>(pFormat->GetFormatAttr(RES_FRAMEDIR)).GetValue(), bVert, true, bBrowseMode ); } else @@ -194,12 +194,12 @@ void SwTabFrm::CheckDirection( bool bVert ) void SwCellFrm::CheckDirection( bool bVert ) { - const SwFrmFmt* pFmt = GetFmt(); + const SwFrameFormat* pFormat = GetFormat(); const SfxPoolItem* pItem; // Check if the item is set, before actually // using it. Otherwise the dynamic pool default is used, which may be set // to LTR in case of OOo 1.0 documents. - if( pFmt && SfxItemState::SET == pFmt->GetItemState( RES_FRAMEDIR, true, &pItem ) ) + if( pFormat && SfxItemState::SET == pFormat->GetItemState( RES_FRAMEDIR, true, &pItem ) ) { const SvxFrameDirectionItem* pFrmDirItem = static_cast<const SvxFrameDirectionItem*>(pItem); const SwViewShell *pSh = getRootFrm()->GetCurrShell(); @@ -210,7 +210,7 @@ void SwCellFrm::CheckDirection( bool bVert ) SwFrm::CheckDirection( bVert ); } -void SwTxtFrm::CheckDirection( bool bVert ) +void SwTextFrm::CheckDirection( bool bVert ) { const SwViewShell *pSh = getRootFrm()->GetCurrShell(); const bool bBrowseMode = pSh && pSh->GetViewOptions()->getBrowseMode(); @@ -339,7 +339,7 @@ void SwFrm::Prepare( const PrepareHint, const void *, bool ) /** * Invalidates the page in which the Frm is currently placed. - * The page is invalidated depending on the type (Layout, Cntnt, FlyFrm) + * The page is invalidated depending on the type (Layout, Content, FlyFrm) */ void SwFrm::InvalidatePage( const SwPageFrm *pPage ) const { @@ -369,18 +369,18 @@ void SwFrm::InvalidatePage( const SwPageFrm *pPage ) const if ( pPage && pPage->GetUpper() ) { - if ( pPage->GetFmt()->GetDoc()->IsInDtor() ) + if ( pPage->GetFormat()->GetDoc()->IsInDtor() ) return; SwRootFrm *pRoot = const_cast<SwRootFrm*>(static_cast<const SwRootFrm*>(pPage->GetUpper())); const SwFlyFrm *pFly = FindFlyFrm(); - if ( IsCntntFrm() ) + if ( IsContentFrm() ) { if ( pRoot->IsTurboAllowed() ) { // If a ContentFrame wants to register for a second time, make it a TurboAction. if ( !pRoot->GetTurbo() || this == pRoot->GetTurbo() ) - pRoot->SetTurbo( static_cast<const SwCntntFrm*>(this) ); + pRoot->SetTurbo( static_cast<const SwContentFrm*>(this) ); else { pRoot->DisallowTurbo(); @@ -398,15 +398,15 @@ void SwFrm::InvalidatePage( const SwPageFrm *pPage ) const { if ( pFly->IsFlyInCntFrm() ) { pPage->InvalidateFlyInCnt(); - static_cast<const SwFlyInCntFrm*>(pFly)->InvalidateCntnt(); + static_cast<const SwFlyInCntFrm*>(pFly)->InvalidateContent(); pFly->GetAnchorFrm()->InvalidatePage(); } else - pPage->InvalidateFlyCntnt(); + pPage->InvalidateFlyContent(); } } else - pPage->InvalidateCntnt(); + pPage->InvalidateContent(); } } else @@ -437,8 +437,8 @@ void SwFrm::InvalidatePage( const SwPageFrm *pPage ) const } pRoot->SetIdleFlags(); - const SwTxtNode *pTxtNode = dynamic_cast< const SwTxtNode * >(GetDep()); - if (pTxtNode && pTxtNode->IsGrammarCheckDirty()) + const SwTextNode *pTextNode = dynamic_cast< const SwTextNode * >(GetDep()); + if (pTextNode && pTextNode->IsGrammarCheckDirty()) pRoot->SetNeedGrammarCheck( true ); } } @@ -459,9 +459,9 @@ Size SwFrm::ChgSize( const Size& aNewSize ) long nDiff = nNew - (maFrm.*fnRect->fnGetHeight)(); if( nDiff ) { - if ( GetUpper()->IsFtnBossFrm() && HasFixSize() && + if ( GetUpper()->IsFootnoteBossFrm() && HasFixSize() && NA_GROW_SHRINK != - static_cast<SwFtnBossFrm*>(GetUpper())->NeighbourhoodAdjustment( this ) ) + static_cast<SwFootnoteBossFrm*>(GetUpper())->NeighbourhoodAdjustment( this ) ) { (maFrm.*fnRect->fnSetHeight)( nNew ); SwTwips nReal = static_cast<SwLayoutFrm*>(this)->AdjustNeighbourhood(nDiff); @@ -715,16 +715,16 @@ void SwFrm::RemoveFromLayout() mpUpper = 0; } -void SwCntntFrm::Paste( SwFrm* pParent, SwFrm* pSibling) +void SwContentFrm::Paste( SwFrm* pParent, SwFrm* pSibling) { OSL_ENSURE( pParent, "No parent for pasting." ); - OSL_ENSURE( pParent->IsLayoutFrm(), "Parent is CntntFrm." ); + OSL_ENSURE( pParent->IsLayoutFrm(), "Parent is ContentFrm." ); OSL_ENSURE( pParent != this, "I'm the parent." ); OSL_ENSURE( pSibling != this, "I'm my own neighbour." ); OSL_ENSURE( !GetPrev() && !GetNext() && !GetUpper(), "I'm still registered somewhere" ); OSL_ENSURE( !pSibling || pSibling->IsFlowFrm(), - "<SwCntntFrm::Paste(..)> - sibling not of expected type." ); + "<SwContentFrm::Paste(..)> - sibling not of expected type." ); //Insert in the tree. InsertBefore( static_cast<SwLayoutFrm*>(pParent), pSibling ); @@ -748,8 +748,8 @@ void SwCntntFrm::Paste( SwFrm* pParent, SwFrm* pSibling) pNxt->_InvalidatePos(); pNxt->InvalidatePage( pPage ); if( pNxt->IsSctFrm() ) - pNxt = static_cast<SwSectionFrm*>(pNxt)->ContainsCntnt(); - if( pNxt && pNxt->IsTxtFrm() && pNxt->IsInFtn() ) + pNxt = static_cast<SwSectionFrm*>(pNxt)->ContainsContent(); + if( pNxt && pNxt->IsTextFrm() && pNxt->IsInFootnote() ) pNxt->Prepare( PREP_FTN, 0, false ); } @@ -763,7 +763,7 @@ void SwCntntFrm::Paste( SwFrm* pParent, SwFrm* pSibling) { if ( IsFollow() ) //I'm a direct follower of my master now - static_cast<SwCntntFrm*>(GetPrev())->Prepare( PREP_FOLLOW_FOLLOWS ); + static_cast<SwContentFrm*>(GetPrev())->Prepare( PREP_FOLLOW_FOLLOWS ); else { if ( GetPrev()->Frm().Height() != @@ -784,7 +784,7 @@ void SwCntntFrm::Paste( SwFrm* pParent, SwFrm* pSibling) GetPrev()->InvalidatePage( pPage ); } } - if ( IsInFtn() ) + if ( IsInFootnote() ) { SwFrm* pFrm = GetIndPrev(); if( pFrm && pFrm->IsSctFrm() ) @@ -793,7 +793,7 @@ void SwCntntFrm::Paste( SwFrm* pParent, SwFrm* pSibling) pFrm->Prepare( PREP_QUOVADIS, 0, false ); if( !GetNext() ) { - pFrm = FindFtnFrm()->GetNext(); + pFrm = FindFootnoteFrm()->GetNext(); if( pFrm && 0 != (pFrm=static_cast<SwLayoutFrm*>(pFrm)->ContainsAny()) ) pFrm->_InvalidatePrt(); } @@ -817,7 +817,7 @@ void SwCntntFrm::Paste( SwFrm* pParent, SwFrm* pSibling) } } -void SwCntntFrm::Cut() +void SwContentFrm::Cut() { OSL_ENSURE( GetUpper(), "Cut without Upper()." ); @@ -828,10 +828,10 @@ void SwCntntFrm::Cut() { if( pFrm->IsSctFrm() ) pFrm = static_cast<SwSectionFrm*>(pFrm)->ContainsAny(); - if ( pFrm && pFrm->IsCntntFrm() ) + if ( pFrm && pFrm->IsContentFrm() ) { pFrm->_InvalidatePrt(); - if( IsInFtn() ) + if( IsInFootnote() ) pFrm->Prepare( PREP_QUOVADIS, 0, false ); } // #i26250# - invalidate printing area of previous @@ -875,7 +875,7 @@ void SwCntntFrm::Cut() pFrm->InvalidatePage( pPage ); } } - if( pFrm && IsInFtn() ) + if( pFrm && IsInFootnote() ) pFrm->Prepare( PREP_ERGOSUM, 0, false ); if( IsInSct() && !GetPrev() ) { @@ -897,7 +897,7 @@ void SwCntntFrm::Cut() pFrm->_InvalidatePos(); pFrm->InvalidatePage( pPage ); } - // If I'm (was) the only CntntFrm in my upper, it has to do the + // If I'm (was) the only ContentFrm in my upper, it has to do the // retouching. Also, perhaps a page became empty. else { SwRootFrm *pRoot = getRootFrm(); @@ -937,7 +937,7 @@ void SwCntntFrm::Cut() { SwSectionFrm *pSct = 0; if ( !pUp->Lower() && - ( ( pUp->IsFtnFrm() && !pUp->IsColLocked() ) || + ( ( pUp->IsFootnoteFrm() && !pUp->IsColLocked() ) || ( pUp->IsInSct() && // #i29438# // We have to consider the case that the section may be "empty" @@ -946,14 +946,14 @@ void SwCntntFrm::Cut() !pUp->IsCellFrm() && // #126020# - adjust check for empty section // #130797# - correct fix #126020# - !(pSct = pUp->FindSctFrm())->ContainsCntnt() && + !(pSct = pUp->FindSctFrm())->ContainsContent() && !pSct->ContainsAny( true ) ) ) ) { if ( pUp->GetUpper() ) { // prevent delete of <ColLocked> footnote frame - if ( pUp->IsFtnFrm() && !pUp->IsColLocked()) + if ( pUp->IsFootnoteFrm() && !pUp->IsColLocked()) { if( pUp->GetNext() && !pUp->GetPrev() ) { @@ -967,8 +967,8 @@ void SwCntntFrm::Cut() else { - if ( pSct->IsColLocked() || !pSct->IsInFtn() || - ( pUp->IsFtnFrm() && pUp->IsColLocked() ) ) + if ( pSct->IsColLocked() || !pSct->IsInFootnote() || + ( pUp->IsFootnoteFrm() && pUp->IsColLocked() ) ) { pSct->DelEmpty( false ); // If a locked section may not be deleted then at least @@ -997,7 +997,7 @@ void SwCntntFrm::Cut() void SwLayoutFrm::Paste( SwFrm* pParent, SwFrm* pSibling) { OSL_ENSURE( pParent, "No parent for pasting." ); - OSL_ENSURE( pParent->IsLayoutFrm(), "Parent is CntntFrm." ); + OSL_ENSURE( pParent->IsLayoutFrm(), "Parent is ContentFrm." ); OSL_ENSURE( pParent != this, "I'm the parent oneself." ); OSL_ENSURE( pSibling != this, "I'm my own neighbour." ); OSL_ENSURE( !GetPrev() && !GetNext() && !GetUpper(), @@ -1051,7 +1051,7 @@ void SwLayoutFrm::Paste( SwFrm* pParent, SwFrm* pSibling) if( 0 != pFrm ) { pFrm->_InvalidatePos(); - if( IsInFtn() ) + if( IsInFootnote() ) { if( pFrm->IsSctFrm() ) pFrm = static_cast<SwSectionFrm*>(pFrm)->ContainsAny(); @@ -1059,7 +1059,7 @@ void SwLayoutFrm::Paste( SwFrm* pParent, SwFrm* pSibling) pFrm->Prepare( PREP_ERGOSUM, 0, false ); } } - if ( IsInFtn() && 0 != ( pFrm = GetIndPrev() ) ) + if ( IsInFootnote() && 0 != ( pFrm = GetIndPrev() ) ) { if( pFrm->IsSctFrm() ) pFrm = static_cast<SwSectionFrm*>(pFrm)->ContainsAny(); @@ -1072,8 +1072,8 @@ void SwLayoutFrm::Paste( SwFrm* pParent, SwFrm* pSibling) { // AdjustNeighbourhood is now also called in columns which are not // placed inside a frame - sal_uInt8 nAdjust = GetUpper()->IsFtnBossFrm() ? - static_cast<SwFtnBossFrm*>(GetUpper())->NeighbourhoodAdjustment( this ) + sal_uInt8 nAdjust = GetUpper()->IsFootnoteBossFrm() ? + static_cast<SwFootnoteBossFrm*>(GetUpper())->NeighbourhoodAdjustment( this ) : NA_GROW_SHRINK; SwTwips nGrow = (Frm().*fnRect->fnGetHeight)(); if( NA_ONLY_ADJUST == nAdjust ) @@ -1110,9 +1110,9 @@ void SwLayoutFrm::Cut() // of his content if ( pUp && nShrink ) { - if( pUp->IsFtnBossFrm() ) + if( pUp->IsFootnoteBossFrm() ) { - sal_uInt8 nAdjust= static_cast<SwFtnBossFrm*>(pUp)->NeighbourhoodAdjustment( this ); + sal_uInt8 nAdjust= static_cast<SwFootnoteBossFrm*>(pUp)->NeighbourhoodAdjustment( this ); if( NA_ONLY_ADJUST == nAdjust ) AdjustNeighbourhood( -nShrink ); else @@ -1184,7 +1184,7 @@ SwTwips SwFrm::Grow( SwTwips nDist, bool bTst, bool bInfo ) { nPrtHeight = (Prt().*fnRect->fnGetHeight)(); (Prt().*fnRect->fnSetHeight)( nPrtHeight + - ( IsCntntFrm() ? nDist : nReal ) ); + ( IsContentFrm() ? nDist : nReal ) ); } return nReal; } @@ -1225,7 +1225,7 @@ SwTwips SwFrm::Shrink( SwTwips nDist, bool bTst, bool bInfo ) { const SwTwips nPrtHeight = (Prt().*fnRect->fnGetHeight)(); (Prt().*fnRect->fnSetHeight)( nPrtHeight - - ( IsCntntFrm() ? nDist : nReal ) ); + ( IsContentFrm() ? nDist : nReal ) ); } return nReal; } @@ -1257,7 +1257,7 @@ SwTwips SwFrm::AdjustNeighbourhood( SwTwips nDiff, bool bTst ) { PROTOCOL_ENTER( this, PROT_ADJUSTN, 0, &nDiff ); - if ( !nDiff || !GetUpper()->IsFtnBossFrm() ) // only inside pages/columns + if ( !nDiff || !GetUpper()->IsFootnoteBossFrm() ) // only inside pages/columns return 0L; const SwViewShell *pSh = getRootFrm()->GetCurrShell(); @@ -1296,7 +1296,7 @@ SwTwips SwFrm::AdjustNeighbourhood( SwTwips nDiff, bool bTst ) if ( !pViewShell || pViewShell->VisArea().Height() >= pUp->Frm().Height() ) { //First minimize Body, it will grow again later. - SwFrm *pBody = static_cast<SwFtnBossFrm*>(pUp)->FindBodyCont(); + SwFrm *pBody = static_cast<SwFootnoteBossFrm*>(pUp)->FindBodyCont(); const long nTmp = nChg - pBody->Prt().Height(); if ( !bTst ) { @@ -1338,7 +1338,7 @@ SwTwips SwFrm::AdjustNeighbourhood( SwTwips nDiff, bool bTst ) { SetCompletePaint(); if ( !IsHeaderFrm() ) - static_cast<SwFtnBossFrm*>(pUp)->FindBodyCont()->SetCompletePaint(); + static_cast<SwFootnoteBossFrm*>(pUp)->FindBodyCont()->SetCompletePaint(); } //Invalidate the page because of the frames. Thereby the page becomes //the right size again if a frame didn't fit. This only works @@ -1362,7 +1362,7 @@ SwTwips SwFrm::AdjustNeighbourhood( SwTwips nDiff, bool bTst ) GetNext()->_InvalidatePos(); //Trigger a repaint if necessary. - SvxBrushItem aBack(pUp->GetFmt()->makeBackgroundBrushItem()); + SvxBrushItem aBack(pUp->GetFormat()->makeBackgroundBrushItem()); const SvxGraphicPosition ePos = aBack.GetGraphicPos(); if ( ePos != GPOS_NONE && ePos != GPOS_TILED ) pViewShell->InvalidateWindows( pUp->Frm() ); @@ -1401,7 +1401,7 @@ SwTwips SwFrm::AdjustNeighbourhood( SwTwips nDiff, bool bTst ) nBrowseAdd = nChg; } - const SwFtnBossFrm *pBoss = static_cast<SwFtnBossFrm*>(GetUpper()); + const SwFootnoteBossFrm *pBoss = static_cast<SwFootnoteBossFrm*>(GetUpper()); SwTwips nReal = 0, nAdd = 0; @@ -1414,22 +1414,22 @@ SwTwips SwFrm::AdjustNeighbourhood( SwTwips nDiff, bool bTst ) { SwSectionFrm *pSect = FindSctFrm(); if( nDiff > 0 && pSect->IsEndnAtEnd() && GetNext() && - GetNext()->IsFtnContFrm() ) + GetNext()->IsFootnoteContFrm() ) { - SwFtnContFrm* pCont = static_cast<SwFtnContFrm*>(GetNext()); + SwFootnoteContFrm* pCont = static_cast<SwFootnoteContFrm*>(GetNext()); SwTwips nMinH = 0; - SwFtnFrm* pFtn = static_cast<SwFtnFrm*>(pCont->Lower()); - bool bFtn = false; - while( pFtn ) + SwFootnoteFrm* pFootnote = static_cast<SwFootnoteFrm*>(pCont->Lower()); + bool bFootnote = false; + while( pFootnote ) { - if( !pFtn->GetAttr()->GetFtn().IsEndNote() ) + if( !pFootnote->GetAttr()->GetFootnote().IsEndNote() ) { - nMinH += (pFtn->Frm().*fnRect->fnGetHeight)(); - bFtn = true; + nMinH += (pFootnote->Frm().*fnRect->fnGetHeight)(); + bFootnote = true; } - pFtn = static_cast<SwFtnFrm*>(pFtn->GetNext()); + pFootnote = static_cast<SwFootnoteFrm*>(pFootnote->GetNext()); } - if( bFtn ) + if( bFootnote ) nMinH += (pCont->Prt().*fnRect->fnGetTop)(); nReal = (pCont->Frm().*fnRect->fnGetHeight)() - nMinH; if( nReal > nDiff ) @@ -1447,9 +1447,9 @@ SwTwips SwFrm::AdjustNeighbourhood( SwTwips nDiff, bool bTst ) } else { - const bool bFtnPage = pBoss->IsPageFrm() && static_cast<const SwPageFrm*>(pBoss)->IsFtnPage(); - if ( bFtnPage && !IsFtnContFrm() ) - pFrm = (SwFrm*)pBoss->FindFtnCont(); + const bool bFootnotePage = pBoss->IsPageFrm() && static_cast<const SwPageFrm*>(pBoss)->IsFootnotePage(); + if ( bFootnotePage && !IsFootnoteContFrm() ) + pFrm = (SwFrm*)pBoss->FindFootnoteCont(); if ( !pFrm ) pFrm = (SwFrm*)pBoss->FindBodyCont(); @@ -1460,7 +1460,7 @@ SwTwips SwFrm::AdjustNeighbourhood( SwTwips nDiff, bool bTst ) nReal = (pFrm->Frm().*fnRect->fnGetHeight)(); if( nReal > nDiff ) nReal = nDiff; - if( !bFtnPage ) + if( !bFootnotePage ) { //Respect the minimal boundary! if( nReal ) @@ -1469,8 +1469,8 @@ SwTwips SwFrm::AdjustNeighbourhood( SwTwips nDiff, bool bTst ) if ( nReal > nMax ) nReal = nMax; } - if( !IsFtnContFrm() && nDiff > nReal && - pFrm->GetNext() && pFrm->GetNext()->IsFtnContFrm() + if( !IsFootnoteContFrm() && nDiff > nReal && + pFrm->GetNext() && pFrm->GetNext()->IsFootnoteContFrm() && ( pFrm->GetNext()->IsVertical() == IsVertical() ) ) { @@ -1521,8 +1521,8 @@ SwTwips SwFrm::AdjustNeighbourhood( SwTwips nDiff, bool bTst ) { SwFlyFrm* pFly = static_cast<SwFlyFrm*>(pAnchoredObj); OSL_ENSURE( !pFly->IsFlyInCntFrm(), "FlyInCnt at Page?" ); - const SwFmtVertOrient &rVert = - pFly->GetFmt()->GetVertOrient(); + const SwFormatVertOrient &rVert = + pFly->GetFormat()->GetVertOrient(); // When do we have to invalidate? // If a frame is aligned on a PageTextArea and the header // changes a TOP, MIDDLE or NONE aligned frame needs to @@ -1612,7 +1612,7 @@ void SwFrm::ImplInvalidateLineNum() if ( _InvalidationAllowed( INVALID_LINENUM ) ) { mbValidLineNum = false; - OSL_ENSURE( IsTxtFrm(), "line numbers are implemented for text only" ); + OSL_ENSURE( IsTextFrm(), "line numbers are implemented for text only" ); InvalidatePage(); // OD 2004-05-19 #i28701# @@ -1622,9 +1622,9 @@ void SwFrm::ImplInvalidateLineNum() void SwFrm::ReinitializeFrmSizeAttrFlags() { - const SwFmtFrmSize &rFmtSize = GetAttrSet()->GetFrmSize(); - if ( ATT_VAR_SIZE == rFmtSize.GetHeightSizeType() || - ATT_MIN_SIZE == rFmtSize.GetHeightSizeType()) + const SwFormatFrmSize &rFormatSize = GetAttrSet()->GetFrmSize(); + if ( ATT_VAR_SIZE == rFormatSize.GetHeightSizeType() || + ATT_MIN_SIZE == rFormatSize.GetHeightSizeType()) { mbFixSize = false; if ( GetType() & (FRM_HEADER | FRM_FOOTER | FRM_ROW) ) @@ -1635,7 +1635,7 @@ void SwFrm::ReinitializeFrmSizeAttrFlags() pFrm->_InvalidatePrt(); pFrm = pFrm->GetNext(); } - SwCntntFrm *pCnt = static_cast<SwLayoutFrm*>(this)->ContainsCntnt(); + SwContentFrm *pCnt = static_cast<SwLayoutFrm*>(this)->ContainsContent(); // #i36991# - be save. // E.g., a row can contain *no* content. if ( pCnt ) @@ -1645,17 +1645,17 @@ void SwFrm::ReinitializeFrmSizeAttrFlags() { pCnt->Prepare( PREP_ADJUST_FRM ); pCnt->_InvalidateSize(); - pCnt = pCnt->GetNextCntntFrm(); + pCnt = pCnt->GetNextContentFrm(); } while ( static_cast<SwLayoutFrm*>(this)->IsAnLower( pCnt ) ); } } } - else if ( rFmtSize.GetHeightSizeType() == ATT_FIX_SIZE ) + else if ( rFormatSize.GetHeightSizeType() == ATT_FIX_SIZE ) { if( IsVertical() ) - ChgSize( Size( rFmtSize.GetWidth(), Frm().Height())); + ChgSize( Size( rFormatSize.GetWidth(), Frm().Height())); else - ChgSize( Size( Frm().Width(), rFmtSize.GetHeight())); + ChgSize( Size( Frm().Width(), rFormatSize.GetHeight())); } } @@ -1703,7 +1703,7 @@ void SwFrm::ValidateThisAndAllLowers( const sal_uInt16 nStage ) } } -SwTwips SwCntntFrm::GrowFrm( SwTwips nDist, bool bTst, bool bInfo ) +SwTwips SwContentFrm::GrowFrm( SwTwips nDist, bool bTst, bool bInfo ) { SWRECTFN( this ) @@ -1731,7 +1731,7 @@ SwTwips SwCntntFrm::GrowFrm( SwTwips nDist, bool bTst, bool bInfo ) // due to the positioning of its objects ). Thus, invalivate this next frame, // if document compatibility option 'Consider wrapping style influence on // object positioning' is ON. - else if ( GetUpper()->GetFmt()->getIDocumentSettingAccess()->get(DocumentSettingId::CONSIDER_WRAP_ON_OBJECT_POSITION) ) + else if ( GetUpper()->GetFormat()->getIDocumentSettingAccess()->get(DocumentSettingId::CONSIDER_WRAP_ON_OBJECT_POSITION) ) { InvalidateNextPos(); } @@ -1748,7 +1748,7 @@ SwTwips SwCntntFrm::GrowFrm( SwTwips nDist, bool bTst, bool bInfo ) if ( !bTst ) { - //Cntnts are always resized to the wished value. + //Contents are always resized to the wished value. long nOld = (Frm().*fnRect->fnGetHeight)(); (Frm().*fnRect->fnSetHeight)( nOld + nDist ); if( IsVertical()&& !IsVertLR() && !IsReverse() ) @@ -1758,7 +1758,7 @@ SwTwips SwCntntFrm::GrowFrm( SwTwips nDist, bool bTst, bool bInfo ) { if ( pTab->GetTable()->GetHTMLTableLayout() && !pTab->IsJoinLocked() && - !pTab->GetFmt()->GetDoc()->GetDocShell()->IsReadOnly() ) + !pTab->GetFormat()->GetDoc()->GetDocShell()->IsReadOnly() ) { pTab->InvalidatePos(); pTab->SetResizeHTMLTable(); @@ -1797,7 +1797,7 @@ SwTwips SwCntntFrm::GrowFrm( SwTwips nDist, bool bTst, bool bInfo ) { GetNext()->InvalidatePos(); } - else if ( GetUpper()->GetFmt()->getIDocumentSettingAccess()->get(DocumentSettingId::CONSIDER_WRAP_ON_OBJECT_POSITION) ) + else if ( GetUpper()->GetFormat()->getIDocumentSettingAccess()->get(DocumentSettingId::CONSIDER_WRAP_ON_OBJECT_POSITION) ) { InvalidateNextPos(); } @@ -1806,7 +1806,7 @@ SwTwips SwCntntFrm::GrowFrm( SwTwips nDist, bool bTst, bool bInfo ) return nReal; } -SwTwips SwCntntFrm::ShrinkFrm( SwTwips nDist, bool bTst, bool bInfo ) +SwTwips SwContentFrm::ShrinkFrm( SwTwips nDist, bool bTst, bool bInfo ) { SWRECTFN( this ) OSL_ENSURE( nDist >= 0, "nDist < 0" ); @@ -1846,7 +1846,7 @@ SwTwips SwCntntFrm::ShrinkFrm( SwTwips nDist, bool bTst, bool bInfo ) { if ( pTab->GetTable()->GetHTMLTableLayout() && !pTab->IsJoinLocked() && - !pTab->GetFmt()->GetDoc()->GetDocShell()->IsReadOnly() ) + !pTab->GetFormat()->GetDoc()->GetDocShell()->IsReadOnly() ) { pTab->InvalidatePos(); pTab->SetResizeHTMLTable(); @@ -1886,8 +1886,8 @@ SwTwips SwCntntFrm::ShrinkFrm( SwTwips nDist, bool bTst, bool bInfo ) if( aBound.IsOver( aRect ) ) { - const SwFrmFmt& rFmt = pAnchoredObj->GetFrmFmt(); - if( SURROUND_THROUGHT != rFmt.GetSurround().GetSurround() ) + const SwFrameFormat& rFormat = pAnchoredObj->GetFrameFormat(); + if( SURROUND_THROUGHT != rFormat.GetSurround().GetSurround() ) { const SwFrm* pAnchor = pAnchoredObj->GetAnchorFrm(); if ( pAnchor && pAnchor->FindFooterOrHeader() == GetUpper() ) @@ -1919,7 +1919,7 @@ SwTwips SwCntntFrm::ShrinkFrm( SwTwips nDist, bool bTst, bool bInfo ) return nReal; } -void SwCntntFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew ) +void SwContentFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew ) { sal_uInt8 nInvFlags = 0; @@ -1992,7 +1992,7 @@ void SwCntntFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew ) } } -void SwCntntFrm::_UpdateAttr( const SfxPoolItem* pOld, const SfxPoolItem* pNew, +void SwContentFrm::_UpdateAttr( const SfxPoolItem* pOld, const SfxPoolItem* pNew, sal_uInt8 &rInvFlags, SwAttrSetChg *pOldSet, SwAttrSetChg *pNewSet ) { @@ -2013,8 +2013,8 @@ void SwCntntFrm::_UpdateAttr( const SfxPoolItem* pOld, const SfxPoolItem* pNew, CheckPageDescs( pPage ); if ( GetAttrSet()->GetPageDesc().GetNumOffset() ) static_cast<SwRootFrm*>(pPage->GetUpper())->SetVirtPageNum( true ); - SwDocPosUpdate aMsgHnt( pPage->Frm().Top() ); - pPage->GetFmt()->GetDoc()->getIDocumentFieldsAccess().UpdatePageFlds( &aMsgHnt ); + SwDocPosUpdate aMsgHint( pPage->Frm().Top() ); + pPage->GetFormat()->GetDoc()->getIDocumentFieldsAccess().UpdatePageFields( &aMsgHint ); } break; @@ -2045,12 +2045,12 @@ void SwCntntFrm::_UpdateAttr( const SfxPoolItem* pOld, const SfxPoolItem* pNew, } // OD 2004-03-17 #i11860# if ( GetIndNext() && - !GetUpper()->GetFmt()->getIDocumentSettingAccess()->get(DocumentSettingId::USE_FORMER_OBJECT_POS) ) + !GetUpper()->GetFormat()->getIDocumentSettingAccess()->get(DocumentSettingId::USE_FORMER_OBJECT_POS) ) { // OD 2004-07-01 #i28701# - use new method <InvalidateObjs(..)> GetIndNext()->InvalidateObjs( true ); } - Prepare( PREP_UL_SPACE ); //TxtFrm has to correct line spacing. + Prepare( PREP_UL_SPACE ); //TextFrm has to correct line spacing. rInvFlags |= 0x80; /* no break here */ } @@ -2065,7 +2065,7 @@ void SwCntntFrm::_UpdateAttr( const SfxPoolItem* pOld, const SfxPoolItem* pNew, case RES_BREAK: { rInvFlags |= 0x42; - const IDocumentSettingAccess* pIDSA = GetUpper()->GetFmt()->getIDocumentSettingAccess(); + const IDocumentSettingAccess* pIDSA = GetUpper()->GetFormat()->getIDocumentSettingAccess(); if( pIDSA->get(DocumentSettingId::PARA_SPACE_MAX) || pIDSA->get(DocumentSettingId::PARA_SPACE_MAX_AT_PAGES) ) { @@ -2095,7 +2095,7 @@ void SwCntntFrm::_UpdateAttr( const SfxPoolItem* pOld, const SfxPoolItem* pNew, case RES_PARATR_CONNECT_BORDER: { rInvFlags |= 0x01; - if ( IsTxtFrm() ) + if ( IsTextFrm() ) { InvalidateNextPrtArea(); } @@ -2142,12 +2142,12 @@ void SwCntntFrm::_UpdateAttr( const SfxPoolItem* pOld, const SfxPoolItem* pNew, } } -SwLayoutFrm::SwLayoutFrm(SwFrmFmt *const pFmt, SwFrm *const pSib) - : SwFrm(pFmt, pSib) +SwLayoutFrm::SwLayoutFrm(SwFrameFormat *const pFormat, SwFrm *const pSib) + : SwFrm(pFormat, pSib) , m_pLower(nullptr) { - const SwFmtFrmSize &rFmtSize = pFmt->GetFrmSize(); - if ( rFmtSize.GetHeightSizeType() == ATT_FIX_SIZE ) + const SwFormatFrmSize &rFormatSize = pFormat->GetFrmSize(); + if ( rFormatSize.GetHeightSizeType() == ATT_FIX_SIZE ) mbFixSize = true; } @@ -2179,8 +2179,8 @@ SwTwips SwLayoutFrm::InnerHeight() const do { nRet += (pCnt->Frm().*fnRect->fnGetHeight)(); - if( pCnt->IsCntntFrm() && static_cast<const SwTxtFrm*>(pCnt)->IsUndersized() ) - nRet += static_cast<const SwTxtFrm*>(pCnt)->GetParHeight() - + if( pCnt->IsContentFrm() && static_cast<const SwTextFrm*>(pCnt)->IsUndersized() ) + nRet += static_cast<const SwTextFrm*>(pCnt)->GetParHeight() - (pCnt->Prt().*fnRect->fnGetHeight)(); if( pCnt->IsLayoutFrm() && !pCnt->IsTabFrm() ) nRet += static_cast<const SwLayoutFrm*>(pCnt)->InnerHeight() - @@ -2237,8 +2237,8 @@ SwTwips SwLayoutFrm::GrowFrm( SwTwips nDist, bool bTst, bool bInfo ) { if ( GetUpper() ) { // AdjustNeighbourhood now only for the columns (but not in frames) - sal_uInt8 nAdjust = GetUpper()->IsFtnBossFrm() ? - static_cast<SwFtnBossFrm*>(GetUpper())->NeighbourhoodAdjustment( this ) + sal_uInt8 nAdjust = GetUpper()->IsFootnoteBossFrm() ? + static_cast<SwFootnoteBossFrm*>(GetUpper())->NeighbourhoodAdjustment( this ) : NA_GROW_SHRINK; if( NA_ONLY_ADJUST == nAdjust ) nReal = AdjustNeighbourhood( nReal, bTst ); @@ -2271,7 +2271,7 @@ SwTwips SwLayoutFrm::GrowFrm( SwTwips nDist, bool bTst, bool bInfo ) if( NA_GROW_ADJUST == nAdjust && nGrow < nReal ) nReal += AdjustNeighbourhood( nReal - nGrow, bTst ); - if ( IsFtnFrm() && (nGrow != nReal) && GetNext() ) + if ( IsFootnoteFrm() && (nGrow != nReal) && GetNext() ) { //Footnotes can replace their successor. SwTwips nSpace = bTst ? 0 : -nDist; @@ -2287,7 +2287,7 @@ SwTwips SwLayoutFrm::GrowFrm( SwTwips nDist, bool bTst, bool bInfo ) if ( nReal > nSpace ) nReal = nSpace; if ( nReal && !bTst ) - static_cast<SwFtnFrm*>(this)->InvalidateNxtFtnCnts( FindPageFrm() ); + static_cast<SwFootnoteFrm*>(this)->InvalidateNxtFootnoteCnts( FindPageFrm() ); } else nReal = nGrow; @@ -2319,7 +2319,7 @@ SwTwips SwLayoutFrm::GrowFrm( SwTwips nDist, bool bTst, bool bInfo ) if ( GetNext() ) { GetNext()->_InvalidatePos(); - if ( GetNext()->IsCntntFrm() ) + if ( GetNext()->IsContentFrm() ) GetNext()->InvalidatePage( pPage ); } if ( !IsPageBodyFrm() ) @@ -2333,7 +2333,7 @@ SwTwips SwLayoutFrm::GrowFrm( SwTwips nDist, bool bTst, bool bInfo ) if( IsCellFrm() ) InvaPercentLowers( nReal ); - SvxBrushItem aBack(GetFmt()->makeBackgroundBrushItem()); + SvxBrushItem aBack(GetFormat()->makeBackgroundBrushItem()); const SvxGraphicPosition ePos = aBack.GetGraphicPos(); if ( GPOS_NONE != ePos && GPOS_TILED != ePos ) SetCompletePaint(); @@ -2398,8 +2398,8 @@ SwTwips SwLayoutFrm::ShrinkFrm( SwTwips nDist, bool bTst, bool bInfo ) bMoveAccFrm = true; } - sal_uInt8 nAdjust = GetUpper() && GetUpper()->IsFtnBossFrm() ? - static_cast<SwFtnBossFrm*>(GetUpper())->NeighbourhoodAdjustment( this ) + sal_uInt8 nAdjust = GetUpper() && GetUpper()->IsFootnoteBossFrm() ? + static_cast<SwFootnoteBossFrm*>(GetUpper())->NeighbourhoodAdjustment( this ) : NA_GROW_SHRINK; // AdjustNeighbourhood also in columns (but not in frames) @@ -2466,7 +2466,7 @@ SwTwips SwLayoutFrm::ShrinkFrm( SwTwips nDist, bool bTst, bool bInfo ) if ( GetNext() ) { GetNext()->_InvalidatePos(); - if ( GetNext()->IsCntntFrm() ) + if ( GetNext()->IsContentFrm() ) GetNext()->InvalidatePage( pPage ); if ( IsTabFrm() ) static_cast<SwTabFrm*>(this)->SetComplete(); @@ -2487,10 +2487,10 @@ SwTwips SwLayoutFrm::ShrinkFrm( SwTwips nDist, bool bTst, bool bInfo ) _InvalidateAll(); InvalidatePage( pPage ); bool bCompletePaint = true; - const SwFrmFmt* pFmt = GetFmt(); - if (pFmt) + const SwFrameFormat* pFormat = GetFormat(); + if (pFormat) { - SvxBrushItem aBack(pFmt->makeBackgroundBrushItem()); + SvxBrushItem aBack(pFormat->makeBackgroundBrushItem()); const SvxGraphicPosition ePos = aBack.GetGraphicPos(); if ( GPOS_NONE == ePos || GPOS_TILED == ePos ) bCompletePaint = false; @@ -2505,16 +2505,16 @@ SwTwips SwLayoutFrm::ShrinkFrm( SwTwips nDist, bool bTst, bool bInfo ) if( IsCellFrm() ) InvaPercentLowers( nReal ); - SwCntntFrm *pCnt; - if( IsFtnFrm() && !static_cast<SwFtnFrm*>(this)->GetAttr()->GetFtn().IsEndNote() && - ( GetFmt()->GetDoc()->GetFtnInfo().ePos != FTNPOS_CHAPTER || - ( IsInSct() && FindSctFrm()->IsFtnAtEnd() ) ) && - 0 != (pCnt = static_cast<SwFtnFrm*>(this)->GetRefFromAttr() ) ) + SwContentFrm *pCnt; + if( IsFootnoteFrm() && !static_cast<SwFootnoteFrm*>(this)->GetAttr()->GetFootnote().IsEndNote() && + ( GetFormat()->GetDoc()->GetFootnoteInfo().ePos != FTNPOS_CHAPTER || + ( IsInSct() && FindSctFrm()->IsFootnoteAtEnd() ) ) && + 0 != (pCnt = static_cast<SwFootnoteFrm*>(this)->GetRefFromAttr() ) ) { if ( pCnt->IsFollow() ) { // If we are in an other column/page than the frame with the // reference, we don't need to invalidate its master. - SwFrm *pTmp = pCnt->FindFtnBossFrm(true) == FindFtnBossFrm(true) + SwFrm *pTmp = pCnt->FindFootnoteBossFrm(true) == FindFootnoteBossFrm(true) ? &pCnt->FindMaster()->GetFrm() : pCnt; pTmp->Prepare( PREP_ADJUST_FRM ); pTmp->InvalidateSize(); @@ -2589,7 +2589,7 @@ void SwLayoutFrm::ChgLowersProp( const Size& rOldSize ) if( pLowerFrm->IsSctFrm() ) pLowerFrm = static_cast<SwSectionFrm*>(pLowerFrm)->GetSection() && !static_cast<SwSectionFrm*>(pLowerFrm)->ToMaximize( false ) ? - static_cast<SwSectionFrm*>(pLowerFrm)->FindLastCntnt() : NULL; + static_cast<SwSectionFrm*>(pLowerFrm)->FindLastContent() : NULL; // continue with found last lower, probably the last content of a section if ( pLowerFrm ) @@ -2620,8 +2620,8 @@ void SwLayoutFrm::ChgLowersProp( const Size& rOldSize ) if( !pLowerFrm->IsFlowFrm() || !SwFlowFrm::CastFlowFrm( pLowerFrm )->HasFollow() ) pLowerFrm->InvalidateNextPos( true ); - if ( pLowerFrm->IsTxtFrm() ) - static_cast<SwCntntFrm*>(pLowerFrm)->Prepare( PREP_ADJUST_FRM ); + if ( pLowerFrm->IsTextFrm() ) + static_cast<SwContentFrm*>(pLowerFrm)->Prepare( PREP_ADJUST_FRM ); } else { @@ -2652,8 +2652,8 @@ void SwLayoutFrm::ChgLowersProp( const Size& rOldSize ) { pLowerFrm->_InvalidateSize(); pLowerFrm->InvalidatePage( pPage ); - if ( pLowerFrm->IsTxtFrm() ) - static_cast<SwCntntFrm*>(pLowerFrm)->Prepare( PREP_ADJUST_FRM ); + if ( pLowerFrm->IsTextFrm() ) + static_cast<SwContentFrm*>(pLowerFrm)->Prepare( PREP_ADJUST_FRM ); } } // #i41694# - improvement by removing duplicates @@ -2676,7 +2676,7 @@ void SwLayoutFrm::ChgLowersProp( const Size& rOldSize ) } // end of { special case } // Invalidate page for content only once. - bool bInvaPageForCntnt = true; + bool bInvaPageForContent = true; // Declare booleans <bFixChgd> and <bVarChgd>, indicating for text frame // adjustment, if fixed/variable size has changed. @@ -2711,13 +2711,13 @@ void SwLayoutFrm::ChgLowersProp( const Size& rOldSize ) // Travel through all lowers using <GetNext()> while ( pLowerFrm ) { - if ( pLowerFrm->IsTxtFrm() ) + if ( pLowerFrm->IsTextFrm() ) { // Text frames will only be invalidated - prepare invalidation if ( bFixChgd ) - static_cast<SwCntntFrm*>(pLowerFrm)->Prepare( PREP_FIXSIZE_CHG ); + static_cast<SwContentFrm*>(pLowerFrm)->Prepare( PREP_FIXSIZE_CHG ); if ( bVarChgd ) - static_cast<SwCntntFrm*>(pLowerFrm)->Prepare( PREP_ADJUST_FRM ); + static_cast<SwContentFrm*>(pLowerFrm)->Prepare( PREP_ADJUST_FRM ); } else { @@ -2738,7 +2738,7 @@ void SwLayoutFrm::ChgLowersProp( const Size& rOldSize ) // frames to its upper width. pLowerFrm->Frm().Width( Prt().Width() ); } - else if( rOldSize.Width() && !pLowerFrm->IsFtnFrm() ) + else if( rOldSize.Width() && !pLowerFrm->IsFootnoteFrm() ) { // Adjust frame width proportional, if lower isn't a // foot note frame and condition <nLowerType & nFixWidth> @@ -2785,7 +2785,7 @@ void SwLayoutFrm::ChgLowersProp( const Size& rOldSize ) // the <Grow> of header or footer are overwritten. // NOTE: Height of header/footer frame is determined by contents. else if ( rOldSize.Height() && - !pLowerFrm->IsFtnFrm() && + !pLowerFrm->IsFootnoteFrm() && !pLowerFrm->IsHeaderFrm() && !pLowerFrm->IsFooterFrm() ) @@ -2815,9 +2815,9 @@ void SwLayoutFrm::ChgLowersProp( const Size& rOldSize ) ( IsColumnFrm() && IsInSct() ) ) { - OSL_ENSURE( pLowerFrm->IsBodyFrm() || pLowerFrm->IsFtnContFrm(), + OSL_ENSURE( pLowerFrm->IsBodyFrm() || pLowerFrm->IsFootnoteContFrm(), "ChgLowersProp - only for body or foot note container" ); - if ( pLowerFrm->IsBodyFrm() || pLowerFrm->IsFtnContFrm() ) + if ( pLowerFrm->IsBodyFrm() || pLowerFrm->IsFootnoteContFrm() ) { if ( IsVertical() || pLowerFrm->IsBodyFrm() ) { @@ -2863,7 +2863,7 @@ void SwLayoutFrm::ChgLowersProp( const Size& rOldSize ) SwFrm* pTmp = Lower(); while( pTmp->GetNext() ) { - if( !pTmp->IsFtnContFrm() || !pTmp->IsVertical() ) + if( !pTmp->IsFootnoteContFrm() || !pTmp->IsVertical() ) nSum -= pTmp->Frm().Height(); pTmp = pTmp->GetNext(); } @@ -2879,16 +2879,16 @@ void SwLayoutFrm::ChgLowersProp( const Size& rOldSize ) } // end of else { NOT text frame } pLowerFrm->_InvalidateAll(); - if ( bInvaPageForCntnt && pLowerFrm->IsCntntFrm() ) + if ( bInvaPageForContent && pLowerFrm->IsContentFrm() ) { pLowerFrm->InvalidatePage(); - bInvaPageForCntnt = false; + bInvaPageForContent = false; } if ( !pLowerFrm->GetNext() && pLowerFrm->IsRetoucheFrm() ) { //If a growth took place and the subordinate elements can retouch - //itself (currently Tabs, Sections and Cntnt) we trigger it. + //itself (currently Tabs, Sections and Content) we trigger it. if ( rOldSize.Height() < Prt().SSize().Height() || rOldSize.Width() < Prt().SSize().Width() ) pLowerFrm->SetRetouche(); @@ -2903,16 +2903,16 @@ void SwLayoutFrm::ChgLowersProp( const Size& rOldSize ) Lower()->IsColumnFrm() ) { // get column attribute - const SwFmtCol* pColAttr = NULL; + const SwFormatCol* pColAttr = NULL; if ( IsPageBodyFrm() ) { OSL_ENSURE( GetUpper()->IsPageFrm(), "Upper is not page frame" ); - pColAttr = &GetUpper()->GetFmt()->GetCol(); + pColAttr = &GetUpper()->GetFormat()->GetCol(); } else { OSL_ENSURE( IsFlyFrm() || IsSctFrm(), "Columns not in fly or section" ); - pColAttr = &GetFmt()->GetCol(); + pColAttr = &GetFormat()->GetCol(); } if ( pColAttr->IsOrtho() && pColAttr->GetNumCols() > 1 ) @@ -2950,7 +2950,7 @@ void SwLayoutFrm::Format( const SwBorderAttrs *pAttrs ) if ( !HasFixSize() ) { const SwTwips nBorder = nUpper + nLower; - const SwFmtFrmSize &rSz = GetFmt()->GetFrmSize(); + const SwFormatFrmSize &rSz = GetFormat()->GetFrmSize(); SwTwips nMinHeight = rSz.GetHeightSizeType() == ATT_MIN_SIZE ? rSz.GetHeight() : 0; do { mbValidSize = true; @@ -2961,9 +2961,9 @@ void SwLayoutFrm::Format( const SwBorderAttrs *pAttrs ) SwFrm *pFrm = Lower(); while ( pFrm ) { nRemaining += (pFrm->Frm().*fnRect->fnGetHeight)(); - if( pFrm->IsTxtFrm() && static_cast<SwTxtFrm*>(pFrm)->IsUndersized() ) - // This TxtFrm would like to be a bit bigger - nRemaining += static_cast<SwTxtFrm*>(pFrm)->GetParHeight() + if( pFrm->IsTextFrm() && static_cast<SwTextFrm*>(pFrm)->IsUndersized() ) + // This TextFrm would like to be a bit bigger + nRemaining += static_cast<SwTextFrm*>(pFrm)->GetParHeight() - (pFrm->Prt().*fnRect->fnGetHeight)(); else if( pFrm->IsSctFrm() && static_cast<SwSectionFrm*>(pFrm)->IsUndersized() ) nRemaining += static_cast<SwSectionFrm*>(pFrm)->Undersize(); @@ -3017,7 +3017,7 @@ static void InvaPercentFlys( SwFrm *pFrm, SwTwips nDiff ) if ( pAnchoredObj->ISA(SwFlyFrm) ) { SwFlyFrm *pFly = static_cast<SwFlyFrm*>(pAnchoredObj); - const SwFmtFrmSize &rSz = pFly->GetFmt()->GetFrmSize(); + const SwFormatFrmSize &rSz = pFly->GetFormat()->GetFrmSize(); if ( rSz.GetWidthPercent() || rSz.GetHeightPercent() ) { bool bNotify = true; @@ -3033,7 +3033,7 @@ static void InvaPercentFlys( SwFrm *pFrm, SwTwips nDiff ) // 100% height and no text wrap inside a cell of a table. if( pFly->Frm().Height()*10 > ( nDiff + pRel->Prt().Height() )*9 && - pFly->GetFmt()->GetSurround().GetSurround() != + pFly->GetFormat()->GetSurround().GetSurround() != SURROUND_THROUGHT ) bNotify = false; } @@ -3049,7 +3049,7 @@ void SwLayoutFrm::InvaPercentLowers( SwTwips nDiff ) if ( GetDrawObjs() ) ::InvaPercentFlys( this, nDiff ); - SwFrm *pFrm = ContainsCntnt(); + SwFrm *pFrm = ContainsContent(); if ( pFrm ) do { @@ -3063,7 +3063,7 @@ void SwLayoutFrm::InvaPercentLowers( SwTwips nDiff ) if ( pFrm->IsTabFrm() ) { - const SwFmtFrmSize &rSz = static_cast<SwLayoutFrm*>(pFrm)->GetFmt()->GetFrmSize(); + const SwFormatFrmSize &rSz = static_cast<SwLayoutFrm*>(pFrm)->GetFormat()->GetFrmSize(); if ( rSz.GetWidthPercent() || rSz.GetHeightPercent() ) pFrm->InvalidatePrt(); } @@ -3073,7 +3073,7 @@ void SwLayoutFrm::InvaPercentLowers( SwTwips nDiff ) } while ( pFrm && IsAnLower( pFrm ) ) ; } -long SwLayoutFrm::CalcRel( const SwFmtFrmSize &rSz, bool ) const +long SwLayoutFrm::CalcRel( const SwFormatFrmSize &rSz, bool ) const { long nRet = rSz.GetWidth(), nPercent = rSz.GetWidthPercent(); @@ -3109,9 +3109,9 @@ static long lcl_CalcMinColDiff( SwLayoutFrm *pLayFrm ) { if( pFrm && pFrm->IsBodyFrm() ) pFrm = static_cast<SwBodyFrm*>(pFrm)->Lower(); - if ( pFrm && pFrm->IsTxtFrm() ) + if ( pFrm && pFrm->IsTextFrm() ) { - const long nTmp = static_cast<SwTxtFrm*>(pFrm)->FirstLineHeight(); + const long nTmp = static_cast<SwTextFrm*>(pFrm)->FirstLineHeight(); if ( nTmp != USHRT_MAX ) { if ( pCol == pLayFrm->Lower() ) @@ -3132,7 +3132,7 @@ static long lcl_CalcMinColDiff( SwLayoutFrm *pLayFrm ) static bool lcl_IsFlyHeightClipped( SwLayoutFrm *pLay ) { - SwFrm *pFrm = pLay->ContainsCntnt(); + SwFrm *pFrm = pLay->ContainsContent(); while ( pFrm ) { if ( pFrm->IsInTab() ) @@ -3172,7 +3172,7 @@ void SwLayoutFrm::FormatWidthCols( const SwBorderAttrs &rAttrs, // than the amount of columns. //3. Go back to 1. until everything is stable. - const SwFmtCol &rCol = rAttrs.GetAttrSet().GetCol(); + const SwFormatCol &rCol = rAttrs.GetAttrSet().GetCol(); const sal_uInt16 nNumCols = rCol.GetNumCols(); bool bEnd = false; @@ -3228,7 +3228,7 @@ void SwLayoutFrm::FormatWidthCols( const SwBorderAttrs &rAttrs, if( nMaximum > BROWSE_HEIGHT ) nMaximum = BROWSE_HEIGHT; - bNoBalance = static_cast<SwSectionFrm*>(this)->GetSection()->GetFmt()-> + bNoBalance = static_cast<SwSectionFrm*>(this)->GetSection()->GetFormat()-> GetBalancedColumns().GetValue(); SwFrm* pAny = ContainsAny(); if( bNoBalance || @@ -3243,16 +3243,16 @@ void SwLayoutFrm::FormatWidthCols( const SwBorderAttrs &rAttrs, nTop = nMaximum; (this->*fnRect->fnSetYMargins)( nTop, 0 ); } - if( !pAny && !static_cast<SwSectionFrm*>(this)->IsFtnLock() ) + if( !pAny && !static_cast<SwSectionFrm*>(this)->IsFootnoteLock() ) { - SwFtnContFrm* pFtnCont = static_cast<SwSectionFrm*>(this)->ContainsFtnCont(); - if( pFtnCont ) + SwFootnoteContFrm* pFootnoteCont = static_cast<SwSectionFrm*>(this)->ContainsFootnoteCont(); + if( pFootnoteCont ) { - SwFrm* pFtnAny = pFtnCont->ContainsAny(); - if( pFtnAny && pFtnAny->IsValid() ) + SwFrm* pFootnoteAny = pFootnoteCont->ContainsAny(); + if( pFootnoteAny && pFootnoteAny->IsValid() ) { bBackLock = true; - static_cast<SwSectionFrm*>(this)->SetFtnLock( true ); + static_cast<SwSectionFrm*>(this)->SetFootnoteLock( true ); } } } @@ -3299,11 +3299,11 @@ void SwLayoutFrm::FormatWidthCols( const SwBorderAttrs &rAttrs, // ColumnFrms have a BodyFrm now, which needs to be calculated pCol->Lower()->Calc(); if( pCol->Lower()->GetNext() ) - pCol->Lower()->GetNext()->Calc(); // SwFtnCont + pCol->Lower()->GetNext()->Calc(); // SwFootnoteCont pCol = static_cast<SwLayoutFrm*>(pCol->GetNext()); } - ::CalcCntnt( this ); + ::CalcContent( this ); pCol = static_cast<SwLayoutFrm*>(Lower()); OSL_ENSURE( pCol && pCol->GetNext(), ":-( column making holidays?"); @@ -3312,7 +3312,7 @@ void SwLayoutFrm::FormatWidthCols( const SwBorderAttrs &rAttrs, // OD 28.03.2003 #108446# - check for all column content and all columns while ( bMinDiff && pCol ) { - bMinDiff = 0 != pCol->ContainsCntnt(); + bMinDiff = 0 != pCol->ContainsContent(); pCol = static_cast<SwLayoutFrm*>(pCol->GetNext()); } pCol = static_cast<SwLayoutFrm*>(Lower()); @@ -3339,7 +3339,7 @@ void SwLayoutFrm::FormatWidthCols( const SwBorderAttrs &rAttrs, { bFoundLower = true; pLay = static_cast<SwLayoutFrm*>(pLay->GetNext()); - OSL_ENSURE( pLay->IsFtnContFrm(),"FtnContainer expected" ); + OSL_ENSURE( pLay->IsFootnoteContFrm(),"FootnoteContainer expected" ); nInnerHeight += pLay->InnerHeight(); nInnerHeight += (pLay->Frm().*fnRect->fnGetHeight)() - (pLay->Prt().*fnRect->fnGetHeight)(); @@ -3486,11 +3486,11 @@ void SwLayoutFrm::FormatWidthCols( const SwBorderAttrs &rAttrs, if( IsSctFrm() && static_cast<SwSectionFrm*>(this)->HasFollow() ) { // If we created a Follow, we need to give its content - // the opportunity to flow back inside the CalcCntnt - SwCntntFrm* pTmpCntnt = - static_cast<SwSectionFrm*>(this)->GetFollow()->ContainsCntnt(); - if( pTmpCntnt ) - pTmpCntnt->_InvalidatePos(); + // the opportunity to flow back inside the CalcContent + SwContentFrm* pTmpContent = + static_cast<SwSectionFrm*>(this)->GetFollow()->ContainsContent(); + if( pTmpContent ) + pTmpContent->_InvalidatePos(); } } else @@ -3503,24 +3503,24 @@ void SwLayoutFrm::FormatWidthCols( const SwBorderAttrs &rAttrs, } // OD 01.04.2003 #108446# - Don't collect endnotes for sections. Thus, set // 2nd parameter to <true>. - ::CalcCntnt( this, true ); + ::CalcContent( this, true ); if( IsSctFrm() ) { // OD 14.03.2003 #i11760# - adjust 2nd parameter - sal_True --> true - ::CalcCntnt( this, true ); + ::CalcContent( this, true ); if( bBackLock ) - static_cast<SwSectionFrm*>(this)->SetFtnLock( false ); + static_cast<SwSectionFrm*>(this)->SetFootnoteLock( false ); } } -static SwCntntFrm* lcl_InvalidateSection( SwFrm *pCnt, sal_uInt8 nInv ) +static SwContentFrm* lcl_InvalidateSection( SwFrm *pCnt, sal_uInt8 nInv ) { SwSectionFrm* pSect = pCnt->FindSctFrm(); - // If our CntntFrm is placed inside a table or a footnote, only sections + // If our ContentFrm is placed inside a table or a footnote, only sections // which are also placed inside are meant. // Exception: If a table is directly passed. if( ( ( pCnt->IsInTab() && !pSect->IsInTab() ) || - ( pCnt->IsInFtn() && !pSect->IsInFtn() ) ) && !pCnt->IsTabFrm() ) + ( pCnt->IsInFootnote() && !pSect->IsInFootnote() ) ) && !pCnt->IsTabFrm() ) return NULL; if( nInv & INV_SIZE ) pSect->_InvalidateSize(); @@ -3531,12 +3531,12 @@ static SwCntntFrm* lcl_InvalidateSection( SwFrm *pCnt, sal_uInt8 nInv ) SwFlowFrm *pFoll = pSect->GetFollow(); // Temporary separation from follow pSect->SetFollow( NULL ); - SwCntntFrm* pRet = pSect->FindLastCntnt(); + SwContentFrm* pRet = pSect->FindLastContent(); pSect->SetFollow( pFoll ); return pRet; } -static SwCntntFrm* lcl_InvalidateTable( SwTabFrm *pTable, sal_uInt8 nInv ) +static SwContentFrm* lcl_InvalidateTable( SwTabFrm *pTable, sal_uInt8 nInv ) { if( ( nInv & INV_SECTION ) && pTable->IsInSct() ) lcl_InvalidateSection( pTable, nInv ); @@ -3546,15 +3546,15 @@ static SwCntntFrm* lcl_InvalidateTable( SwTabFrm *pTable, sal_uInt8 nInv ) pTable->_InvalidatePos(); if( nInv & INV_PRTAREA ) pTable->_InvalidatePrt(); - return pTable->FindLastCntnt(); + return pTable->FindLastContent(); } -static void lcl_InvalidateAllCntnt( SwCntntFrm *pCnt, sal_uInt8 nInv ); +static void lcl_InvalidateAllContent( SwContentFrm *pCnt, sal_uInt8 nInv ); -static void lcl_InvalidateCntnt( SwCntntFrm *pCnt, sal_uInt8 nInv ) +static void lcl_InvalidateContent( SwContentFrm *pCnt, sal_uInt8 nInv ) { - SwCntntFrm *pLastTabCnt = NULL; - SwCntntFrm *pLastSctCnt = NULL; + SwContentFrm *pLastTabCnt = NULL; + SwContentFrm *pLastSctCnt = NULL; while ( pCnt ) { if( nInv & INV_SECTION ) @@ -3569,15 +3569,15 @@ static void lcl_InvalidateCntnt( SwCntntFrm *pCnt, sal_uInt8 nInv ) } #if OSL_DEBUG_LEVEL > 0 else - OSL_ENSURE( !pLastSctCnt, "Where's the last SctCntnt?" ); + OSL_ENSURE( !pLastSctCnt, "Where's the last SctContent?" ); #endif } if( nInv & INV_TABLE ) { if( pCnt->IsInTab() ) { - // To not call FindTabFrm() for each CntntFrm of a table and - // then invalidate the table, we remember the last CntntFrm of + // To not call FindTabFrm() for each ContentFrm of a table and + // then invalidate the table, we remember the last ContentFrm of // the table and ignore IsInTab() until we are past it. // When entering the table, LastSctCnt is set to null, so // sections inside the table are correctly invalidated. @@ -3596,7 +3596,7 @@ static void lcl_InvalidateCntnt( SwCntntFrm *pCnt, sal_uInt8 nInv ) } #if OSL_DEBUG_LEVEL > 0 else - OSL_ENSURE( !pLastTabCnt, "Where's the last TabCntnt?" ); + OSL_ENSURE( !pLastTabCnt, "Where's the last TabContent?" ); #endif } @@ -3609,12 +3609,12 @@ static void lcl_InvalidateCntnt( SwCntntFrm *pCnt, sal_uInt8 nInv ) if ( nInv & INV_LINENUM ) pCnt->InvalidateLineNum(); if ( pCnt->GetDrawObjs() ) - lcl_InvalidateAllCntnt( pCnt, nInv ); - pCnt = pCnt->GetNextCntntFrm(); + lcl_InvalidateAllContent( pCnt, nInv ); + pCnt = pCnt->GetNextContentFrm(); } } -static void lcl_InvalidateAllCntnt( SwCntntFrm *pCnt, sal_uInt8 nInv ) +static void lcl_InvalidateAllContent( SwContentFrm *pCnt, sal_uInt8 nInv ) { SwSortedObjs &rObjs = *pCnt->GetDrawObjs(); for ( size_t i = 0; i < rObjs.size(); ++i ) @@ -3625,7 +3625,7 @@ static void lcl_InvalidateAllCntnt( SwCntntFrm *pCnt, sal_uInt8 nInv ) SwFlyFrm *pFly = static_cast<SwFlyFrm*>(pAnchoredObj); if ( pFly->IsFlyInCntFrm() ) { - ::lcl_InvalidateCntnt( pFly->ContainsCntnt(), nInv ); + ::lcl_InvalidateContent( pFly->ContainsContent(), nInv ); if( nInv & INV_DIRECTION ) pFly->CheckDirChange(); } @@ -3633,17 +3633,17 @@ static void lcl_InvalidateAllCntnt( SwCntntFrm *pCnt, sal_uInt8 nInv ) } } -void SwRootFrm::InvalidateAllCntnt( sal_uInt8 nInv ) +void SwRootFrm::InvalidateAllContent( sal_uInt8 nInv ) { // First process all page bound FlyFrms. SwPageFrm *pPage = static_cast<SwPageFrm*>(Lower()); while( pPage ) { pPage->InvalidateFlyLayout(); - pPage->InvalidateFlyCntnt(); + pPage->InvalidateFlyContent(); pPage->InvalidateFlyInCnt(); pPage->InvalidateLayout(); - pPage->InvalidateCntnt(); + pPage->InvalidateContent(); pPage->InvalidatePage( pPage ); // So even the Turbo disappears if applicable if ( pPage->GetSortedObjs() ) @@ -3655,7 +3655,7 @@ void SwRootFrm::InvalidateAllCntnt( sal_uInt8 nInv ) if ( pAnchoredObj->ISA(SwFlyFrm) ) { SwFlyFrm* pFly = static_cast<SwFlyFrm*>(pAnchoredObj); - ::lcl_InvalidateCntnt( pFly->ContainsCntnt(), nInv ); + ::lcl_InvalidateContent( pFly->ContainsContent(), nInv ); if ( nInv & INV_DIRECTION ) pFly->CheckDirChange(); } @@ -3667,7 +3667,7 @@ void SwRootFrm::InvalidateAllCntnt( sal_uInt8 nInv ) } //Invalidate the whole document content and the character bound Flys here. - ::lcl_InvalidateCntnt( ContainsCntnt(), nInv ); + ::lcl_InvalidateContent( ContainsContent(), nInv ); if( nInv & INV_PRTAREA ) { @@ -3694,7 +3694,7 @@ void SwRootFrm::InvalidateAllObjPos() for ( size_t i = 0; i < rObjs.size(); ++i ) { SwAnchoredObject* pAnchoredObj = rObjs[i]; - const SwFmtAnchor& rAnch = pAnchoredObj->GetFrmFmt().GetAnchor(); + const SwFormatAnchor& rAnch = pAnchoredObj->GetFrameFormat().GetAnchor(); if ((rAnch.GetAnchorId() != FLY_AT_PARA) && (rAnch.GetAnchorId() != FLY_AT_CHAR)) { |