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

Change-Id: Ibf958dbfbf7cdbe6ad31d390138be8d4d468c225

8 files changed, 15 insertions, 15 deletions

diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index 4633f2ac8607..caccf120ae00 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -195,7 +195,7 @@ void lcl_AddPropertiesToVector(
     rOutProperties.push_back(
         Property( "AddIn",
                   PROP_DOCUMENT_ADDIN,
-                  ::getCppuType( reinterpret_cast< Reference< util::XRefreshable > * >(0)),
+                  cppu::UnoType<util::XRefreshable>::get(),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEVOID ));
     rOutProperties.push_back(
@@ -207,7 +207,7 @@ void lcl_AddPropertiesToVector(
     rOutProperties.push_back(
         Property( "AdditionalShapes",
                   PROP_DOCUMENT_ADDITIONAL_SHAPES,
-                  ::getCppuType( reinterpret_cast< Reference< drawing::XShapes > * >(0)),
+                  cppu::UnoType<drawing::XShapes>::get(),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEVOID
                   | beans::PropertyAttribute::READONLY ));
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
index 796d755912a3..c7d808cc8147 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
@@ -1059,21 +1059,21 @@ void WrappedStatisticProperties::addProperties( ::std::vector< Property > & rOut
     rOutProperties.push_back(
         Property( "DataRegressionProperties",
                   PROP_CHART_STATISTIC_REGRESSION_PROPERTIES,
-                  ::getCppuType( reinterpret_cast< const Reference< beans::XPropertySet > * >(0)),
+                  cppu::UnoType<beans::XPropertySet>::get(),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::READONLY
                   | beans::PropertyAttribute::MAYBEVOID ));
     rOutProperties.push_back(
         Property( "DataErrorProperties",
                   PROP_CHART_STATISTIC_ERROR_PROPERTIES,
-                  ::getCppuType( reinterpret_cast< const Reference< beans::XPropertySet > * >(0)),
+                  cppu::UnoType<beans::XPropertySet>::get(),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::READONLY
                   | beans::PropertyAttribute::MAYBEVOID ));
     rOutProperties.push_back(
         Property( "DataMeanValueProperties",
                   PROP_CHART_STATISTIC_MEAN_VALUE_PROPERTIES,
-                  ::getCppuType( reinterpret_cast< const Reference< beans::XPropertySet > * >(0)),
+                  cppu::UnoType<beans::XPropertySet>::get(),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::READONLY
                   | beans::PropertyAttribute::MAYBEVOID ));
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
index 9fef7daa751e..2469312207fe 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
@@ -266,14 +266,14 @@ void WrappedStockProperties::addProperties( ::std::vector< Property > & rOutProp
     rOutProperties.push_back(
         Property( "Volume",
                   PROP_CHART_STOCK_VOLUME,
-                  ::getCppuType( reinterpret_cast< sal_Bool * >(0)),
+                  cppu::UnoType<sal_Bool>::get(),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT
                   | beans::PropertyAttribute::MAYBEVOID ));
     rOutProperties.push_back(
         Property( "UpDown",
                   PROP_CHART_STOCK_UPDOWN,
-                  ::getCppuType( reinterpret_cast< sal_Bool * >(0)),
+                  cppu::UnoType<sal_Bool>::get(),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT
                   | beans::PropertyAttribute::MAYBEVOID ));
diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx
index 32f0419f8b22..bc5f4940a33c 100644
--- a/chart2/source/model/filter/XMLFilter.cxx
+++ b/chart2/source/model/filter/XMLFilter.cxx
@@ -339,7 +339,7 @@ sal_Int32 XMLFilter::impl_Import(
             { OUString("ProgressMax"),     0, ::cppu::UnoType<sal_Int32>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
             { OUString("ProgressCurrent"), 0, ::cppu::UnoType<sal_Int32>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
             { OUString("PrivateData"), 0,
-                ::getCppuType( (Reference<XInterface> *)0 ),
+                cppu::UnoType<XInterface>::get(),
                 ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
             { OUString("BaseURI"), 0,
                 ::cppu::UnoType<OUString>::get(),
diff --git a/chart2/source/model/template/CandleStickChartType.cxx b/chart2/source/model/template/CandleStickChartType.cxx
index 57320b90e3e6..faf5f39627eb 100644
--- a/chart2/source/model/template/CandleStickChartType.cxx
+++ b/chart2/source/model/template/CandleStickChartType.cxx
@@ -59,13 +59,13 @@ void lcl_AddPropertiesToVector(
     rOutProperties.push_back(
         Property( "WhiteDay",
                   PROP_CANDLESTICKCHARTTYPE_WHITE_DAY,
-                  ::getCppuType( reinterpret_cast< Reference< beans::XPropertySet > *>(0)),
+                  cppu::UnoType<beans::XPropertySet>::get(),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEVOID ));
     rOutProperties.push_back(
         Property( "BlackDay",
                   PROP_CANDLESTICKCHARTTYPE_BLACK_DAY,
-                  ::getCppuType( reinterpret_cast< Reference< beans::XPropertySet > *>(0)),
+                  cppu::UnoType<beans::XPropertySet>::get(),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEVOID ));
 
diff --git a/chart2/source/model/template/PieChartTypeTemplate.cxx b/chart2/source/model/template/PieChartTypeTemplate.cxx
index b30f633ec171..e49decf1150e 100644
--- a/chart2/source/model/template/PieChartTypeTemplate.cxx
+++ b/chart2/source/model/template/PieChartTypeTemplate.cxx
@@ -63,7 +63,7 @@ static void lcl_AddPropertiesToVector(
     rOutProperties.push_back(
         Property( "OffsetMode",
                   PROP_PIE_TEMPLATE_OFFSET_MODE,
-                  ::getCppuType( reinterpret_cast< const chart2::PieChartOffsetMode * >(0)),
+                  cppu::UnoType<chart2::PieChartOffsetMode>::get(),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
     rOutProperties.push_back(
diff --git a/chart2/source/tools/FillProperties.cxx b/chart2/source/tools/FillProperties.cxx
index a6177d69b312..5316984b10fc 100644
--- a/chart2/source/tools/FillProperties.cxx
+++ b/chart2/source/tools/FillProperties.cxx
@@ -94,7 +94,7 @@ void lcl_AddPropertiesToVector_without_BitmapProperties( ::std::vector< ::com::s
     rOutProperties.push_back(
         Property( "FillBackground",
                   FillProperties::PROP_FILL_BACKGROUND,
-                  ::getCppuType( reinterpret_cast< const sal_Bool * >(0)),
+                  cppu::UnoType<sal_Bool>::get(),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 }
@@ -147,7 +147,7 @@ void lcl_AddPropertiesToVector_only_BitmapProperties( ::std::vector< ::com::sun:
     rOutProperties.push_back(
         Property( "FillBitmapLogicalSize",
                   FillProperties::PROP_FILL_BITMAP_LOGICALSIZE,
-                  ::getCppuType( reinterpret_cast< const sal_Bool * >(0)),
+                  cppu::UnoType<sal_Bool>::get(),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
diff --git a/chart2/source/tools/ModifyListenerHelper.cxx b/chart2/source/tools/ModifyListenerHelper.cxx
index 3245ca527c1a..ae5e5d0ddf53 100644
--- a/chart2/source/tools/ModifyListenerHelper.cxx
+++ b/chart2/source/tools/ModifyListenerHelper.cxx
@@ -39,7 +39,7 @@ void lcl_fireModifyEvent(
     const lang::EventObject * pEvent )
 {
     ::cppu::OInterfaceContainerHelper * pCntHlp = rBroadcastHelper.getContainer(
-        ::getCppuType( reinterpret_cast< Reference< util::XModifyListener > * >(0)));
+        cppu::UnoType<util::XModifyListener>::get());
     if( pCntHlp )
     {
         lang::EventObject aEventToSend;
@@ -156,7 +156,7 @@ void ModifyEventForwarder::RemoveListener( const Reference< util::XModifyListene
 void ModifyEventForwarder::DisposeAndClear( const Reference< uno::XWeak > & xSource )
 {
     ::cppu::OInterfaceContainerHelper * pCntHlp = m_aModifyListeners.getContainer(
-        ::getCppuType( reinterpret_cast< Reference< util::XModifyListener > * >(0)));
+        cppu::UnoType<util::XModifyListener>::get());
     if( pCntHlp )
         pCntHlp->disposeAndClear( lang::EventObject( xSource ) );
 }