diff options
Diffstat (limited to 'sw/source/core/access/accfrmobjslist.cxx')
-rw-r--r-- | sw/source/core/access/accfrmobjslist.cxx | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/sw/source/core/access/accfrmobjslist.cxx b/sw/source/core/access/accfrmobjslist.cxx index 5c3cb557d0a1..36d6a880b5b0 100644 --- a/sw/source/core/access/accfrmobjslist.cxx +++ b/sw/source/core/access/accfrmobjslist.cxx @@ -31,24 +31,24 @@ SwAccessibleChildSList_const_iterator::SwAccessibleChildSList_const_iterator( const SwAccessibleChildSList& rLst, SwAccessibleMap& rAccMap ) : rList( rLst ), - aCurr( rList.GetFrm().GetLower() ), + aCurr( rList.GetFrame().GetLower() ), nNextObj( 0 ) { - if( !aCurr.GetSwFrm() ) + if( !aCurr.GetSwFrame() ) { - const SwFrm& rFrm = rList.GetFrm(); - if( rFrm.IsPageFrm() ) + const SwFrame& rFrame = rList.GetFrame(); + if( rFrame.IsPageFrame() ) { - const SwPageFrm& rPgFrm = static_cast< const SwPageFrm& >( rFrm ); - const SwSortedObjs *pObjs = rPgFrm.GetSortedObjs(); + const SwPageFrame& rPgFrame = static_cast< const SwPageFrame& >( rFrame ); + const SwSortedObjs *pObjs = rPgFrame.GetSortedObjs(); if( pObjs && pObjs->size() ) { aCurr = (*pObjs)[nNextObj++]->GetDrawObj(); } } - else if( rFrm.IsTextFrm() ) + else if( rFrame.IsTextFrame() ) { - const SwSortedObjs *pObjs = rFrm.GetDrawObjs(); + const SwSortedObjs *pObjs = rFrame.GetDrawObjs(); if ( pObjs && pObjs->size() ) { aCurr = (*pObjs)[nNextObj++]->GetDrawObj(); @@ -62,7 +62,7 @@ SwAccessibleChildSList_const_iterator::SwAccessibleChildSList_const_iterator( if ( !aCurr.IsValid() ) { ::rtl::Reference < SwAccessibleContext > xAccImpl = - rAccMap.GetContextImpl( &rFrm, false ); + rAccMap.GetContextImpl( &rFrame, false ); if( xAccImpl.is() ) { SwAccessibleContext* pAccImpl = xAccImpl.get(); @@ -92,10 +92,10 @@ SwAccessibleChildSList_const_iterator& SwAccessibleChildSList_const_iterator::ne { bNextTaken = false; } - else if( aCurr.GetSwFrm() ) + else if( aCurr.GetSwFrame() ) { - aCurr = aCurr.GetSwFrm()->GetNext(); - if( !aCurr.GetSwFrm() ) + aCurr = aCurr.GetSwFrame()->GetNext(); + if( !aCurr.GetSwFrame() ) { bNextTaken = false; } @@ -103,18 +103,18 @@ SwAccessibleChildSList_const_iterator& SwAccessibleChildSList_const_iterator::ne if( !bNextTaken ) { - const SwFrm& rFrm = rList.GetFrm(); - if( rFrm.IsPageFrm() ) + const SwFrame& rFrame = rList.GetFrame(); + if( rFrame.IsPageFrame() ) { - const SwPageFrm& rPgFrm = static_cast< const SwPageFrm& >( rFrm ); - const SwSortedObjs *pObjs = rPgFrm.GetSortedObjs(); + const SwPageFrame& rPgFrame = static_cast< const SwPageFrame& >( rFrame ); + const SwSortedObjs *pObjs = rPgFrame.GetSortedObjs(); aCurr = ( pObjs && nNextObj < pObjs->size() ) ? (*pObjs)[nNextObj++]->GetDrawObj() : static_cast< const SdrObject *>( nullptr ); } - else if( rFrm.IsTextFrm() ) + else if( rFrame.IsTextFrame() ) { - const SwSortedObjs* pObjs = rFrm.GetDrawObjs(); + const SwSortedObjs* pObjs = rFrame.GetDrawObjs(); const size_t nObjsCount = pObjs ? pObjs->size() : 0; aCurr = ( pObjs && nNextObj < nObjsCount ) ? (*pObjs)[nNextObj++]->GetDrawObj() @@ -128,7 +128,7 @@ SwAccessibleChildSList_const_iterator& SwAccessibleChildSList_const_iterator::ne if ( !aCurr.IsValid() ) { ::rtl::Reference < SwAccessibleContext > xAccImpl = - rList.GetAccMap().GetContextImpl( &rFrm, false ); + rList.GetAccMap().GetContextImpl( &rFrame, false ); if( xAccImpl.is() ) { SwAccessibleContext* pAccImpl = xAccImpl.get(); |