1 files changed, 5 insertions, 12 deletions
diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx b/sc/source/ui/Accessibility/AccessibleCell.cxx
index dd7f189738b9..35288daa99fc 100644
--- a/sc/source/ui/Accessibility/AccessibleCell.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCell.cxx
@@ -85,20 +85,13 @@ ScAccessibleCell::~ScAccessibleCell()
 {
     if (!ScAccessibleContextBase::IsDefunc() && !rBHelper.bInDispose)
     {
-        // increment refcount to prevent double call off dtor
+        // increment refcount to prevent double call of dtor
         osl_atomic_increment( &m_refCount );
         // call dispose to inform object which have a weak reference to this object
         dispose();
     }
 }
 
-void ScAccessibleCell::Init()
-{
-    ScAccessibleCellBase::Init();
-
-    SetEventSource(this);
-}
-
 void SAL_CALL ScAccessibleCell::disposing()
 {
     SolarMutexGuard aGuard;
@@ -142,7 +135,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleCell::getAccessibleAtPoint(
 void SAL_CALL ScAccessibleCell::grabFocus(  )
 {
     SolarMutexGuard aGuard;
-    IsObjectValid();
+    ensureAlive();
     if (getAccessibleParent().is() && mpViewShell)
     {
         uno::Reference<XAccessibleComponent> xAccessibleComponent(getAccessibleParent()->getAccessibleContext(), uno::UNO_QUERY);
@@ -285,7 +278,7 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL
        ScAccessibleCell::getAccessibleRelationSet()
 {
     SolarMutexGuard aGuard;
-    IsObjectValid();
+    ensureAlive();
     rtl::Reference<utl::AccessibleRelationSetHelper> pRelationSet;
     if (mpAccDoc)
         pRelationSet = mpAccDoc->GetRelationSet(&maCellAddress);
@@ -491,7 +484,7 @@ static OUString ReplaceFourChar(const OUString& oldOUString)
         .replaceAll(u":", u"\\:");
 }
 
-uno::Any SAL_CALL ScAccessibleCell::getExtendedAttributes()
+OUString SAL_CALL ScAccessibleCell::getExtendedAttributes()
 {
     SolarMutexGuard aGuard;
 
@@ -529,7 +522,7 @@ uno::Any SAL_CALL ScAccessibleCell::getExtendedAttributes()
         sAttributes += strFor ;
     }
 
-    return uno::Any(sAttributes);
+    return sAttributes;
 }
 
 // cell has its own ParaIndent property, so when calling character attributes on cell, the ParaIndent should replace the ParaLeftMargin if its value is not zero.