Do not use C++-UNO internal static_type functions in client code

...use cppu::UnoType instead.

Change-Id: I507914b30ef8acda910ee4ecc0589fd328eb6f31

8 files changed, 18 insertions, 18 deletions

diff --git a/sd/source/core/stlfamily.cxx b/sd/source/core/stlfamily.cxx
index 179acbb1aad1..507f25545ce2 100644
--- a/sd/source/core/stlfamily.cxx
+++ b/sd/source/core/stlfamily.cxx
@@ -305,7 +305,7 @@ sal_Bool SAL_CALL SdStyleFamily::hasByName( const OUString& aName ) throw(Runtim
 
 Type SAL_CALL SdStyleFamily::getElementType() throw(RuntimeException)
 {
-    return XStyle::static_type();
+    return cppu::UnoType<XStyle>::get();
 }
 
 // ----------------------------------------------------------
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 2401f06fccbd..7324c994e358 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -1211,7 +1211,7 @@ Type SAL_CALL SdStyleSheetPool::getElementType() throw(RuntimeException)
 {
     throwIfDisposed();
 
-    return XNameAccess::static_type();
+    return cppu::UnoType<XNameAccess>::get();
 }
 
 // --------------------------------------------------------------------
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 2a266f4b3ef4..0cee3877dad8 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -78,7 +78,7 @@ static SvxItemPropertySet& GetStylePropertySet()
     static const SfxItemPropertyMapEntry aFullPropertyMap_Impl[] =
     {
         { OUString("Family"),                 WID_STYLE_FAMILY,       ::getCppuType((const OUString*)0), PropertyAttribute::READONLY,    0},
-        { OUString("UserDefinedAttributes"),  SDRATTR_XMLATTRIBUTES,  XNameContainer::static_type(), 0,     0},
+        { OUString("UserDefinedAttributes"),  SDRATTR_XMLATTRIBUTES,  cppu::UnoType<XNameContainer>::get(), 0,     0},
         { OUString("DisplayName"),            WID_STYLE_DISPNAME,     ::getCppuType((const OUString*)0), PropertyAttribute::READONLY,    0},
         { OUString("Hidden"),                 WID_STYLE_HIDDEN,       ::getCppuType((bool*)0),       0,     0},
 
@@ -349,7 +349,7 @@ bool SdStyleSheet::IsUsed() const
     {
         MutexGuard aGuard( mrBHelper.rMutex );
 
-        OInterfaceContainerHelper * pContainer = mrBHelper.getContainer( XModifyListener::static_type() );
+        OInterfaceContainerHelper * pContainer = mrBHelper.getContainer( cppu::UnoType<XModifyListener>::get() );
         if( pContainer )
         {
             Sequence< Reference< XInterface > > aModifyListeners( pContainer->getElements() );
@@ -848,7 +848,7 @@ void SAL_CALL SdStyleSheet::addModifyListener( const Reference< XModifyListener
     {
         if( !mpModifyListenerForewarder.get() )
             mpModifyListenerForewarder.reset( new ModifyListenerForewarder( this ) );
-        mrBHelper.addListener( XModifyListener::static_type(), xListener );
+        mrBHelper.addListener( cppu::UnoType<XModifyListener>::get(), xListener );
     }
 }
 
@@ -856,7 +856,7 @@ void SAL_CALL SdStyleSheet::addModifyListener( const Reference< XModifyListener
 
 void SAL_CALL SdStyleSheet::removeModifyListener( const Reference< XModifyListener >& xListener ) throw (RuntimeException)
 {
-    mrBHelper.removeListener( XModifyListener::static_type(), xListener );
+    mrBHelper.removeListener( cppu::UnoType<XModifyListener>::get(), xListener );
 }
 
 //------------------------------------------------------------------------
@@ -865,7 +865,7 @@ void SdStyleSheet::notifyModifyListener()
 {
     MutexGuard aGuard( mrBHelper.rMutex );
 
-    OInterfaceContainerHelper * pContainer = mrBHelper.getContainer( XModifyListener::static_type() );
+    OInterfaceContainerHelper * pContainer = mrBHelper.getContainer( cppu::UnoType<XModifyListener>::get() );
     if( pContainer )
     {
         EventObject aEvt( static_cast< OWeakObject * >( this ) );
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index fe9429f8f3a6..6578d4dc04f8 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -465,7 +465,7 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError )
         { OUString("OrganizerMode"), 0,
               ::getBooleanCppuType(),
               ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
-        { OUString("SourceStorage"), 0, embed::XStorage::static_type(),
+        { OUString("SourceStorage"), 0, cppu::UnoType<embed::XStorage>::get(),
           ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
         { OUString(), 0, css::uno::Type(), 0, 0 }
     };
@@ -841,7 +841,7 @@ sal_Bool SdXMLFilter::Export()
             { OUString("StyleFamilies"), 0,
                   ::getCppuType( (Sequence<sal_Int32>*)0 ),
                   ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
-            { OUString("TargetStorage"), 0, embed::XStorage::static_type(),
+            { OUString("TargetStorage"), 0, cppu::UnoType<embed::XStorage>::get(),
                   ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
             { OUString(), 0, css::uno::Type(), 0, 0 }
         };
diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx
index 20518234235f..0f4ca1daed19 100644
--- a/sd/source/ui/animations/motionpathtag.cxx
+++ b/sd/source/ui/animations/motionpathtag.cxx
@@ -1279,11 +1279,11 @@ void SAL_CALL MotionPathTag::disposing( const EventObject& /*Source*/ ) throw (R
 
 Any SAL_CALL MotionPathTag::queryInterface( const ::com::sun::star::uno::Type& aType ) throw (RuntimeException)
 {
-    if( aType == XChangesListener::static_type() )
+    if( aType == cppu::UnoType<XChangesListener>::get() )
         return Any( Reference< XChangesListener >( this ) );
-    if( aType == XEventListener::static_type() )
+    if( aType == cppu::UnoType<XEventListener>::get() )
         return Any( Reference< XEventListener >( this ) );
-    if( aType == XInterface::static_type() )
+    if( aType == cppu::UnoType<XInterface>::get() )
         return Any( Reference< XInterface >( this ) );
 
     return Any();
diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx
index ab0c0b9c9e87..bb940a5621a0 100644
--- a/sd/source/ui/framework/factories/BasicViewFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx
@@ -372,7 +372,7 @@ void SAL_CALL BasicViewFactory::initialize (const Sequence<Any>& aArguments)
             }
         }
 
-        pDescriptor->mxView.set( pDescriptor->mpWrapper->queryInterface( XResource::static_type() ), UNO_QUERY_THROW );
+        pDescriptor->mxView.set( pDescriptor->mpWrapper->queryInterface( cppu::UnoType<XResource>::get() ), UNO_QUERY_THROW );
     }
 
     return pDescriptor;
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 7fcdd175c4b9..87e6435bc2a7 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -3486,7 +3486,7 @@ void SAL_CALL SlideshowImpl::stopSound(  ) throw (RuntimeException)
 
 ::com::sun::star::uno::Type SAL_CALL SlideshowImpl::getElementType(  ) throw (::com::sun::star::uno::RuntimeException)
 {
-    return XDrawPage::static_type();
+    return cppu::UnoType<XDrawPage>::get();
 }
 
 // --------------------------------------------------------------------
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index c323181bbdec..c285a6aac802 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -147,7 +147,7 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( sal_Bool bImpress, PageKin
         { OUString("TransitionFadeColor"),          WID_TRANSITION_FADE_COLOR, ::getCppuType((const sal_Int32*)0),         0,  0},
         { OUString("TransitionDuration"),           WID_TRANSITION_DURATION, ::getCppuType((const double*)0),          0,  0},
         { OUString("LoopSound"),                    WID_LOOP_SOUND, ::getBooleanCppuType(),                    0, 0},
-        { OUString("NavigationOrder"),              WID_NAVORDER, ::com::sun::star::container::XIndexAccess::static_type(),0,  0},
+        { OUString("NavigationOrder"),              WID_NAVORDER, cppu::UnoType<::com::sun::star::container::XIndexAccess>::get(),0,  0},
         { OUString(), 0, css::uno::Type(), 0, 0 }
     };
 
@@ -174,7 +174,7 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( sal_Bool bImpress, PageKin
         { OUString("IsDateTimeFixed"),              WID_PAGE_DATETIMEFIXED, ::getBooleanCppuType(),                    0, 0},                                                                 \
         { OUString("DateTimeText"),                 WID_PAGE_DATETIMETEXT, ::getCppuType((const OUString*)0),              0,  0},                                                            \
         { OUString("DateTimeFormat"),               WID_PAGE_DATETIMEFORMAT, ::getCppuType((const sal_Int32*)0),           0,  0},                                                            \
-        { OUString("NavigationOrder"),              WID_NAVORDER, ::com::sun::star::container::XIndexAccess::static_type(),0,  0},                                                            \
+        { OUString("NavigationOrder"),              WID_NAVORDER, cppu::UnoType<::com::sun::star::container::XIndexAccess>::get(),0,  0},                                                            \
         { OUString(), 0, css::uno::Type(), 0, 0 }
 
     static const SfxItemPropertyMapEntry aDrawPageNotesHandoutPropertyMap_Impl[] =
@@ -204,7 +204,7 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( sal_Bool bImpress, PageKin
         { OUString(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, ::getCppuType((const Reference< ::com::sun::star::container::XNameContainer >*)0)  ,         0,     0},                          \
         { OUString(sUNO_Prop_BookmarkURL),          WID_PAGE_BOOKMARK,  ::getCppuType((const OUString*)0),             0,  0},                                                                             \
         { OUString("IsBackgroundDark"),             WID_PAGE_ISDARK,    ::getBooleanCppuType(),                        beans::PropertyAttribute::READONLY, 0},                                             \
-        { OUString("NavigationOrder"),              WID_NAVORDER, ::com::sun::star::container::XIndexAccess::static_type(),0,  0},                                                                         \
+        { OUString("NavigationOrder"),              WID_NAVORDER, cppu::UnoType<::com::sun::star::container::XIndexAccess>::get(),0,  0},                                                                         \
         { OUString(), 0, css::uno::Type(), 0, 0 }
 
     static const SfxItemPropertyMapEntry aGraphicPagePropertyMap_Impl[] =
@@ -2646,7 +2646,7 @@ Any SAL_CALL SdNavigationOrderAccess::getByIndex( sal_Int32 Index ) throw (Index
 // XElementAccess
 Type SAL_CALL SdNavigationOrderAccess::getElementType(  ) throw (RuntimeException)
 {
-    return XShape::static_type();
+    return cppu::UnoType<XShape>::get();
 }
 
 sal_Bool SAL_CALL SdNavigationOrderAccess::hasElements(  ) throw (RuntimeException)