refactor out some com::sun::star typedefs

which mostly serve to make the code harder to read

Change-Id: Ia2a83fee9f850ab6f0bea6305ce8600d6b785fe8

3 files changed, 12 insertions, 16 deletions

diff --git a/vcl/osx/OSXTransferable.hxx b/vcl/osx/OSXTransferable.hxx
index d8c5ba322dd8..bdf93457a0c8 100644
--- a/vcl/osx/OSXTransferable.hxx
+++ b/vcl/osx/OSXTransferable.hxx
@@ -39,8 +39,6 @@ class OSXTransferable : public ::cppu::WeakImplHelper<com::sun::star::datatransf
                         private ::boost::noncopyable
 {
 public:
-  typedef com::sun::star::uno::Sequence< sal_Int8 > ByteSequence_t;
-
   explicit OSXTransferable(com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XMimeContentTypeFactory> rXMimeCntFactory,
                            DataFlavorMapperPtr_t pDataFlavorMapper,
                            NSPasteboard* pasteboard);
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index 4f35390355f0..9fce8872780a 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -327,7 +327,7 @@ protected:
     OUString     m_sTitle;
     OUString     m_sFilter;
 
-    UnoFilterList       m_aSubFilters;
+    css::uno::Sequence< css::beans::StringPair >       m_aSubFilters;
 
 public:
     FilterEntry( const OUString& _rTitle, const OUString& _rFilter )
@@ -346,11 +346,11 @@ public:
     @return
         the number of sub filters
     */
-    sal_Int32       getSubFilters( UnoFilterList& _rSubFilterList );
+    sal_Int32       getSubFilters( css::uno::Sequence< css::beans::StringPair >& _rSubFilterList );
 
     // helpers for iterating the sub filters
-    const UnoFilterEntry*   beginSubFilters() const { return m_aSubFilters.getConstArray(); }
-    const UnoFilterEntry*   endSubFilters() const { return m_aSubFilters.getConstArray() + m_aSubFilters.getLength(); }
+    const css::beans::StringPair*   beginSubFilters() const { return m_aSubFilters.getConstArray(); }
+    const css::beans::StringPair*   endSubFilters() const { return m_aSubFilters.getConstArray() + m_aSubFilters.getLength(); }
 };
 
 bool FilterEntry::hasSubFilters() const
@@ -358,7 +358,7 @@ bool FilterEntry::hasSubFilters() const
     return( 0 < m_aSubFilters.getLength() );
 }
 
-sal_Int32 FilterEntry::getSubFilters( UnoFilterList& _rSubFilterList )
+sal_Int32 FilterEntry::getSubFilters( css::uno::Sequence< css::beans::StringPair >& _rSubFilterList )
 {
     _rSubFilterList = m_aSubFilters;
     return m_aSubFilters.getLength();
@@ -477,7 +477,7 @@ namespace {
 
             return bMatch;
         }
-        bool operator () ( const UnoFilterEntry& _rEntry )
+        bool operator () ( const css::beans::StringPair& _rEntry )
         {
             OUString aShrunkName = shrinkFilterName( _rEntry.First );
             return aShrunkName == rTitle;
@@ -500,14 +500,14 @@ bool SalGtkFilePicker::FilterNameExists( const OUString& rTitle )
     return bRet;
 }
 
-bool SalGtkFilePicker::FilterNameExists( const UnoFilterList& _rGroupedFilters )
+bool SalGtkFilePicker::FilterNameExists( const css::uno::Sequence< css::beans::StringPair >& _rGroupedFilters )
 {
     bool bRet = false;
 
     if( m_pFilterList )
     {
-        const UnoFilterEntry* pStart = _rGroupedFilters.getConstArray();
-        const UnoFilterEntry* pEnd = pStart + _rGroupedFilters.getLength();
+        const css::beans::StringPair* pStart = _rGroupedFilters.getConstArray();
+        const css::beans::StringPair* pEnd = pStart + _rGroupedFilters.getLength();
         for( ; pStart != pEnd; ++pStart )
             if( ::std::any_of(
                         m_pFilterList->begin(),
@@ -1897,7 +1897,7 @@ void SalGtkFilePicker::SetFilters()
             {
                 if( aListIter->hasSubFilters() )
                 {   // it's a filter group
-                    UnoFilterList aSubFilters;
+                    css::uno::Sequence< css::beans::StringPair > aSubFilters;
                     aListIter->getSubFilters( aSubFilters );
                     const StringPair* pSubFilters   = aSubFilters.getConstArray();
                     const StringPair* pSubFiltersEnd = pSubFilters + aSubFilters.getLength();
@@ -1933,7 +1933,7 @@ void SalGtkFilePicker::SetFilters()
             if( aListIter->hasSubFilters() )
             {   // it's a filter group
 
-                UnoFilterList aSubFilters;
+                css::uno::Sequence< css::beans::StringPair > aSubFilters;
                 aListIter->getSubFilters( aSubFilters );
 
                 implAddFilterGroup( aListIter->getTitle(), aSubFilters );
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx
index be93c590e104..25b39e09f079 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx
@@ -40,8 +40,6 @@ struct ElementEntry_Impl;
 
 typedef ::std::list < FilterEntry >     FilterList;
 typedef ::std::list < ElementEntry_Impl >   ElementList;
-typedef ::com::sun::star::beans::StringPair UnoFilterEntry;
-typedef ::com::sun::star::uno::Sequence< UnoFilterEntry >   UnoFilterList;  // can be transported more effectively
 
 // class declaration
 
@@ -170,7 +168,7 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base
         SalGtkFilePicker& operator=( const SalGtkFilePicker& ) = delete;
 
         bool FilterNameExists( const OUString& rTitle );
-        bool FilterNameExists( const UnoFilterList& _rGroupedFilters );
+        bool FilterNameExists( const css::uno::Sequence< css::beans::StringPair >& _rGroupedFilters );
 
         void ensureFilterList( const OUString& _rInitialCurrentFilter );