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

Change-Id: Ibf958dbfbf7cdbe6ad31d390138be8d4d468c225

15 files changed, 53 insertions, 53 deletions

diff --git a/xmloff/source/chart/ColorPropertySet.cxx b/xmloff/source/chart/ColorPropertySet.cxx
index c0c05c3aea63..23a3a4a891fa 100644
--- a/xmloff/source/chart/ColorPropertySet.cxx
+++ b/xmloff/source/chart/ColorPropertySet.cxx
@@ -51,7 +51,7 @@ lcl_ColorPropertySetInfo::lcl_ColorPropertySetInfo( bool bFillColor ) :
         // note: length of FillColor and LineColor is 9
         m_aColorPropName( (bFillColor ? "FillColor" : "LineColor"), 9, RTL_TEXTENCODING_ASCII_US ),
         m_aColorProp( m_aColorPropName, -1,
-                      ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), 0)
+                      cppu::UnoType<sal_Int32>::get(), 0)
 {}
 
 Sequence< Property > SAL_CALL lcl_ColorPropertySetInfo::getProperties()
diff --git a/xmloff/source/chart/PropertyMaps.cxx b/xmloff/source/chart/PropertyMaps.cxx
index a95a392705d3..564241479bb5 100644
--- a/xmloff/source/chart/PropertyMaps.cxx
+++ b/xmloff/source/chart/PropertyMaps.cxx
@@ -94,17 +94,17 @@ const XMLPropertyHandler* XMLChartPropHdlFactory::GetPropertyHandler( sal_Int32
 
             case XML_SCH_TYPE_AXIS_LABEL_POSITION:
                 pHdl = new XMLEnumPropertyHdl( aXMLChartAxisLabelPositionEnumMap,
-                                               ::getCppuType((const chart::ChartAxisLabelPosition*)0) );
+                                               cppu::UnoType<chart::ChartAxisLabelPosition>::get());
                 break;
 
             case XML_SCH_TYPE_TICK_MARK_POSITION:
                 pHdl = new XMLEnumPropertyHdl( aXMLChartAxisMarkPositionEnumMap,
-                                               ::getCppuType((const chart::ChartAxisMarkPosition*)0) );
+                                               cppu::UnoType<chart::ChartAxisMarkPosition>::get());
                 break;
 
             case XML_SCH_TYPE_AXIS_ARRANGEMENT:
                 pHdl = new XMLEnumPropertyHdl( aXMLChartAxisArrangementEnumMap,
-                                               ::getCppuType((const chart::ChartAxisArrangeOrderType*)0) );
+                                               cppu::UnoType<chart::ChartAxisArrangeOrderType>::get());
                 break;
 
             case XML_SCH_TYPE_ERROR_BAR_STYLE:
@@ -132,7 +132,7 @@ const XMLPropertyHandler* XMLChartPropHdlFactory::GetPropertyHandler( sal_Int32
                 break;
             case XML_SCH_TYPE_DATAROWSOURCE:
                 pHdl = new XMLEnumPropertyHdl( aXMLChartDataRowSourceTypeEnumMap,
-                                               ::getCppuType((const chart::ChartDataRowSource*)0) );
+                                               cppu::UnoType<chart::ChartDataRowSource>::get());
                 break;
             case XML_SCH_TYPE_TEXT_ORIENTATION:
                 pHdl = new XMLTextOrientationHdl();
diff --git a/xmloff/source/chart/SchXMLEnumConverter.cxx b/xmloff/source/chart/SchXMLEnumConverter.cxx
index ec04afdbcb8e..5bf2819b9fe7 100644
--- a/xmloff/source/chart/SchXMLEnumConverter.cxx
+++ b/xmloff/source/chart/SchXMLEnumConverter.cxx
@@ -44,7 +44,7 @@ class XMLLegendPositionPropertyHdl : public XMLEnumPropertyHdl
 {
 public:
     XMLLegendPositionPropertyHdl()
-        : XMLEnumPropertyHdl( aXMLLegendPositionEnumMap, ::getCppuType((const chart::ChartLegendPosition*)0) ) {}
+        : XMLEnumPropertyHdl( aXMLLegendPositionEnumMap, cppu::UnoType<chart::ChartLegendPosition>::get()) {}
     virtual ~XMLLegendPositionPropertyHdl() {};
 };
 
