From b09b5f8f7cfd2d7f3125dab93ebe996c160e1e0c Mon Sep 17 00:00:00 2001
From: Julien Nabet <serval2412@yahoo.fr>
Date: Thu, 22 May 2014 23:19:05 +0200
Subject: Prefer cppu::UnoType<T>::get() to ::getCppuType((T*)0) part19

Change-Id: Iab50c52a132c90389992ef68c2d31df95a193ab9
---
 embedserv/source/embed/docholder.cxx   | 2 +-
 embedserv/source/embed/ed_idataobj.cxx | 2 +-
 embedserv/source/embed/servprov.cxx    | 7 ++-----
 3 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'embedserv/source')

diff --git a/embedserv/source/embed/docholder.cxx b/embedserv/source/embed/docholder.cxx
index 1b2732cb8b51..71ce91baa19f 100644
--- a/embedserv/source/embed/docholder.cxx
+++ b/embedserv/source/embed/docholder.cxx
@@ -1046,7 +1046,7 @@ IDispatch* DocumentHolder::GetIDispatch()
                     bridge::ModelDependent::OLE );
 
                 if ( anyResult.getValueTypeClass() ==
-                     getCppuType((sal_uInt32*) 0).getTypeClass() )
+                     cppu::UnoType<sal_uInt32>::get().getTypeClass() )
                 {
                     VARIANT* pVariant = *(VARIANT**)anyResult.getValue();
                     if ( pVariant->vt == VT_DISPATCH )
diff --git a/embedserv/source/embed/ed_idataobj.cxx b/embedserv/source/embed/ed_idataobj.cxx
index 2bad409194ca..ddb802aa318e 100644
--- a/embedserv/source/embed/ed_idataobj.cxx
+++ b/embedserv/source/embed/ed_idataobj.cxx
@@ -56,7 +56,7 @@ sal_uInt64 EmbedDocument_Impl::getMetaFileHandle_Impl( sal_Bool isEnhMeta )
             aFlavor.HumanPresentableName = "Windows GDIMetaFile";
         }
 
-        aFlavor.DataType = getCppuType( (const sal_uInt64*) 0 );
+        aFlavor.DataType = cppu::UnoType<sal_uInt64>::get();
 
         uno::Any aAny = xTransferable->getTransferData( aFlavor );
         aAny >>= pResult;
diff --git a/embedserv/source/embed/servprov.cxx b/embedserv/source/embed/servprov.cxx
index 8f365414c327..a2db313a7778 100644
--- a/embedserv/source/embed/servprov.cxx
+++ b/embedserv/source/embed/servprov.cxx
@@ -161,11 +161,8 @@ EmbedServer_Impl::getTypes( )
         if( ! pCollection )
         {
             static ::cppu::OTypeCollection collection(
-                getCppuType(
-                    reinterpret_cast<uno::Reference< uno::XWeak>*>(0)),
-                getCppuType(
-                    reinterpret_cast<
-                    uno::Reference< lang::XTypeProvider>*>(0)));
+                cppu::UnoType<uno::XWeak>::get(),
+                cppu::UnoType<lang::XTypeProvider>::get() );
             pCollection = &collection;
         }
     }
-- 
cgit