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

Change-Id: Ie16923d17541e84e0d7424fffe37caf410786abf

6 files changed, 19 insertions, 19 deletions

diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 55f642c3a3c0..6fca87b723d1 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -3731,7 +3731,7 @@ bool SvxBrushItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 
         case MID_GRAPHIC_URL:
         {
-            if ( rVal.getValueType() == ::getCppuType( (OUString*)0 ) )
+            if ( rVal.getValueType() == ::cppu::UnoType<OUString>::get() )
             {
                 OUString sLink;
                 rVal >>= sLink;
@@ -3763,7 +3763,7 @@ bool SvxBrushItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 
         case MID_GRAPHIC_FILTER:
         {
-            if( rVal.getValueType() == ::getCppuType( (OUString*)0 ) )
+            if( rVal.getValueType() == ::cppu::UnoType<OUString>::get() )
             {
                 OUString sLink;
                 rVal >>= sLink;
diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx
index 6e14f3c496d2..fd44829e1a56 100644
--- a/editeng/source/uno/unofield.cxx
+++ b/editeng/source/uno/unofield.cxx
@@ -71,10 +71,10 @@ const SfxItemPropertySet* ImplGetFieldItemPropertySet( sal_Int32 mnId )
 {
     static const SfxItemPropertyMapEntry aExDateTimeFieldPropertyMap_Impl[] =
     {
-        { OUString(UNO_TC_PROP_DATE_TIME), WID_DATE,  ::getCppuType((const util::DateTime*)0), 0, 0 },
+        { OUString(UNO_TC_PROP_DATE_TIME), WID_DATE,  ::cppu::UnoType<util::DateTime>::get(), 0, 0 },
         { OUString(UNO_TC_PROP_IS_FIXED),  WID_BOOL1, ::getBooleanCppuType(),                  0, 0 },
         { OUString(UNO_TC_PROP_IS_DATE),   WID_BOOL2, ::getBooleanCppuType(),                  0, 0 },
-        { OUString(UNO_TC_PROP_NUMFORMAT), WID_INT32, ::getCppuType((const sal_Int32*)0),      0, 0 },
+        { OUString(UNO_TC_PROP_NUMFORMAT), WID_INT32, ::cppu::UnoType<sal_Int32>::get(),      0, 0 },
         { OUString(), 0, css::uno::Type(), 0, 0 }
     };
     static const SfxItemPropertySet aExDateTimeFieldPropertySet_Impl(aExDateTimeFieldPropertyMap_Impl);
@@ -89,10 +89,10 @@ const SfxItemPropertySet* ImplGetFieldItemPropertySet( sal_Int32 mnId )
     static const SfxItemPropertyMapEntry aUrlFieldPropertyMap_Impl[] =
     {
 
-        { OUString(UNO_TC_PROP_URL_FORMAT),         WID_INT16,   ::getCppuType((const sal_Int16*)0), 0, 0 },
-        { OUString(UNO_TC_PROP_URL_REPRESENTATION), WID_STRING1, ::getCppuType((const OUString*)0),  0, 0 },
-        { OUString(UNO_TC_PROP_URL_TARGET),         WID_STRING2, ::getCppuType((const OUString*)0),  0, 0 },
-        { OUString(UNO_TC_PROP_URL),                WID_STRING3, ::getCppuType((const OUString*)0),  0, 0 },
+        { OUString(UNO_TC_PROP_URL_FORMAT),         WID_INT16,   ::cppu::UnoType<sal_Int16>::get(), 0, 0 },
+        { OUString(UNO_TC_PROP_URL_REPRESENTATION), WID_STRING1, ::cppu::UnoType<OUString>::get(),  0, 0 },
+        { OUString(UNO_TC_PROP_URL_TARGET),         WID_STRING2, ::cppu::UnoType<OUString>::get(),  0, 0 },
+        { OUString(UNO_TC_PROP_URL),                WID_STRING3, ::cppu::UnoType<OUString>::get(),  0, 0 },
         { OUString(), 0, css::uno::Type(), 0, 0 }
     };
     static const SfxItemPropertySet aUrlFieldPropertySet_Impl(aUrlFieldPropertyMap_Impl);
@@ -106,8 +106,8 @@ const SfxItemPropertySet* ImplGetFieldItemPropertySet( sal_Int32 mnId )
     static const SfxItemPropertyMapEntry aExtFileFieldPropertyMap_Impl[] =
     {
         { OUString(UNO_TC_PROP_IS_FIXED),             WID_BOOL1,   ::getBooleanCppuType(),             0, 0 },
-        { OUString(UNO_TC_PROP_FILE_FORMAT),          WID_INT16,   ::getCppuType((const sal_Int16*)0), 0, 0 },
-        { OUString(UNO_TC_PROP_CURRENT_PRESENTATION), WID_STRING1, ::getCppuType((const OUString*)0),  0, 0 },
+        { OUString(UNO_TC_PROP_FILE_FORMAT),          WID_INT16,   ::cppu::UnoType<sal_Int16>::get(), 0, 0 },
+        { OUString(UNO_TC_PROP_CURRENT_PRESENTATION), WID_STRING1, ::cppu::UnoType<OUString>::get(),  0, 0 },
         { OUString(), 0, css::uno::Type(), 0, 0 }
     };
     static const SfxItemPropertySet aExtFileFieldPropertySet_Impl(aExtFileFieldPropertyMap_Impl);
@@ -115,9 +115,9 @@ const SfxItemPropertySet* ImplGetFieldItemPropertySet( sal_Int32 mnId )
     static const SfxItemPropertyMapEntry aAuthorFieldPropertyMap_Impl[] =
     {
         { OUString(UNO_TC_PROP_IS_FIXED),             WID_BOOL1,  ::getBooleanCppuType(),             0, 0 },
-        { OUString(UNO_TC_PROP_CURRENT_PRESENTATION), WID_STRING1,::getCppuType((const OUString*)0),  0, 0 },
-        { OUString(UNO_TC_PROP_AUTHOR_CONTENT),       WID_STRING2,::getCppuType((const OUString*)0),  0, 0 },
-        { OUString(UNO_TC_PROP_AUTHOR_FORMAT),        WID_INT16,  ::getCppuType((const sal_Int16*)0), 0, 0 },
+        { OUString(UNO_TC_PROP_CURRENT_PRESENTATION), WID_STRING1,::cppu::UnoType<OUString>::get(),  0, 0 },
+        { OUString(UNO_TC_PROP_AUTHOR_CONTENT),       WID_STRING2,::cppu::UnoType<OUString>::get(),  0, 0 },
+        { OUString(UNO_TC_PROP_AUTHOR_FORMAT),        WID_INT16,  ::cppu::UnoType<sal_Int16>::get(), 0, 0 },
         { OUString(UNO_TC_PROP_AUTHOR_FULLNAME),      WID_BOOL2,  ::getBooleanCppuType(),             0, 0 },
         { OUString(), 0, css::uno::Type(), 0, 0 }
     };
@@ -125,7 +125,7 @@ const SfxItemPropertySet* ImplGetFieldItemPropertySet( sal_Int32 mnId )
 
     static const SfxItemPropertyMapEntry aMeasureFieldPropertyMap_Impl[] =
     {
-        { OUString(UNO_TC_PROP_MEASURE_KIND), WID_INT16,  ::getCppuType((const sal_Int16*)0), 0, 0 },
+        { OUString(UNO_TC_PROP_MEASURE_KIND), WID_INT16,  ::cppu::UnoType<sal_Int16>::get(), 0, 0 },
         { OUString(), 0, css::uno::Type(), 0, 0 }
     };
     static const SfxItemPropertySet aMeasureFieldPropertySet_Impl(aMeasureFieldPropertyMap_Impl);
diff --git a/editeng/source/uno/unoipset.cxx b/editeng/source/uno/unoipset.cxx
index 84915f0b59f7..e0b66fce0d0d 100644
--- a/editeng/source/uno/unoipset.cxx
+++ b/editeng/source/uno/unoipset.cxx
@@ -125,7 +125,7 @@ uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry*
             }
         }
         else if ( pMap->aType.getTypeClass() == uno::TypeClass_ENUM &&
-              aVal.getValueType() == ::getCppuType((const sal_Int32*)0) )
+              aVal.getValueType() == ::cppu::UnoType<sal_Int32>::get() )
         {
             // convert typeless SfxEnumItem to enum type
             sal_Int32 nEnum;
@@ -237,7 +237,7 @@ uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry*
     }
 
     if ( pMap->aType.getTypeClass() == uno::TypeClass_ENUM &&
-          aVal.getValueType() == ::getCppuType((const sal_Int32*)0) )
+          aVal.getValueType() == ::cppu::UnoType<sal_Int32>::get() )
     {
         sal_Int32 nEnum;
         aVal >>= nEnum;
diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx
index 3b3f24246253..971b55b4b0e3 100644
--- a/editeng/source/uno/unonrule.cxx
+++ b/editeng/source/uno/unonrule.cxx
@@ -217,7 +217,7 @@ Sequence<beans::PropertyValue> SvxUnoNumberingRules::getNumberingRuleByIndex( sa
     {
         awt::FontDescriptor aDesc;
         SvxUnoFontDescriptor::ConvertFromFont( *rFmt.GetBulletFont(), aDesc );
-        aVal.setValue(&aDesc, ::getCppuType((const awt::FontDescriptor*)0));
+        aVal.setValue(&aDesc, ::cppu::UnoType<awt::FontDescriptor>::get());
         pArray[nIdx++] = beans::PropertyValue( OUString(UNO_NAME_NRULE_BULLET_FONT), -1, aVal, beans::PropertyState_DIRECT_VALUE);
     }
 
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index 659baec88cf4..e2c4b7a7cccb 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -89,7 +89,7 @@ const SfxItemPropertyMapEntry* ImplGetSvxTextPortionPropertyMap()
         SVX_UNOEDIT_OUTLINER_PROPERTIES,
         SVX_UNOEDIT_PARA_PROPERTIES,
         {OUString("TextField"),                     EE_FEATURE_FIELD,   ::getCppuType((const uno::Reference< text::XTextField >*)0),   beans::PropertyAttribute::READONLY, 0 },
-        {OUString("TextPortionType"),               WID_PORTIONTYPE,    ::getCppuType((const OUString*)0), beans::PropertyAttribute::READONLY, 0 },
+        {OUString("TextPortionType"),               WID_PORTIONTYPE,    ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::READONLY, 0 },
         {OUString("TextUserDefinedAttributes"),         EE_CHAR_XMLATTRIBS,     ::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(), 0, css::uno::Type(), 0, 0 }
diff --git a/editeng/source/xml/xmltxtexp.cxx b/editeng/source/xml/xmltxtexp.cxx
index 6e5b01b58460..65bb17a8533e 100644
--- a/editeng/source/xml/xmltxtexp.cxx
+++ b/editeng/source/xml/xmltxtexp.cxx
@@ -385,7 +385,7 @@ SvxXMLTextExportComponent::SvxXMLTextExportComponent(
 //      SVX_UNOEDIT_OUTLINER_PROPERTIES,
         {OUString(UNO_NAME_NUMBERING_RULES),        EE_PARA_NUMBULLET,  ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace>*)0), 0, 0 },
         {OUString(UNO_NAME_NUMBERING),              EE_PARA_BULLETSTATE,::getBooleanCppuType(), 0, 0 },
-        {OUString(UNO_NAME_NUMBERING_LEVEL),        EE_PARA_OUTLLEVEL,  ::getCppuType((const sal_Int16*)0), 0, 0 },
+        {OUString(UNO_NAME_NUMBERING_LEVEL),        EE_PARA_OUTLLEVEL,  ::cppu::UnoType<sal_Int16>::get(), 0, 0 },
         SVX_UNOEDIT_PARA_PROPERTIES,
         { OUString(), 0, css::uno::Type(), 0, 0 }
     };