@@ -65,7 +65,7 @@ class XMLLegendExpansionPropertyHdl : public XMLEnumPropertyHdl
 {
 public:
     XMLLegendExpansionPropertyHdl()
-        : XMLEnumPropertyHdl( aXMLLegendExpansionEnumMap, ::getCppuType((const chart::ChartLegendExpansion*)0) ) {}
+        : XMLEnumPropertyHdl( aXMLLegendExpansionEnumMap, cppu::UnoType<chart::ChartLegendExpansion>::get()) {}
     virtual ~XMLLegendExpansionPropertyHdl() {};
 };
 
diff --git a/xmloff/source/core/SettingsExportHelper.cxx b/xmloff/source/core/SettingsExportHelper.cxx
index 64adf5af38c6..66c10ae222ae 100644
--- a/xmloff/source/core/SettingsExportHelper.cxx
+++ b/xmloff/source/core/SettingsExportHelper.cxx
@@ -142,27 +142,27 @@ void XMLSettingsExportHelper::CallTypeFunction(const uno::Any& rAny,
                 aAny >>= aProps;
                 exportbase64Binary(aProps, rName);
             }
-            else if (aType.equals(getCppuType( (uno::Reference<container::XNameContainer> *)0 ) ) ||
-                    aType.equals(getCppuType( (uno::Reference<container::XNameAccess> *)0 ) ))
+            else if (aType.equals(cppu::UnoType<container::XNameContainer>::get()) ||
+                    aType.equals(cppu::UnoType<container::XNameAccess>::get()))
             {
                 uno::Reference< container::XNameAccess> aNamed;
                 aAny >>= aNamed;
                 exportNameAccess(aNamed, rName);
             }
-            else if (aType.equals(getCppuType( (uno::Reference<container::XIndexAccess> *)0 ) ) ||
-                    aType.equals(getCppuType( (uno::Reference<container::XIndexContainer> *)0 ) ) )
+            else if (aType.equals(cppu::UnoType<container::XIndexAccess>::get()) ||
+                    aType.equals(cppu::UnoType<container::XIndexContainer>::get()) )
             {
                 uno::Reference<container::XIndexAccess> aIndexed;
                 aAny >>= aIndexed;
                 exportIndexAccess(aIndexed, rName);
             }
-            else if (aType.equals(getCppuType( (util::DateTime *)0 ) ) )
+            else if (aType.equals(cppu::UnoType<util::DateTime>::get()) )
             {
                 util::DateTime aDateTime;
                 aAny >>= aDateTime;
                 exportDateTime(aDateTime, rName);
             }
-            else if( aType.equals(getCppuType( (uno::Reference<i18n::XForbiddenCharacters> *)0 ) ) )
+            else if( aType.equals(cppu::UnoType<i18n::XForbiddenCharacters>::get()) )
             {
                 exportForbiddenCharacters( aAny, rName );
             }
