Remove unnecessary macro ITYPE

Change-Id: I9ade981c771367fd292600d73124f89b94a7a924

7 files changed, 69 insertions, 72 deletions

diff --git a/sd/source/ui/unoidl/unocpres.cxx b/sd/source/ui/unoidl/unocpres.cxx
index 2cae9282d3ed..11dd9cf7a204 100644
--- a/sd/source/ui/unoidl/unocpres.cxx
+++ b/sd/source/ui/unoidl/unocpres.cxx
@@ -164,7 +164,7 @@ void SAL_CALL SdXCustomPresentation::replaceByIndex( sal_Int32 Index, const uno:
 uno::Type SAL_CALL SdXCustomPresentation::getElementType()
     throw(uno::RuntimeException)
 {
-    return ITYPE( drawing::XDrawPage );
+    return cppu::UnoType<drawing::XDrawPage>::get();
 }
 
 sal_Bool SAL_CALL SdXCustomPresentation::hasElements()
@@ -462,7 +462,7 @@ sal_Bool SAL_CALL SdXCustomPresentationAccess::hasByName( const OUString& aName
 uno::Type SAL_CALL SdXCustomPresentationAccess::getElementType()
     throw(uno::RuntimeException)
 {
-    return ITYPE( container::XIndexContainer );
+    return cppu::UnoType<container::XIndexContainer>::get();
 }
 
 sal_Bool SAL_CALL SdXCustomPresentationAccess::hasElements()
diff --git a/sd/source/ui/unoidl/unohelp.hxx b/sd/source/ui/unoidl/unohelp.hxx
index 690a2391983f..0b54151c6265 100644
--- a/sd/source/ui/unoidl/unohelp.hxx
+++ b/sd/source/ui/unoidl/unohelp.hxx
@@ -43,9 +43,6 @@ inline void bool2any( sal_Bool bBool, ::com::sun::star::uno::Any& rAny )
 
 }
 
-#define ITYPE( xint ) \
-    ::getCppuType((const uno::Reference< xint >*)0)
-
 #define QUERYINT( xint ) \
     if( rType == ::getCppuType((const uno::Reference< xint >*)0) ) \
         aAny <<= uno::Reference< xint >(this)
diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx
index 802b73c28b78..e7e1c27c8ab5 100644
--- a/sd/source/ui/unoidl/unolayer.cxx
+++ b/sd/source/ui/unoidl/unolayer.cxx
@@ -710,7 +710,7 @@ sal_Bool SAL_CALL SdLayerManager::hasByName( const OUString& aName ) throw(uno::
 uno::Type SAL_CALL SdLayerManager::getElementType()
     throw(uno::RuntimeException)
 {
-    return ITYPE( drawing::XLayer );
+    return cppu::UnoType<drawing::XLayer>::get();
 }
 
 sal_Bool SAL_CALL SdLayerManager::hasElements() throw(uno::RuntimeException)
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index b43b39503f7a..2aa7af5cdf56 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -263,9 +263,9 @@ uno::Any SAL_CALL SdXImpressDocument::queryInterface( const uno::Type & rType )
     else QUERYINT(style::XStyleFamiliesSupplier);
     else QUERYINT(com::sun::star::ucb::XAnyCompareFactory);
     else QUERYINT(view::XRenderable);
-    else if( mbImpressDoc && rType == ITYPE(presentation::XPresentationSupplier) )
+    else if( mbImpressDoc && rType == cppu::UnoType<presentation::XPresentationSupplier>::get() )
             aAny <<= uno::Reference< presentation::XPresentationSupplier >(this);
-    else if( mbImpressDoc && rType == ITYPE(presentation::XCustomPresentationSupplier) )
+    else if( mbImpressDoc && rType == cppu::UnoType<presentation::XCustomPresentationSupplier>::get() )
             aAny <<= uno::Reference< presentation::XCustomPresentationSupplier >(this);
     else
         return SfxBaseModel::queryInterface( rType );
@@ -352,22 +352,22 @@ uno::Sequence< uno::Type > SAL_CALL SdXImpressDocument::getTypes(  ) throw(uno::
         maTypeSequence.realloc(  nBaseTypes + nOwnTypes );
         uno::Type* pTypes = maTypeSequence.getArray();
 
-        *pTypes++ = ITYPE(beans::XPropertySet);
-        *pTypes++ = ITYPE(lang::XServiceInfo);
-        *pTypes++ = ITYPE(lang::XMultiServiceFactory);
-        *pTypes++ = ITYPE(drawing::XDrawPageDuplicator);
-        *pTypes++ = ITYPE(drawing::XLayerSupplier);
-        *pTypes++ = ITYPE(drawing::XMasterPagesSupplier);
-        *pTypes++ = ITYPE(drawing::XDrawPagesSupplier);
-        *pTypes++ = ITYPE(document::XLinkTargetSupplier);
-        *pTypes++ = ITYPE(style::XStyleFamiliesSupplier);
-        *pTypes++ = ITYPE(com::sun::star::ucb::XAnyCompareFactory);
-        *pTypes++ = ITYPE(view::XRenderable);
+        *pTypes++ = cppu::UnoType<beans::XPropertySet>::get();
+        *pTypes++ = cppu::UnoType<lang::XServiceInfo>::get();
+        *pTypes++ = cppu::UnoType<lang::XMultiServiceFactory>::get();
+        *pTypes++ = cppu::UnoType<drawing::XDrawPageDuplicator>::get();
+        *pTypes++ = cppu::UnoType<drawing::XLayerSupplier>::get();
+        *pTypes++ = cppu::UnoType<drawing::XMasterPagesSupplier>::get();
+        *pTypes++ = cppu::UnoType<drawing::XDrawPagesSupplier>::get();
+        *pTypes++ = cppu::UnoType<document::XLinkTargetSupplier>::get();
+        *pTypes++ = cppu::UnoType<style::XStyleFamiliesSupplier>::get();
+        *pTypes++ = cppu::UnoType<com::sun::star::ucb::XAnyCompareFactory>::get();
+        *pTypes++ = cppu::UnoType<view::XRenderable>::get();
         if( mbImpressDoc )
         {
-            *pTypes++ = ITYPE(presentation::XPresentationSupplier);
-            *pTypes++ = ITYPE(presentation::XCustomPresentationSupplier);
-            *pTypes++ = ITYPE(presentation::XHandoutMasterSupplier);
+            *pTypes++ = cppu::UnoType<presentation::XPresentationSupplier>::get();
+            *pTypes++ = cppu::UnoType<presentation::XCustomPresentationSupplier>::get();
+            *pTypes++ = cppu::UnoType<presentation::XHandoutMasterSupplier>::get();
         }
 
         for( sal_Int32 nType = 0; nType < nBaseTypes; nType++ )
@@ -2455,7 +2455,7 @@ sal_Bool SAL_CALL SdDrawPagesAccess::hasByName( const OUString& aName ) throw(un
 uno::Type SAL_CALL SdDrawPagesAccess::getElementType()
     throw(uno::RuntimeException)
 {
-    return ITYPE( drawing::XDrawPage );
+    return cppu::UnoType<drawing::XDrawPage>::get();
 }
 
 sal_Bool SAL_CALL SdDrawPagesAccess::hasElements()
@@ -2657,7 +2657,7 @@ uno::Any SAL_CALL SdMasterPagesAccess::getByIndex( sal_Int32 Index )
 uno::Type SAL_CALL SdMasterPagesAccess::getElementType()
     throw(uno::RuntimeException)
 {
-    return ITYPE(drawing::XDrawPage);
+    return cppu::UnoType<drawing::XDrawPage>::get();
 }
 
 sal_Bool SAL_CALL SdMasterPagesAccess::hasElements()
@@ -2957,7 +2957,7 @@ sal_Bool SAL_CALL SdDocLinkTargets::hasByName( const OUString& aName )
 uno::Type SAL_CALL SdDocLinkTargets::getElementType()
     throw(uno::RuntimeException)
 {
-    return ITYPE(beans::XPropertySet);
+    return cppu::UnoType<beans::XPropertySet>::get();
 }
 
 sal_Bool SAL_CALL SdDocLinkTargets::hasElements()
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx
index 217d28d0a413..d1b867cef058 100644
--- a/sd/source/ui/unoidl/unoobj.cxx
+++ b/sd/source/ui/unoidl/unoobj.cxx
@@ -129,8 +129,8 @@ static SdTypesCache gImplTypesCache;
 
 
         #define IMPRESS_MAP_ENTRIES \
-        { OUString(UNO_NAME_OBJ_LEGACYFRAGMENT),WID_LEGACYFRAGMENT,  ITYPE(drawing::XShape),                                   0, 0},\
-        { OUString(UNO_NAME_OBJ_ANIMATIONPATH), WID_ANIMPATH,        ITYPE(drawing::XShape),                                   0, 0},\
+        { OUString(UNO_NAME_OBJ_LEGACYFRAGMENT),WID_LEGACYFRAGMENT,  cppu::UnoType<drawing::XShape>::get(),                                   0, 0},\
+        { OUString(UNO_NAME_OBJ_ANIMATIONPATH), WID_ANIMPATH,        cppu::UnoType<drawing::XShape>::get(),                                   0, 0},\
         { OUString(UNO_NAME_OBJ_BOOKMARK),      WID_BOOKMARK,        ::getCppuType((const OUString*)0),                        0, 0},\
         { OUString(UNO_NAME_OBJ_DIMCOLOR),      WID_DIMCOLOR,        ::getCppuType((const sal_Int32*)0),                       0, 0},\
         { OUString(UNO_NAME_OBJ_DIMHIDE),       WID_DIMHIDE,         ::getBooleanCppuType(),                                   0, 0},\
@@ -142,7 +142,7 @@ static SdTypesCache gImplTypesCache;
         { OUString(UNO_NAME_OBJ_CLICKACTION),   WID_CLICKACTION,     ::getCppuType((const presentation::ClickAction*)0),       0, 0},\
         { OUString(UNO_NAME_OBJ_PLAYFULL),      WID_PLAYFULL,        ::getBooleanCppuType(),                                   0, 0},\
         { OUString(UNO_NAME_OBJ_PRESORDER),     WID_PRESORDER,       ::getCppuType((const sal_Int32*)0),                       0, 0},\
-        { OUString(UNO_NAME_OBJ_STYLE),         WID_STYLE,           ITYPE( style::XStyle),                                    ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},\
+        { OUString(UNO_NAME_OBJ_STYLE),         WID_STYLE,           cppu::UnoType<style::XStyle>::get(),                                    ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},\
         { OUString(UNO_NAME_OBJ_SOUNDFILE),     WID_SOUNDFILE,       ::getCppuType((const OUString*)0),                        0, 0},\
         { OUString(UNO_NAME_OBJ_SOUNDON),       WID_SOUNDON,         ::getBooleanCppuType(),                                   0, 0},\
         { OUString(UNO_NAME_OBJ_SPEED),         WID_SPEED,           ::getCppuType((const presentation::AnimationSpeed*)0),    0, 0},\
@@ -179,7 +179,7 @@ static SdTypesCache gImplTypesCache;
     #define DRAW_MAP_ENTRIES\
         { OUString(UNO_NAME_OBJ_BOOKMARK),      WID_BOOKMARK,       ::getCppuType((const OUString*)0),                 0, 0},\
         { OUString(UNO_NAME_OBJ_CLICKACTION),   WID_CLICKACTION,    ::getCppuType((const presentation::ClickAction*)0),0, 0},\
-        { OUString(UNO_NAME_OBJ_STYLE),         WID_STYLE,          ITYPE(style::XStyle),                              ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},\
+        { OUString(UNO_NAME_OBJ_STYLE),         WID_STYLE,          cppu::UnoType<style::XStyle>::get(),                              ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},\
         { OUString("NavigationOrder"),          WID_NAVORDER,       ::getCppuType((const sal_Int32*)0),                       0, 0},\
         { OUString(), 0, css::uno::Type(), 0, 0 }
 
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index f50523013870..c323181bbdec 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -108,7 +108,7 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( sal_Bool bImpress, PageKin
 {
     static const SfxItemPropertyMapEntry aDrawPagePropertyMap_Impl[] =
     {
-        { OUString(UNO_NAME_PAGE_BACKGROUND),       WID_PAGE_BACK,      ITYPE( beans::XPropertySet ),                  beans::PropertyAttribute::MAYBEVOID,0},
+        { OUString(UNO_NAME_PAGE_BACKGROUND),       WID_PAGE_BACK,      cppu::UnoType<beans::XPropertySet>::get(),                  beans::PropertyAttribute::MAYBEVOID,0},
         { OUString(UNO_NAME_PAGE_BOTTOM),           WID_PAGE_BOTTOM,    ::getCppuType((const sal_Int32*)0),            0,  0},
         { OUString(UNO_NAME_PAGE_LEFT),             WID_PAGE_LEFT,      ::getCppuType((const sal_Int32*)0),            0,  0},
         { OUString(UNO_NAME_PAGE_RIGHT),            WID_PAGE_RIGHT,     ::getCppuType((const sal_Int32*)0),            0,  0},
@@ -118,7 +118,7 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( sal_Bool bImpress, PageKin
         { OUString(UNO_NAME_PAGE_EFFECT),           WID_PAGE_EFFECT,    ::getCppuType((const presentation::FadeEffect*)0),     0,  0},
         { OUString(UNO_NAME_PAGE_HEIGHT),           WID_PAGE_HEIGHT,    ::getCppuType((const sal_Int32*)0),            0,  0},
         { OUString(UNO_NAME_PAGE_LAYOUT),           WID_PAGE_LAYOUT,    ::getCppuType((const sal_Int16*)0),            0,  0},
-        { OUString(UNO_NAME_LINKDISPLAYBITMAP),     WID_PAGE_LDBITMAP,  ITYPE( awt::XBitmap),                          beans::PropertyAttribute::READONLY, 0},
+        { OUString(UNO_NAME_LINKDISPLAYBITMAP),     WID_PAGE_LDBITMAP,  cppu::UnoType<awt::XBitmap>::get(),                          beans::PropertyAttribute::READONLY, 0},
         { OUString(UNO_NAME_LINKDISPLAYNAME),       WID_PAGE_LDNAME,    ::getCppuType((const OUString*)0),             beans::PropertyAttribute::READONLY, 0},
         { OUString(UNO_NAME_PAGE_NUMBER),           WID_PAGE_NUMBER,    ::getCppuType((const sal_Int16*)0),            beans::PropertyAttribute::READONLY, 0},
         { OUString(UNO_NAME_PAGE_ORIENTATION),      WID_PAGE_ORIENT,    ::getCppuType((const view::PaperOrientation*)0),0, 0},
@@ -158,7 +158,7 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( sal_Bool bImpress, PageKin
         { OUString(UNO_NAME_PAGE_TOP),              WID_PAGE_TOP,       ::getCppuType((const sal_Int32*)0),            0,  0},                                                                \
         { OUString(UNO_NAME_PAGE_HEIGHT),           WID_PAGE_HEIGHT,    ::getCppuType((const sal_Int32*)0),            0,  0},                                                                \
         { OUString(UNO_NAME_PAGE_LAYOUT),           WID_PAGE_LAYOUT,    ::getCppuType((const sal_Int16*)0),            0,  0},                                                                \
-        { OUString(UNO_NAME_LINKDISPLAYBITMAP),     WID_PAGE_LDBITMAP,  ITYPE( awt::XBitmap),                          beans::PropertyAttribute::READONLY, 0},                                \
+        { OUString(UNO_NAME_LINKDISPLAYBITMAP),     WID_PAGE_LDBITMAP,  cppu::UnoType<awt::XBitmap>::get(),                          beans::PropertyAttribute::READONLY, 0},                                \
         { OUString(UNO_NAME_LINKDISPLAYNAME),       WID_PAGE_LDNAME,    ::getCppuType((const OUString*)0),             beans::PropertyAttribute::READONLY, 0},                                \
         { OUString(UNO_NAME_PAGE_NUMBER),           WID_PAGE_NUMBER,    ::getCppuType((const sal_Int16*)0),            beans::PropertyAttribute::READONLY, 0},                                \
         { OUString(UNO_NAME_PAGE_ORIENTATION),      WID_PAGE_ORIENT,    ::getCppuType((const view::PaperOrientation*)0),0, 0},                                                                \
@@ -180,7 +180,7 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( sal_Bool bImpress, PageKin
     static const SfxItemPropertyMapEntry aDrawPageNotesHandoutPropertyMap_Impl[] =
     {
         // this must be the first two entries so they can be excluded for PK_STANDARD
-        { OUString(UNO_NAME_PAGE_BACKGROUND),       WID_PAGE_BACK,      ITYPE( beans::XPropertySet ),                  beans::PropertyAttribute::MAYBEVOID,0},
+        { OUString(UNO_NAME_PAGE_BACKGROUND),       WID_PAGE_BACK,      cppu::UnoType<beans::XPropertySet>::get(),                  beans::PropertyAttribute::MAYBEVOID,0},
         DRAW_PAGE_NOTES_PROPERTIES
     };
     static const SfxItemPropertyMapEntry aDrawPageNotesHandoutPropertyNoBackMap_Impl[] =
@@ -194,7 +194,7 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( sal_Bool bImpress, PageKin
         { OUString(UNO_NAME_PAGE_RIGHT),            WID_PAGE_RIGHT,     ::getCppuType((const sal_Int32*)0),            0,  0},                                                                             \
         { OUString(UNO_NAME_PAGE_TOP),              WID_PAGE_TOP,       ::getCppuType((const sal_Int32*)0),            0,  0},                                                                             \
         { OUString(UNO_NAME_PAGE_HEIGHT),           WID_PAGE_HEIGHT,    ::getCppuType((const sal_Int32*)0),            0,  0},                                                                             \
-        { OUString(UNO_NAME_LINKDISPLAYBITMAP),     WID_PAGE_LDBITMAP,  ITYPE(awt::XBitmap),                           beans::PropertyAttribute::READONLY, 0},                                             \
+        { OUString(UNO_NAME_LINKDISPLAYBITMAP),     WID_PAGE_LDBITMAP,  cppu::UnoType<awt::XBitmap>::get(),                           beans::PropertyAttribute::READONLY, 0},                                             \
         { OUString(UNO_NAME_LINKDISPLAYNAME),       WID_PAGE_LDNAME,    ::getCppuType((const OUString*)0),             beans::PropertyAttribute::READONLY, 0},                                             \
         { OUString(UNO_NAME_PAGE_NUMBER),           WID_PAGE_NUMBER,    ::getCppuType((const sal_Int16*)0),            beans::PropertyAttribute::READONLY, 0},                                             \
         { OUString(UNO_NAME_PAGE_ORIENTATION),      WID_PAGE_ORIENT,    ::getCppuType((const view::PaperOrientation*)0),0, 0},                                                                             \
@@ -209,7 +209,7 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( sal_Bool bImpress, PageKin
 
     static const SfxItemPropertyMapEntry aGraphicPagePropertyMap_Impl[] =
     {
-        { OUString(UNO_NAME_PAGE_BACKGROUND),       WID_PAGE_BACK,      ITYPE( beans::XPropertySet),                   beans::PropertyAttribute::MAYBEVOID,0},
+        { OUString(UNO_NAME_PAGE_BACKGROUND),       WID_PAGE_BACK,      cppu::UnoType<beans::XPropertySet>::get(),                   beans::PropertyAttribute::MAYBEVOID,0},
         GRAPHIC_PAGE_PROPERTIES
     };
     static const SfxItemPropertyMapEntry aGraphicPagePropertyNoBackMap_Impl[] =
@@ -262,13 +262,13 @@ const SvxItemPropertySet* ImplGetMasterPagePropertySet( PageKind ePageKind )
 {
     static const SfxItemPropertyMapEntry aMasterPagePropertyMap_Impl[] =
     {
-        { OUString(UNO_NAME_PAGE_BACKGROUND),       WID_PAGE_BACK,      ITYPE(beans::XPropertySet),                    0,  0},
+        { OUString(UNO_NAME_PAGE_BACKGROUND),       WID_PAGE_BACK,      cppu::UnoType<beans::XPropertySet>::get(),                    0,  0},
         { OUString(UNO_NAME_PAGE_BOTTOM),           WID_PAGE_BOTTOM,    ::getCppuType((const sal_Int32*)0),            0,  0},
         { OUString(UNO_NAME_PAGE_LEFT),             WID_PAGE_LEFT,      ::getCppuType((const sal_Int32*)0),            0,  0},
         { OUString(UNO_NAME_PAGE_RIGHT),            WID_PAGE_RIGHT,     ::getCppuType((const sal_Int32*)0),            0,  0},
         { OUString(UNO_NAME_PAGE_TOP),              WID_PAGE_TOP,       ::getCppuType((const sal_Int32*)0),            0,  0},
         { OUString(UNO_NAME_PAGE_HEIGHT),           WID_PAGE_HEIGHT,    ::getCppuType((const sal_Int32*)0),            0,  0},
-        { OUString(UNO_NAME_LINKDISPLAYBITMAP),     WID_PAGE_LDBITMAP,  ITYPE(awt::XBitmap),                           beans::PropertyAttribute::READONLY, 0},
+        { OUString(UNO_NAME_LINKDISPLAYBITMAP),     WID_PAGE_LDBITMAP,  cppu::UnoType<awt::XBitmap>::get(),                           beans::PropertyAttribute::READONLY, 0},
         { OUString(UNO_NAME_LINKDISPLAYNAME),       WID_PAGE_LDNAME,    ::getCppuType((const OUString*)0),             beans::PropertyAttribute::READONLY, 0},
         { OUString(UNO_NAME_PAGE_NUMBER),           WID_PAGE_NUMBER,    ::getCppuType((const sal_Int16*)0),            beans::PropertyAttribute::READONLY, 0},
         { OUString(UNO_NAME_PAGE_ORIENTATION),      WID_PAGE_ORIENT,    ::getCppuType((const view::PaperOrientation*)0),0, 0},
@@ -528,11 +528,11 @@ Any SAL_CALL SdGenericDrawPage::queryInterface( const uno::Type & rType )
     else QUERYINT( drawing::XShapeCombiner );
     else QUERYINT( drawing::XShapeBinder );
     else QUERYINT( beans::XMultiPropertySet );
-    else if( rType == ITYPE( office::XAnnotationAccess ) )
+    else if( rType == cppu::UnoType<office::XAnnotationAccess>::get() )
     {
         return Any( Reference< office::XAnnotationAccess >( this ) );
     }
-    else if( rType == ITYPE( XAnimationNodeSupplier ) )
+    else if( rType == cppu::UnoType<XAnimationNodeSupplier>::get() )
     {
         if( mbIsImpressDocument )
         {
@@ -1874,7 +1874,7 @@ SdPageLinkTargets::~SdPageLinkTargets() throw()
 uno::Type SAL_CALL SdPageLinkTargets::getElementType()
     throw(uno::RuntimeException)
 {
-    return ITYPE(beans::XPropertySet);
+    return cppu::UnoType<beans::XPropertySet>::get();
 }
 
 sal_Bool SAL_CALL SdPageLinkTargets::hasElements()
@@ -2032,7 +2032,7 @@ SdDrawPage::~SdDrawPage() throw()
 Any SAL_CALL SdDrawPage::queryInterface( const uno::Type & rType )
     throw(uno::RuntimeException)
 {
-    if( rType == ITYPE( drawing::XMasterPageTarget ) )
+    if( rType == cppu::UnoType<drawing::XMasterPageTarget>::get() )
     {
         return makeAny( Reference< drawing::XMasterPageTarget >( this ) );
     }
@@ -2042,7 +2042,7 @@ Any SAL_CALL SdDrawPage::queryInterface( const uno::Type & rType )
         {
             const PageKind ePageKind = GetPage() ? GetPage()->GetPageKind() : PK_STANDARD;
 
-            if( ePageKind != PK_HANDOUT && rType == ITYPE( presentation::XPresentationPage ) )
+            if( ePageKind != PK_HANDOUT && rType == cppu::UnoType<presentation::XPresentationPage>::get() )
             {
                 return makeAny( Reference< presentation::XPresentationPage >( this ) );
             }
@@ -2079,21 +2079,21 @@ Sequence< uno::Type > SAL_CALL SdDrawPage::getTypes() throw(uno::RuntimeExceptio
         // Collect the types of this class.
         ::std::vector<uno::Type> aTypes;
         aTypes.reserve(13);
-        aTypes.push_back(ITYPE(drawing::XDrawPage));
-        aTypes.push_back(ITYPE(beans::XPropertySet));
-        aTypes.push_back(ITYPE(container::XNamed));
-        aTypes.push_back(ITYPE(drawing::XMasterPageTarget));
-        aTypes.push_back(ITYPE(lang::XServiceInfo));
-        aTypes.push_back(ITYPE(util::XReplaceable));
-        aTypes.push_back(ITYPE(document::XLinkTargetSupplier));
-        aTypes.push_back(ITYPE( drawing::XShapeCombiner ));
-        aTypes.push_back(ITYPE( drawing::XShapeBinder ));
-        aTypes.push_back(ITYPE( office::XAnnotationAccess ));
-        aTypes.push_back(ITYPE( beans::XMultiPropertySet ));
+        aTypes.push_back(cppu::UnoType<drawing::XDrawPage>::get());
+        aTypes.push_back(cppu::UnoType<beans::XPropertySet>::get());
+        aTypes.push_back(cppu::UnoType<container::XNamed>::get());
+        aTypes.push_back(cppu::UnoType<drawing::XMasterPageTarget>::get());
+        aTypes.push_back(cppu::UnoType<lang::XServiceInfo>::get());
+        aTypes.push_back(cppu::UnoType<util::XReplaceable>::get());
+        aTypes.push_back(cppu::UnoType<document::XLinkTargetSupplier>::get());
+        aTypes.push_back(cppu::UnoType<drawing::XShapeCombiner>::get());
+        aTypes.push_back(cppu::UnoType<drawing::XShapeBinder>::get());
+        aTypes.push_back(cppu::UnoType<office::XAnnotationAccess>::get());
+        aTypes.push_back(cppu::UnoType<beans::XMultiPropertySet>::get());
         if( bPresPage )
-            aTypes.push_back(ITYPE(presentation::XPresentationPage));
+            aTypes.push_back(cppu::UnoType<presentation::XPresentationPage>::get());
         if( bPresPage && ePageKind == PK_STANDARD )
-            aTypes.push_back(ITYPE(XAnimationNodeSupplier));
+            aTypes.push_back(cppu::UnoType<XAnimationNodeSupplier>::get());
 
         // Get types of base class.
         const Sequence< uno::Type > aBaseTypes( SdGenericDrawPage::getTypes() );
@@ -2689,13 +2689,13 @@ Any SAL_CALL SdMasterPage::queryInterface( const uno::Type & rType )
 
     uno::Any aAny;
 
-    if( rType == ITYPE( container::XIndexAccess ) )
+    if( rType == cppu::UnoType<container::XIndexAccess>::get() )
         aAny <<= Reference< container::XIndexAccess >((presentation::XPresentationPage*)(this));
-    else if( rType == ITYPE( container::XElementAccess ) )
+    else if( rType == cppu::UnoType<container::XElementAccess>::get() )
         aAny <<=  Reference< container::XElementAccess >((presentation::XPresentationPage*)(this));
-    else if( rType == ITYPE( container::XNamed ) )
+    else if( rType == cppu::UnoType<container::XNamed>::get() )
         aAny <<=  Reference< container::XNamed >(this);
-    else if( rType == ITYPE( presentation::XPresentationPage ) &&
+    else if( rType == cppu::UnoType<presentation::XPresentationPage>::get() &&
              ( mbIsImpressDocument &&
                GetPage()  && GetPage()->GetPageKind() != PK_HANDOUT) )
         aAny <<= Reference< presentation::XPresentationPage >( this );
@@ -2732,20 +2732,20 @@ Sequence< uno::Type > SAL_CALL SdMasterPage::getTypes() throw(uno::RuntimeExcept
         // Collect the types of this class.
         ::std::vector<uno::Type> aTypes;
         aTypes.reserve(12);
-        aTypes.push_back(ITYPE(drawing::XDrawPage));
-        aTypes.push_back(ITYPE(beans::XPropertySet));
-        aTypes.push_back(ITYPE(container::XNamed));
-        aTypes.push_back(ITYPE(lang::XServiceInfo));
-        aTypes.push_back(ITYPE(util::XReplaceable));
-        aTypes.push_back(ITYPE(document::XLinkTargetSupplier));
-        aTypes.push_back(ITYPE( drawing::XShapeCombiner ));
-        aTypes.push_back(ITYPE( drawing::XShapeBinder ));
-        aTypes.push_back(ITYPE( office::XAnnotationAccess ));
-        aTypes.push_back(ITYPE( beans::XMultiPropertySet ));
+        aTypes.push_back(cppu::UnoType<drawing::XDrawPage>::get());
+        aTypes.push_back(cppu::UnoType<beans::XPropertySet>::get());
+        aTypes.push_back(cppu::UnoType<container::XNamed>::get());
+        aTypes.push_back(cppu::UnoType<lang::XServiceInfo>::get());
+        aTypes.push_back(cppu::UnoType<util::XReplaceable>::get());
+        aTypes.push_back(cppu::UnoType<document::XLinkTargetSupplier>::get());
+        aTypes.push_back(cppu::UnoType<drawing::XShapeCombiner>::get());
+        aTypes.push_back(cppu::UnoType<drawing::XShapeBinder>::get());
+        aTypes.push_back(cppu::UnoType<office::XAnnotationAccess>::get());
+        aTypes.push_back(cppu::UnoType<beans::XMultiPropertySet>::get());
         if( bPresPage )
-            aTypes.push_back(ITYPE(presentation::XPresentationPage));
+            aTypes.push_back(cppu::UnoType<presentation::XPresentationPage>::get());
         if( bPresPage && ePageKind == PK_STANDARD )
-            aTypes.push_back(ITYPE(XAnimationNodeSupplier));
+            aTypes.push_back(cppu::UnoType<XAnimationNodeSupplier>::get());
 
         // Get types of base class.
         const Sequence< uno::Type > aBaseTypes( SdGenericDrawPage::getTypes() );
diff --git a/sd/source/ui/unoidl/unosrch.cxx b/sd/source/ui/unoidl/unosrch.cxx
index 8b44fdd876f1..690c2f9b294a 100644
--- a/sd/source/ui/unoidl/unosrch.cxx
+++ b/sd/source/ui/unoidl/unosrch.cxx
@@ -831,7 +831,7 @@ SdUnoFindAllAccess::~SdUnoFindAllAccess() throw()
 uno::Type SAL_CALL SdUnoFindAllAccess::getElementType()
     throw(::com::sun::star::uno::RuntimeException)
 {
-    return ITYPE( text::XTextRange );
+    return cppu::UnoType<text::XTextRange>::get();
 }
 
 sal_Bool SAL_CALL SdUnoFindAllAccess::hasElements()