remove some unnecessary typedefs around uno::Reference

Not very useful these days, since we have the css:: prefix to reduce
verbosity.

Found with a search like:
git grep -nP 'typedef .*uno::Reference.*<.*>\s+\w+;'
| grep -v 'std::'

Change-Id: I16f41c53837ec5c613545ae45df38b0daddcbadd
Reviewed-on: https://gerrit.libreoffice.org/16730
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

5 files changed, 17 insertions, 21 deletions

diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx
index c75912a10af4..9c5b38207532 100644
--- a/svx/source/dialog/frmsel.cxx
+++ b/svx/source/dialog/frmsel.cxx
@@ -272,7 +272,7 @@ FrameSelectorImpl::~FrameSelectorImpl()
 {
     if( mpAccess )
         mpAccess->Invalidate();
-    for( AccessibleImplVec::iterator aIt = maChildVec.begin(), aEnd = maChildVec.end(); aIt != aEnd; ++aIt )
+    for( auto aIt = maChildVec.begin(), aEnd = maChildVec.end(); aIt != aEnd; ++aIt )
         if( *aIt )
             (*aIt)->Invalidate();
 }
diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx
index 5dba115d44eb..f41a186c5c4f 100644
--- a/svx/source/inc/datanavi.hxx
+++ b/svx/source/inc/datanavi.hxx
@@ -311,12 +311,10 @@ namespace svxform
         inline void                 SetInstanceURL( const OUString &url ) { m_sInstanceURL=url; }
         inline void                 SetLinkOnce( bool bLinkOnce ) { m_bLinkOnce=bLinkOnce; }
 
-        typedef com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> XPropertySet_t;
-        typedef com::sun::star::uno::Reference<com::sun::star::xml::dom::XNode> XNode_t;
-
-        inline XPropertySet_t GetBindingForNode( const XNode_t &xNode ) { return m_xUIHelper->getBindingForNode(xNode,true); }
-        inline OUString GetServiceNameForNode( const XNode_t &xNode ) { return m_xUIHelper->getDefaultServiceNameForNode(xNode); }
-        inline XFormsUIHelper1_ref GetXFormsHelper() const { return m_xUIHelper; }
+        inline css::uno::Reference<css::beans::XPropertySet>
+                                    GetBindingForNode( const css::uno::Reference<css::xml::dom::XNode> &xNode ) { return m_xUIHelper->getBindingForNode(xNode,true); }
+        inline OUString             GetServiceNameForNode( const css::uno::Reference<css::xml::dom::XNode> &xNode ) { return m_xUIHelper->getDefaultServiceNameForNode(xNode); }
+        inline XFormsUIHelper1_ref  GetXFormsHelper() const { return m_xUIHelper; }
     };
 
 
diff --git a/svx/source/inc/fmcontrolbordermanager.hxx b/svx/source/inc/fmcontrolbordermanager.hxx
index 796e9df671cf..bcb1127f0d4c 100644
--- a/svx/source/inc/fmcontrolbordermanager.hxx
+++ b/svx/source/inc/fmcontrolbordermanager.hxx
@@ -126,9 +126,8 @@ namespace svxform
         };
 
         typedef ::std::set< ControlData, ControlDataCompare > ControlBag;
-        typedef ::com::sun::star::awt::XVclWindowPeer                                       WindowPeer;
-        typedef ::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclWindowPeer >   WindowPeerRef;
-        typedef ::std::set< WindowPeerRef, ::comphelper::OInterfaceCompare< WindowPeer > >  PeerBag;
+        typedef ::std::set< css::uno::Reference< css::awt::XVclWindowPeer >,
+                            ::comphelper::OInterfaceCompare< css::awt::XVclWindowPeer > >  PeerBag;
 
         PeerBag     m_aColorableControls;
         PeerBag     m_aNonColorableControls;
diff --git a/svx/source/inc/frmselimpl.hxx b/svx/source/inc/frmselimpl.hxx
index 4b516e83139b..441cb1e62b13 100644
--- a/svx/source/inc/frmselimpl.hxx
+++ b/svx/source/inc/frmselimpl.hxx
@@ -99,10 +99,6 @@ typedef std::vector< FrameBorder* > FrameBorderPtrVec;
 
 struct FrameSelectorImpl : public Resource
 {
-    typedef css::uno::Reference<css::accessibility::XAccessible> XAccessibleRef;
-    typedef std::vector<a11y::AccFrameSelector*> AccessibleImplVec;
-    typedef std::vector<XAccessibleRef> XAccessibleRefVec;
-
     FrameSelector&      mrFrameSel;     /// The control itself.
     ScopedVclPtr<VirtualDevice> mpVirDev; /// For all buffered drawing operations.
     ImageList           maILArrows;     /// Arrows in current system colors.
@@ -146,9 +142,12 @@ struct FrameSelectorImpl : public Resource
     bool                mbHCMode;       /// true = High contrast mode.
 
     a11y::AccFrameSelector* mpAccess;   /// Pointer to accessibility object of the control.
-    XAccessibleRef      mxAccess;       /// Reference to accessibility object of the control.
-    AccessibleImplVec   maChildVec;     /// Pointers to accessibility objects for frame borders.
-    XAccessibleRefVec   mxChildVec;     /// References to accessibility objects for frame borders.
+    css::uno::Reference<css::accessibility::XAccessible>
+                        mxAccess;       /// Reference to accessibility object of the control.
+    std::vector<a11y::AccFrameSelector*>
+                        maChildVec;     /// Pointers to accessibility objects for frame borders.
+    std::vector<css::uno::Reference<css::accessibility::XAccessible> >
+                        mxChildVec;     /// References to accessibility objects for frame borders.
 
     explicit            FrameSelectorImpl( FrameSelector& rFrameSel );
                         ~FrameSelectorImpl();
diff --git a/svx/source/sdr/primitive2d/primitivefactory2d.cxx b/svx/source/sdr/primitive2d/primitivefactory2d.cxx
index df42d47b46ab..8544b3fc9d6f 100644
--- a/svx/source/sdr/primitive2d/primitivefactory2d.cxx
+++ b/svx/source/sdr/primitive2d/primitivefactory2d.cxx
@@ -63,11 +63,11 @@ public:
     }
 };
 
-Primitive2DSequence SAL_CALL PrimitiveFactory2D::createPrimitivesFromXShape(
+css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > SAL_CALL PrimitiveFactory2D::createPrimitivesFromXShape(
     const uno::Reference< drawing::XShape >& xShape,
     const uno::Sequence< beans::PropertyValue >& /*aParms*/ ) throw (uno::RuntimeException, std::exception)
 {
-    Primitive2DSequence aRetval;
+    css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > aRetval;
 
     if(xShape.is())
     {
@@ -83,11 +83,11 @@ Primitive2DSequence SAL_CALL PrimitiveFactory2D::createPrimitivesFromXShape(
     return aRetval;
 }
 
-Primitive2DSequence SAL_CALL PrimitiveFactory2D::createPrimitivesFromXDrawPage(
+css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > SAL_CALL PrimitiveFactory2D::createPrimitivesFromXDrawPage(
     const uno::Reference< drawing::XDrawPage >& xDrawPage,
     const uno::Sequence< beans::PropertyValue >& /*aParms*/ ) throw (uno::RuntimeException, std::exception)
 {
-    Primitive2DSequence aRetval;
+    css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > aRetval;
 
     if(xDrawPage.is())
     {