diff --git a/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx b/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx
index 6dea02857480..eb9c4f3e68e1 100644
--- a/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx
+++ b/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx
@@ -136,7 +136,7 @@ void SAL_CALL XMLEmbeddedObjectExportFilter::initialize(
     for( sal_Int32 nIndex = 0; nIndex < nAnyCount; nIndex++, pAny++ )
     {
         if( pAny->getValueType() ==
-                ::getCppuType((const Reference< XDocumentHandler >*)0))
+                cppu::UnoType<XDocumentHandler>::get())
         {
             *pAny >>= xHandler;
             *pAny >>= xExtHandler;
diff --git a/xmloff/source/core/unoatrcn.cxx b/xmloff/source/core/unoatrcn.cxx
index 68d43114e472..df29325e0644 100644
--- a/xmloff/source/core/unoatrcn.cxx
+++ b/xmloff/source/core/unoatrcn.cxx
@@ -53,7 +53,7 @@ SvUnoAttributeContainer::~SvUnoAttributeContainer()
 uno::Type SAL_CALL SvUnoAttributeContainer::getElementType(void)
     throw( uno::RuntimeException, std::exception )
 {
-    return ::getCppuType((const xml::AttributeData*)0);
+    return cppu::UnoType<xml::AttributeData>::get();
 }
 
 sal_Bool SAL_CALL SvUnoAttributeContainer::hasElements(void)
@@ -159,7 +159,7 @@ sal_Bool SAL_CALL SvUnoAttributeContainer::hasByName(const OUString& aName) thro
 void SAL_CALL SvUnoAttributeContainer::replaceByName(const OUString& aName, const uno::Any& aElement)
     throw( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
-    if( aElement.hasValue() && aElement.getValueType() == ::getCppuType((const xml::AttributeData*)0) )
+    if( aElement.hasValue() && aElement.getValueType() == cppu::UnoType<xml::AttributeData>::get())
     {
         sal_uInt16 nAttr = getIndexByName(aName );
         if( nAttr == USHRT_MAX )
@@ -201,7 +201,7 @@ void SAL_CALL SvUnoAttributeContainer::replaceByName(const OUString& aName, cons
 void SAL_CALL SvUnoAttributeContainer::insertByName(const OUString& aName, const uno::Any& aElement)
 throw( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
-    if( !aElement.hasValue() || aElement.getValueType() != ::getCppuType((const xml::AttributeData*)0) )
+    if( !aElement.hasValue() || aElement.getValueType() != cppu::UnoType<xml::AttributeData>::get())
         throw lang::IllegalArgumentException();
 
     sal_uInt16 nAttr = getIndexByName(aName );
diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx
index 4ea112dc3705..e242ed01825a 100644
--- a/xmloff/source/draw/animationimport.cxx
+++ b/xmloff/source/draw/animationimport.cxx
@@ -1304,7 +1304,7 @@ AnimationsImport::~AnimationsImport() throw ()
 // XInterface
 Any SAL_CALL AnimationsImport::queryInterface( const Type& aType ) throw (RuntimeException, std::exception)
 {
-    if ( aType == ::getCppuType((Reference<XAnimationNodeSupplier> *)0) )
+    if ( aType == cppu::UnoType<XAnimationNodeSupplier>::get())
     {
         return makeAny( Reference<XAnimationNodeSupplier>( this ) );
     }
diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx
index ca6834012639..c572e68defbd 100644
--- a/xmloff/source/draw/sdpropls.cxx
+++ b/xmloff/source/draw/sdpropls.cxx
@@ -876,12 +876,12 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy
         {
             case XML_SD_TYPE_STROKE :
             {
-                pHdl = new XMLEnumPropertyHdl( aXML_LineStyle_EnumMap, ::getCppuType((const drawing::LineStyle*)0) );
+                pHdl = new XMLEnumPropertyHdl( aXML_LineStyle_EnumMap, cppu::UnoType<drawing::LineStyle>::get());
                 break;
             }
             case XML_SD_TYPE_LINEJOIN :
             {
-                pHdl = new XMLEnumPropertyHdl( aXML_LineJoint_EnumMap, ::getCppuType((const drawing::LineJoint*)0) );
+                pHdl = new XMLEnumPropertyHdl( aXML_LineJoint_EnumMap, cppu::UnoType<drawing::LineJoint>::get());
                 break;
             }
             case XML_SD_TYPE_LINECAP :
@@ -891,7 +891,7 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy
             }
             case XML_SD_TYPE_FILLSTYLE :
             {
-                pHdl = new XMLEnumPropertyHdl( aXML_FillStyle_EnumMap, ::getCppuType((const drawing::FillStyle*)0) );
+                pHdl = new XMLEnumPropertyHdl( aXML_FillStyle_EnumMap, cppu::UnoType<drawing::FillStyle>::get());
                 break;
             }
             case XML_SD_TYPE_PRESPAGE_TYPE :
@@ -916,7 +916,7 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy
             }
             case XML_SD_TYPE_PRESPAGE_SPEED :
             {
-                pHdl = new XMLEnumPropertyHdl( aXML_TransSpeed_EnumMap, ::getCppuType((const presentation::AnimationSpeed*)0) );
+                pHdl = new XMLEnumPropertyHdl( aXML_TransSpeed_EnumMap, cppu::UnoType<presentation::AnimationSpeed>::get());
                 break;
             }
             case XML_SD_TYPE_PRESPAGE_DURATION :
@@ -936,7 +936,7 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy
             }
             case XML_SD_TYPE_WRITINGMODE :
             {
-                pHdl = new XMLEnumPropertyHdl( aXML_WritingMode_EnumMap, ::getCppuType((const text::WritingMode*)0) );
+                pHdl = new XMLEnumPropertyHdl( aXML_WritingMode_EnumMap, cppu::UnoType<text::WritingMode>::get());
                 break;
             }
             case XML_SD_TYPE_PRESPAGE_VISIBILITY :
@@ -963,7 +963,7 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy
 
             case XML_SD_TYPE_NORMALS_KIND:
             {
-                pHdl = new XMLEnumPropertyHdl( aXML_NormalsKind_EnumMap, ::getCppuType((const drawing::NormalsKind*)0) );
+                pHdl = new XMLEnumPropertyHdl( aXML_NormalsKind_EnumMap, cppu::UnoType<drawing::NormalsKind>::get());
                 break;
             }
             case XML_SD_TYPE_NORMALS_DIRECTION:
@@ -973,22 +973,22 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy
             }
             case XML_SD_TYPE_TEX_GENERATION_MODE_X:
             {
-                pHdl = new XMLEnumPropertyHdl( aXML_TexGenerationX_EnumMap, ::getCppuType((const drawing::TextureProjectionMode*)0) );
+                pHdl = new XMLEnumPropertyHdl( aXML_TexGenerationX_EnumMap, cppu::UnoType<drawing::TextureProjectionMode>::get());
                 break;
             }
             case XML_SD_TYPE_TEX_GENERATION_MODE_Y:
             {
-                pHdl = new XMLEnumPropertyHdl( aXML_TexGenerationY_EnumMap, ::getCppuType((const drawing::TextureProjectionMode*)0) );
+                pHdl = new XMLEnumPropertyHdl( aXML_TexGenerationY_EnumMap, cppu::UnoType<drawing::TextureProjectionMode>::get());
                 break;
             }
             case XML_SD_TYPE_TEX_KIND:
             {
-                pHdl = new XMLEnumPropertyHdl( aXML_TexKind_EnumMap, ::getCppuType((const drawing::TextureKind*)0) );
+                pHdl = new XMLEnumPropertyHdl( aXML_TexKind_EnumMap, cppu::UnoType<drawing::TextureKind>::get());
                 break;
             }
             case XML_SD_TYPE_TEX_MODE:
             {
-                pHdl = new XMLEnumPropertyHdl( aXML_TexMode_EnumMap, ::getCppuType((const drawing::TextureMode*)0) );
+                pHdl = new XMLEnumPropertyHdl( aXML_TexMode_EnumMap, cppu::UnoType<drawing::TextureMode>::get());
                 break;
             }
             case XML_SD_TYPE_NUMBULLET:
@@ -1003,7 +1003,7 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy
             }
             case XML_SD_TYPE_BITMAP_MODE:
             {
-                pHdl = new XMLEnumPropertyHdl( aXML_BitmapMode_EnumMap, getCppuType((const drawing::BitmapMode*)0) );
+                pHdl = new XMLEnumPropertyHdl( aXML_BitmapMode_EnumMap, cppu::UnoType<drawing::BitmapMode>::get());
                 break;
             }
             case XML_SD_TYPE_BITMAPREPOFFSETX:
@@ -1024,26 +1024,26 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy
             }
             case XML_SD_TYPE_BITMAP_REFPOINT:
             {
-                pHdl = new XMLEnumPropertyHdl( aXML_RefPoint_EnumMap, getCppuType((const ::com::sun::star::drawing::RectanglePoint*)0) );
+                pHdl = new XMLEnumPropertyHdl( aXML_RefPoint_EnumMap, cppu::UnoType<com::sun::star::drawing::RectanglePoint>::get());
                 break;
             }
             case XML_TYPE_TEXT_ANIMATION:
-                pHdl = new XMLEnumPropertyHdl( pXML_TextAnimation_Enum, ::getCppuType((const com::sun::star::drawing::TextAnimationKind*)0) );
+                pHdl = new XMLEnumPropertyHdl( pXML_TextAnimation_Enum, cppu::UnoType<com::sun::star::drawing::TextAnimationKind>::get());
                 break;
             case XML_TYPE_TEXT_ANIMATION_BLINKING:
-                pHdl = new XMLEnumPropertyHdl( pXML_TextAnimation_Blinking_Enum, ::getCppuType((const com::sun::star::drawing::TextAnimationKind*)0) );
+                pHdl = new XMLEnumPropertyHdl( pXML_TextAnimation_Blinking_Enum, cppu::UnoType<com::sun::star::drawing::TextAnimationKind>::get());
                 break;
             case XML_TYPE_TEXT_ANIMATION_DIRECTION:
-                pHdl = new XMLEnumPropertyHdl( pXML_TextAnimationDirection_Enum, ::getCppuType((const com::sun::star::drawing::TextAnimationDirection*)0) );
+                pHdl = new XMLEnumPropertyHdl( pXML_TextAnimationDirection_Enum, cppu::UnoType<com::sun::star::drawing::TextAnimationDirection>::get());
                 break;
             case XML_TYPE_TEXT_ANIMATION_STEPS:
                 pHdl = new XMLTextAnimationStepPropertyHdl;
                 break;
             case XML_SD_TYPE_TEXT_ALIGN:
-                pHdl = new XMLEnumPropertyHdl( pXML_TextAlign_Enum, ::getCppuType((const com::sun::star::drawing::TextHorizontalAdjust*)0) );
+                pHdl = new XMLEnumPropertyHdl( pXML_TextAlign_Enum, cppu::UnoType<com::sun::star::drawing::TextHorizontalAdjust>::get());
                 break;
             case XML_SD_TYPE_VERTICAL_ALIGN:
-                pHdl = new XMLEnumPropertyHdl( pXML_VerticalAlign_Enum, ::getCppuType((const com::sun::star::drawing::TextVerticalAdjust*)0) );
+                pHdl = new XMLEnumPropertyHdl( pXML_VerticalAlign_Enum, cppu::UnoType<com::sun::star::drawing::TextVerticalAdjust>::get());
                 break;
             case XML_SD_TYPE_FITTOSIZE:
                 {
@@ -1064,10 +1064,10 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy
                 pHdl = new XMLEnumPropertyHdl( pXML_MeasureUnit_Enum, ::cppu::UnoType<sal_Int32>::get() );
                 break;
             case XML_SD_TYPE_MEASURE_HALIGN:
-                pHdl = new XMLEnumPropertyHdl( pXML_Measure_HAlign_Enum, ::getCppuType((const com::sun::star::drawing::MeasureTextHorzPos*)0) );
+                pHdl = new XMLEnumPropertyHdl( pXML_Measure_HAlign_Enum, cppu::UnoType<com::sun::star::drawing::MeasureTextHorzPos>::get());
                 break;
             case XML_SD_TYPE_MEASURE_VALIGN:
-                pHdl = new XMLEnumPropertyHdl( pXML_Measure_VAlign_Enum, ::getCppuType((const com::sun::star::drawing::MeasureTextVertPos*)0) );
+                pHdl = new XMLEnumPropertyHdl( pXML_Measure_VAlign_Enum, cppu::UnoType<com::sun::star::drawing::MeasureTextVertPos>::get());
                 break;
             case XML_SD_TYPE_MEASURE_PLACING:
                 {
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index 611a7113d220..77d87bad09ff 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -2078,7 +2078,7 @@ void SdXMLConnectorShapeContext::StartElement(const uno::Reference< xml::sax::XA
 
                 if ( bApplySVGD )
                 {
-                    assert(maPath.getValueType() == ::getCppuType((const drawing::PolyPolygonBezierCoords*)0));
+                    assert(maPath.getValueType() == cppu::UnoType<drawing::PolyPolygonBezierCoords>::get());
                     xProps->setPropertyValue("PolyPolygonBezier", maPath);
                 }
             }
diff --git a/xmloff/source/style/prhdlfac.cxx b/xmloff/source/style/prhdlfac.cxx
index e211bc60ce74..002c7f43a90a 100644
--- a/xmloff/source/style/prhdlfac.cxx
+++ b/xmloff/source/style/prhdlfac.cxx
@@ -392,7 +392,7 @@ const XMLPropertyHandler* XMLPropertyHandlerFactory::CreatePropertyHandler( sal_
             break;
         case XML_TYPE_COLOR_MODE:
             pPropHdl = new XMLEnumPropertyHdl( aXML_ColorMode_EnumMap,
-                            ::getCppuType((const drawing::ColorMode*)0) );
+                            cppu::UnoType<drawing::ColorMode>::get());
             break;
         case XML_TYPE_DURATION16_MS:
             pPropHdl = new XMLDurationMS16PropHdl_Impl;
@@ -400,7 +400,7 @@ const XMLPropertyHandler* XMLPropertyHandlerFactory::CreatePropertyHandler( sal_
         case XML_TYPE_TEXT_HORIZONTAL_ADJUST:
             pPropHdl = new XMLEnumPropertyHdl(
                 aXML_HorizontalAdjust_Enum,
-                ::getCppuType((const text::HorizontalAdjust*)0) );
+                cppu::UnoType<text::HorizontalAdjust>::get());
             break;
         case XML_TYPE_TEXT_DRAW_ASPECT:
             pPropHdl = new DrawAspectHdl;
diff --git a/xmloff/source/text/XMLAutoTextEventImport.cxx b/xmloff/source/text/XMLAutoTextEventImport.cxx
index 8f91521c5a6b..6b6b3fbfcbc8 100644
--- a/xmloff/source/text/XMLAutoTextEventImport.cxx
+++ b/xmloff/source/text/XMLAutoTextEventImport.cxx
@@ -65,7 +65,7 @@ void XMLAutoTextEventImport::initialize(
     for( sal_Int32 i = 0; i < nLength; i++ )
     {
         const Type& rType = rArguments[i].getValueType();
-        if ( rType == ::getCppuType( (Reference<XEventsSupplier>*)NULL ) )
+        if ( rType == cppu::UnoType<XEventsSupplier>::get())
         {
             Reference<XEventsSupplier> xSupplier;
             rArguments[i] >>= xSupplier;
@@ -73,7 +73,7 @@ void XMLAutoTextEventImport::initialize(
 
             xEvents = xSupplier->getEvents();
         }
-        else if (rType == ::getCppuType( (Reference<XNameReplace>*)NULL ) )
+        else if (rType == cppu::UnoType<XNameReplace>::get())
         {
             rArguments[i] >>= xEvents;
             DBG_ASSERT(xEvents.is(), "need XEventsSupplier or XNameReplace");
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index b4ad80d53374..7c91085ffd96 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -377,7 +377,7 @@ BoundFrameSets::BoundFrameSets(const Reference<XInterface> xModel)
 void FieldParamExporter::Export()
 {
     const Type aStringType = ::cppu::UnoType<OUString>::get();
-    const Type aBoolType = ::getCppuType((sal_Bool*)0);
+    const Type aBoolType = cppu::UnoType<sal_Bool>::get();
     const Type aSeqType = ::getCppuType((Sequence<OUString>*)0);
     const Type aIntType = ::cppu::UnoType<sal_Int32>::get();
     Sequence<OUString> vParameters(m_xFieldParams->getElementNames());
diff --git a/xmloff/source/text/txtprhdl.cxx b/xmloff/source/text/txtprhdl.cxx
index d25091e37bb3..224f35ebffbd 100644
--- a/xmloff/source/text/txtprhdl.cxx
+++ b/xmloff/source/text/txtprhdl.cxx
@@ -1399,7 +1399,7 @@ const XMLPropertyHandler *XMLTextPropertyHandlerFactory_Impl::GetPropertyHandler
 
     //UUUU
     case XML_SW_TYPE_FILLSTYLE:
-        pHdl = new XMLEnumPropertyHdl( aXML_FillStyle_EnumMap, ::getCppuType((const FillStyle*)0) );
+        pHdl = new XMLEnumPropertyHdl( aXML_FillStyle_EnumMap, cppu::UnoType<FillStyle>::get());
         break;
     case XML_SW_TYPE_FILLBITMAPSIZE:
         pHdl = new XMLFillBitmapSizePropertyHandler();
@@ -1408,10 +1408,10 @@ const XMLPropertyHandler *XMLTextPropertyHandlerFactory_Impl::GetPropertyHandler
         pHdl = new XMLBitmapLogicalSizePropertyHandler();
         break;
     case XML_SW_TYPE_BITMAP_REFPOINT:
-        pHdl = new XMLEnumPropertyHdl( aXML_RefPoint_EnumMap, getCppuType((const RectanglePoint*)0) );
+        pHdl = new XMLEnumPropertyHdl( aXML_RefPoint_EnumMap, cppu::UnoType<RectanglePoint>::get());
         break;
     case XML_SW_TYPE_BITMAP_MODE:
-        pHdl = new XMLEnumPropertyHdl( aXML_BitmapMode_EnumMap, getCppuType((const BitmapMode*)0) );
+        pHdl = new XMLEnumPropertyHdl( aXML_BitmapMode_EnumMap, cppu::UnoType<BitmapMode>::get());
         break;
     case XML_SW_TYPE_BITMAPREPOFFSETX:
     case XML_SW_TYPE_BITMAPREPOFFSETY:
diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx
index 3098480ee8cd..7d51d95001d3 100644
--- a/xmloff/source/transform/OOo2Oasis.cxx
+++ b/xmloff/source/transform/OOo2Oasis.cxx
@@ -1866,12 +1866,12 @@ Any OOo2OasisTransformer::queryInterface( const Type& rType )
     throw (RuntimeException, std::exception)
 {
     Any aRet;
-    if ( rType == ::getCppuType((Reference<XImporter> *)0) )
+    if ( rType == cppu::UnoType<XImporter>::get())
     {
         Reference<XImporter> xThis( this );
            aRet <<= xThis;
     }
-    else if ( rType == ::getCppuType((Reference<XFilter> *)0) )
+    else if ( rType == cppu::UnoType<XFilter>::get())
     {
         Reference<XFilter> xThis( this );
         aRet <<= xThis;
@@ -2047,8 +2047,8 @@ Sequence< ::com::sun::star::uno::Type > SAL_CALL
     aTypes.realloc( nIndex + 2 );
 
     ::com::sun::star::uno::Type* pTypes = aTypes.getArray();
-    pTypes[nIndex++] = ::getCppuType( static_cast< Reference< XImporter > * >( 0 ) );
-    pTypes[nIndex++] = ::getCppuType( static_cast< Reference< XFilter > * >( 0 ) );
+    pTypes[nIndex++] = cppu::UnoType<XImporter>::get();
+    pTypes[nIndex++] = cppu::UnoType<XFilter>::get();
 
     return aTypes;
 }
diff --git a/xmloff/source/transform/TransformerBase.cxx b/xmloff/source/transform/TransformerBase.cxx
index 2433ca4f4ac2..f17501ef148e 100644
--- a/xmloff/source/transform/TransformerBase.cxx
+++ b/xmloff/source/transform/TransformerBase.cxx
@@ -430,15 +430,15 @@ void SAL_CALL XMLTransformerBase::initialize( const Sequence< Any >& aArguments
         // uses queryInterface, and the model also has a XPropertySet interface.
 
         // document handler
-        if( ::getCppuType( (const Reference< XDocumentHandler >*) 0 ).isAssignableFrom( pAny->getValueType() ) )
+        if( cppu::UnoType<XDocumentHandler>::get().isAssignableFrom( pAny->getValueType() ) )
             m_xHandler.set( *pAny, UNO_QUERY );
 
         // property set to transport data across
-        if( ::getCppuType( (const Reference< XPropertySet >*) 0 ).isAssignableFrom( pAny->getValueType() ) )
+        if( cppu::UnoType<XPropertySet>::get().isAssignableFrom( pAny->getValueType() ) )
             m_xPropSet.set( *pAny, UNO_QUERY );
 
         // xmodel
-        if( ::getCppuType( (const Reference< ::com::sun::star::frame::XModel >*) 0 ).isAssignableFrom( pAny->getValueType() ) )
+        if( cppu::UnoType<com::sun::star::frame::XModel>::get().isAssignableFrom( pAny->getValueType() ) )
             mxModel.set( *pAny, UNO_QUERY );
     }