Replace remaining getCppuType et al with cppu::UnoType

Change-Id: Ic063dda4152b794898011af375a4a53d7451e41a

11 files changed, 14 insertions, 14 deletions

diff --git a/dtrans/source/test/test_dtrans.cxx b/dtrans/source/test/test_dtrans.cxx
index 052708e2a29c..6c363b0abf36 100644
--- a/dtrans/source/test/test_dtrans.cxx
+++ b/dtrans/source/test/test_dtrans.cxx
@@ -193,7 +193,7 @@ StringTransferable::StringTransferable( ) :
 
     //df.MimeType = L"text/plain; charset=windows1252";
     df.MimeType = "text/html";
-    df.DataType = getCppuType( ( Sequence< sal_Int8 >* )0 );
+    df.DataType = cppu::UnoType<Sequence< sal_Int8 >>::get();
 
     m_seqDFlv[0] = df;
 }
diff --git a/dtrans/source/win32/clipb/WinClipboard.cxx b/dtrans/source/win32/clipb/WinClipboard.cxx
index 2ffb7bd3c55a..9c0531559265 100644
--- a/dtrans/source/win32/clipb/WinClipboard.cxx
+++ b/dtrans/source/win32/clipb/WinClipboard.cxx
@@ -158,7 +158,7 @@ void SAL_CALL CWinClipboard::addClipboardListener( const Reference< XClipboardLi
                                         static_cast< XClipboardEx* >( this ),
                                         1 );
 
-    rBHelper.aLC.addInterface( getCppuType( &listener ), listener );
+    rBHelper.aLC.addInterface( cppu::UnoType<decltype(listener)>::get(), listener );
 }
 
 // getName
@@ -176,7 +176,7 @@ void SAL_CALL CWinClipboard::removeClipboardListener( const Reference< XClipboar
                                         static_cast< XClipboardEx* >( this ),
                                         1 );
 
-    rBHelper.aLC.removeInterface( getCppuType( &listener ), listener );
+    rBHelper.aLC.removeInterface( cppu::UnoType<decltype(listener)>::get(), listener );
 }
 
 // getName
diff --git a/dtrans/source/win32/dnd/sourcecontext.cxx b/dtrans/source/win32/dnd/sourcecontext.cxx
index d97fc9b0b71f..bbc3557a12a6 100644
--- a/dtrans/source/win32/dnd/sourcecontext.cxx
+++ b/dtrans/source/win32/dnd/sourcecontext.cxx
@@ -33,7 +33,7 @@ SourceContext::SourceContext( DragSource* pSource,
 #if OSL_DEBUG_LEVEL > 1
     if( listener.is())
 #endif
-    rBHelper.addListener( ::getCppuType( &listener ), listener );
+    rBHelper.addListener( cppu::UnoType<decltype(listener)>::get(), listener );
 }
 
 SourceContext::~SourceContext()
