remove XACC macro

Change-Id: Ide6eb5df56747d7ff1575f9eacd7fa2a9f627ca1

5 files changed, 71 insertions, 95 deletions

diff --git a/svtools/inc/svtools/accessibletable.hxx b/svtools/inc/svtools/accessibletable.hxx
index 27fb91de02a6..0b3ca19c0ce7 100644
--- a/svtools/inc/svtools/accessibletable.hxx
+++ b/svtools/inc/svtools/accessibletable.hxx
@@ -24,14 +24,12 @@
 #include <unotools/accessiblestatesethelper.hxx>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 
-// ============================================================================
 
 namespace svt{ namespace table
 {
 
 typedef sal_Int32   RowPos;
 
-// ============================================================================
 
 enum AccessibleTableType
 {
@@ -54,9 +52,6 @@ enum AccessibleTableControlObjType
     TCTYPE_COLUMNHEADERCELL,    /// A cell of the column header bar.
 };
 
-// ============================================================================
-
-#define XACC ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
 
 /** This abstract class provides methods to implement an accessible table object.
 */
@@ -68,8 +63,8 @@ public:
     /** @return  The position of the current column. */
     virtual sal_Int32               GetCurrentColumn() const = 0;
     /** Creates and returns the accessible object of the whole GridControl. */
-    virtual XACC CreateAccessible()= 0;
-    virtual XACC CreateAccessibleControl( sal_Int32 _nIndex )= 0;
+    virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible()= 0;
+    virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleControl( sal_Int32 _nIndex )= 0;
     virtual ::rtl::OUString GetAccessibleObjectName(AccessibleTableControlObjType eObjType, sal_Int32 _nRow, sal_Int32 _nCol) const= 0;
     virtual sal_Bool    GoToCell( sal_Int32 _nColumnPos, sal_Int32 _nRow )= 0;
     virtual sal_Bool    HasColHeader() = 0;
@@ -93,7 +88,7 @@ public:
     // Window
     virtual Rectangle GetWindowExtentsRelative( Window *pRelativeWindow ) const = 0;
     virtual void GrabFocus()= 0;
-    virtual XACC GetAccessible( sal_Bool bCreate = sal_True )= 0;
+    virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessible( sal_Bool bCreate = sal_True )= 0;
     virtual Window* GetAccessibleParentWindow() const= 0;
     virtual Window* GetWindowInstance()= 0;
     virtual sal_Int32 GetAccessibleControlCount() const = 0;
@@ -113,7 +108,7 @@ public:
     virtual ::rtl::OUString GetRowName(sal_Int32 _nIndex) const = 0;
     virtual ::rtl::OUString GetColumnDescription( sal_uInt16 _nColumnPos ) const = 0;
     virtual ::rtl::OUString GetColumnName( sal_Int32 _nIndex ) const = 0;
-    virtual ::com::sun::star::uno::Any GetCellContent( sal_Int32 _nRowPos, sal_Int32 _nColPos) const = 0;
+    virtual css::uno::Any GetCellContent( sal_Int32 _nRowPos, sal_Int32 _nColPos) const = 0;
     virtual ::rtl::OUString GetAccessibleCellText(sal_Int32 _nRowPos, sal_Int32 _nColPos) const = 0;
 
     virtual sal_Int32 GetSelectedRowCount() const = 0;
@@ -126,7 +121,6 @@ protected:
     ~IAccessibleTable() {}
 };
 
-// ----------------------------------------------------------------------------
 
 /** interface for an implementation of a table control's Accesible component
 */
@@ -140,7 +134,7 @@ public:
 
         The returned reference is guaranteed to not be <NULL/>.
     */
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+    virtual css::uno::Reference< css::accessibility::XAccessible >
         getMyself() = 0;
 
     /** disposes the accessible implementation, so that it becomes defunc
@@ -154,12 +148,12 @@ public:
 
     /** returns the accessible object for the row or the column header bar
     */
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+    virtual css::uno::Reference< css::accessibility::XAccessible >
         getTableHeader( ::svt::table::AccessibleTableControlObjType _eObjType ) = 0;
 
     /** returns the accessible object for the table representation
     */
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+    virtual css::uno::Reference< css::accessibility::XAccessible >
         getTable() = 0;
 
     /** commits the event at all listeners of the cell
@@ -172,8 +166,8 @@ public:
       */
      virtual void commitCellEvent(
          sal_Int16 nEventId,
-         const ::com::sun::star::uno::Any& rNewValue,
-         const ::com::sun::star::uno::Any& rOldValue
+         const css::uno::Any& rNewValue,
+         const css::uno::Any& rOldValue
      ) = 0;
     /** commits the event at all listeners of the table
          @param nEventId
@@ -185,29 +179,25 @@ public:
       */
      virtual void commitTableEvent(
          sal_Int16 nEventId,
-         const ::com::sun::star::uno::Any& rNewValue,
-         const ::com::sun::star::uno::Any& rOldValue
+         const css::uno::Any& rNewValue,
+         const css::uno::Any& rOldValue
      ) = 0;
 
     ///** Commits an event to all listeners. */
     virtual void commitEvent(
         sal_Int16 nEventId,
-        const ::com::sun::star::uno::Any& rNewValue,
-        const ::com::sun::star::uno::Any& rOldValue
+        const css::uno::Any& rNewValue,
+        const css::uno::Any& rOldValue
     ) = 0;
 
 protected:
     ~IAccessibleTableControl() {}
 };
 
