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

Change-Id: Ibf958dbfbf7cdbe6ad31d390138be8d4d468c225

8 files changed, 23 insertions, 23 deletions

diff --git a/sd/source/core/text/textapi.cxx b/sd/source/core/text/textapi.cxx
index 0eedb57ce646..b705e417d6ae 100644
--- a/sd/source/core/text/textapi.cxx
+++ b/sd/source/core/text/textapi.cxx
@@ -120,10 +120,10 @@ const SvxItemPropertySet* ImplGetSdTextPortionPropertyMap()
         SVX_UNOEDIT_FONT_PROPERTIES,
         SVX_UNOEDIT_OUTLINER_PROPERTIES,
         SVX_UNOEDIT_PARA_PROPERTIES,
-        {OUString("TextField"),                     EE_FEATURE_FIELD,   ::getCppuType((const Reference< XTextField >*)0),  PropertyAttribute::READONLY, 0 },
+        {OUString("TextField"),                     EE_FEATURE_FIELD,   cppu::UnoType<XTextField>::get(),  PropertyAttribute::READONLY, 0 },
         {OUString("TextPortionType"),               WID_PORTIONTYPE,    ::cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0 },
-        {OUString("TextUserDefinedAttributes"),     EE_CHAR_XMLATTRIBS,     ::getCppuType((const Reference< XNameContainer >*)0)  ,        0,     0},
-        {OUString("ParaUserDefinedAttributes"),     EE_PARA_XMLATTRIBS,     ::getCppuType((const Reference< XNameContainer >*)0)  ,        0,     0},
+        {OUString("TextUserDefinedAttributes"),     EE_CHAR_XMLATTRIBS,     cppu::UnoType<XNameContainer>::get(),        0,     0},
+        {OUString("ParaUserDefinedAttributes"),     EE_PARA_XMLATTRIBS,     cppu::UnoType<XNameContainer>::get(),        0,     0},
         { OUString(), 0, css::uno::Type(), 0, 0 }
     };
     static SvxItemPropertySet aSdTextPortionPropertyMap( aSdTextPortionPropertyEntries, SdrObject::GetGlobalDrawObjectItemPool() );
diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx
index 4205bf9b2ae4..411ffad05a14 100644
--- a/sd/source/filter/eppt/pptx-epptbase.cxx
+++ b/sd/source/filter/eppt/pptx-epptbase.cxx
@@ -727,7 +727,7 @@ bool PPTWriterBase::GetShapeByIndex( sal_uInt32 nIndex, bool bGroup )
         if ( !mXShape.is() )
             break;
 
-        Any aAny( mXShape->queryInterface( ::getCppuType( (const Reference< XPropertySet >*) 0 ) ));
+        Any aAny( mXShape->queryInterface( cppu::UnoType<XPropertySet>::get()));
         aAny >>= mXPropSet;
 
         if ( !mXPropSet.is() )
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index 1befad1fd752..411e7b15ce54 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -447,7 +447,7 @@ bool SdXMLFilter::Import( ErrCode& nError )
         { OUString("Preview"),         0, ::cppu::UnoType<sal_Bool>::get(),  ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
         { OUString("PageLayouts"), 0, cppu::UnoType<container::XNameAccess>::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/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index 8ccd1176f812..28914899d915 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -1671,7 +1671,7 @@ void CustomAnimationPane::onChange( bool bCreate )
         Reference< XSelectionSupplier >  xSel( mxView, UNO_QUERY_THROW );
         maViewSelection = xSel->getSelection();
 
-        if( maViewSelection.getValueType() == ::getCppuType((const Reference< XShapes >*)0) )
+        if( maViewSelection.getValueType() == cppu::UnoType<XShapes>::get())
         {
             Reference< XIndexAccess > xShapes;
             maViewSelection >>= xShapes;
@@ -1691,7 +1691,7 @@ void CustomAnimationPane::onChange( bool bCreate )
                 }
             }
         }
-        else if ( maViewSelection.getValueType() == ::getCppuType((const Reference< XShape >*)0) )
+        else if ( maViewSelection.getValueType() == cppu::UnoType<XShape>::get())
         {
             aTargets.push_back( maViewSelection );
             Reference< XText > xText;
@@ -1699,7 +1699,7 @@ void CustomAnimationPane::onChange( bool bCreate )
             if( !xText.is() || xText->getString().isEmpty() )
                 bHasText = false;
         }
-        else if ( maViewSelection.getValueType() == ::getCppuType((const Reference< XTextCursor >*)0) )
+        else if ( maViewSelection.getValueType() == cppu::UnoType<XTextCursor>::get())
         {
             Reference< XShape > xShape;
             std::list< sal_Int16 > aParaList;
diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx
index f5ed766c5f91..380b69c2478b 100644
--- a/sd/source/ui/unoidl/DrawController.cxx
+++ b/sd/source/ui/unoidl/DrawController.cxx
@@ -68,7 +68,7 @@ DrawController::DrawController (ViewShellBase& rBase) throw()
           OMultiTypeInterfaceContainerHelper::keyType>& >(
               BroadcastHelperOwner::maBroadcastHelper)),
       m_aSelectionTypeIdentifier(
-        ::getCppuType( (Reference<view::XSelectionChangeListener > *)0 )),
+        cppu::UnoType<view::XSelectionChangeListener>::get()),
       mpBase(&rBase),
       maLastVisArea(),
       mpCurrentPage(NULL),
@@ -125,9 +125,9 @@ Sequence<Type> SAL_CALL DrawController::getTypes (void)
     // OPropertySetHelper does not provide getTypes, so we have to
     // implement this method manually and list its three interfaces.
     OTypeCollection aTypeCollection (
-        ::getCppuType (( const Reference<beans::XMultiPropertySet>*)NULL),
-        ::getCppuType (( const Reference<beans::XFastPropertySet>*)NULL),
-        ::getCppuType (( const Reference<beans::XPropertySet>*)NULL));
+        cppu::UnoType<beans::XMultiPropertySet>::get(),
+        cppu::UnoType<beans::XFastPropertySet>::get(),
+        cppu::UnoType<beans::XPropertySet>::get());
 
     return ::comphelper::concatSequences(
         SfxBaseController::getTypes(),
@@ -328,7 +328,7 @@ void  SAL_CALL
     ThrowIfDisposed();
     // Have to forward the event to our selection change listeners.
     OInterfaceContainerHelper* pListeners = BroadcastHelperOwner::maBroadcastHelper.getContainer(
-        ::getCppuType((Reference<view::XSelectionChangeListener>*)0));
+        cppu::UnoType<view::XSelectionChangeListener>::get());
     if (pListeners)
     {
         // Re-send the event to all of our listeners.
@@ -706,13 +706,13 @@ void DrawController::FillPropertyTable (
         beans::Property(
             "SubController",
             PROPERTY_SUB_CONTROLLER,
-            ::getCppuType((const Reference<drawing::XDrawSubController>*)0),
+            cppu::UnoType<drawing::XDrawSubController>::get(),
             beans::PropertyAttribute::BOUND));
     rProperties.push_back(
         beans::Property(
             "CurrentPage",
             PROPERTY_CURRENTPAGE,
-            ::getCppuType((const Reference< drawing::XDrawPage > *)0),
+            cppu::UnoType<drawing::XDrawPage>::get(),
             beans::PropertyAttribute::BOUND ));
     rProperties.push_back(
         beans::Property("IsLayerMode",
@@ -727,7 +727,7 @@ void DrawController::FillPropertyTable (
     rProperties.push_back(
         beans::Property("ActiveLayer",
             PROPERTY_ACTIVE_LAYER,
-            ::getCppuType((const Reference< drawing::XLayer > *)0),
+            cppu::UnoType<drawing::XLayer>::get(),
             beans::PropertyAttribute::BOUND ));
     rProperties.push_back(
         beans::Property("ZoomValue",
diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
index f84a973e917e..9ba698d32e12 100644
--- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx
+++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
@@ -190,7 +190,7 @@ enum SdDocumentSettingsPropertyHandles
             { OUString("GradientTableURL"),      HANDLE_GRADIENTTABLEURL,    ::cppu::UnoType<OUString>::get(),     0,  0 },
             { OUString("BitmapTableURL"),        HANDLE_BITMAPTABLEURL,      ::cppu::UnoType<OUString>::get(),     0,  0 },
 
-            { OUString("ForbiddenCharacters"),   HANDLE_FORBIDDENCHARS,      ::getCppuType((const Reference< XForbiddenCharacters >*)0),    0, 0 },
+            { OUString("ForbiddenCharacters"),   HANDLE_FORBIDDENCHARS,      cppu::UnoType<XForbiddenCharacters>::get(),    0, 0 },
             { OUString("ApplyUserData"),         HANDLE_APPLYUSERDATA,       ::getBooleanCppuType(),                0,  0 },
 
             { OUString("PageNumberFormat"),      HANDLE_PAGENUMFMT,          ::cppu::UnoType<sal_Int32>::get(),    0,  0 },
diff --git a/sd/source/ui/unoidl/randomnode.cxx b/sd/source/ui/unoidl/randomnode.cxx
index b9c84b99a163..7ed6c841312a 100644
--- a/sd/source/ui/unoidl/randomnode.cxx
+++ b/sd/source/ui/unoidl/randomnode.cxx
@@ -547,7 +547,7 @@ Reference< XCloneable > SAL_CALL RandomAnimationNode::createClone() throw (Runti
 // XElementAccess
 Type SAL_CALL RandomAnimationNode::getElementType() throw (RuntimeException, std::exception)
 {
-    return ::getCppuType((const Reference< XAnimationNode >*)0);
+    return cppu::UnoType<XAnimationNode>::get();
 }
 
 
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index ebc9d65c9f53..a4fd2e2a758d 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -124,10 +124,10 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( bool bImpress, PageKind eP
         { OUString(UNO_NAME_PAGE_PREVIEW),          WID_PAGE_PREVIEW,   ::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
         { OUString(UNO_NAME_PAGE_PREVIEWBITMAP),    WID_PAGE_PREVIEWBITMAP, ::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
         { OUString(UNO_NAME_PAGE_VISIBLE),          WID_PAGE_VISIBLE,   ::getBooleanCppuType(),                        0, 0},
-        { OUString(UNO_NAME_OBJ_SOUNDFILE),         WID_PAGE_SOUNDFILE, ::getCppuType((const Any*)0),              0, 0},
+        { OUString(UNO_NAME_OBJ_SOUNDFILE),         WID_PAGE_SOUNDFILE, cppu::UnoType<Any>::get(),              0, 0},
         { OUString(sUNO_Prop_IsBackgroundVisible),  WID_PAGE_BACKVIS,   ::getBooleanCppuType(),                        0, 0},
         { OUString(sUNO_Prop_IsBackgroundObjectsVisible),   WID_PAGE_BACKOBJVIS,    ::getBooleanCppuType(),                        0, 0},
-        { OUString(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, ::getCppuType((const Reference< ::com::sun::star::container::XNameContainer >*)0)  ,         0,     0},
+        { OUString(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, cppu::UnoType<com::sun::star::container::XNameContainer>::get(),         0,     0},
         { OUString(sUNO_Prop_BookmarkURL),          WID_PAGE_BOOKMARK,  ::cppu::UnoType<OUString>::get(),             0,  0},
         { OUString("HighResDuration"),              WID_PAGE_HIGHRESDURATION,  ::cppu::UnoType<double>::get(),            0,  0},
         { OUString("IsBackgroundDark") ,            WID_PAGE_ISDARK,    ::getBooleanCppuType(),                        beans::PropertyAttribute::READONLY, 0},
@@ -198,7 +198,7 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( bool bImpress, PageKind eP
         { OUString(UNO_NAME_PAGE_WIDTH),            WID_PAGE_WIDTH,     ::cppu::UnoType<sal_Int32>::get(),            0,  0},                                                                             \
         { OUString(UNO_NAME_PAGE_PREVIEW),          WID_PAGE_PREVIEW,   ::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},    \
         { OUString(UNO_NAME_PAGE_PREVIEWBITMAP),    WID_PAGE_PREVIEWBITMAP, ::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},\
-        { OUString(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, ::getCppuType((const Reference< ::com::sun::star::container::XNameContainer >*)0)  ,         0,     0},                          \
+        { OUString(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, cppu::UnoType<com::sun::star::container::XNameContainer>::get(),         0,     0},                          \
         { OUString(sUNO_Prop_BookmarkURL),          WID_PAGE_BOOKMARK,  ::cppu::UnoType<OUString>::get(),             0,  0},                                                                             \
         { OUString("IsBackgroundDark"),             WID_PAGE_ISDARK,    ::getBooleanCppuType(),                        beans::PropertyAttribute::READONLY, 0},                                             \
         { OUString("NavigationOrder"),              WID_NAVORDER, cppu::UnoType<css::container::XIndexAccess>::get(),0,  0},                                                                         \
@@ -271,7 +271,7 @@ const SvxItemPropertySet* ImplGetMasterPagePropertySet( PageKind ePageKind )
         { OUString(UNO_NAME_PAGE_ORIENTATION),      WID_PAGE_ORIENT,    ::cppu::UnoType<view::PaperOrientation>::get(),0, 0},
         { OUString(UNO_NAME_PAGE_WIDTH),            WID_PAGE_WIDTH,     ::cppu::UnoType<sal_Int32>::get(),            0,  0},
         { OUString("BackgroundFullSize"),           WID_PAGE_BACKFULL,  ::getBooleanCppuType(),                        0, 0},
-        { OUString(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, ::getCppuType((const Reference< ::com::sun::star::container::XNameContainer >*)0)  ,         0,     0},
+        { OUString(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, cppu::UnoType<com::sun::star::container::XNameContainer>::get(),         0,     0},
         { OUString("IsBackgroundDark"),             WID_PAGE_ISDARK,    ::getBooleanCppuType(),                        beans::PropertyAttribute::READONLY, 0},
         { OUString(), 0, css::uno::Type(), 0, 0 }
     };
@@ -287,7 +287,7 @@ const SvxItemPropertySet* ImplGetMasterPagePropertySet( PageKind ePageKind )
         { OUString(UNO_NAME_PAGE_NUMBER),           WID_PAGE_NUMBER,    ::cppu::UnoType<sal_Int16>::get(),            beans::PropertyAttribute::READONLY, 0},
         { OUString(UNO_NAME_PAGE_WIDTH),            WID_PAGE_WIDTH,     ::cppu::UnoType<sal_Int32>::get(),            0,  0},
         { OUString(UNO_NAME_PAGE_LAYOUT),           WID_PAGE_LAYOUT,    ::cppu::UnoType<sal_Int16>::get(),            0,  0},
-        { OUString(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, ::getCppuType((const Reference< ::com::sun::star::container::XNameContainer >*)0)  ,         0,     0},
+        { OUString(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, cppu::UnoType<com::sun::star::container::XNameContainer>::get(),         0,     0},
         { OUString("IsBackgroundDark"),             WID_PAGE_ISDARK,    ::getBooleanCppuType(),                        beans::PropertyAttribute::READONLY, 0},
         { OUString("IsHeaderVisible"),              WID_PAGE_HEADERVISIBLE, ::getBooleanCppuType(),                    0, 0},
         { OUString("HeaderText"),                   WID_PAGE_HEADERTEXT, ::cppu::UnoType<OUString>::get(),                0,  0},