diff --git a/dtrans/source/win32/dnd/target.cxx b/dtrans/source/win32/dnd/target.cxx
index f7f770444ab9..8c8e963b321a 100644
--- a/dtrans/source/win32/dnd/target.cxx
+++ b/dtrans/source/win32/dnd/target.cxx
@@ -261,13 +261,13 @@ Sequence< OUString > SAL_CALL DropTarget::getSupportedServiceNames(  ) throw (Ru
 void SAL_CALL DropTarget::addDropTargetListener( const Reference< XDropTargetListener >& dtl )
         throw(RuntimeException)
 {
-    rBHelper.addListener( ::getCppuType( &dtl ), dtl );
+    rBHelper.addListener( cppu::UnoType<decltype(dtl)>::get(), dtl );
 }
 
 void SAL_CALL DropTarget::removeDropTargetListener( const Reference< XDropTargetListener >& dtl )
         throw(RuntimeException)
 {
-    rBHelper.removeListener( ::getCppuType( &dtl ), dtl );
+    rBHelper.removeListener( cppu::UnoType<decltype(dtl)>::get(), dtl );
 }
 
 sal_Bool SAL_CALL DropTarget::isActive(  ) throw(RuntimeException)
diff --git a/dtrans/source/win32/dtobj/DOTransferable.cxx b/dtrans/source/win32/dtobj/DOTransferable.cxx
index 0b4f9856184b..d8e22cb6327e 100644
--- a/dtrans/source/win32/dtobj/DOTransferable.cxx
+++ b/dtrans/source/win32/dtobj/DOTransferable.cxx
@@ -45,7 +45,7 @@ using namespace com::sun::star::container;
 
 namespace
 {
-    const Type CPPUTYPE_SEQINT8  = getCppuType( ( Sequence< sal_Int8 >* )0 );
+    const Type CPPUTYPE_SEQINT8  = cppu::UnoType<Sequence< sal_Int8 >>::get();
     const Type CPPUTYPE_OUSTRING = cppu::UnoType<OUString>::get();
 
     inline
diff --git a/dtrans/source/win32/dtobj/DataFmtTransl.cxx b/dtrans/source/win32/dtobj/DataFmtTransl.cxx
index 33c458f0bff2..cfba2ebaa742 100644
--- a/dtrans/source/win32/dtobj/DataFmtTransl.cxx
+++ b/dtrans/source/win32/dtobj/DataFmtTransl.cxx
@@ -49,7 +49,7 @@ using namespace com::sun::star::lang;
 const Type       CPPUTYPE_SALINT32   = cppu::UnoType<sal_Int32>::get();
 const Type       CPPUTYPE_SALINT8    = cppu::UnoType<sal_Int8>::get();
 const Type       CPPUTYPE_OUSTRING   = cppu::UnoType<OUString>::get();
-const Type       CPPUTYPE_SEQSALINT8 = getCppuType((Sequence< sal_Int8>*)0);
+const Type       CPPUTYPE_SEQSALINT8 = cppu::UnoType<Sequence< sal_Int8>>::get();
 const sal_Int32  MAX_CLIPFORMAT_NAME = 256;
 
 const OUString TEXT_PLAIN_CHARSET   ("text/plain;charset=");
diff --git a/dtrans/source/win32/dtobj/XTDataObject.cxx b/dtrans/source/win32/dtobj/XTDataObject.cxx
index a2374686a5c9..3c8a93731945 100644
--- a/dtrans/source/win32/dtobj/XTDataObject.cxx
+++ b/dtrans/source/win32/dtobj/XTDataObject.cxx
@@ -413,7 +413,7 @@ void SAL_CALL CXTDataObject::renderSynthesizedHtmlAndSetupStgMedium( FORMATETC&
 
     // creating a DataFlavor on the fly
     aFlavor.MimeType = "text/html";
-    aFlavor.DataType = getCppuType( (Sequence< sal_Int8 >*)0 );
+    aFlavor.DataType = cppu::UnoType<Sequence< sal_Int8 >>::get();
 
     Any aAny = m_XTransferable->getTransferData( aFlavor );
 
diff --git a/dtrans/source/win32/ftransl/ftransl.cxx b/dtrans/source/win32/ftransl/ftransl.cxx
index b2ddb09b1453..bc14f54391bb 100644
--- a/dtrans/source/win32/ftransl/ftransl.cxx
+++ b/dtrans/source/win32/ftransl/ftransl.cxx
@@ -38,14 +38,14 @@
 #define IMPL_NAME  "com.sun.star.datatransfer.DataFormatTranslator"
 
 #define MODULE_PRIVATE
-#define CPPUTYPE_SEQSALINT8       getCppuType( (const Sequence< sal_Int8 >*) 0 )
+#define CPPUTYPE_SEQSALINT8       cppu::UnoType<Sequence< sal_Int8 >>::get()
 #define CPPUTYPE_DEFAULT          CPPUTYPE_SEQSALINT8
 #define CPPUTYPE_OUSTR            cppu::UnoType<OUString>::get()
 #define CPPUTYPE_SALINT32         cppu::UnoType<sal_Int32>::get()
 #define EMPTY_OUSTR               OUString()
 
 const OUString Windows_FormatName ("windows_formatname");
-const com::sun::star::uno::Type CppuType_ByteSequence = ::getCppuType((const com::sun::star::uno::Sequence<sal_Int8>*)0);
+const com::sun::star::uno::Type CppuType_ByteSequence = cppu::UnoType<com::sun::star::uno::Sequence<sal_Int8>>::get();
 const com::sun::star::uno::Type CppuType_String       = ::cppu::UnoType<OUString>::get();
 
 // namespace directives
diff --git a/dtrans/source/win32/workbench/test_wincb.cxx b/dtrans/source/win32/workbench/test_wincb.cxx
index 5fd199bda55e..a2d0ff9ae7a6 100644
--- a/dtrans/source/win32/workbench/test_wincb.cxx
+++ b/dtrans/source/win32/workbench/test_wincb.cxx
@@ -132,7 +132,7 @@ CTransferable::CTransferable( ) :
     //df.DataType = cppu::UnoType<OUString>::get();
 
     df.MimeType = L"text/plain;charset=Windows1252";
-    df.DataType = getCppuType( (Sequence< sal_Int8 >*)0 );
+    df.DataType = cppu::UnoType<Sequence< sal_Int8 >>::get();
 
     m_FlavorList[0] = df;
 }
diff --git a/dtrans/test/win32/dnd/targetlistener.cxx b/dtrans/test/win32/dnd/targetlistener.cxx
index e531a30304e0..0a93d394560a 100644
--- a/dtrans/test/win32/dnd/targetlistener.cxx
+++ b/dtrans/test/win32/dnd/targetlistener.cxx
@@ -43,7 +43,7 @@ void SAL_CALL DropTargetListener::drop( const DropTargetDropEvent& e )
     e.Context->rejectDrop();
 
     DataFlavor flavor( OUString(OUString("text/plain;charset=windows-1252")),
-        OUString(L"Text plain"), getCppuType( ( Sequence<sal_Int8>*)0 ) );
+        OUString(L"Text plain"), cppu::UnoType<Sequence<sal_Int8>>::get() );
 
     Any anyData= e.Transferable->getTransferData( flavor);
     Sequence<sal_Int8> seq= *( Sequence<sal_Int8>*)anyData.getValue();
diff --git a/dtrans/test/win32/dnd/transferable.cxx b/dtrans/test/win32/dnd/transferable.cxx
index b9bd35f82928..924c031763b5 100644
--- a/dtrans/test/win32/dnd/transferable.cxx
+++ b/dtrans/test/win32/dnd/transferable.cxx
@@ -36,7 +36,7 @@ CTransferable::CTransferable( wchar_t* dataString ) :
 
     //df.MimeType = L"text/plain; charset=windows1252";
     df.MimeType = L"text/plain";
-    df.DataType = getCppuType( ( Sequence< sal_Int8 >* )0 );
+    df.DataType = cppu::UnoType<Sequence< sal_Int8 >>::get();
 
     m_seqDFlv[0] = df;
 }