-// ----------------------------------------------------------------------------
 
-// ============================================================================
 } // namespace table
 } // namespace svt
 
-// ============================================================================
-
 #endif // _SVTOOLS_ACCESSIBLETABLE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/accessibletableprovider.hxx b/svtools/inc/svtools/accessibletableprovider.hxx
index bb2ef0b5ba2b..76fc296592fb 100644
--- a/svtools/inc/svtools/accessibletableprovider.hxx
+++ b/svtools/inc/svtools/accessibletableprovider.hxx
@@ -25,18 +25,13 @@
 #include <svtools/AccessibleBrowseBoxObjType.hxx>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 
-// ============================================================================
 
 namespace svt
 {
 
-// ============================================================================
-
 #define OFFSET_DEFAULT  ((sal_Int32)-1)
 #define OFFSET_NONE     ((sal_Int32)0)
 
-// ============================================================================
-
 enum AccessibleTableChildIndex
 {
     /** Child index of the column header bar (first row). Exists always. */
@@ -49,9 +44,6 @@ enum AccessibleTableChildIndex
     BBINDEX_FIRSTCONTROL    = 3
 };
 
-// ============================================================================
-
-#define XACC ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
 
 /** This abstract class provides methods to implement an accessible table object.
 */
@@ -90,8 +82,8 @@ public:
     /** @return  <TRUE/>, if the row is selected. */
     virtual bool                    IsRowSelected( long _nRow ) const = 0;
     virtual sal_Bool                IsColumnSelected( long _nColumnPos ) const = 0;
-    virtual void                    GetAllSelectedRows( ::com::sun::star::uno::Sequence< sal_Int32 >& _rRows ) const = 0;
-    virtual void                    GetAllSelectedColumns( ::com::sun::star::uno::Sequence< sal_Int32 >& _rColumns ) const = 0;
+    virtual void                    GetAllSelectedRows( css::uno::Sequence< sal_Int32 >& _rRows ) const = 0;
+    virtual void                    GetAllSelectedColumns( css::uno::Sequence< sal_Int32 >& _rColumns ) const = 0;
 
     /** @return  <TRUE/>, if the cell is visible. */
     virtual sal_Bool                IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumnPos ) const = 0;
@@ -101,12 +93,12 @@ public:
     virtual Rectangle               calcTableRect( sal_Bool _bOnScreen = sal_True ) = 0;
     virtual Rectangle               GetFieldRectPixelAbs( sal_Int32 _nRow, sal_uInt16 _nColumnPos, sal_Bool _bIsHeader, sal_Bool _bOnScreen = sal_True ) = 0;
 
-    virtual XACC                    CreateAccessibleCell( sal_Int32 _nRow, sal_uInt16 _nColumnPos ) = 0;
-    virtual XACC                    CreateAccessibleRowHeader( sal_Int32 _nRow ) = 0;
-    virtual XACC                    CreateAccessibleColumnHeader( sal_uInt16 _nColumnPos ) = 0;
+    virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleCell( sal_Int32 _nRow, sal_uInt16 _nColumnPos ) = 0;
+    virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleRowHeader( sal_Int32 _nRow ) = 0;
+    virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleColumnHeader( sal_uInt16 _nColumnPos ) = 0;
 
     virtual sal_Int32               GetAccessibleControlCount() const = 0;
-    virtual XACC                    CreateAccessibleControl( sal_Int32 _nIndex ) = 0;
+    virtual css::uno::Reference< css::accessibility::XAccessible >                    CreateAccessibleControl( sal_Int32 _nIndex ) = 0;
     virtual sal_Bool                ConvertPointToControlIndex( sal_Int32& _rnIndex, const Point& _rPoint ) = 0;
 
     virtual sal_Bool                ConvertPointToCellAddress( sal_Int32& _rnRow, sal_uInt16& _rnColPos, const Point& _rPoint ) = 0;
@@ -121,12 +113,12 @@ public:
     virtual void                    GrabTableFocus() = 0;
 
     // OutputDevice
-    virtual sal_Bool                    GetGlyphBoundRects( const Point& rOrigin, const String& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector ) = 0;
+    virtual sal_Bool                GetGlyphBoundRects( const Point& rOrigin, const String& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector ) = 0;
 
     // Window
     virtual Rectangle               GetWindowExtentsRelative( Window *pRelativeWindow ) const = 0;
     virtual void                    GrabFocus() = 0;
-    virtual XACC                    GetAccessible( sal_Bool bCreate = sal_True ) = 0;
+    virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessible( sal_Bool bCreate = sal_True ) = 0;
     virtual Window*                 GetAccessibleParentWindow() const = 0;
     virtual Window*                 GetWindowInstance() = 0;
 
@@ -137,7 +129,6 @@ protected:
     ~IAccessibleTableProvider() {}
 };
 
-// ----------------------------------------------------------------------------
 
 /** interface for an implementation of a table control's Accesible component
 */
@@ -151,16 +142,16 @@ public:
 
         The returned reference is guaranteed to not be <NULL/>.
     */
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+    virtual css::uno::Reference< css::accessibility::XAccessible >
         getMyself() = 0;
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+    virtual css::uno::Reference< css::accessibility::XAccessible >
         SAL_CALL getAccessibleChild( sal_Int32 nChildIndex )
-            throw ( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException ) = 0;
+            throw ( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException ) = 0;
 
     /** returns the accessible object for the row or the column header bar
     */
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+    virtual css::uno::Reference< css::accessibility::XAccessible >
         getHeaderBar( ::svt::AccessibleBrowseBoxObjType _eObjType ) = 0;
 
 protected:
@@ -179,7 +170,7 @@ public:
 
         The returned reference is guaranteed to not be <NULL/>.
     */
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+    virtual css::uno::Reference< css::accessibility::XAccessible >
         getMyself() = 0;
 
     /** disposes the accessible implementation, so that it becomes defunc
@@ -193,12 +184,12 @@ public:
 
     /** returns the accessible object for the row or the column header bar
     */
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+    virtual css::uno::Reference< css::accessibility::XAccessible >
         getHeaderBar( ::svt::AccessibleBrowseBoxObjType _eObjType ) = 0;
 
     /** returns the accessible object for the table representation
     */
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+    virtual css::uno::Reference< css::accessibility::XAccessible >
         getTable() = 0;
 
     /** commits the event at all listeners of the column/row header bar
@@ -211,8 +202,8 @@ public:
     */
     virtual void commitHeaderBarEvent(
         sal_Int16 nEventId,
-        const ::com::sun::star::uno::Any& rNewValue,
-        const ::com::sun::star::uno::Any& rOldValue,
+        const css::uno::Any& rNewValue,
+        const css::uno::Any& rOldValue,
         sal_Bool _bColumnHeaderBar
     ) = 0;
 
@@ -226,28 +217,24 @@ public:
     */
     virtual void commitTableEvent(
         sal_Int16 nEventId,
-        const ::com::sun::star::uno::Any& rNewValue,
-        const ::com::sun::star::uno::Any& rOldValue
+        const css::uno::Any& rNewValue,
+        const css::uno::Any& rOldValue
     ) = 0;
 
     /** Commits an event to all listeners. */
     virtual void commitEvent(
         sal_Int16 nEventId,
-        const ::com::sun::star::uno::Any& rNewValue,
-        const ::com::sun::star::uno::Any& rOldValue
+        const css::uno::Any& rNewValue,
+        const css::uno::Any& rOldValue
     ) = 0;
 
 protected:
     ~IAccessibleBrowseBox() {}
 };
 
-// ----------------------------------------------------------------------------
-
-// ============================================================================
 
 } // namespace svt
 
-// ============================================================================
 
 #endif // _SVTOOLS_ACCESSIBLETABLEPROVIDER_HXX
 
diff --git a/svtools/inc/svtools/brwbox.hxx b/svtools/inc/svtools/brwbox.hxx
index 8c9b70bb0fc6..4459d6dc69d4 100644
--- a/svtools/inc/svtools/brwbox.hxx
+++ b/svtools/inc/svtools/brwbox.hxx
@@ -304,7 +304,6 @@ private:
     DECL_DLLPRIVATE_LINK(       StartDragHdl, HeaderBar * );
 
     SVT_DLLPRIVATE long            GetFrozenWidth() const;
-//#endif
 
     sal_Bool            GoToRow(long nRow, sal_Bool bRowColMove, sal_Bool bDoNotModifySelection = sal_False );
 
@@ -394,8 +393,8 @@ protected:
     sal_Bool        IsDropFormatSupported( SotFormatStringId nFormat );     // need this because the base class' IsDropFormatSupported is not const ...
     sal_Bool        IsDropFormatSupported( SotFormatStringId nFormat ) const;
 
-    sal_Bool        IsDropFormatSupported( const ::com::sun::star::datatransfer::DataFlavor& _rFlavor );        // need this because the base class' IsDropFormatSupported is not const ...
-    sal_Bool        IsDropFormatSupported( const ::com::sun::star::datatransfer::DataFlavor& _rFlavor ) const;
+    sal_Bool        IsDropFormatSupported( const css::datatransfer::DataFlavor& _rFlavor );        // need this because the base class' IsDropFormatSupported is not const ...
+    sal_Bool        IsDropFormatSupported( const css::datatransfer::DataFlavor& _rFlavor ) const;
 
 private:
     void*           implGetDataFlavors() const;
@@ -608,8 +607,8 @@ public:
             the old value
     */
     void commitBrowseBoxEvent(sal_Int16 nEventId,
-            const ::com::sun::star::uno::Any& rNewValue,
-            const ::com::sun::star::uno::Any& rOldValue);
+            const css::uno::Any& rNewValue,
+            const css::uno::Any& rOldValue);
 
     /** commitTableEvent commit the event at all listeners of the table
         @param nEventId
@@ -620,8 +619,8 @@ public:
             the old value
     */
     void commitTableEvent(sal_Int16 nEventId,
-            const ::com::sun::star::uno::Any& rNewValue,
-            const ::com::sun::star::uno::Any& rOldValue);
+            const css::uno::Any& rNewValue,
+            const css::uno::Any& rOldValue);
 
     /** fires an AccessibleEvent relative to a header bar AccessibleContext
 
@@ -633,8 +632,8 @@ public:
             the old value
     */
     void commitHeaderBarEvent(sal_Int16 nEventId,
-            const ::com::sun::star::uno::Any& rNewValue,
-            const ::com::sun::star::uno::Any& rOldValue,
+            const css::uno::Any& rNewValue,
+            const css::uno::Any& rOldValue,
             sal_Bool _bColumnHeaderBar
          );
 
