more removal of com::sun::star typedefs

Change-Id: Ia73f1b4f1dcfa3f0936359e744afe76e02dcd2eb

3 files changed, 8 insertions, 17 deletions

diff --git a/forms/source/inc/commandimageprovider.hxx b/forms/source/inc/commandimageprovider.hxx
index af0aefcc9f0e..7b6f01bf8d80 100644
--- a/forms/source/inc/commandimageprovider.hxx
+++ b/forms/source/inc/commandimageprovider.hxx
@@ -35,15 +35,13 @@ namespace frm
 
     //= ICommandImageProvider
 
-    typedef OUString                                 CommandURL;
-    typedef css::uno::Sequence< CommandURL >         CommandURLs;
-    typedef ::std::vector< Image >                   CommandImages;
+    typedef ::std::vector< Image >                 CommandImages;
 
     class SAL_NO_VTABLE ICommandImageProvider
     {
     public:
         virtual CommandImages   getCommandImages(
-                                    const CommandURLs& _rCommandURLs,
+                                    const css::uno::Sequence< OUString >& _rCommandURLs,
                                     const bool _bLarge
                                 ) const = 0;
 
diff --git a/forms/source/inc/componenttools.hxx b/forms/source/inc/componenttools.hxx
index 4a41e88d9938..f3e445effd1e 100644
--- a/forms/source/inc/componenttools.hxx
+++ b/forms/source/inc/componenttools.hxx
@@ -34,11 +34,7 @@ namespace frm
 
     struct TypeCompareLess : public ::std::binary_function< css::uno::Type, css::uno::Type, bool >
     {
-    private:
-        typedef css::uno::Type             Type;
-
-    public:
-        bool operator()( const Type& _rLHS, const Type& _rRHS ) const
+        bool operator()( const css::uno::Type& _rLHS, const css::uno::Type& _rRHS ) const
         {
             return _rLHS.getTypeName() < _rRHS.getTypeName();
         }
@@ -50,9 +46,8 @@ namespace frm
     class TypeBag
     {
     public:
-        typedef css::uno::Type                          Type;
-        typedef css::uno::Sequence< Type >              TypeSequence;
-        typedef ::std::set< Type, TypeCompareLess >     TypeSet;
+        typedef css::uno::Sequence< css::uno::Type >            TypeSequence;
+        typedef ::std::set< css::uno::Type, TypeCompareLess >   TypeSet;
 
     private:
         TypeSet     m_aTypes;
@@ -72,9 +67,9 @@ namespace frm
             const TypeSequence& _rTypes3
         );
 
-        void    addType( const Type& i_rType );
+        void    addType( const css::uno::Type& i_rType );
         void    addTypes( const TypeSequence& _rTypes );
-        void    removeType( const Type& i_rType );
+        void    removeType( const css::uno::Type& i_rType );
 
         /** returns the types represented by this bag
         */
diff --git a/forms/source/inc/listenercontainers.hxx b/forms/source/inc/listenercontainers.hxx
index 59cdccc35a02..e46443dbc0d1 100644
--- a/forms/source/inc/listenercontainers.hxx
+++ b/forms/source/inc/listenercontainers.hxx
@@ -32,9 +32,7 @@ namespace frm
     class EventListeners : public ::comphelper::OListenerContainerBase< LISTENER, css::lang::EventObject >
     {
     public:
-        typedef LISTENER                            ListenerClass;
-        typedef css::lang::EventObject              EventClass;
-        typedef ::comphelper::OListenerContainerBase< ListenerClass, EventClass >
+        typedef ::comphelper::OListenerContainerBase< LISTENER, css::lang::EventObject >
                                                     EventListeners_Base;
 
     private: