more removal of com::sun::star typedefs

Change-Id: Ia73f1b4f1dcfa3f0936359e744afe76e02dcd2eb

10 files changed, 31 insertions, 46 deletions

diff --git a/forms/source/helper/commandimageprovider.cxx b/forms/source/helper/commandimageprovider.cxx
index b8150cb0926f..cf3a05ad49e9 100644
--- a/forms/source/helper/commandimageprovider.cxx
+++ b/forms/source/helper/commandimageprovider.cxx
@@ -69,7 +69,7 @@ namespace frm
         }
 
         // ICommandImageProvider
-        virtual CommandImages getCommandImages( const CommandURLs& _rCommandURLs, const bool _bLarge ) const override;
+        virtual CommandImages getCommandImages( const css::uno::Sequence< OUString >& _rCommandURLs, const bool _bLarge ) const override;
 
     private:
         void    impl_init_nothrow( const Reference<XComponentContext>& _rContext, const Reference< XModel >& _rxDocument );
@@ -117,7 +117,7 @@ namespace frm
     }
 
 
-    CommandImages DocumentCommandImageProvider::getCommandImages( const CommandURLs& _rCommandURLs, const bool _bLarge ) const
+    CommandImages DocumentCommandImageProvider::getCommandImages( const css::uno::Sequence< OUString >& _rCommandURLs, const bool _bLarge ) const
     {
         const size_t nCommandCount = _rCommandURLs.getLength();
         CommandImages aImages( nCommandCount );
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:
diff --git a/forms/source/misc/componenttools.cxx b/forms/source/misc/componenttools.cxx
index 62e7609f62ea..add35d583630 100644
--- a/forms/source/misc/componenttools.cxx
+++ b/forms/source/misc/componenttools.cxx
@@ -66,13 +66,13 @@ namespace frm
     }
 
 
-    void TypeBag::addType( const Type& i_rType )
+    void TypeBag::addType( const css::uno::Type& i_rType )
     {
         m_aTypes.insert( i_rType );
     }
 
 
-    void TypeBag::removeType( const TypeBag::Type& i_rType )
+    void TypeBag::removeType( const css::uno::Type& i_rType )
     {
         m_aTypes.erase( i_rType );
     }
diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx
index bda953d7ab26..90723a27b9c0 100644
--- a/forms/source/solar/control/navtoolbar.cxx
+++ b/forms/source/solar/control/navtoolbar.cxx
@@ -364,7 +364,7 @@ namespace frm
         }
 
         // translate them into command URLs
