sw/inc/accmap.hxx | 8 ++++---- sw/source/core/access/accmap.cxx | 10 +++++----- sw/source/core/view/viewimp.cxx | 2 +- sw/source/uibase/docvw/PostItMgr.cxx | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-)
New commits: commit ad59dcf7dad19540403f5812677901e6fad30257 Author: Caolán McNamara <caol...@redhat.com> Date: Thu Jun 30 15:33:14 2016 +0100 everything is called Dispose, hard to find anything Change-Id: I473ed39c975886a6be30860cb61f6fe59c5508a4 diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx index 2178a72..7c1f229 100644 --- a/sw/inc/accmap.hxx +++ b/sw/inc/accmap.hxx @@ -182,10 +182,10 @@ public: void RemoveContext( const SdrObject *pObj ); // Dispose frame and its children if bRecursive is set - void Dispose( const SwFrame* pFrame, - const SdrObject* pObj, - vcl::Window* pWindow, - bool bRecursive = false ); + void A11yDispose( const SwFrame* pFrame, + const SdrObject* pObj, + vcl::Window* pWindow, + bool bRecursive = false ); void InvalidatePosOrSize( const SwFrame* pFrame, const SdrObject* pObj, diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx index 2f902ad..26720d1 100644 --- a/sw/source/core/access/accmap.cxx +++ b/sw/source/core/access/accmap.cxx @@ -2241,10 +2241,10 @@ void SwAccessibleMap::RemoveContext( const SdrObject *pObj ) } } -void SwAccessibleMap::Dispose( const SwFrame *pFrame, - const SdrObject *pObj, - vcl::Window* pWindow, - bool bRecursive ) +void SwAccessibleMap::A11yDispose( const SwFrame *pFrame, + const SdrObject *pObj, + vcl::Window* pWindow, + bool bRecursive ) { SwAccessibleChild aFrameOrObj( pFrame, pObj, pWindow ); @@ -3189,7 +3189,7 @@ bool SwAccessibleMap::ReplaceChild ( // Also get keep parent. uno::Reference < XAccessible > xParent( pCurrentChild->getAccessibleParent() ); pCurrentChild = nullptr; // will be released by dispose - Dispose( nullptr, pObj, nullptr ); + A11yDispose( nullptr, pObj, nullptr ); { osl::MutexGuard aGuard( maMutex ); diff --git a/sw/source/core/view/viewimp.cxx b/sw/source/core/view/viewimp.cxx index 254a5b7..09b21ba 100644 --- a/sw/source/core/view/viewimp.cxx +++ b/sw/source/core/view/viewimp.cxx @@ -308,7 +308,7 @@ void SwViewShellImp::DisposeAccessible( const SwFrame *pFrame, for(SwViewShell& rTmp : GetShell()->GetRingContainer()) { if( rTmp.Imp()->IsAccessible() ) - rTmp.Imp()->GetAccessibleMap().Dispose( pFrame, pObj, nullptr, bRecursive ); + rTmp.Imp()->GetAccessibleMap().A11yDispose( pFrame, pObj, nullptr, bRecursive ); } } diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx index 4e7e165..66a2de1 100644 --- a/sw/source/uibase/docvw/PostItMgr.cxx +++ b/sw/source/uibase/docvw/PostItMgr.cxx @@ -2182,7 +2182,7 @@ void SwPostItMgr::DisconnectSidebarWinFromFrame( const SwFrame& rFrame, if ( bRemoved && mpWrtShell->GetAccessibleMap() ) { - mpWrtShell->GetAccessibleMap()->Dispose( nullptr, nullptr, &rSidebarWin ); + mpWrtShell->GetAccessibleMap()->A11yDispose( nullptr, nullptr, &rSidebarWin ); } } }
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits