From ac76cc7e605b1bc9c0ff8e24d0b9995a8247074e Mon Sep 17 00:00:00 2001
From: Julien Nabet <serval2412@yahoo.fr>
Date: Fri, 23 May 2014 22:11:27 +0200
Subject: Prefer cppu::UnoType<T>::get() to ::getCppuType((T*)0) part20

Change-Id: If87cdfb2c605254f6d69baa4ca5aec09091caa68
---
 svl/source/fsstor/fsstorage.cxx             |  8 ++++----
 svl/source/fsstor/oinputstreamcontainer.cxx | 10 +++++-----
 svl/source/fsstor/ostreamcontainer.cxx      | 14 +++++++-------
 3 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'svl')

diff --git a/svl/source/fsstor/fsstorage.cxx b/svl/source/fsstor/fsstorage.cxx
index d1f2f1323af8..7ccfeb721806 100644
--- a/svl/source/fsstor/fsstorage.cxx
+++ b/svl/source/fsstor/fsstorage.cxx
@@ -318,10 +318,10 @@ uno::Sequence< uno::Type > SAL_CALL FSStorage::getTypes()
         if ( m_pImpl->m_pTypeCollection == NULL )
         {
             m_pImpl->m_pTypeCollection = new ::cppu::OTypeCollection
-                                (   ::getCppuType( ( const uno::Reference< lang::XTypeProvider >* )NULL )
-                                ,   ::getCppuType( ( const uno::Reference< embed::XStorage >* )NULL )
-                                ,   ::getCppuType( ( const uno::Reference< embed::XHierarchicalStorageAccess >* )NULL )
-                                ,   ::getCppuType( ( const uno::Reference< beans::XPropertySet >* )NULL ) );
+                                (   cppu::UnoType<lang::XTypeProvider>::get()
+                                ,   cppu::UnoType<embed::XStorage>::get()
+                                ,   cppu::UnoType<embed::XHierarchicalStorageAccess>::get()
+                                ,   cppu::UnoType<beans::XPropertySet>::get());
         }
     }
 
diff --git a/svl/source/fsstor/oinputstreamcontainer.cxx b/svl/source/fsstor/oinputstreamcontainer.cxx
index 0b3384dd981e..3a9280d75012 100644
--- a/svl/source/fsstor/oinputstreamcontainer.cxx
+++ b/svl/source/fsstor/oinputstreamcontainer.cxx
@@ -56,17 +56,17 @@ uno::Sequence< uno::Type > SAL_CALL OFSInputStreamContainer::getTypes()
             if ( m_bSeekable )
             {
                 static ::cppu::OTypeCollection aTypeCollection(
-                        ::getCppuType(( const uno::Reference< io::XStream >* )NULL ),
-                        ::getCppuType(( const uno::Reference< io::XInputStream >* )NULL ),
-                        ::getCppuType(( const uno::Reference< io::XSeekable >* )NULL ) );
+                        cppu::UnoType<io::XStream>::get(),
+                        cppu::UnoType<io::XInputStream>::get(),
+                        cppu::UnoType<io::XSeekable>::get());
 
                 pTypeCollection = &aTypeCollection ;
             }
             else
             {
                 static ::cppu::OTypeCollection aTypeCollection(
-                        ::getCppuType(( const uno::Reference< io::XStream >* )NULL ),
-                        ::getCppuType(( const uno::Reference< io::XInputStream >* )NULL ) );
+                        cppu::UnoType<io::XStream>::get(),
+                        cppu::UnoType<io::XInputStream>::get());
 
                 pTypeCollection = &aTypeCollection ;
             }
diff --git a/svl/source/fsstor/ostreamcontainer.cxx b/svl/source/fsstor/ostreamcontainer.cxx
index eed5e5a9b4f6..2651ad4c8398 100644
--- a/svl/source/fsstor/ostreamcontainer.cxx
+++ b/svl/source/fsstor/ostreamcontainer.cxx
@@ -151,29 +151,29 @@ uno::Sequence< uno::Type > SAL_CALL OFSStreamContainer::getTypes()
         if ( m_pTypeCollection == NULL )
         {
             ::cppu::OTypeCollection aTypeCollection
-                                    (   ::getCppuType( ( const uno::Reference< lang::XTypeProvider >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< embed::XExtendedStorageStream >* )NULL ) );
+                                    (   cppu::UnoType<lang::XTypeProvider>::get()
+                                    ,   cppu::UnoType<embed::XExtendedStorageStream>::get());
 
             if ( m_xSeekable.is() )
                 aTypeCollection = ::cppu::OTypeCollection
-                                    (   ::getCppuType( ( const uno::Reference< io::XSeekable >* )NULL ),
+                                    (   cppu::UnoType<io::XSeekable>::get(),
                                         aTypeCollection.getTypes() );
             if ( m_xInputStream.is() )
                 aTypeCollection = ::cppu::OTypeCollection
-                                    (   ::getCppuType( ( const uno::Reference< io::XInputStream >* )NULL ),
+                                    (   cppu::UnoType<io::XInputStream>::get(),
                                         aTypeCollection.getTypes() );
 
             if ( m_xOutputStream.is() )
                 aTypeCollection = ::cppu::OTypeCollection
-                                    (   ::getCppuType( ( const uno::Reference< io::XOutputStream >* )NULL ),
+                                    (   cppu::UnoType<io::XOutputStream>::get(),
                                         aTypeCollection.getTypes() );
             if ( m_xTruncate.is() )
                 aTypeCollection = ::cppu::OTypeCollection
-                                    (   ::getCppuType( ( const uno::Reference< io::XTruncate >* )NULL ),
+                                    (   cppu::UnoType<io::XTruncate>::get(),
                                         aTypeCollection.getTypes() );
             if ( m_xAsyncOutputMonitor.is() )
                 aTypeCollection = ::cppu::OTypeCollection
-                                    (   ::getCppuType( ( const uno::Reference< io::XAsyncOutputMonitor >* )NULL ),
+                                    (   cppu::UnoType<io::XAsyncOutputMonitor>::get(),
                                         aTypeCollection.getTypes() );
 
             m_pTypeCollection = new ::cppu::OTypeCollection( aTypeCollection );
-- 
cgit