1 files changed, 12 insertions, 12 deletions
diff --git a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
index 06165071b621..a61e86a4e2d7 100644
--- a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
+++ b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
@@ -22,7 +22,8 @@
 
 #include <extended/accessibleeditbrowseboxcell.hxx>
 #include <comphelper/processfactory.hxx>
-#include <tools/diagnose_ex.h>
+#include <utility>
+#include <comphelper/diagnose_ex.hxx>
 
 namespace accessibility
 {
@@ -57,7 +58,7 @@ namespace accessibility
 
     OUString SAL_CALL EditBrowseBoxTableCell::getImplementationName()
     {
-        return "com.sun.star.comp.svtools.TableCellProxy";
+        return u"com.sun.star.comp.svtools.TableCellProxy"_ustr;
     }
 
     IMPLEMENT_FORWARD_XINTERFACE2( EditBrowseBoxTableCell, AccessibleBrowseBoxCell, OAccessibleContextWrapperHelper )
@@ -122,7 +123,7 @@ namespace accessibility
         return baseGetAccessibleRelationSet( );
     }
 
-    css::uno::Reference<css::accessibility::XAccessibleStateSet > SAL_CALL EditBrowseBoxTableCell::getAccessibleStateSet()
+    sal_Int64 SAL_CALL EditBrowseBoxTableCell::getAccessibleStateSet()
     {
         SolarMethodGuard aGuard(getMutex());
         ensureIsAlive();
@@ -131,7 +132,7 @@ namespace accessibility
             // TODO: shouldn't we add an ACTIVE here? Isn't the EditBrowseBoxTableCell always ACTIVE?
     }
 
-    sal_Int32 SAL_CALL EditBrowseBoxTableCell::getAccessibleChildCount(  )
+    sal_Int64 SAL_CALL EditBrowseBoxTableCell::getAccessibleChildCount(  )
     {
         SolarMethodGuard aGuard(getMutex());
         ensureIsAlive();
@@ -139,7 +140,7 @@ namespace accessibility
         return baseGetAccessibleChildCount();
     }
 
-    css::uno::Reference< css::accessibility::XAccessible > SAL_CALL EditBrowseBoxTableCell::getAccessibleChild( sal_Int32 i )
+    css::uno::Reference< css::accessibility::XAccessible > SAL_CALL EditBrowseBoxTableCell::getAccessibleChild( sal_Int64 i )
     {
         SolarMethodGuard aGuard(getMutex());
         ensureIsAlive();
@@ -180,13 +181,12 @@ namespace accessibility
 
     // EditBrowseBoxTableCell
     EditBrowseBoxTableCellAccess::EditBrowseBoxTableCellAccess(
-            const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, const css::uno::Reference< css::accessibility::XAccessible >& _rxControlAccessible,
-            const css::uno::Reference< css::awt::XWindow >& _rxFocusWindow,
+            css::uno::Reference< css::accessibility::XAccessible > _xParent, css::uno::Reference< css::accessibility::XAccessible > _xControlAccessible,
+            css::uno::Reference< css::awt::XWindow > _xFocusWindow,
             ::vcl::IAccessibleTableProvider& _rBrowseBox, sal_Int32 _nRowPos, sal_uInt16 _nColPos )
-        :WeakComponentImplHelper( m_aMutex )
-        ,m_xParent( _rxParent )
-        ,m_xControlAccessible( _rxControlAccessible )
-        ,m_xFocusWindow( _rxFocusWindow )
+        :m_xParent(std::move( _xParent ))
+        ,m_xControlAccessible(std::move( _xControlAccessible ))
+        ,m_xFocusWindow(std::move( _xFocusWindow ))
         ,m_pBrowseBox( &_rBrowseBox )
         ,m_nRowPos( _nRowPos )
         ,m_nColPos( _nColPos )
@@ -213,7 +213,7 @@ namespace accessibility
         return xMyContext;
     }
 
-    void SAL_CALL EditBrowseBoxTableCellAccess::disposing()
+    void EditBrowseBoxTableCellAccess::disposing(std::unique_lock<std::mutex>&)
     {
         // dispose our context, if it still alive
         css::uno::Reference< XComponent > xMyContext( m_aContext.get(), UNO_QUERY );