@@ -674,8 +673,8 @@ public:
     // ACCESSIBILITY ==========================================================
 public:
     /** Creates and returns the accessible object of the whole BrowseBox. */
-    virtual ::com::sun::star::uno::Reference<
-        ::com::sun::star::accessibility::XAccessible > CreateAccessible();
+    virtual css::uno::Reference<
+        css::accessibility::XAccessible > CreateAccessible();
 
     // Children ---------------------------------------------------------------
 
@@ -683,22 +682,22 @@ public:
         @param nRow  The row index of the cell.
         @param nColumnId  The column pos of the cell.
         @return  The XAccessible interface of the specified cell. */
-    virtual ::com::sun::star::uno::Reference<
-        ::com::sun::star::accessibility::XAccessible >
+    virtual css::uno::Reference<
+        css::accessibility::XAccessible >
     CreateAccessibleCell( sal_Int32 nRow, sal_uInt16 nColumnPos );
 
     /** Creates the accessible object of a row header.
         @param nRow  The row index of the header.
         @return  The XAccessible interface of the specified row header. */
-    virtual ::com::sun::star::uno::Reference<
-        ::com::sun::star::accessibility::XAccessible >
+    virtual css::uno::Reference<
+        css::accessibility::XAccessible >
     CreateAccessibleRowHeader( sal_Int32 nRow );
 
     /** Creates the accessible object of a column header.
         @param nColumnId  The column ID of the header.
         @return  The XAccessible interface of the specified column header. */
-    virtual ::com::sun::star::uno::Reference<
-        ::com::sun::star::accessibility::XAccessible >
+    virtual css::uno::Reference<
+        css::accessibility::XAccessible >
     CreateAccessibleColumnHeader( sal_uInt16 nColumnPos );
 
     /** @return  The count of additional controls of the control area. */
@@ -707,8 +706,8 @@ public:
     /** Creates the accessible object of an additional control.
         @param nIndex  The 0-based index of the control.
         @return  The XAccessible interface of the specified control. */
-    virtual ::com::sun::star::uno::Reference<
-        ::com::sun::star::accessibility::XAccessible >
+    virtual css::uno::Reference<
+        css::accessibility::XAccessible >
     CreateAccessibleControl( sal_Int32 nIndex );
 
     // Conversions ------------------------------------------------------------
@@ -795,14 +794,14 @@ public:
     virtual sal_Bool                IsColumnSelected( long _nColumn ) const;
     virtual sal_Int32               GetSelectedRowCount() const;
     virtual sal_Int32               GetSelectedColumnCount() const;
-    virtual void                    GetAllSelectedRows( ::com::sun::star::uno::Sequence< sal_Int32 >& _rRows ) const;
-    virtual void                    GetAllSelectedColumns( ::com::sun::star::uno::Sequence< sal_Int32 >& _rColumns ) const;
+    virtual void                    GetAllSelectedRows( css::uno::Sequence< sal_Int32 >& _rRows ) const;
+    virtual void                    GetAllSelectedColumns( css::uno::Sequence< sal_Int32 >& _rColumns ) const;
     virtual sal_Bool                IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumn ) const;
     virtual String                  GetAccessibleCellText(long _nRow, sal_uInt16 _nColPos) const;
     virtual sal_Bool                    GetGlyphBoundRects( const Point& rOrigin, const String& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector );
     virtual Rectangle               GetWindowExtentsRelative( Window *pRelativeWindow ) const;
     virtual void                    GrabFocus();
