Prefer cppu::UnoType<T>::get() to ::getCppuType((T*)0) part6

Change-Id: Ib523206d67ad13416557be1b37a58ba7a9791ca5

11 files changed, 117 insertions, 117 deletions

diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index 51d0d656248c..8e904c20f64c 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -76,10 +76,10 @@ static const SvxItemPropertySet* ImplGetSvxCellPropertySet()
         { OUString("Style"),                        OWN_ATTR_STYLE,                 cppu::UnoType< ::com::sun::star::style::XStyle >::get(),                                    ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
         { OUString(UNO_NAME_TEXT_WRITINGMODE),      SDRATTR_TEXTDIRECTION,          ::getCppuType( (::com::sun::star::text::WritingMode*) 0 ),                         0,      0},
         { OUString(UNO_NAME_TEXT_HORZADJUST),       SDRATTR_TEXT_HORZADJUST,        ::getCppuType((const ::com::sun::star::drawing::TextHorizontalAdjust*)0),  0,      0}, \
-        { OUString(UNO_NAME_TEXT_LEFTDIST),         SDRATTR_TEXT_LEFTDIST,          ::getCppuType((const sal_Int32*)0),        0,      SFX_METRIC_ITEM}, \
-        { OUString(UNO_NAME_TEXT_LOWERDIST),        SDRATTR_TEXT_LOWERDIST,         ::getCppuType((const sal_Int32*)0),        0,      SFX_METRIC_ITEM}, \
-        { OUString(UNO_NAME_TEXT_RIGHTDIST),        SDRATTR_TEXT_RIGHTDIST,         ::getCppuType((const sal_Int32*)0),        0,      SFX_METRIC_ITEM}, \
-        { OUString(UNO_NAME_TEXT_UPPERDIST),        SDRATTR_TEXT_UPPERDIST,         ::getCppuType((const sal_Int32*)0),        0,      SFX_METRIC_ITEM}, \
+        { OUString(UNO_NAME_TEXT_LEFTDIST),         SDRATTR_TEXT_LEFTDIST,          ::cppu::UnoType<sal_Int32>::get(),        0,      SFX_METRIC_ITEM}, \
+        { OUString(UNO_NAME_TEXT_LOWERDIST),        SDRATTR_TEXT_LOWERDIST,         ::cppu::UnoType<sal_Int32>::get(),        0,      SFX_METRIC_ITEM}, \
+        { OUString(UNO_NAME_TEXT_RIGHTDIST),        SDRATTR_TEXT_RIGHTDIST,         ::cppu::UnoType<sal_Int32>::get(),        0,      SFX_METRIC_ITEM}, \
+        { OUString(UNO_NAME_TEXT_UPPERDIST),        SDRATTR_TEXT_UPPERDIST,         ::cppu::UnoType<sal_Int32>::get(),        0,      SFX_METRIC_ITEM}, \
         { OUString(UNO_NAME_TEXT_VERTADJUST),       SDRATTR_TEXT_VERTADJUST,        ::getCppuType((const ::com::sun::star::drawing::TextVerticalAdjust*)0),    0,      0},\
         { OUString(UNO_NAME_TEXT_WORDWRAP),         SDRATTR_TEXT_WORDWRAP,          ::getBooleanCppuType(),        0,      0}, \
 
@@ -988,7 +988,7 @@ Any Cell::GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleEntry* pMa
     if( pMap->aType != aAny.getValueType() )
     {
         // since the sfx uint16 item now exports a sal_Int32, we may have to fix this here
-        if( ( pMap->aType == ::getCppuType((const sal_Int16*)0)) && aAny.getValueType() == ::getCppuType((const sal_Int32*)0) )
+        if( ( pMap->aType == ::cppu::UnoType<sal_Int16>::get()) && aAny.getValueType() == ::cppu::UnoType<sal_Int32>::get() )
         {
             sal_Int32 nValue = 0;
             aAny >>= nValue;
diff --git a/svx/source/table/tablecolumn.cxx b/svx/source/table/tablecolumn.cxx
index e2ba8467e99c..2909f3e5d936 100644
--- a/svx/source/table/tablecolumn.cxx
+++ b/svx/source/table/tablecolumn.cxx
@@ -255,7 +255,7 @@ rtl::Reference< FastPropertySetInfo > TableColumn::getStaticPropertySetInfo()
 
             aProperties[0].Name = "Width";
             aProperties[0].Handle = Property_Width;
-            aProperties[0].Type = ::getCppuType((const sal_Int32*)0);
+            aProperties[0].Type = ::cppu::UnoType<sal_Int32>::get();
             aProperties[0].Attributes = 0;
 
             aProperties[1].Name = "OptimalWidth";
@@ -275,7 +275,7 @@ rtl::Reference< FastPropertySetInfo > TableColumn::getStaticPropertySetInfo()
 
             aProperties[4].Name = "Size";
             aProperties[4].Handle = Property_Width;
-            aProperties[4].Type = ::getCppuType((const sal_Int32*)0);
+            aProperties[4].Type = ::cppu::UnoType<sal_Int32>::get();
             aProperties[4].Attributes = 0;
 
             aProperties[5].Name = "OptimalSize";
diff --git a/svx/source/table/tablerow.cxx b/svx/source/table/tablerow.cxx
index 7434db61fb0a..c213e495ab40 100644
--- a/svx/source/table/tablerow.cxx
+++ b/svx/source/table/tablerow.cxx
@@ -329,7 +329,7 @@ rtl::Reference< FastPropertySetInfo > TableRow::getStaticPropertySetInfo()
 
             aProperties[0].Name = "Height";
             aProperties[0].Handle = Property_Height;
-            aProperties[0].Type = ::getCppuType((const sal_Int32*)0);
+            aProperties[0].Type = ::cppu::UnoType<sal_Int32>::get();
             aProperties[0].Attributes = 0;
 
             aProperties[1].Name = "OptimalHeight";
@@ -349,7 +349,7 @@ rtl::Reference< FastPropertySetInfo > TableRow::getStaticPropertySetInfo()
 
             aProperties[4].Name = "Size";
             aProperties[4].Handle = Property_Height;
-            aProperties[4].Type = ::getCppuType((const sal_Int32*)0);
+            aProperties[4].Type = ::cppu::UnoType<sal_Int32>::get();
             aProperties[4].Attributes = 0;
 
             aProperties[5].Name = "OptimalSize";
diff --git a/svx/source/unodraw/UnoNamespaceMap.cxx b/svx/source/unodraw/UnoNamespaceMap.cxx
index 3ef214670aa3..a0486428aeb2 100644
--- a/svx/source/unodraw/UnoNamespaceMap.cxx
+++ b/svx/source/unodraw/UnoNamespaceMap.cxx
@@ -262,7 +262,7 @@ sal_Bool SAL_CALL NamespaceMap::hasByName( const OUString& aName ) throw (Runtim
 // XElementAccess
 Type SAL_CALL NamespaceMap::getElementType() throw (RuntimeException, std::exception)
 {
-    return ::getCppuType( (const OUString*) 0 );
+    return ::cppu::UnoType<OUString>::get();
 }
 
 sal_Bool SAL_CALL NamespaceMap::hasElements() throw (RuntimeException, std::exception)
diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx
index 597075347b8c..5d30c42b8a46 100644
--- a/svx/source/unodraw/XPropertyTable.cxx
+++ b/svx/source/unodraw/XPropertyTable.cxx
@@ -293,7 +293,7 @@ XPropertyEntry* SvxUnoXColorTable::getEntry( const OUString& rName, const uno::A
 uno::Type SAL_CALL SvxUnoXColorTable::getElementType()
     throw( uno::RuntimeException, std::exception )
 {
-    return ::getCppuType((const sal_Int32*)0);
+    return ::cppu::UnoType<sal_Int32>::get();
 }
 
 // XServiceInfo
@@ -678,7 +678,7 @@ XPropertyEntry* SvxUnoXBitmapTable::getEntry( const OUString& rName, const uno::
 uno::Type SAL_CALL SvxUnoXBitmapTable::getElementType()
     throw( uno::RuntimeException, std::exception )
 {
-    return ::getCppuType((const OUString*)0);
+    return ::cppu::UnoType<OUString>::get();
 }
 
 // XServiceInfo
diff --git a/svx/source/unodraw/unobtabl.cxx b/svx/source/unodraw/unobtabl.cxx
index cd208a8624ac..938d3cc79d28 100644
--- a/svx/source/unodraw/unobtabl.cxx
+++ b/svx/source/unodraw/unobtabl.cxx
@@ -100,7 +100,7 @@ NameOrIndex* SvxUnoBitmapTable::createItem() const throw()
 uno::Type SAL_CALL SvxUnoBitmapTable::getElementType(  )
     throw( uno::RuntimeException, std::exception )
 {
-    return ::getCppuType( (const OUString*)0 );
+    return ::cppu::UnoType<OUString>::get();
 }
 
 /**
diff --git a/svx/source/unodraw/unoctabl.cxx b/svx/source/unodraw/unoctabl.cxx
index bb910a4a6cad..759435cac5dd 100644
--- a/svx/source/unodraw/unoctabl.cxx
+++ b/svx/source/unodraw/unoctabl.cxx
@@ -169,7 +169,7 @@ sal_Bool SAL_CALL SvxUnoColorTable::hasByName( const OUString& aName )
 uno::Type SAL_CALL SvxUnoColorTable::getElementType()
     throw( uno::RuntimeException, std::exception )
 {
-    return ::getCppuType((const sal_Int32*)0);
+    return ::cppu::UnoType<sal_Int32>::get();
 }
 
 sal_Bool SAL_CALL SvxUnoColorTable::hasElements()
diff --git a/svx/source/unodraw/unopool.cxx b/svx/source/unodraw/unopool.cxx
index ad3a3e562925..5575e3e7fa10 100644
--- a/svx/source/unodraw/unopool.cxx
+++ b/svx/source/unodraw/unopool.cxx
@@ -139,7 +139,7 @@ void SvxUnoDrawPool::getAny( SfxItemPool* pPool, const comphelper::PropertyMapEn
         SvxUnoConvertToMM( eMapUnit, rValue );
     }
     // convert int32 to correct enum type if needed
-    else if ( pEntry->maType.getTypeClass() == uno::TypeClass_ENUM && rValue.getValueType() == ::getCppuType((const sal_Int32*)0) )
+    else if ( pEntry->maType.getTypeClass() == uno::TypeClass_ENUM && rValue.getValueType() == ::cppu::UnoType<sal_Int32>::get() )
     {
         sal_Int32 nEnum;
         rValue >>= nEnum;
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index db97e84a179a..92bdcfbd6c1e 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -457,17 +457,17 @@ SfxItemPropertyMapEntry const * ImplGetSvxOle2PropertyMap()
         TEXT_PROPERTIES
         FONTWORK_PROPERTIES
 
-        { OUString("ThumbnailGraphicURL"),      OWN_ATTR_THUMBNAIL          , ::getCppuType(( const OUString*)0), 0, 0 },
+        { OUString("ThumbnailGraphicURL"),      OWN_ATTR_THUMBNAIL          , ::cppu::UnoType<OUString>::get(), 0, 0 },
         { OUString("Model"),                    OWN_ATTR_OLEMODEL           , ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
         { OUString("EmbeddedObject"),           OWN_ATTR_OLE_EMBEDDED_OBJECT, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
         { OUString("EmbeddedObjectNoNewClient"),OWN_ATTR_OLE_EMBEDDED_OBJECT_NONEWCLIENT, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
         { OUString("OriginalSize"),             OWN_ATTR_OLESIZE            , ::getCppuType(( const ::com::sun::star::awt::Size*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
-        { OUString("CLSID"),                    OWN_ATTR_CLSID              , ::getCppuType(( const OUString*)0), 0, 0 },
+        { OUString("CLSID"),                    OWN_ATTR_CLSID              , ::cppu::UnoType<OUString>::get(), 0, 0 },
         { OUString("IsInternal"),               OWN_ATTR_INTERNAL_OLE       , ::getBooleanCppuType() , ::com::sun::star::beans::PropertyAttribute::READONLY,     0},
         { OUString("VisibleArea"),              OWN_ATTR_OLE_VISAREA        , ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), 0, 0},
         { OUString("Aspect"),                   OWN_ATTR_OLE_ASPECT         , ::getCppuType((const sal_Int64*)0), 0, 0},
-        { OUString(UNO_NAME_OLE2_PERSISTNAME),  OWN_ATTR_PERSISTNAME        , ::getCppuType(( const OUString*)0), 0, 0 },
-        { OUString("LinkURL"),                  OWN_ATTR_OLE_LINKURL        , ::getCppuType(( const OUString*)0), 0, 0 },
+        { OUString(UNO_NAME_OLE2_PERSISTNAME),  OWN_ATTR_PERSISTNAME        , ::cppu::UnoType<OUString>::get(), 0, 0 },
+        { OUString("LinkURL"),                  OWN_ATTR_OLE_LINKURL        , ::cppu::UnoType<OUString>::get(), 0, 0 },
         { OUString(UNO_NAME_GRAPHOBJ_GRAPHIC),   OWN_ATTR_VALUE_GRAPHIC     , ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic>*)0),     0,     0},
         { OUString(), 0, css::uno::Type(), 0, 0 }
     };
@@ -479,26 +479,26 @@ SfxItemPropertyMapEntry const * ImplGetSvxPluginPropertyMap()
 {
     static SfxItemPropertyMapEntry const aPluginPropertyMap_Impl[] =
     {
-        { OUString("PluginMimeType"),           OWN_ATTR_PLUGIN_MIMETYPE    , ::getCppuType((const OUString*)0),    0,  0},
-        { OUString("PluginURL"),                OWN_ATTR_PLUGIN_URL         , ::getCppuType((const OUString*)0),    0,  0},
+        { OUString("PluginMimeType"),           OWN_ATTR_PLUGIN_MIMETYPE    , ::cppu::UnoType<OUString>::get(),    0,  0},
+        { OUString("PluginURL"),                OWN_ATTR_PLUGIN_URL         , ::cppu::UnoType<OUString>::get(),    0,  0},
         { OUString("PluginCommands"),           OWN_ATTR_PLUGIN_COMMANDS    , ::getCppuType((::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >*)0), 0, 0},
         { OUString("Transformation"),           OWN_ATTR_TRANSFORMATION     , ::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 0, 0 },
-        { OUString(UNO_NAME_MISC_OBJ_ZORDER),   OWN_ATTR_ZORDER             , ::getCppuType((const sal_Int32*)0),      0,      0},
-        { OUString(UNO_NAME_MISC_OBJ_LAYERID),  SDRATTR_LAYERID             , ::getCppuType((const sal_Int16*)0),      0,  0},
-        { OUString(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME           , ::getCppuType((const OUString*)0),    0,  0},
+        { OUString(UNO_NAME_MISC_OBJ_ZORDER),   OWN_ATTR_ZORDER             , ::cppu::UnoType<sal_Int32>::get(),      0,      0},
+        { OUString(UNO_NAME_MISC_OBJ_LAYERID),  SDRATTR_LAYERID             , ::cppu::UnoType<sal_Int16>::get(),      0,  0},
+        { OUString(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME           , ::cppu::UnoType<OUString>::get(),    0,  0},
         { OUString(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP           , ::getCppuType(( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
-        { OUString(UNO_NAME_LINKDISPLAYNAME),   OWN_ATTR_LDNAME             , ::getCppuType(( const OUString*)0),   ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+        { OUString(UNO_NAME_LINKDISPLAYNAME),   OWN_ATTR_LDNAME             , ::cppu::UnoType<OUString>::get(),   ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
         { OUString(UNO_NAME_OLE2_METAFILE),     OWN_ATTR_METAFILE           , ::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
-        { OUString("ThumbnailGraphicURL"),      OWN_ATTR_THUMBNAIL          , ::getCppuType(( const OUString*)0), 0, 0 },
+        { OUString("ThumbnailGraphicURL"),      OWN_ATTR_THUMBNAIL          , ::cppu::UnoType<OUString>::get(), 0, 0 },
         { OUString(UNO_NAME_MISC_OBJ_MOVEPROTECT),      SDRATTR_OBJMOVEPROTECT, ::getBooleanCppuType(),0, 0},
         { OUString(UNO_NAME_MISC_OBJ_SIZEPROTECT),      SDRATTR_OBJSIZEPROTECT, ::getBooleanCppuType(),0, 0},
-        { OUString(UNO_NAME_OLE2_PERSISTNAME),  OWN_ATTR_PERSISTNAME        , ::getCppuType(( const OUString*)0), 0, 0 },
-        { OUString("LinkURL"),                  OWN_ATTR_OLE_LINKURL        , ::getCppuType(( const OUString*)0), 0, 0 },
+        { OUString(UNO_NAME_OLE2_PERSISTNAME),  OWN_ATTR_PERSISTNAME        , ::cppu::UnoType<OUString>::get(), 0, 0 },
+        { OUString("LinkURL"),                  OWN_ATTR_OLE_LINKURL        , ::cppu::UnoType<OUString>::get(), 0, 0 },
         { OUString(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT,            ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
         { OUString("VisibleArea"),              OWN_ATTR_OLE_VISAREA        , ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), 0, 0},
         // #i68101#
-        { OUString(UNO_NAME_MISC_OBJ_TITLE),        OWN_ATTR_MISC_OBJ_TITLE         , ::getCppuType((const OUString*)0),    0,  0},
-        { OUString(UNO_NAME_MISC_OBJ_DESCRIPTION),  OWN_ATTR_MISC_OBJ_DESCRIPTION   , ::getCppuType((const OUString*)0),    0,  0},
+        { OUString(UNO_NAME_MISC_OBJ_TITLE),        OWN_ATTR_MISC_OBJ_TITLE         , ::cppu::UnoType<OUString>::get(),    0,  0},
+        { OUString(UNO_NAME_MISC_OBJ_DESCRIPTION),  OWN_ATTR_MISC_OBJ_DESCRIPTION   , ::cppu::UnoType<OUString>::get(),    0,  0},
         { OUString(), 0, css::uno::Type(), 0, 0 }
     };
 
@@ -510,29 +510,29 @@ SfxItemPropertyMapEntry const * ImplGetSvxFramePropertyMap()
     //TODO/LATER: new properties for ScrollingMode and DefaultBorder
     static SfxItemPropertyMapEntry const aFramePropertyMap_Impl[] =
     {
-        { OUString("FrameURL"),                 OWN_ATTR_FRAME_URL          , ::getCppuType((const OUString*)0),    0,  0},
-        { OUString("FrameName"),                OWN_ATTR_FRAME_NAME         , ::getCppuType((const OUString*)0),    0,  0},
+        { OUString("FrameURL"),                 OWN_ATTR_FRAME_URL          , ::cppu::UnoType<OUString>::get(),    0,  0},
+        { OUString("FrameName"),                OWN_ATTR_FRAME_NAME         , ::cppu::UnoType<OUString>::get(),    0,  0},
         { OUString("FrameIsAutoScroll"),        OWN_ATTR_FRAME_ISAUTOSCROLL , ::getBooleanCppuType() , ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
         { OUString("FrameIsBorder"),            OWN_ATTR_FRAME_ISBORDER     , ::getBooleanCppuType() , 0, 0},
-        { OUString("FrameMarginWidth"),         OWN_ATTR_FRAME_MARGIN_WIDTH , ::getCppuType((const sal_Int32*)0),      0,      0},
-        { OUString("FrameMarginHeight"),        OWN_ATTR_FRAME_MARGIN_HEIGHT, ::getCppuType((const sal_Int32*)0),      0,      0},
+        { OUString("FrameMarginWidth"),         OWN_ATTR_FRAME_MARGIN_WIDTH , ::cppu::UnoType<sal_Int32>::get(),      0,      0},
+        { OUString("FrameMarginHeight"),        OWN_ATTR_FRAME_MARGIN_HEIGHT, ::cppu::UnoType<sal_Int32>::get(),      0,      0},
         { OUString("Transformation"),           OWN_ATTR_TRANSFORMATION     , ::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 0, 0 },
-        { OUString(UNO_NAME_MISC_OBJ_ZORDER),   OWN_ATTR_ZORDER             , ::getCppuType((const sal_Int32*)0),      0,      0},
-        { OUString(UNO_NAME_MISC_OBJ_LAYERID),  SDRATTR_LAYERID             , ::getCppuType((const sal_Int16*)0),      0,  0},
-        { OUString(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME           , ::getCppuType((const OUString*)0),    0,  0},
+        { OUString(UNO_NAME_MISC_OBJ_ZORDER),   OWN_ATTR_ZORDER             , ::cppu::UnoType<sal_Int32>::get(),      0,      0},
+        { OUString(UNO_NAME_MISC_OBJ_LAYERID),  SDRATTR_LAYERID             , ::cppu::UnoType<sal_Int16>::get(),      0,  0},
+        { OUString(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME           , ::cppu::UnoType<OUString>::get(),    0,  0},
         { OUString(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP           , ::getCppuType(( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
-        { OUString(UNO_NAME_LINKDISPLAYNAME),   OWN_ATTR_LDNAME             , ::getCppuType(( const OUString*)0),   ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+        { OUString(UNO_NAME_LINKDISPLAYNAME),   OWN_ATTR_LDNAME             , ::cppu::UnoType<OUString>::get(),   ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
         { OUString(UNO_NAME_OLE2_METAFILE),     OWN_ATTR_METAFILE           , ::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
-        { OUString("ThumbnailGraphicURL"),      OWN_ATTR_THUMBNAIL          , ::getCppuType(( const OUString*)0), 0, 0 },
+        { OUString("ThumbnailGraphicURL"),      OWN_ATTR_THUMBNAIL          , ::cppu::UnoType<OUString>::get(), 0, 0 },
         { OUString(UNO_NAME_MISC_OBJ_MOVEPROTECT),      SDRATTR_OBJMOVEPROTECT, ::getBooleanCppuType(),0, 0},
         { OUString(UNO_NAME_MISC_OBJ_SIZEPROTECT),      SDRATTR_OBJSIZEPROTECT, ::getBooleanCppuType(),0, 0},
-        { OUString(UNO_NAME_OLE2_PERSISTNAME),  OWN_ATTR_PERSISTNAME        , ::getCppuType(( const OUString*)0), 0, 0 },
-        { OUString("LinkURL"),                  OWN_ATTR_OLE_LINKURL        , ::getCppuType(( const OUString*)0), 0, 0 },
+        { OUString(UNO_NAME_OLE2_PERSISTNAME),  OWN_ATTR_PERSISTNAME        , ::cppu::UnoType<OUString>::get(), 0, 0 },
+        { OUString("LinkURL"),                  OWN_ATTR_OLE_LINKURL        , ::cppu::UnoType<OUString>::get(), 0, 0 },
         { OUString(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT,            ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
         { OUString("VisibleArea"),              OWN_ATTR_OLE_VISAREA        , ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), 0, 0},
         // #i68101#
-        { OUString(UNO_NAME_MISC_OBJ_TITLE),        OWN_ATTR_MISC_OBJ_TITLE         , ::getCppuType((const OUString*)0),    0,  0},
-        { OUString(UNO_NAME_MISC_OBJ_DESCRIPTION),  OWN_ATTR_MISC_OBJ_DESCRIPTION   , ::getCppuType((const OUString*)0),    0,  0},
+        { OUString(UNO_NAME_MISC_OBJ_TITLE),        OWN_ATTR_MISC_OBJ_TITLE         , ::cppu::UnoType<OUString>::get(),    0,  0},
+        { OUString(UNO_NAME_MISC_OBJ_DESCRIPTION),  OWN_ATTR_MISC_OBJ_DESCRIPTION   , ::cppu::UnoType<OUString>::get(),    0,  0},
         { OUString(), 0, css::uno::Type(), 0, 0 }
     };
 
@@ -543,29 +543,29 @@ SfxItemPropertyMapEntry const * ImplGetSvxAppletPropertyMap()
 {
     static SfxItemPropertyMapEntry const aAppletPropertyMap_Impl[] =
     {
-        { OUString("AppletCodeBase"),           OWN_ATTR_APPLET_CODEBASE    , ::getCppuType(( const OUString*)0), 0, 0},
-        { OUString("AppletName"),               OWN_ATTR_APPLET_NAME        , ::getCppuType(( const OUString*)0), 0, 0},
-        { OUString("AppletCode"),               OWN_ATTR_APPLET_CODE        , ::getCppuType(( const OUString*)0), 0, 0},
+        { OUString("AppletCodeBase"),           OWN_ATTR_APPLET_CODEBASE    , ::cppu::UnoType<OUString>::get(), 0, 0},
+        { OUString("AppletName"),               OWN_ATTR_APPLET_NAME        , ::cppu::UnoType<OUString>::get(), 0, 0},
+        { OUString("AppletCode"),               OWN_ATTR_APPLET_CODE        , ::cppu::UnoType<OUString>::get(), 0, 0},
         { OUString("AppletCommands"),           OWN_ATTR_APPLET_COMMANDS    , ::getCppuType((::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >*)0), 0, 0},
-        { OUString("AppletDocBase"),            OWN_ATTR_APPLET_DOCBASE     , ::getCppuType(( const OUString*)0), 0, 0},
+        { OUString("AppletDocBase"),            OWN_ATTR_APPLET_DOCBASE     , ::cppu::UnoType<OUString>::get(), 0, 0},
         { OUString("AppletIsScript"),           OWN_ATTR_APPLET_ISSCRIPT    , ::getBooleanCppuType(), 0, 0 },
         { OUString("Transformation"),           OWN_ATTR_TRANSFORMATION     , ::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 0, 0 },
-        { OUString(UNO_NAME_MISC_OBJ_ZORDER),   OWN_ATTR_ZORDER             , ::getCppuType((const sal_Int32*)0),      0,      0},
-        { OUString(UNO_NAME_MISC_OBJ_LAYERID),  SDRATTR_LAYERID             , ::getCppuType((const sal_Int16*)0),      0,  0},
-        { OUString(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME           , ::getCppuType((const OUString*)0),    0,  0},
+        { OUString(UNO_NAME_MISC_OBJ_ZORDER),   OWN_ATTR_ZORDER             , ::cppu::UnoType<sal_Int32>::get(),      0,      0},
+        { OUString(UNO_NAME_MISC_OBJ_LAYERID),  SDRATTR_LAYERID             , ::cppu::UnoType<sal_Int16>::get(),      0,  0},
+        { OUString(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME           , ::cppu::UnoType<OUString>::get(),    0,  0},
         { OUString(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP           , ::getCppuType(( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
-        { OUString(UNO_NAME_LINKDISPLAYNAME),   OWN_ATTR_LDNAME             , ::getCppuType(( const OUString*)0),   ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+        { OUString(UNO_NAME_LINKDISPLAYNAME),   OWN_ATTR_LDNAME             , ::cppu::UnoType<OUString>::get(),   ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
         { OUString(UNO_NAME_OLE2_METAFILE),     OWN_ATTR_METAFILE           , ::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
-        { OUString("ThumbnailGraphicURL"),      OWN_ATTR_THUMBNAIL          , ::getCppuType(( const OUString*)0), 0, 0 },
+        { OUString("ThumbnailGraphicURL"),      OWN_ATTR_THUMBNAIL          , ::cppu::UnoType<OUString>::get(), 0, 0 },
         { OUString(UNO_NAME_MISC_OBJ_MOVEPROTECT),      SDRATTR_OBJMOVEPROTECT, ::getBooleanCppuType(),0, 0},
         { OUString(UNO_NAME_MISC_OBJ_SIZEPROTECT),      SDRATTR_OBJSIZEPROTECT, ::getBooleanCppuType(),0, 0},
-        { OUString(UNO_NAME_OLE2_PERSISTNAME),  OWN_ATTR_PERSISTNAME        , ::getCppuType(( const OUString*)0), 0, 0 },
-        { OUString("LinkURL"),                  OWN_ATTR_OLE_LINKURL        , ::getCppuType(( const OUString*)0), 0, 0 },
+        { OUString(UNO_NAME_OLE2_PERSISTNAME),  OWN_ATTR_PERSISTNAME        , ::cppu::UnoType<OUString>::get(), 0, 0 },
+        { OUString("LinkURL"),                  OWN_ATTR_OLE_LINKURL        , ::cppu::UnoType<OUString>::get(), 0, 0 },
         { OUString(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT,            ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
         { OUString("VisibleArea"),              OWN_ATTR_OLE_VISAREA        , ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), 0, 0},
         // #i68101#
-        { OUString(UNO_NAME_MISC_OBJ_TITLE),        OWN_ATTR_MISC_OBJ_TITLE         , ::getCppuType((const OUString*)0),    0,  0},
-        { OUString(UNO_NAME_MISC_OBJ_DESCRIPTION),  OWN_ATTR_MISC_OBJ_DESCRIPTION   , ::getCppuType((const OUString*)0),    0,  0},
+        { OUString(UNO_NAME_MISC_OBJ_TITLE),        OWN_ATTR_MISC_OBJ_TITLE         , ::cppu::UnoType<OUString>::get(),    0,  0},
+        { OUString(UNO_NAME_MISC_OBJ_DESCRIPTION),  OWN_ATTR_MISC_OBJ_DESCRIPTION   , ::cppu::UnoType<OUString>::get(),    0,  0},
         { OUString(), 0, css::uno::Type(), 0, 0 }
     };
 
@@ -577,46 +577,46 @@ SfxItemPropertyMapEntry const * ImplGetSvxControlShapePropertyMap()
     static SfxItemPropertyMapEntry const aControlPropertyMap_Impl[] =
     {
         // the following properties are mapped to the XControl Model of this shape
-        { OUString(UNO_NAME_EDIT_CHAR_FONTNAME),        0,  ::getCppuType((const OUString*)0),  0, 0 },
-        { OUString(UNO_NAME_EDIT_CHAR_FONTSTYLENAME),   0,  ::getCppuType((const OUString*)0),  0, 0 },
-        { OUString(UNO_NAME_EDIT_CHAR_FONTFAMILY),      0,  ::getCppuType((const sal_Int16*)0),        0, 0 },
-        { OUString(UNO_NAME_EDIT_CHAR_FONTCHARSET),     0,  ::getCppuType((const sal_Int16*)0),        0, 0 },
+        { OUString(UNO_NAME_EDIT_CHAR_FONTNAME),        0,  ::cppu::UnoType<OUString>::get(),  0, 0 },
+        { OUString(UNO_NAME_EDIT_CHAR_FONTSTYLENAME),   0,  ::cppu::UnoType<OUString>::get(),  0, 0 },
+        { OUString(UNO_NAME_EDIT_CHAR_FONTFAMILY),      0,  ::cppu::UnoType<sal_Int16>::get(),        0, 0 },
+        { OUString(UNO_NAME_EDIT_CHAR_FONTCHARSET),     0,  ::cppu::UnoType<sal_Int16>::get(),        0, 0 },
         { OUString(UNO_NAME_EDIT_CHAR_HEIGHT),          0,  ::getCppuType((const float*)0),            0, 0 },
-        { OUString(UNO_NAME_EDIT_CHAR_FONTPITCH),       0,  ::getCppuType((const sal_Int16*)0),        0, 0 },
+        { OUString(UNO_NAME_EDIT_CHAR_FONTPITCH),       0,  ::cppu::UnoType<sal_Int16>::get(),        0, 0 },
         { OUString(UNO_NAME_EDIT_CHAR_POSTURE),         0,  ::getCppuType((const ::com::sun::star::awt::FontSlant*)0),0, 0 },
         { OUString(UNO_NAME_EDIT_CHAR_WEIGHT),          0,  ::getCppuType((const float*)0),            0, 0 },
-        { OUString(UNO_NAME_EDIT_CHAR_UNDERLINE),       0,  ::getCppuType((const sal_Int16*)0),        0, 0 },
-        { OUString(UNO_NAME_EDIT_CHAR_STRIKEOUT),       0,  ::getCppuType((const sal_Int16*)0),        0, 0},
-        { OUString(UNO_NAME_EDIT_CHAR_CASEMAP),         0,  ::getCppuType((const sal_Int16*)0),        0, 0 },
-        { OUString(UNO_NAME_EDIT_CHAR_COLOR),           0,  ::getCppuType((const sal_Int32*)0),        0, 0 },
-        { OUString("CharRelief"),                       0,  ::getCppuType((const sal_Int16*)0),        0, 0 },
-        { OUString("CharUnderlineColor"),               0,  ::getCppuType((const sal_Int32*)0),        0, 0 },
-        { OUString("CharKerning"),                      0,  ::getCppuType((const sal_Int16*)0),        0, 0 },
+        { OUString(UNO_NAME_EDIT_CHAR_UNDERLINE),       0,  ::cppu::UnoType<sal_Int16>::get(),        0, 0 },
+        { OUString(UNO_NAME_EDIT_CHAR_STRIKEOUT),       0,  ::cppu::UnoType<sal_Int16>::get(),        0, 0},
+        { OUString(UNO_NAME_EDIT_CHAR_CASEMAP),         0,  ::cppu::UnoType<sal_Int16>::get(),        0, 0 },
+        { OUString(UNO_NAME_EDIT_CHAR_COLOR),           0,  ::cppu::UnoType<sal_Int32>::get(),        0, 0 },
+        { OUString("CharRelief"),                       0,  ::cppu::UnoType<sal_Int16>::get(),        0, 0 },
+        { OUString("CharUnderlineColor"),               0,  ::cppu::UnoType<sal_Int32>::get(),        0, 0 },
+        { OUString("CharKerning"),                      0,  ::cppu::UnoType<sal_Int16>::get(),        0, 0 },
         { OUString("CharWordMode"),                     0,  ::getBooleanCppuType(),                    0, 0 },
-        { OUString(UNO_NAME_EDIT_PARA_ADJUST),          0,  ::getCppuType((const sal_Int16*)0),        0, 0 },
+        { OUString(UNO_NAME_EDIT_PARA_ADJUST),          0,  ::cppu::UnoType<sal_Int16>::get(),        0, 0 },
         { OUString("TextVerticalAdjust"),               0,  ::getCppuType((const TextVerticalAdjust*)0), MAYBEVOID, 0 },
-        { OUString("ControlBackground"),                0,  ::getCppuType((const sal_Int32*)0),        0, 0 },
-        { OUString("ControlBorder"),                    0,  ::getCppuType((const sal_Int16*)0),        0, 0 },
-        { OUString("ControlBorderColor"),               0,  ::getCppuType((const sal_Int32*)0),        0, 0 },
-        { OUString("ControlSymbolColor"),               0,  ::getCppuType((const sal_Int16*)0),        0, 0 },
-        { OUString("ImageScaleMode"),                   0,  ::getCppuType((const sal_Int16*)0),        0, 0 },
+        { OUString("ControlBackground"),                0,  ::cppu::UnoType<sal_Int32>::get(),        0, 0 },
+        { OUString("ControlBorder"),                    0,  ::cppu::UnoType<sal_Int16>::get(),        0, 0 },
+        { OUString("ControlBorderColor"),               0,  ::cppu::UnoType<sal_Int32>::get(),        0, 0 },
+        { OUString("ControlSymbolColor"),               0,  ::cppu::UnoType<sal_Int16>::get(),        0, 0 },
+        { OUString("ImageScaleMode"),                   0,  ::cppu::UnoType<sal_Int16>::get(),        0, 0 },
         { OUString(UNO_NAME_MISC_OBJ_MOVEPROTECT),      SDRATTR_OBJMOVEPROTECT, ::getBooleanCppuType(),0, 0},
         { OUString(UNO_NAME_MISC_OBJ_SIZEPROTECT),      SDRATTR_OBJSIZEPROTECT, ::getBooleanCppuType(),0, 0},
-        { OUString("ControlTextEmphasis"),              0,  ::getCppuType((const sal_Int16*)0),        0, 0 },
+        { OUString("ControlTextEmphasis"),              0,  ::cppu::UnoType<sal_Int16>::get(),        0, 0 },
         { OUString("ControlWritingMode"),               0,  ::cppu::UnoType< sal_Int16 >::get(), 0, 0},
         // the following properties are handled by SvxShape
         { OUString("Transformation"),           OWN_ATTR_TRANSFORMATION     , ::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 0, 0 },
-        { OUString(UNO_NAME_MISC_OBJ_ZORDER),   OWN_ATTR_ZORDER             , ::getCppuType((const sal_Int32*)0),      0,      0},
-        { OUString(UNO_NAME_MISC_OBJ_LAYERID),  SDRATTR_LAYERID             , ::getCppuType((const sal_Int16*)0),      0,  0},
-        { OUString(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME           , ::getCppuType((const OUString*)0),    0,  0},
+        { OUString(UNO_NAME_MISC_OBJ_ZORDER),   OWN_ATTR_ZORDER             , ::cppu::UnoType<sal_Int32>::get(),      0,      0},
+        { OUString(UNO_NAME_MISC_OBJ_LAYERID),  SDRATTR_LAYERID             , ::cppu::UnoType<sal_Int16>::get(),      0,  0},
+        { OUString(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME           , ::cppu::UnoType<OUString>::get(),    0,  0},
         { OUString(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP           , ::getCppuType(( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
-        { OUString(UNO_NAME_LINKDISPLAYNAME),   OWN_ATTR_LDNAME             , ::getCppuType(( const OUString*)0),   ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+        { OUString(UNO_NAME_LINKDISPLAYNAME),   OWN_ATTR_LDNAME             , ::cppu::UnoType<OUString>::get(),   ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
         { OUString("UserDefinedAttributes"),        SDRATTR_XMLATTRIBUTES,      ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
         {OUString("ParaUserDefinedAttributes"),         EE_PARA_XMLATTRIBS,     ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
         { OUString(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT,            ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
         // #i68101#
-        { OUString(UNO_NAME_MISC_OBJ_TITLE),        OWN_ATTR_MISC_OBJ_TITLE         , ::getCppuType((const OUString*)0),    0,  0},
-        { OUString(UNO_NAME_MISC_OBJ_DESCRIPTION),  OWN_ATTR_MISC_OBJ_DESCRIPTION   , ::getCppuType((const OUString*)0),    0,  0},
+        { OUString(UNO_NAME_MISC_OBJ_TITLE),        OWN_ATTR_MISC_OBJ_TITLE         , ::cppu::UnoType<OUString>::get(),    0,  0},
+        { OUString(UNO_NAME_MISC_OBJ_DESCRIPTION),  OWN_ATTR_MISC_OBJ_DESCRIPTION   , ::cppu::UnoType<OUString>::get(),    0,  0},
         // #i112587#
         { OUString(UNO_NAME_MISC_OBJ_PRINTABLE),    SDRATTR_OBJPRINTABLE            , ::getBooleanCppuType(),                      0,  0},
         { OUString("Visible"),                      SDRATTR_OBJVISIBLE              , ::getBooleanCppuType(),                      0,  0},
@@ -631,19 +631,19 @@ SfxItemPropertyMapEntry const * ImplGetSvxPageShapePropertyMap()
 {
     static SfxItemPropertyMapEntry const aPageShapePropertyMap_Impl[] =
     {
-        { OUString("PageNumber"),               OWN_ATTR_PAGE_NUMBER        , ::getCppuType((const sal_Int32*)0),      0, 0},
+        { OUString("PageNumber"),               OWN_ATTR_PAGE_NUMBER        , ::cppu::UnoType<sal_Int32>::get(),      0, 0},
         { OUString("Transformation"),           OWN_ATTR_TRANSFORMATION     , ::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 0, 0 },
-        { OUString(UNO_NAME_MISC_OBJ_ZORDER),   OWN_ATTR_ZORDER             , ::getCppuType((const sal_Int32*)0),      0, 0},
-        { OUString(UNO_NAME_MISC_OBJ_LAYERID),  SDRATTR_LAYERID             , ::getCppuType((const sal_Int16*)0),      0, 0},
-        { OUString(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME           , ::getCppuType((const OUString*)0), 0, 0},
+        { OUString(UNO_NAME_MISC_OBJ_ZORDER),   OWN_ATTR_ZORDER             , ::cppu::UnoType<sal_Int32>::get(),      0, 0},
+        { OUString(UNO_NAME_MISC_OBJ_LAYERID),  SDRATTR_LAYERID             , ::cppu::UnoType<sal_Int16>::get(),      0, 0},
+        { OUString(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME           , ::cppu::UnoType<OUString>::get(), 0, 0},
         { OUString(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP           , ::getCppuType(( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
-        { OUString(UNO_NAME_LINKDISPLAYNAME),   OWN_ATTR_LDNAME             , ::getCppuType(( const OUString*)0),   ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+        { OUString(UNO_NAME_LINKDISPLAYNAME),   OWN_ATTR_LDNAME             , ::cppu::UnoType<OUString>::get(),   ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
         { OUString(UNO_NAME_MISC_OBJ_MOVEPROTECT),      SDRATTR_OBJMOVEPROTECT, ::getBooleanCppuType(),0, 0},
         { OUString(UNO_NAME_MISC_OBJ_SIZEPROTECT),      SDRATTR_OBJSIZEPROTECT, ::getBooleanCppuType(),0, 0},
         { OUString(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT,            ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
         // #i68101#
-        { OUString(UNO_NAME_MISC_OBJ_TITLE),        OWN_ATTR_MISC_OBJ_TITLE         , ::getCppuType((const OUString*)0),    0,  0},
-        { OUString(UNO_NAME_MISC_OBJ_DESCRIPTION),  OWN_ATTR_MISC_OBJ_DESCRIPTION   , ::getCppuType((const OUString*)0),    0,  0},
+        { OUString(UNO_NAME_MISC_OBJ_TITLE),        OWN_ATTR_MISC_OBJ_TITLE         , ::cppu::UnoType<OUString>::get(),    0,  0},
+        { OUString(UNO_NAME_MISC_OBJ_DESCRIPTION),  OWN_ATTR_MISC_OBJ_DESCRIPTION   , ::cppu::UnoType<OUString>::get(),    0,  0},
         { OUString(), 0, css::uno::Type(), 0, 0 }
     };
 
@@ -655,15 +655,15 @@ SfxItemPropertyMapEntry const * ImplGetSvxCaptionPropertyMap()
     static SfxItemPropertyMapEntry const aCaptionPropertyMap_Impl[] =
     {
         { OUString("CaptionPoint"),             OWN_ATTR_CAPTION_POINT,     ::getCppuType((const com::sun::star::awt::Point*)0),   0, 0 },
-        { OUString("CaptionType"),              SDRATTR_CAPTIONTYPE,        ::getCppuType((const sal_Int16*)0), 0, 0},
+        { OUString("CaptionType"),              SDRATTR_CAPTIONTYPE,        ::cppu::UnoType<sal_Int16>::get(), 0, 0},
         { OUString("CaptionIsFixedAngle"),      SDRATTR_CAPTIONFIXEDANGLE,  ::getBooleanCppuType(), 0, 0},
-        { OUString("CaptionAngle"),             SDRATTR_CAPTIONANGLE,       ::getCppuType((const sal_Int32*)0),    0,  0},
-        { OUString("CaptionGap"),               SDRATTR_CAPTIONGAP,         ::getCppuType((const sal_Int32*)0),    0,  SFX_METRIC_ITEM},
-        { OUString("CaptionEscapeDirection"),   SDRATTR_CAPTIONESCDIR,      ::getCppuType((const sal_Int32*)0),    0,  0},
+        { OUString("CaptionAngle"),             SDRATTR_CAPTIONANGLE,       ::cppu::UnoType<sal_Int32>::get(),    0,  0},
+        { OUString("CaptionGap"),               SDRATTR_CAPTIONGAP,         ::cppu::UnoType<sal_Int32>::get(),    0,  SFX_METRIC_ITEM},
+        { OUString("CaptionEscapeDirection"),   SDRATTR_CAPTIONESCDIR,      ::cppu::UnoType<sal_Int32>::get(),    0,  0},
         { OUString("CaptionIsEscapeRelative"),  SDRATTR_CAPTIONESCISREL,    ::getBooleanCppuType(), 0, 0},
-        { OUString("CaptionEscapeRelative"),    SDRATTR_CAPTIONESCREL,      ::getCppuType((const sal_Int32*)0),    0,  0},
-        { OUString("CaptionEscapeAbsolute"),    SDRATTR_CAPTIONESCABS,      ::getCppuType((const sal_Int32*)0),    0,  SFX_METRIC_ITEM},
-        { OUString("CaptionLineLength"),        SDRATTR_CAPTIONLINELEN,     ::getCppuType((const sal_Int32*)0),    0,  SFX_METRIC_ITEM},
+        { OUString("CaptionEscapeRelative"),    SDRATTR_CAPTIONESCREL,      ::cppu::UnoType<sal_Int32>::get(),    0,  0},
+        { OUString("CaptionEscapeAbsolute"),    SDRATTR_CAPTIONESCABS,      ::cppu::UnoType<sal_Int32>::get(),    0,  SFX_METRIC_ITEM},
+        { OUString("CaptionLineLength"),        SDRATTR_CAPTIONLINELEN,     ::cppu::UnoType<sal_Int32>::get(),    0,  SFX_METRIC_ITEM},
         { OUString("CaptionIsFitLineLength"),   SDRATTR_CAPTIONFITLINELEN,  ::getBooleanCppuType(), 0, 0},
         EDGERADIUS_PROPERTIES
         FILL_PROPERTIES
@@ -688,10 +688,10 @@ SfxItemPropertyMapEntry const * ImplGetSvxCustomShapePropertyMap()
 {
     static SfxItemPropertyMapEntry const aCustomShapePropertyMap_Impl[] =
     {
-        { OUString("CustomShapeEngine"),            SDRATTR_CUSTOMSHAPE_ENGINE,         ::getCppuType((const OUString*)0),  0, 0 },
-        { OUString("CustomShapeData"),          SDRATTR_CUSTOMSHAPE_DATA,               ::getCppuType((const OUString*)0),  0, 0 },
+        { OUString("CustomShapeEngine"),            SDRATTR_CUSTOMSHAPE_ENGINE,         ::cppu::UnoType<OUString>::get(),  0, 0 },
+        { OUString("CustomShapeData"),          SDRATTR_CUSTOMSHAPE_DATA,               ::cppu::UnoType<OUString>::get(),  0, 0 },
         { OUString("CustomShapeGeometry"),      SDRATTR_CUSTOMSHAPE_GEOMETRY,           ::getCppuType((::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >*)0),  0, 0 },
-        { OUString("CustomShapeGraphicURL"),        SDRATTR_CUSTOMSHAPE_REPLACEMENT_URL,    ::getCppuType((const OUString*)0),  0,  0},
+        { OUString("CustomShapeGraphicURL"),        SDRATTR_CUSTOMSHAPE_REPLACEMENT_URL,    ::cppu::UnoType<OUString>::get(),  0,  0},
         CUSTOMSHAPE_PROPERTIES
         FILL_PROPERTIES
         LINE_PROPERTIES
@@ -712,27 +712,27 @@ SfxItemPropertyMapEntry const * ImplGetSvxMediaShapePropertyMap()
 {
     static SfxItemPropertyMapEntry const aMediaShapePropertyMap_Impl[] =
     {
-        { OUString(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER, ::getCppuType((const sal_Int32*)0), 0, 0},
-        { OUString(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID, ::getCppuType((const sal_Int16*)0), 0, 0},
-        { OUString(UNO_NAME_MISC_OBJ_LAYERNAME), SDRATTR_LAYERNAME, ::getCppuType((const OUString*)0), 0, 0},
+        { OUString(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
+        { OUString(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID, ::cppu::UnoType<sal_Int16>::get(), 0, 0},
+        { OUString(UNO_NAME_MISC_OBJ_LAYERNAME), SDRATTR_LAYERNAME, ::cppu::UnoType<OUString>::get(), 0, 0},
         { OUString(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP, ::getCppuType(( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
-        { OUString(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME, ::getCppuType(( const OUString*)0),  ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+        { OUString(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME, ::cppu::UnoType<OUString>::get(),  ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
         { OUString("Transformation"), OWN_ATTR_TRANSFORMATION, ::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 0, 0 },
-        { OUString("MediaURL"), OWN_ATTR_MEDIA_URL, ::getCppuType((const OUString*)0), 0, 0},
+        { OUString("MediaURL"), OWN_ATTR_MEDIA_URL, ::cppu::UnoType<OUString>::get(), 0, 0},
         { OUString("PreferredSize"), OWN_ATTR_MEDIA_PREFERREDSIZE, ::getCppuType((const ::com::sun::star::awt::Size*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
         { OUString("Loop"), OWN_ATTR_MEDIA_LOOP, ::getCppuType((const sal_Bool*)0), 0, 0},
         { OUString("Mute"), OWN_ATTR_MEDIA_MUTE, ::getCppuType((const sal_Bool*)0), 0, 0},
-        { OUString("VolumeDB"), OWN_ATTR_MEDIA_VOLUMEDB, ::getCppuType((const sal_Int16*)0), 0, 0},
+        { OUString("VolumeDB"), OWN_ATTR_MEDIA_VOLUMEDB, ::cppu::UnoType<sal_Int16>::get(), 0, 0},
         { OUString("Zoom"), OWN_ATTR_MEDIA_ZOOM, ::getCppuType((const ::com::sun::star::media::ZoomLevel*)0), 0, 0},
         { OUString(UNO_NAME_MISC_OBJ_MOVEPROTECT), SDRATTR_OBJMOVEPROTECT, ::getBooleanCppuType(),0, 0},
         { OUString(UNO_NAME_MISC_OBJ_SIZEPROTECT), SDRATTR_OBJSIZEPROTECT, ::getBooleanCppuType(),0, 0},
         { OUString(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
         // #i68101#
-        { OUString(UNO_NAME_MISC_OBJ_TITLE),        OWN_ATTR_MISC_OBJ_TITLE         , ::getCppuType((const OUString*)0),    0,  0},
-        { OUString(UNO_NAME_MISC_OBJ_DESCRIPTION),  OWN_ATTR_MISC_OBJ_DESCRIPTION   , ::getCppuType((const OUString*)0),    0,  0},
+        { OUString(UNO_NAME_MISC_OBJ_TITLE),        OWN_ATTR_MISC_OBJ_TITLE         , ::cppu::UnoType<OUString>::get(),    0,  0},
+        { OUString(UNO_NAME_MISC_OBJ_DESCRIPTION),  OWN_ATTR_MISC_OBJ_DESCRIPTION   , ::cppu::UnoType<OUString>::get(),    0,  0},
         {OUString("PrivateStream"), OWN_ATTR_MEDIA_STREAM, cppu::UnoType<css::io::XInputStream>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
-        {OUString("PrivateTempFileURL"), OWN_ATTR_MEDIA_TEMPFILEURL, ::getCppuType((const OUString*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
-        { OUString("MediaMimeType"), OWN_ATTR_MEDIA_MIMETYPE, ::getCppuType((const OUString*)0), 0, 0},
+        {OUString("PrivateTempFileURL"), OWN_ATTR_MEDIA_TEMPFILEURL, ::cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+        { OUString("MediaMimeType"), OWN_ATTR_MEDIA_MIMETYPE, ::cppu::UnoType<OUString>::get(), 0, 0},
         { OUString(), 0, css::uno::Type(), 0, 0 }
     };
 
@@ -743,18 +743,18 @@ SfxItemPropertyMapEntry const * ImplGetSvxTableShapePropertyMap()
 {
     static SfxItemPropertyMapEntry const  aTableShapePropertyMap_Impl[] =
     {
-        { OUString(UNO_NAME_MISC_OBJ_ZORDER),       OWN_ATTR_ZORDER, ::getCppuType((const sal_Int32*)0), 0, 0},
-        { OUString(UNO_NAME_MISC_OBJ_LAYERID),      SDRATTR_LAYERID, ::getCppuType((const sal_Int16*)0), 0,    0},
-        { OUString(UNO_NAME_MISC_OBJ_LAYERNAME),    SDRATTR_LAYERNAME, ::getCppuType((const OUString*)0), 0, 0},
+        { OUString(UNO_NAME_MISC_OBJ_ZORDER),       OWN_ATTR_ZORDER, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
+        { OUString(UNO_NAME_MISC_OBJ_LAYERID),      SDRATTR_LAYERID, ::cppu::UnoType<sal_Int16>::get(), 0,    0},
+        { OUString(UNO_NAME_MISC_OBJ_LAYERNAME),    SDRATTR_LAYERNAME, ::cppu::UnoType<OUString>::get(), 0, 0},
         { OUString(UNO_NAME_LINKDISPLAYBITMAP),     OWN_ATTR_LDBITMAP, cppu::UnoType<css::awt::XBitmap>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
-        { OUString(UNO_NAME_LINKDISPLAYNAME),       OWN_ATTR_LDNAME, ::getCppuType(( const OUString*)0),    ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+        { OUString(UNO_NAME_LINKDISPLAYNAME),       OWN_ATTR_LDNAME, ::cppu::UnoType<OUString>::get(),    ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
         { OUString("Transformation"),               OWN_ATTR_TRANSFORMATION, ::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 0, 0 },
         { OUString(UNO_NAME_MISC_OBJ_MOVEPROTECT),  SDRATTR_OBJMOVEPROTECT, ::getBooleanCppuType(),0, 0},
         { OUString(UNO_NAME_MISC_OBJ_SIZEPROTECT),  SDRATTR_OBJSIZEPROTECT, ::getBooleanCppuType(),0, 0},
         { OUString(UNO_NAME_MISC_OBJ_BOUNDRECT),    OWN_ATTR_BOUNDRECT, ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
         { OUString(UNO_NAME_MISC_OBJ_NAME),         SDRATTR_OBJECTNAME, ::getCppuType((const ::rtl::OUString*)0),    0,      0},
-        { OUString(UNO_NAME_MISC_OBJ_TITLE),        OWN_ATTR_MISC_OBJ_TITLE         , ::getCppuType((const OUString*)0),    0,  0},
-        { OUString(UNO_NAME_MISC_OBJ_DESCRIPTION),  OWN_ATTR_MISC_OBJ_DESCRIPTION   , ::getCppuType((const OUString*)0),    0,  0},
+        { OUString(UNO_NAME_MISC_OBJ_TITLE),        OWN_ATTR_MISC_OBJ_TITLE         , ::cppu::UnoType<OUString>::get(),    0,  0},
+        { OUString(UNO_NAME_MISC_OBJ_DESCRIPTION),  OWN_ATTR_MISC_OBJ_DESCRIPTION   , ::cppu::UnoType<OUString>::get(),    0,  0},
         { OUString("Model"),                        OWN_ATTR_OLEMODEL               , cppu::UnoType<css::table::XTable>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
         { OUString("TableTemplate"),                OWN_ATTR_TABLETEMPLATE          , cppu::UnoType<css::container::XIndexAccess>::get(), 0, 0},
         { OUString("UseFirstRowStyle"),             OWN_ATTR_TABLETEMPLATE_FIRSTROW, ::getBooleanCppuType(),0, 0},
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index c0df7549300e..bd389bc6d365 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -2026,7 +2026,7 @@ uno::Any SvxShape::GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleE
         if( pMap->aType != aAny.getValueType() )
         {
             // since the sfx uint16 item now exports a sal_Int32, we may have to fix this here
-            if( ( pMap->aType == ::getCppuType((const sal_Int16*)0)) && aAny.getValueType() == ::getCppuType((const sal_Int32*)0) )
+            if( ( pMap->aType == ::cppu::UnoType<sal_Int16>::get()) && aAny.getValueType() == ::cppu::UnoType<sal_Int32>::get() )
             {
                 sal_Int32 nValue = 0;
                 aAny >>= nValue;
diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx
index bce885e94a86..50251c09b46d 100644
--- a/svx/source/xml/xmlxtimp.cxx
+++ b/svx/source/xml/xmlxtimp.cxx
@@ -469,7 +469,7 @@ SvXMLImportContext *SvxXMLXTableImport::CreateContext( sal_uInt16 nPrefix, const
 
         if ( rLocalName == "color-table" )
         {
-            if( aType == ::getCppuType((const sal_Int32*)0) )
+            if( aType == ::cppu::UnoType<sal_Int32>::get() )
                 return new SvxXMLTableImportContext( *this, nPrefix, rLocalName, xAttrList, stice_color, mrTable, bOOoFormat );
         }
         else if ( rLocalName == "marker-table" )
@@ -494,7 +494,7 @@ SvXMLImportContext *SvxXMLXTableImport::CreateContext( sal_uInt16 nPrefix, const
         }
         else if ( rLocalName == "bitmap-table" )
         {
-            if( aType == ::getCppuType((const OUString*)0))
+            if( aType == ::cppu::UnoType<OUString>::get())
                 return new SvxXMLTableImportContext( *this, nPrefix, rLocalName, xAttrList, stice_bitmap, mrTable, bOOoFormat );
         }
     }