summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-06-30 15:33:14 +0100
committerCaolán McNamara <caolanm@redhat.com>2016-06-30 17:17:33 +0100
commitad59dcf7dad19540403f5812677901e6fad30257 (patch)
tree067f920c2fa73b71a5c1b5a80592ea8de6e42b58 /sw
parent0381026924947c6164d1eebe7395c91f619965ce (diff)
everything is called Dispose, hard to find anything
Change-Id: I473ed39c975886a6be30860cb61f6fe59c5508a4
Diffstat (limited to 'sw')
-rw-r--r--sw/inc/accmap.hxx8
-rw-r--r--sw/source/core/access/accmap.cxx10
-rw-r--r--sw/source/core/view/viewimp.cxx2
-rw-r--r--sw/source/uibase/docvw/PostItMgr.cxx2
4 files changed, 11 insertions, 11 deletions
diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx
index 2178a7223498..7c1f2299b805 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 2f902ad2dedc..26720d1267ce 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 254a5b7a355b..09b21ba64f0d 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 4e7e165cf9c8..66a2de122539 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 );
}
}
}