-    virtual XACC                    GetAccessible( sal_Bool bCreate = sal_True );
+    virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessible( sal_Bool bCreate = sal_True );
     virtual Window*                 GetAccessibleParentWindow() const;
     virtual Window*                 GetWindowInstance();
 
diff --git a/svtools/inc/svtools/svtabbx.hxx b/svtools/inc/svtools/svtabbx.hxx
index 683ae56b8c64..208a8a70fbd9 100644
--- a/svtools/inc/svtools/svtabbx.hxx
+++ b/svtools/inc/svtools/svtabbx.hxx
@@ -126,7 +126,7 @@ namespace svt {
 class SVT_DLLPUBLIC SvHeaderTabListBox : public SvTabListBox, public svt::IAccessibleTableProvider
 {
 private:
-    typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > > AccessibleChildren;
+    typedef ::std::vector< css::uno::Reference< css::accessibility::XAccessible > > AccessibleChildren;
 
     sal_Bool                        m_bFirstPaint;
     ::svt::SvHeaderTabListBoxImpl*  m_pImpl;
@@ -201,8 +201,8 @@ public:
     /** @return  <TRUE/>, if the row is selected. */
     virtual bool                    IsRowSelected( long _nRow ) const;
     virtual sal_Bool                IsColumnSelected( long _nColumn ) const;
-    virtual void                    GetAllSelectedRows( ::com::sun::star::uno::Sequence< sal_Int32 >& _rRows ) const;
-    virtual void                    GetAllSelectedColumns( ::com::sun::star::uno::Sequence< sal_Int32 >& _rColumns ) const;
+    virtual void                    GetAllSelectedRows( css::uno::Sequence< sal_Int32 >& _rRows ) const;
+    virtual void                    GetAllSelectedColumns( css::uno::Sequence< sal_Int32 >& _rColumns ) const;
 
     /** @return  <TRUE/>, if the cell is visible. */
     virtual sal_Bool                IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumn ) const;
@@ -212,12 +212,12 @@ public:
     virtual Rectangle               calcTableRect( sal_Bool _bOnScreen = sal_True );
     virtual Rectangle               GetFieldRectPixelAbs( sal_Int32 _nRow, sal_uInt16 _nColumn, sal_Bool _bIsHeader, sal_Bool _bOnScreen = sal_True );
 
-    virtual XACC                    CreateAccessibleCell( sal_Int32 _nRow, sal_uInt16 _nColumn );
-    virtual XACC                    CreateAccessibleRowHeader( sal_Int32 _nRow );
-    virtual XACC                    CreateAccessibleColumnHeader( sal_uInt16 _nColumnPos );
+    virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleCell( sal_Int32 _nRow, sal_uInt16 _nColumn );
+    virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleRowHeader( sal_Int32 _nRow );
+    virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleColumnHeader( sal_uInt16 _nColumnPos );
 
     virtual sal_Int32               GetAccessibleControlCount() const;
-    virtual XACC                    CreateAccessibleControl( sal_Int32 _nIndex );
+    virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleControl( sal_Int32 _nIndex );
     virtual sal_Bool                ConvertPointToControlIndex( sal_Int32& _rnIndex, const Point& _rPoint );
 
     virtual sal_Bool                ConvertPointToCellAddress( sal_Int32& _rnRow, sal_uInt16& _rnColPos, const Point& _rPoint );
@@ -234,16 +234,16 @@ public:
     virtual void                    GrabTableFocus();
 
     // OutputDevice
-    virtual sal_Bool                    GetGlyphBoundRects( const Point& rOrigin, const String& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector );
+    virtual sal_Bool                GetGlyphBoundRects( const Point& rOrigin, const String& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector );
 
     // Window
     virtual Rectangle               GetWindowExtentsRelative( Window *pRelativeWindow ) const;
     virtual void                    GrabFocus();
-    virtual XACC                    GetAccessible( sal_Bool bCreate = sal_True );
+    virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessible( sal_Bool bCreate = sal_True );
     virtual Window*                 GetAccessibleParentWindow() const;
 
     /** Creates and returns the accessible object of the whole BrowseBox. */
-    virtual XACC                    CreateAccessible();
+    virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible();
 
     virtual Rectangle               GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex);
     virtual sal_Int32               GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint);
