diff options
4 files changed, 4 insertions, 4 deletions
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx index 3752fccf3eba..8996a64bea1b 100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx @@ -228,7 +228,7 @@ protected: { return this; } - void dispose(); + void DisposeAccessImpl() SAL_OVERRIDE; virtual sal_Bool isAlive() const { return isContextAlive(); diff --git a/accessibility/source/extended/AccessibleGridControl.cxx b/accessibility/source/extended/AccessibleGridControl.cxx index c56f6bd3e85e..5ee23f662eb6 100644 --- a/accessibility/source/extended/AccessibleGridControl.cxx +++ b/accessibility/source/extended/AccessibleGridControl.cxx @@ -421,7 +421,7 @@ AccessibleGridControlAccess::~AccessibleGridControlAccess() } // ----------------------------------------------------------------------------- -void AccessibleGridControlAccess::dispose() +void AccessibleGridControlAccess::DisposeAccessImpl() { SolarMutexGuard g; diff --git a/include/svtools/accessibletable.hxx b/include/svtools/accessibletable.hxx index 285ab8413f63..8b89684571de 100644 --- a/include/svtools/accessibletable.hxx +++ b/include/svtools/accessibletable.hxx @@ -139,7 +139,7 @@ public: /** disposes the accessible implementation, so that it becomes defunc */ - virtual void dispose() = 0; + virtual void DisposeAccessImpl() = 0; /** checks whether the accessible implementation, and its context, are still alive @return <TRUE/>, if the object is not disposed or disposing. diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx index e27dbac76c8e..f4238c9da616 100644 --- a/svtools/source/table/tablecontrol_impl.cxx +++ b/svtools/source/table/tablecontrol_impl.cxx @@ -2727,7 +2727,7 @@ namespace svt { namespace table void TableControl_Impl::disposeAccessible() { if ( m_pAccessibleTable ) - m_pAccessibleTable->dispose(); + m_pAccessibleTable->DisposeAccessImpl(); m_pAccessibleTable = NULL; } |