-        CommandURLs aCommandURLs( aFormFeatures.size() );
+        css::uno::Sequence< OUString > aCommandURLs( aFormFeatures.size() );
         for (   FormFeatures::const_iterator formFeature = aFormFeatures.begin();
                 formFeature != aFormFeatures.end();
                 ++formFeature
diff --git a/forms/source/xforms/binding.cxx b/forms/source/xforms/binding.cxx
index 4a7359064f89..ebb8eb45b35e 100644
--- a/forms/source/xforms/binding.cxx
+++ b/forms/source/xforms/binding.cxx
@@ -727,9 +727,8 @@ void Binding::valueModified()
 
 void Binding::distributeMIP( const css::uno::Reference<css::xml::dom::XNode> & rxNode ) {
 
-    typedef css::xforms::XFormsEventConcrete XFormsEvent_t;
     OUString sEventName("xforms-generic");
-    XFormsEvent_t *pEvent = new XFormsEvent_t;
+    css::xforms::XFormsEventConcrete *pEvent = new css::xforms::XFormsEventConcrete;
     pEvent->initXFormsEvent(sEventName, sal_True, sal_False);
     Reference<XEvent> xEvent(pEvent);
 
diff --git a/forms/source/xforms/convert.cxx b/forms/source/xforms/convert.cxx
index 36d76cba6b59..ddf1c7c8dc0e 100644
--- a/forms/source/xforms/convert.cxx
+++ b/forms/source/xforms/convert.cxx
@@ -294,30 +294,30 @@ Convert& Convert::get()
     return *pConvert;
 }
 
-bool Convert::hasType( const Type_t& rType )
+bool Convert::hasType( const css::uno::Type& rType )
 {
     return maMap.find( rType ) != maMap.end();
 }
 
-Convert::Types_t Convert::getTypes()
+css::uno::Sequence<css::uno::Type> Convert::getTypes()
 {
-    Types_t aTypes( maMap.size() );
+    css::uno::Sequence<css::uno::Type> aTypes( maMap.size() );
     transform( maMap.begin(), maMap.end(), aTypes.getArray(),
             o3tl::select1st<Map_t::value_type>() );
     return aTypes;
 }
 
-OUString Convert::toXSD( const Any_t& rAny )
+OUString Convert::toXSD( const css::uno::Any& rAny )
 {
     Map_t::iterator aIter = maMap.find( rAny.getValueType() );
     return aIter != maMap.end() ? aIter->second.first( rAny ) : OUString();
 }
 
-Convert::Any_t Convert::toAny( const OUString& rValue,
-                               const Type_t& rType )
+css::uno::Any Convert::toAny( const OUString& rValue,
+                              const css::uno::Type& rType )
 {
     Map_t::iterator aIter = maMap.find( rType );
-    return aIter != maMap.end() ? aIter->second.second( rValue ) : Any_t();
+    return aIter != maMap.end() ? aIter->second.second( rValue ) : css::uno::Any();
 }
 
 
diff --git a/forms/source/xforms/convert.hxx b/forms/source/xforms/convert.hxx
index c710d9e3f171..c80bb9f62a9b 100644
--- a/forms/source/xforms/convert.hxx
+++ b/forms/source/xforms/convert.hxx
@@ -41,15 +41,11 @@ struct TypeLess
 
 class Convert
 {
-    typedef css::uno::Type Type_t;
-    typedef css::uno::Sequence<css::uno::Type> Types_t;
-    typedef css::uno::Any Any_t;
-
     // hold conversion objects
-    typedef OUString (*fn_toXSD)( const Any_t& );
-    typedef Any_t (*fn_toAny)( const OUString& );
+    typedef OUString (*fn_toXSD)( const css::uno::Any& );
+    typedef css::uno::Any (*fn_toAny)( const OUString& );
     typedef std::pair<fn_toXSD,fn_toAny> Convert_t;
-    typedef std::map<Type_t,Convert_t,TypeLess> Map_t;
+    typedef std::map<css::uno::Type, Convert_t, TypeLess> Map_t;
     Map_t maMap;
 
     Convert();
@@ -61,16 +57,16 @@ public:
     static Convert& get();
 
     /// can we convert this type?
-    bool hasType( const Type_t& );
+    bool hasType( const css::uno::Type& );
 
     /// get list of convertible types
-    Types_t getTypes();
+    css::uno::Sequence<css::uno::Type> getTypes();
 
     /// convert any to XML representation
-    OUString toXSD( const Any_t& rAny );
+    OUString toXSD( const css::uno::Any& rAny );
 
     /// convert XML representation to Any of given type
-    Any_t toAny( const OUString&, const Type_t& );
+    css::uno::Any toAny( const OUString&, const css::uno::Type& );
 
     /** replace all sequences of 0x08, 0x0A, 0x0D, 0x20 with a single 0x20.
         also strip leading/trailing whitespace.
diff --git a/forms/source/xforms/namedcollection.hxx b/forms/source/xforms/namedcollection.hxx
index d500ff161c68..ec10c91950f3 100644
--- a/forms/source/xforms/namedcollection.hxx
+++ b/forms/source/xforms/namedcollection.hxx
@@ -50,8 +50,7 @@ public:
         return findItem( rName ) != maItems.end();
     }
 
-    typedef css::uno::Sequence<OUString> Names_t;
-    Names_t getNames() const
+    css::uno::Sequence<OUString> getNames() const
     {
         // iterate over members, and collect all those that have names
         std::vector<OUString> aNames;
@@ -66,7 +65,7 @@ public:
         }
 
         // copy names to Sequence and return
-        Names_t aResult( aNames.size() );
+        css::uno::Sequence<OUString> aResult( aNames.size() );
         OUString* pStrings = aResult.getArray();
         std::copy( aNames.begin(), aNames.end(), pStrings );
 
@@ -117,7 +116,7 @@ public:
 
     }
 
-    virtual Names_t SAL_CALL getElementNames()
+    virtual css::uno::Sequence<OUString> SAL_CALL getElementNames()
         throw( css::uno::RuntimeException ) override
     {
         return getNames();