diff --git a/svtools/inc/svtools/table/tablecontrol.hxx b/svtools/inc/svtools/table/tablecontrol.hxx
index 16cd8c9d5cff..193ac865d7a2 100644
--- a/svtools/inc/svtools/table/tablecontrol.hxx
+++ b/svtools/inc/svtools/table/tablecontrol.hxx
@@ -150,8 +150,8 @@ namespace svt { namespace table
         virtual void        StateChanged( StateChangedType i_nStateChange );
 
         /** Creates and returns the accessible object of the whole GridControl. */
-        SVT_DLLPRIVATE virtual XACC CreateAccessible();
-        SVT_DLLPRIVATE virtual XACC CreateAccessibleControl( sal_Int32 _nIndex );
+        SVT_DLLPRIVATE virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible();
+        SVT_DLLPRIVATE virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleControl( sal_Int32 _nIndex );
         SVT_DLLPRIVATE virtual ::rtl::OUString GetAccessibleObjectName(AccessibleTableControlObjType eObjType, sal_Int32 _nRow, sal_Int32 _nCol) const;
         SVT_DLLPRIVATE virtual sal_Bool GoToCell( sal_Int32 _nColumnPos, sal_Int32 _nRow );
         SVT_DLLPRIVATE virtual ::rtl::OUString GetAccessibleObjectDescription(AccessibleTableControlObjType eObjType, sal_Int32 _nPosition = -1) const;
@@ -161,14 +161,14 @@ namespace svt { namespace table
         // Those do not really belong into the public API - they're intended for firing A11Y-related events. However,
         // firing those events should be an implementation internal to the TableControl resp. TableControl_Impl,
         // instead of something triggered externally.
-        void commitCellEventIfAccessibleAlive( sal_Int16 const i_eventID, const ::com::sun::star::uno::Any& i_newValue, const ::com::sun::star::uno::Any& i_oldValue );
-        void commitTableEventIfAccessibleAlive( sal_Int16 const i_eventID, const ::com::sun::star::uno::Any& i_newValue, const ::com::sun::star::uno::Any& i_oldValue );
+        void commitCellEventIfAccessibleAlive( sal_Int16 const i_eventID, const css::uno::Any& i_newValue, const css::uno::Any& i_oldValue );
+        void commitTableEventIfAccessibleAlive( sal_Int16 const i_eventID, const css::uno::Any& i_newValue, const css::uno::Any& i_oldValue );
 
         // .............................................................................................................
         // IAccessibleTable
         virtual Rectangle GetWindowExtentsRelative( Window *pRelativeWindow ) const;
         virtual void GrabFocus();
-        virtual XACC GetAccessible( sal_Bool bCreate = sal_True );
+        virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessible( sal_Bool bCreate = sal_True );
         virtual Window* GetAccessibleParentWindow() const;
         virtual Window* GetWindowInstance();
         virtual sal_Int32 GetAccessibleControlCount() const;
@@ -188,7 +188,7 @@ namespace svt { namespace table
         virtual ::rtl::OUString GetRowName(sal_Int32 _nIndex) const;
         virtual ::rtl::OUString GetColumnDescription( sal_uInt16 _nColumnPos ) const;
         virtual ::rtl::OUString GetColumnName( sal_Int32 _nIndex ) const;
-        virtual ::com::sun::star::uno::Any GetCellContent( sal_Int32 _nRowPos, sal_Int32 _nColPos) const;
+        virtual css::uno::Any GetCellContent( sal_Int32 _nRowPos, sal_Int32 _nColPos) const;
         virtual sal_Bool HasRowHeader();
         virtual sal_Bool HasColHeader();
         virtual ::rtl::OUString GetAccessibleCellText(sal_Int32 _nRowPos, sal_Int32 _nColPos) const;