diff options
Diffstat (limited to 'sw/source/core/access/acctextframe.cxx')
-rw-r--r-- | sw/source/core/access/acctextframe.cxx | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/sw/source/core/access/acctextframe.cxx b/sw/source/core/access/acctextframe.cxx index ae2bc97feb5f..ac338185363d 100644 --- a/sw/source/core/access/acctextframe.cxx +++ b/sw/source/core/access/acctextframe.cxx @@ -45,13 +45,13 @@ using ::com::sun::star::accessibility::XAccessibleContext; SwAccessibleTextFrame::SwAccessibleTextFrame( SwAccessibleMap* pInitMap, - const SwFlyFrm& rFlyFrm ) : - SwAccessibleFrameBase( pInitMap, AccessibleRole::TEXT_FRAME, &rFlyFrm ), + const SwFlyFrame& rFlyFrame ) : + SwAccessibleFrameBase( pInitMap, AccessibleRole::TEXT_FRAME, &rFlyFrame ), msTitle(), msDesc() { const SwFlyFrameFormat* pFlyFrameFormat = - dynamic_cast<const SwFlyFrameFormat*>( rFlyFrm.GetFormat() ); + dynamic_cast<const SwFlyFrameFormat*>( rFlyFrame.GetFormat() ); msTitle = pFlyFrameFormat->GetObjTitle(); msDesc = pFlyFrameFormat->GetObjDescription(); @@ -77,7 +77,7 @@ void SwAccessibleTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem * SwAccessibleFrameBase::Modify( pOld, pNew ); } - const SwFlyFrm *pFlyFrm = static_cast< const SwFlyFrm * >( GetFrm() ); + const SwFlyFrame *pFlyFrame = static_cast< const SwFlyFrame * >( GetFrame() ); switch( nWhich ) { // #i73249# @@ -102,7 +102,7 @@ void SwAccessibleTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem * FireAccessibleEvent( aEvent ); const SwFlyFrameFormat* pFlyFrameFormat = - dynamic_cast<const SwFlyFrameFormat*>( pFlyFrm->GetFormat() ); + dynamic_cast<const SwFlyFrameFormat*>( pFlyFrame->GetFormat() ); if (!pFlyFrameFormat || !pFlyFrameFormat->GetObjDescription().isEmpty()) { break; @@ -111,12 +111,12 @@ void SwAccessibleTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem * // intentionally no break here case RES_DESCRIPTION_CHANGED: { - if ( pFlyFrm ) + if ( pFlyFrame ) { const OUString sOldDesc( msDesc ); const SwFlyFrameFormat* pFlyFrameFormat = - dynamic_cast<const SwFlyFrameFormat*>( pFlyFrm->GetFormat() ); + dynamic_cast<const SwFlyFrameFormat*>( pFlyFrame->GetFormat() ); const OUString& rDesc = pFlyFrameFormat->GetObjDescription(); msDesc = rDesc; if ( msDesc.isEmpty() && @@ -305,23 +305,23 @@ uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleTextFrame::getImplementationId() // XAccessibleRelationSet -SwFlyFrm* SwAccessibleTextFrame::getFlyFrm() const +SwFlyFrame* SwAccessibleTextFrame::getFlyFrame() const { - SwFlyFrm* pFlyFrm = nullptr; + SwFlyFrame* pFlyFrame = nullptr; - const SwFrm* pFrm = GetFrm(); - assert(pFrm); - if( pFrm->IsFlyFrm() ) + const SwFrame* pFrame = GetFrame(); + assert(pFrame); + if( pFrame->IsFlyFrame() ) { - pFlyFrm = static_cast<SwFlyFrm*>( const_cast<SwFrm*>( pFrm ) ); + pFlyFrame = static_cast<SwFlyFrame*>( const_cast<SwFrame*>( pFrame ) ); } - return pFlyFrm; + return pFlyFrame; } -AccessibleRelation SwAccessibleTextFrame::makeRelation( sal_Int16 nType, const SwFlyFrm* pFrm ) +AccessibleRelation SwAccessibleTextFrame::makeRelation( sal_Int16 nType, const SwFlyFrame* pFrame ) { - uno::Sequence<uno::Reference<XInterface> > aSequence { GetMap()->GetContext( pFrm ) }; + uno::Sequence<uno::Reference<XInterface> > aSequence { GetMap()->GetContext( pFrame ) }; return AccessibleRelation( nType, aSequence ); } @@ -335,18 +335,18 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL SwAccessibleTextFrame::getAccess AccessibleRelationSetHelper* pHelper = new AccessibleRelationSetHelper(); - SwFlyFrm* pFlyFrm = getFlyFrm(); - assert(pFlyFrm); + SwFlyFrame* pFlyFrame = getFlyFrame(); + assert(pFlyFrame); - const SwFlyFrm* pPrevFrm = pFlyFrm->GetPrevLink(); - if( pPrevFrm != nullptr ) + const SwFlyFrame* pPrevFrame = pFlyFrame->GetPrevLink(); + if( pPrevFrame != nullptr ) pHelper->AddRelation( makeRelation( - AccessibleRelationType::CONTENT_FLOWS_FROM, pPrevFrm ) ); + AccessibleRelationType::CONTENT_FLOWS_FROM, pPrevFrame ) ); - const SwFlyFrm* pNextFrm = pFlyFrm->GetNextLink(); - if( pNextFrm != nullptr ) + const SwFlyFrame* pNextFrame = pFlyFrame->GetNextLink(); + if( pNextFrame != nullptr ) pHelper->AddRelation( makeRelation( - AccessibleRelationType::CONTENT_FLOWS_TO, pNextFrm ) ); + AccessibleRelationType::CONTENT_FLOWS_TO, pNextFrame ) ); return pHelper; } |