refactor out some com::sun::star typedefs

which mostly serve to make the code harder to read

Change-Id: Ia2a83fee9f850ab6f0bea6305ce8600d6b785fe8

13 files changed, 59 insertions, 90 deletions

diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index 93c0e3d730ed..fd20a4459480 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -116,9 +116,7 @@ public:
     virtual void Notify( const SfxHint& rHint ) override;
 };
 
-typedef ::com::sun::star::uno::Reference<
-            ::com::sun::star::util::XModifyListener > XModifyListenerRef;
-typedef std::vector<XModifyListenerRef> XModifyListenerArr_Impl;
+typedef std::vector< css::uno::Reference< css::util::XModifyListener > > XModifyListenerArr_Impl;
 
 //  ScCellRangesBase - base class for ScCellRangesObj (with access by index)
 //                                and ScCellRangeObj  (without access by index)
diff --git a/sc/inc/datauno.hxx b/sc/inc/datauno.hxx
index 5210624a02d9..5090969f8613 100644
--- a/sc/inc/datauno.hxx
+++ b/sc/inc/datauno.hxx
@@ -57,9 +57,7 @@ class ScDataPilotDescriptorBase;
 
 struct ScSortParam;
 
-typedef ::com::sun::star::uno::Reference<
-            ::com::sun::star::util::XRefreshListener > XDBRefreshListenerRef;
-typedef std::vector<XDBRefreshListenerRef> XDBRefreshListenerArr_Impl;
+typedef std::vector< css::uno::Reference< css::util::XRefreshListener > > XDBRefreshListenerArr_Impl;
 
 class ScDataUnoConversion
 {
diff --git a/sc/inc/dispuno.hxx b/sc/inc/dispuno.hxx
index b2b73d68b621..288a5f0f5ce1 100644
--- a/sc/inc/dispuno.hxx
+++ b/sc/inc/dispuno.hxx
@@ -32,9 +32,7 @@ namespace com { namespace sun { namespace star { namespace frame {
 
 class ScTabViewShell;
 
-typedef ::com::sun::star::uno::Reference<
-            ::com::sun::star::frame::XStatusListener > XStatusListenerRef;
-typedef std::vector<XStatusListenerRef> XStatusListenerArr_Impl;
+typedef std::vector< css::uno::Reference< css::frame::XStatusListener > > XStatusListenerArr_Impl;
 
 class ScDispatchProviderInterceptor : public cppu::WeakImplHelper<
                                         com::sun::star::frame::XDispatchProviderInterceptor,
diff --git a/sc/source/filter/inc/formulabase.hxx b/sc/source/filter/inc/formulabase.hxx
index 39a051e93341..36e5abe8b15f 100644
--- a/sc/source/filter/inc/formulabase.hxx
+++ b/sc/source/filter/inc/formulabase.hxx
@@ -255,12 +255,12 @@ struct BinComplexRef2d
 
 // Token vector, token sequence ===============================================
 
-typedef ::com::sun::star::sheet::FormulaToken       ApiToken;
-typedef ::com::sun::star::uno::Sequence< ApiToken > ApiTokenSequence;
+typedef css::sheet::FormulaToken       ApiToken;
+typedef css::uno::Sequence< ApiToken > ApiTokenSequence;
 
 /** Contains the base address and type of a special token representing an array
     formula or a shared formula (sal_False), or a table operation (sal_True). */
-typedef ::com::sun::star::beans::Pair< ::com::sun::star::table::CellAddress, sal_Bool > ApiSpecialTokenInfo;
+typedef css::beans::Pair< css::table::CellAddress, sal_Bool > ApiSpecialTokenInfo;
 
 /** A vector of formula tokens with additional convenience functions. */
 class ApiTokenVector
diff --git a/sc/source/filter/inc/stylesbuffer.hxx b/sc/source/filter/inc/stylesbuffer.hxx
index 93e5b0c870a9..c3c4e6bd74c7 100644
--- a/sc/source/filter/inc/stylesbuffer.hxx
+++ b/sc/source/filter/inc/stylesbuffer.hxx
@@ -201,17 +201,15 @@ struct ApiScriptFontName
 /** Contains all API font attributes. */
 struct ApiFontData
 {
-    typedef ::com::sun::star::awt::FontDescriptor ApiFontDescriptor;
-
-    ApiScriptFontName   maLatinFont;        /// Font name for latin scripts.
-    ApiScriptFontName   maAsianFont;        /// Font name for east-asian scripts.
-    ApiScriptFontName   maCmplxFont;        /// Font name for complex scripts.
-    ApiFontDescriptor   maDesc;             /// Font descriptor (height in twips, weight in %).
-    sal_Int32           mnColor;            /// Font color.
-    sal_Int16           mnEscapement;       /// Escapement style.
-    sal_Int8            mnEscapeHeight;     /// Escapement font height.
-    bool                mbOutline;          /// True = outlined characters.
-    bool                mbShadow;           /// True = shadowed chgaracters.
+    ApiScriptFontName        maLatinFont;        /// Font name for latin scripts.
+    ApiScriptFontName        maAsianFont;        /// Font name for east-asian scripts.
+    ApiScriptFontName        maCmplxFont;        /// Font name for complex scripts.
+    css::awt::FontDescriptor maDesc;             /// Font descriptor (height in twips, weight in %).
+    sal_Int32                mnColor;            /// Font color.
+    sal_Int16                mnEscapement;       /// Escapement style.
+    sal_Int8                 mnEscapeHeight;     /// Escapement font height.
+    bool                     mbOutline;          /// True = outlined characters.
+    bool                     mbShadow;           /// True = shadowed chgaracters.
 
     explicit            ApiFontData();
 };
@@ -300,19 +298,16 @@ struct AlignmentModel
 /** Contains all API cell alignment attributes. */
 struct ApiAlignmentData
 {
-    typedef ::com::sun::star::table::CellHoriJustify ApiCellHoriJustify;
-    typedef ::com::sun::star::table::CellOrientation ApiCellOrientation;
-
-    ApiCellHoriJustify  meHorJustify;       /// Horizontal alignment.
-    sal_Int32           mnHorJustifyMethod;
-    sal_Int32           mnVerJustify;       /// Vertical alignment.
-    sal_Int32           mnVerJustifyMethod;
-    ApiCellOrientation  meOrientation;      /// Normal or stacked text.
-    sal_Int32           mnRotation;         /// Text rotation angle.
-    sal_Int16           mnWritingMode;      /// CTL text direction.
-    sal_Int16           mnIndent;           /// Indentation.
-    bool                mbWrapText;         /// True = multi-line text.
-    bool                mbShrink;           /// True = shrink to fit cell size.
+    css::table::CellHoriJustify  meHorJustify;       /// Horizontal alignment.
+    sal_Int32                    mnHorJustifyMethod;
+    sal_Int32                    mnVerJustify;       /// Vertical alignment.
+    sal_Int32                    mnVerJustifyMethod;
+    css::table::CellOrientation  meOrientation;      /// Normal or stacked text.
+    sal_Int32                    mnRotation;         /// Text rotation angle.
+    sal_Int16                    mnWritingMode;      /// CTL text direction.
+    sal_Int16                    mnIndent;           /// Indentation.
+    bool                         mbWrapText;         /// True = multi-line text.
+    bool                         mbShrink;           /// True = shrink to fit cell size.
 
     explicit            ApiAlignmentData();
 };
diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
index 3214d948b3bc..d28c3ddeb933 100644
--- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
@@ -103,7 +103,7 @@ void SAL_CALL ScAccessibleCsvControl::disposing()
 
 // XAccessibleComponent -------------------------------------------------------
 
-Reference< XAccessible > SAL_CALL ScAccessibleCsvControl::getAccessibleAtPoint( const AwtPoint& /* rPoint */ )
+Reference< XAccessible > SAL_CALL ScAccessibleCsvControl::getAccessibleAtPoint( const css::awt::Point& /* rPoint */ )
         throw( RuntimeException, std::exception )
 {
     ensureAlive();
@@ -445,7 +445,7 @@ Sequence< PropertyValue > SAL_CALL ScAccessibleCsvRuler::getCharacterAttributes(
     return aSeq;
 }
 
-ScAccessibleCsvRuler::AwtRectangle SAL_CALL ScAccessibleCsvRuler::getCharacterBounds( sal_Int32 nIndex )
+css::awt::Rectangle SAL_CALL ScAccessibleCsvRuler::getCharacterBounds( sal_Int32 nIndex )
         throw( IndexOutOfBoundsException, RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
@@ -453,7 +453,7 @@ ScAccessibleCsvRuler::AwtRectangle SAL_CALL ScAccessibleCsvRuler::getCharacterBo
     ensureValidIndexWithEnd( nIndex );
     ScCsvRuler& rRuler = implGetRuler();
     Point aPos( rRuler.GetX( lcl_GetRulerPos( nIndex ) ) - rRuler.GetCharWidth() / 2, 0 );
-    AwtRectangle aRect( aPos.X(), aPos.Y(), rRuler.GetCharWidth(), rRuler.GetSizePixel().Height() );
+    css::awt::Rectangle aRect( aPos.X(), aPos.Y(), rRuler.GetCharWidth(), rRuler.GetSizePixel().Height() );
     // do not return rectangle out of window
     sal_Int32 nWidth = rRuler.GetOutputSizePixel().Width();
     if( aRect.X >= nWidth )
@@ -470,7 +470,7 @@ sal_Int32 SAL_CALL ScAccessibleCsvRuler::getCharacterCount() throw( RuntimeExcep
     return implGetTextLength();
 }
 
-sal_Int32 SAL_CALL ScAccessibleCsvRuler::getIndexAtPoint( const AwtPoint& rPoint )
+sal_Int32 SAL_CALL ScAccessibleCsvRuler::getIndexAtPoint( const css::awt::Point& rPoint )
         throw( RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
@@ -867,7 +867,7 @@ ScAccessibleCsvGrid::~ScAccessibleCsvGrid()
 
 // XAccessibleComponent -------------------------------------------------------
 
-Reference< XAccessible > SAL_CALL ScAccessibleCsvGrid::getAccessibleAtPoint( const AwtPoint& rPoint )
+Reference< XAccessible > SAL_CALL ScAccessibleCsvGrid::getAccessibleAtPoint( const css::awt::Point& rPoint )
         throw( RuntimeException, std::exception )
 {
     Reference< XAccessible > xRet;
diff --git a/sc/source/ui/dbgui/csvcontrol.cxx b/sc/source/ui/dbgui/csvcontrol.cxx
index e6045041310e..aafe6abaccfc 100644
--- a/sc/source/ui/dbgui/csvcontrol.cxx
+++ b/sc/source/ui/dbgui/csvcontrol.cxx
@@ -298,10 +298,10 @@ ScMoveMode ScCsvControl::GetVertDirection( sal_uInt16 nCode, bool bHomeEnd )
 
 // accessibility --------------------------------------------------------------
 
-ScCsvControl::XAccessibleRef ScCsvControl::CreateAccessible()
+css::uno::Reference< css::accessibility::XAccessible > ScCsvControl::CreateAccessible()
 {
     mxAccessible = ImplCreateAccessible().get();
-    return XAccessibleRef(mxAccessible.get());
+    return css::uno::Reference< css::accessibility::XAccessible >(mxAccessible.get());
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/dbgui/csvtablebox.cxx b/sc/source/ui/dbgui/csvtablebox.cxx
index 52dd3ebcbcbd..b9a69c64a733 100644
--- a/sc/source/ui/dbgui/csvtablebox.cxx
+++ b/sc/source/ui/dbgui/csvtablebox.cxx
@@ -413,7 +413,7 @@ IMPL_LINK_TYPED( ScCsvTableBox, ScrollEndHdl, ScrollBar*, pScrollBar, void )
 
 // accessibility --------------------------------------------------------------
 
-ScCsvTableBox::XAccessibleRef ScCsvTableBox::CreateAccessible()
+css::uno::Reference< css::accessibility::XAccessible > ScCsvTableBox::CreateAccessible()
 {
     // do not use the ScCsvControl mechanism, return default accessible object
     return Control::CreateAccessible();
diff --git a/sc/source/ui/inc/AccessibleCsvControl.hxx b/sc/source/ui/inc/AccessibleCsvControl.hxx
index a979ffc15440..49c31cbdf1d2 100644
--- a/sc/source/ui/inc/AccessibleCsvControl.hxx
+++ b/sc/source/ui/inc/AccessibleCsvControl.hxx
@@ -38,24 +38,12 @@ namespace utl { class AccessibleStateSetHelper; }
 /** Accessible base class used for CSV controls. */
 class ScAccessibleCsvControl : public ScAccessibleContextBase
 {
-protected:
-    typedef ::com::sun::star::uno::Reference<
-        ::com::sun::star::accessibility::XAccessible > XAccessibleRef;
-    typedef ::com::sun::star::uno::Reference<
-        ::com::sun::star::accessibility::XAccessibleRelationSet > XAccessibleRelationSetRef;
-    typedef ::com::sun::star::uno::Reference<
-        ::com::sun::star::accessibility::XAccessibleStateSet > XAccessibleStateSetRef;
-
-    typedef ::com::sun::star::awt::Point        AwtPoint;
-    typedef ::com::sun::star::awt::Size         AwtSize;
-    typedef ::com::sun::star::awt::Rectangle    AwtRectangle;
-
 private:
     VclPtr<ScCsvControl>               mpControl;          /// Pointer to the VCL control.
 
 public:
     explicit                    ScAccessibleCsvControl(
-                                    const XAccessibleRef& rxParent,
+                                    const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
                                     ScCsvControl& rControl,
                                     sal_uInt16 nRole );
     virtual                     ~ScAccessibleCsvControl();
@@ -69,7 +57,7 @@ public:
     // XAccessibleComponent ---------------------------------------------------
 
     /** Returns the child at the specified point (cell returns NULL). */
-    virtual XAccessibleRef SAL_CALL getAccessibleAtPoint( const AwtPoint& rPoint )
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& rPoint )
         throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
 
     /** Sets the focus to this control. */
@@ -109,7 +97,7 @@ protected:
     ScCsvControl& implGetControl() const;
 
     /** Returns the first child of rxParentObj, which has the role nRole. */
-    static XAccessibleRef implGetChildByRole( const XAccessibleRef& rxParentObj, sal_uInt16 nRole )
+    static css::uno::Reference< css::accessibility::XAccessible > implGetChildByRole( const css::uno::Reference< css::accessibility::XAccessible >& rxParentObj, sal_uInt16 nRole )
         throw( ::com::sun::star::uno::RuntimeException );
     /** Creates a StateSetHelper and fills it with DEFUNC, OPAQUE, ENABLED, SHOWING and VISIBLE. */
     ::utl::AccessibleStateSetHelper* implCreateStateSet();
@@ -130,10 +118,6 @@ typedef ::cppu::ImplHelper1<
 /** Accessible class representing the CSV ruler control. */
 class ScAccessibleCsvRuler : public ScAccessibleCsvControl, public ScAccessibleCsvRulerImpl
 {
-protected:
-    typedef ::com::sun::star::uno::Sequence<
-        ::com::sun::star::beans::PropertyValue > PropertyValueSeq;
-
 private:
     OUStringBuffer       maBuffer;   /// Contains the text representation of the ruler.
 
@@ -156,15 +140,15 @@ public:
         throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
 
     /** Throws an exception (the ruler does not have children). */
-    virtual XAccessibleRef SAL_CALL getAccessibleChild( sal_Int32 nIndex )
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 nIndex )
         throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
 
     /** Returns the relation to the grid control. */
-    virtual XAccessibleRelationSetRef SAL_CALL getAccessibleRelationSet()
+    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet()
         throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
 
     /** Returns the current set of states. */
-    virtual XAccessibleStateSetRef SAL_CALL getAccessibleStateSet()
+    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet >  SAL_CALL getAccessibleStateSet()
         throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
 
     // XAccessibleText --------------------------------------------------------
@@ -181,18 +165,18 @@ public:
         throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
 
     /** Returns the attributes of the specified character. */
-    virtual PropertyValueSeq SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes )
+    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes )
         throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
 
     /** Returns the screen coordinates of the specified character. */
-    virtual AwtRectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex )
+    virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex )
         throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
 
     /** Returns the count of characters. */
     virtual sal_Int32 SAL_CALL getCharacterCount() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
 
     /** Returns the character index at the specified coordinate (object's coordinate system). */
-    virtual sal_Int32 SAL_CALL getIndexAtPoint( const AwtPoint& rPoint )
+    virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& rPoint )
         throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
 
     /** Returns the selected text (ruler returns empty string). */
@@ -312,7 +296,7 @@ public:
     // XAccessibleComponent ---------------------------------------------------
 
     /** Returns the cell at the specified point. */
-    virtual XAccessibleRef SAL_CALL getAccessibleAtPoint( const AwtPoint& rPoint )
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& rPoint )
         throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
 
     virtual sal_Int32 SAL_CALL getForeground(  )
@@ -328,15 +312,15 @@ public:
         throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
 
     /** Returns the specified child cell. */
-    virtual XAccessibleRef SAL_CALL getAccessibleChild( sal_Int32 nIndex )
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 nIndex )
         throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
 
     /** Returns the relation to the ruler control. */
-    virtual XAccessibleRelationSetRef SAL_CALL getAccessibleRelationSet()
+    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet()
         throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
 
     /** Returns the current set of states. */
-    virtual XAccessibleStateSetRef SAL_CALL getAccessibleStateSet()
+    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet >  SAL_CALL getAccessibleStateSet()
         throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
 
     // XAccessibleTable -------------------------------------------------------
@@ -392,15 +376,15 @@ public:
         throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
 
     /** Returns the accessible cell object at the specified position. */
-    virtual XAccessibleRef SAL_CALL getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn )
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn )
         throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
 
     /** Returns the caption object of the table. */
-    virtual XAccessibleRef SAL_CALL getAccessibleCaption()
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleCaption()
         throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
 
     /** Returns the summary description object of the table. */
-    virtual XAccessibleRef SAL_CALL getAccessibleSummary()
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleSummary()
         throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
 
     /** Returns true, if the cell at a specified position is selected. */
@@ -442,7 +426,7 @@ public:
         throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
 
     /** Returns the child with the specified index in all selected children. */
-    virtual XAccessibleRef SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
         throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
 
     /** Deselects the child with the specified index in all selected children. */
@@ -537,8 +521,6 @@ private:
 class ScAccessibleCsvCell : public ScAccessibleCsvControl, public accessibility::AccessibleStaticTextBase
 {
 protected:
-    typedef ::com::sun::star::uno::Sequence<
-        ::com::sun::star::beans::PropertyValue >    PropertyValueSeq;
     typedef ::std::unique_ptr< SvxEditSource >      SvxEditSourcePtr;
 
 private:
@@ -575,7 +557,7 @@ public:
         throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
 
     /** Returns the specified child. */
-    virtual XAccessibleRef SAL_CALL getAccessibleChild( sal_Int32 nIndex )
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 nIndex )
         throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
 
     /** Returns the index of this cell in the table. */
@@ -583,11 +565,11 @@ public:
         throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
 
     /** Returns the relation to the ruler control. */
-    virtual XAccessibleRelationSetRef SAL_CALL getAccessibleRelationSet()
+    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet()
         throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
 
     /** Returns the current set of states. */
-    virtual XAccessibleStateSetRef SAL_CALL getAccessibleStateSet()
+    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet >  SAL_CALL getAccessibleStateSet()
         throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
 
     // XInterface -------------------------------------------------------------
diff --git a/sc/source/ui/inc/csvcontrol.hxx b/sc/source/ui/inc/csvcontrol.hxx
index 859b8f3217b1..eb7a7fbefb6b 100644
--- a/sc/source/ui/inc/csvcontrol.hxx
+++ b/sc/source/ui/inc/csvcontrol.hxx
@@ -225,9 +225,6 @@ protected:
     typedef ::std::vector< OUString >   StringVec;
     typedef ::std::vector< StringVec >  StringVecVec;
 
-    typedef ::css::uno::Reference<
-        ::css::accessibility::XAccessible > XAccessibleRef;
-
 private:
     Link<ScCsvControl&,void>    maCmdHdl;           /// External command handler.
     ScCsvCmd                    maCmd;              /// Data of last command.
@@ -379,7 +376,8 @@ public:
 public:
     /** Creates and returns the accessible object of this control. Do not overwrite in
         derived classes, use ImplCreateAccessible() instead. */
-    virtual XAccessibleRef     CreateAccessible() override;
+    virtual css::uno::Reference< css::accessibility::XAccessible >
+                                CreateAccessible() override;
 
 protected:
     /** Derived classes create a new accessible object here. */
diff --git a/sc/source/ui/inc/csvtablebox.hxx b/sc/source/ui/inc/csvtablebox.hxx
index 8a775b9f8072..dd0b95801198 100644
--- a/sc/source/ui/inc/csvtablebox.hxx
+++ b/sc/source/ui/inc/csvtablebox.hxx
@@ -130,7 +130,8 @@ private:
     // accessibility ----------------------------------------------------------
 public:
     /** Creates and returns the accessible object of this control. */
-    virtual XAccessibleRef      CreateAccessible() override;
+    virtual css::uno::Reference< css::accessibility::XAccessible >
+                                CreateAccessible() override;
 
 protected:
     /** Creates a new accessible object. */
diff --git a/sc/workben/result.cxx b/sc/workben/result.cxx
index e497aa4ae5d0..2bf201756b35 100644
--- a/sc/workben/result.cxx
+++ b/sc/workben/result.cxx
@@ -23,7 +23,7 @@
 
 using namespace com::sun::star;
 
-SV_IMPL_PTRARR( XResultListenerArr_Impl, XResultListenerPtr );
+SV_IMPL_PTRARR( XResultListenerArr_Impl, css::uno::Reference< css::sheet::XResultListener >* );
 
 ScAddInResult::ScAddInResult(const String& rStr) :
     aArg( rStr ),
diff --git a/sc/workben/result.hxx b/sc/workben/result.hxx
index b2a87d9a74fd..e887ce69c1bb 100644
--- a/sc/workben/result.hxx
+++ b/sc/workben/result.hxx
@@ -28,8 +28,7 @@
 
 #include <cppuhelper/implbase.hxx>
 
-typedef ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XResultListener >* XResultListenerPtr;
-typedef boost::ptr_vector<XResultListenerPtr> XResultListenerArr_Impl;
+typedef boost::ptr_vector<css::uno::Reference< css::sheet::XResultListener >*> XResultListenerArr_Impl;
 
 class ScAddInResult : public cppu::WeakImplHelper<
                                 com::sun::star::sheet::XVolatileResult>