diff options
Diffstat (limited to 'sw/source/core/layout/fly.cxx')
| -rw-r--r-- | sw/source/core/layout/fly.cxx | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx index bf01c3b1dc7a..986c812454df 100644 --- a/sw/source/core/layout/fly.cxx +++ b/sw/source/core/layout/fly.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_wasm_strip.h> + #include <svl/itemiter.hxx> #include <vcl/imap.hxx> #include <tools/helpers.hxx> @@ -261,6 +263,7 @@ void SwFlyFrame::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. +#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY if( IsAccessibleFrame() && GetFormat() && (IsFlyInContentFrame() || !GetAnchorFrame()) ) { SwRootFrame *pRootFrame = getRootFrame(); @@ -275,6 +278,7 @@ void SwFlyFrame::DestroyImpl() } } } +#endif if( GetFormat() && !GetFormat()->GetDoc()->IsInDtor() ) { @@ -484,6 +488,7 @@ void SwFlyFrame::ChainFrames( SwFlyFrame *pMaster, SwFlyFrame *pFollow ) } // invalidate accessible relation set (accessibility wrapper) +#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY SwViewShell* pSh = pMaster->getRootFrame()->GetCurrShell(); if( pSh ) { @@ -491,6 +496,7 @@ void SwFlyFrame::ChainFrames( SwFlyFrame *pMaster, SwFlyFrame *pFollow ) if( pLayout && pLayout->IsAnyShellAccessible() ) pSh->Imp()->InvalidateAccessibleRelationSet( pMaster, pFollow ); } +#endif } void SwFlyFrame::UnchainFrames( SwFlyFrame *pMaster, SwFlyFrame *pFollow ) @@ -530,6 +536,7 @@ void SwFlyFrame::UnchainFrames( SwFlyFrame *pMaster, SwFlyFrame *pFollow ) pFollow->GetFormat()->GetDoc(), ++nIndex ); // invalidate accessible relation set (accessibility wrapper) +#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY SwViewShell* pSh = pMaster->getRootFrame()->GetCurrShell(); if( pSh ) { @@ -537,6 +544,7 @@ void SwFlyFrame::UnchainFrames( SwFlyFrame *pMaster, SwFlyFrame *pFollow ) if( pLayout && pLayout->IsAnyShellAccessible() ) pSh->Imp()->InvalidateAccessibleRelationSet( pMaster, pFollow ); } +#endif } SwFlyFrame *SwFlyFrame::FindChainNeighbour( SwFrameFormat const &rChain, SwFrame *pAnch ) @@ -792,12 +800,14 @@ void SwFlyFrame::UpdateAttr_( const SfxPoolItem *pOld, const SfxPoolItem *pNew, const SvxProtectItem *pP = static_cast<const SvxProtectItem*>(pNew); GetVirtDrawObj()->SetMoveProtect( pP->IsPosProtected() ); GetVirtDrawObj()->SetResizeProtect( pP->IsSizeProtected() ); +#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY if( pSh ) { SwRootFrame* pLayout = getRootFrame(); if( pLayout && pLayout->IsAnyShellAccessible() ) pSh->Imp()->InvalidateAccessibleEditableState( true, this ); } +#endif } break; case RES_COL: @@ -975,15 +985,17 @@ void SwFlyFrame::UpdateAttr_( const SfxPoolItem *pOld, const SfxPoolItem *pNew, rIDDMA.GetHeavenId() : rIDDMA.GetHellId(); GetVirtDrawObj()->SetLayer( nId ); +#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY if( pSh ) { SwRootFrame* pLayout = getRootFrame(); if( pLayout && pLayout->IsAnyShellAccessible() ) - { - pSh->Imp()->DisposeAccessibleFrame( this ); - pSh->Imp()->AddAccessibleFrame( this ); - } + { + pSh->Imp()->DisposeAccessibleFrame( this ); + pSh->Imp()->AddAccessibleFrame( this ); + } } +#endif // #i28701# - perform reorder of object lists // at anchor frame and at page frame. rInvFlags |= SwFlyFrameInvFlags::UpdateObjInSortedList; @@ -2203,6 +2215,7 @@ void SwFrame::RemoveFly( SwFlyFrame *pToRemove ) pPage->RemoveFlyFromPage( pToRemove ); } // #i73201# +#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY else { if ( pToRemove->IsAccessibleFrame() && @@ -2220,6 +2233,7 @@ void SwFrame::RemoveFly( SwFlyFrame *pToRemove ) } } } +#endif m_pDrawObjs->Remove(*pToRemove); if (!m_pDrawObjs->size()) @@ -2301,6 +2315,7 @@ void SwFrame::AppendDrawObj( SwAnchoredObject& _rNewObj ) } // Notify accessible layout. +#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY SwViewShell* pSh = getRootFrame()->GetCurrShell(); if( pSh ) { @@ -2310,6 +2325,7 @@ void SwFrame::AppendDrawObj( SwAnchoredObject& _rNewObj ) pSh->Imp()->AddAccessibleObj( _rNewObj.GetDrawObj() ); } } +#endif assert(!m_pDrawObjs || m_pDrawObjs->is_sorted()); } @@ -2317,6 +2333,7 @@ void SwFrame::AppendDrawObj( SwAnchoredObject& _rNewObj ) void SwFrame::RemoveDrawObj( SwAnchoredObject& _rToRemoveObj ) { // Notify accessible layout. +#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY SwViewShell* pSh = getRootFrame()->GetCurrShell(); if( pSh ) { @@ -2324,6 +2341,7 @@ void SwFrame::RemoveDrawObj( SwAnchoredObject& _rToRemoveObj ) if (pLayout && pLayout->IsAnyShellAccessible()) pSh->Imp()->DisposeAccessibleObj(_rToRemoveObj.GetDrawObj(), false); } +#endif // deregister from page frame SwPageFrame* pPage = _rToRemoveObj.GetPageFrame(); |