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

...use cppu::UnoType instead.

Change-Id: I507914b30ef8acda910ee4ecc0589fd328eb6f31

7 files changed, 19 insertions, 19 deletions

diff --git a/toolkit/source/controls/animatedimages.cxx b/toolkit/source/controls/animatedimages.cxx
index 26d03e6ef6f5..5946869ca904 100644
--- a/toolkit/source/controls/animatedimages.cxx
+++ b/toolkit/source/controls/animatedimages.cxx
@@ -210,7 +210,7 @@ namespace toolkit
             void ( SAL_CALL XContainerListener::*i_notificationMethod )( const ContainerEvent& ),
             const sal_Int32 i_accessor, const Sequence< OUString >& i_imageURLs, const Reference< XInterface >& i_context )
         {
-            ::cppu::OInterfaceContainerHelper* pContainerListeners = i_broadcaseHelper.getContainer( XContainerListener::static_type() );
+            ::cppu::OInterfaceContainerHelper* pContainerListeners = i_broadcaseHelper.getContainer( cppu::UnoType<XContainerListener>::get() );
             if ( pContainerListeners == NULL )
                 return;
 
@@ -468,13 +468,13 @@ namespace toolkit
     //------------------------------------------------------------------------------------------------------------------
     void SAL_CALL AnimatedImagesControlModel::addContainerListener( const Reference< XContainerListener >& i_listener ) throw (RuntimeException)
     {
-        BrdcstHelper.addListener( XContainerListener::static_type(), i_listener );
+        BrdcstHelper.addListener( cppu::UnoType<XContainerListener>::get(), i_listener );
     }
 
     //------------------------------------------------------------------------------------------------------------------
     void SAL_CALL AnimatedImagesControlModel::removeContainerListener( const Reference< XContainerListener >& i_listener ) throw (RuntimeException)
     {
-        BrdcstHelper.removeListener( XContainerListener::static_type(), i_listener );
+        BrdcstHelper.removeListener( cppu::UnoType<XContainerListener>::get(), i_listener );
     }
 
 //......................................................................................................................
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx
index 163085b26961..8f32532dcea9 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -130,7 +130,7 @@ public:
     }
     virtual Type SAL_CALL getElementType(  ) throw (RuntimeException)
     {
-        return T::static_type( NULL );
+        return cppu::UnoType<T>::get();
     }
     virtual ::sal_Bool SAL_CALL hasElements(  ) throw (RuntimeException)
     {
diff --git a/toolkit/source/controls/grid/defaultgriddatamodel.cxx b/toolkit/source/controls/grid/defaultgriddatamodel.cxx
index b7f212153248..00e0bc502530 100644
--- a/toolkit/source/controls/grid/defaultgriddatamodel.cxx
+++ b/toolkit/source/controls/grid/defaultgriddatamodel.cxx
@@ -75,7 +75,7 @@ namespace toolkit
     void DefaultGridDataModel::broadcast( GridDataEvent const & i_event,
         void ( SAL_CALL XGridDataListener::*i_listenerMethod )( GridDataEvent const & ), ::comphelper::ComponentGuard & i_instanceLock )
     {
-        ::cppu::OInterfaceContainerHelper* pListeners = rBHelper.getContainer( XGridDataListener::static_type() );
+        ::cppu::OInterfaceContainerHelper* pListeners = rBHelper.getContainer( cppu::UnoType<XGridDataListener>::get() );
         if ( !pListeners )
             return;
 
@@ -391,13 +391,13 @@ namespace toolkit
     //------------------------------------------------------------------------------------------------------------------
     void SAL_CALL DefaultGridDataModel::addGridDataListener( const Reference< grid::XGridDataListener >& i_listener ) throw (RuntimeException)
     {
-        rBHelper.addListener( XGridDataListener::static_type(), i_listener );
+        rBHelper.addListener( cppu::UnoType<XGridDataListener>::get(), i_listener );
     }
 
     //------------------------------------------------------------------------------------------------------------------
     void SAL_CALL DefaultGridDataModel::removeGridDataListener( const Reference< grid::XGridDataListener >& i_listener ) throw (RuntimeException)
     {
-        rBHelper.removeListener( XGridDataListener::static_type(), i_listener );
+        rBHelper.removeListener( cppu::UnoType<XGridDataListener>::get(), i_listener );
     }
 
     //------------------------------------------------------------------------------------------------------------------
diff --git a/toolkit/source/controls/grid/gridcolumn.cxx b/toolkit/source/controls/grid/gridcolumn.cxx
index f08b89be6374..bfaf53bfa97b 100644
--- a/toolkit/source/controls/grid/gridcolumn.cxx
+++ b/toolkit/source/controls/grid/gridcolumn.cxx
@@ -85,7 +85,7 @@ namespace toolkit
             i_oldValue, i_newValue, m_nIndex
         );
 
-        ::cppu::OInterfaceContainerHelper* pIter = rBHelper.getContainer( XGridColumnListener::static_type() );
+        ::cppu::OInterfaceContainerHelper* pIter = rBHelper.getContainer( cppu::UnoType<XGridColumnListener>::get() );
 
         i_Guard.clear();
         if( pIter )
@@ -215,13 +215,13 @@ namespace toolkit
     //------------------------------------------------------------------------------------------------------------------
     void SAL_CALL GridColumn::addGridColumnListener( const Reference< XGridColumnListener >& xListener ) throw (RuntimeException)
     {
-        rBHelper.addListener( XGridColumnListener::static_type(), xListener );
+        rBHelper.addListener( cppu::UnoType<XGridColumnListener>::get(), xListener );
     }
 
     //------------------------------------------------------------------------------------------------------------------
     void SAL_CALL GridColumn::removeGridColumnListener( const Reference< XGridColumnListener >& xListener ) throw (RuntimeException)
     {
-        rBHelper.removeListener( XGridColumnListener::static_type(), xListener );
+        rBHelper.removeListener( cppu::UnoType<XGridColumnListener>::get(), xListener );
     }
 
     //------------------------------------------------------------------------------------------------------------------
diff --git a/toolkit/source/controls/grid/sortablegriddatamodel.cxx b/toolkit/source/controls/grid/sortablegriddatamodel.cxx
index 252e6929b6f2..b8db1d3768f5 100644
--- a/toolkit/source/controls/grid/sortablegriddatamodel.cxx
+++ b/toolkit/source/controls/grid/sortablegriddatamodel.cxx
@@ -272,7 +272,7 @@ namespace toolkit
     void SortableGridDataModel::impl_broadcast( void ( SAL_CALL XGridDataListener::*i_listenerMethod )( const GridDataEvent & ),
             GridDataEvent const & i_publicEvent, MethodGuard& i_instanceLock )
     {
-        ::cppu::OInterfaceContainerHelper* pListeners = rBHelper.getContainer( XGridDataListener::static_type() );
+        ::cppu::OInterfaceContainerHelper* pListeners = rBHelper.getContainer( cppu::UnoType<XGridDataListener>::get() );
         if ( pListeners == NULL )
             return;
 
@@ -717,13 +717,13 @@ namespace toolkit
     //------------------------------------------------------------------------------------------------------------------
     void SAL_CALL SortableGridDataModel::addGridDataListener( const Reference< XGridDataListener >& i_listener ) throw (RuntimeException)
     {
-        rBHelper.addListener( XGridDataListener::static_type(), i_listener );
+        rBHelper.addListener( cppu::UnoType<XGridDataListener>::get(), i_listener );
     }
 
     //------------------------------------------------------------------------------------------------------------------
     void SAL_CALL SortableGridDataModel::removeGridDataListener( const Reference< XGridDataListener >& i_listener ) throw (RuntimeException)
     {
-        rBHelper.removeListener( XGridDataListener::static_type(), i_listener );
+        rBHelper.removeListener( cppu::UnoType<XGridDataListener>::get(), i_listener );
     }
 
     //------------------------------------------------------------------------------------------------------------------
diff --git a/toolkit/source/controls/tree/treedatamodel.cxx b/toolkit/source/controls/tree/treedatamodel.cxx
index c8859a202880..01fb0267a670 100644
--- a/toolkit/source/controls/tree/treedatamodel.cxx
+++ b/toolkit/source/controls/tree/treedatamodel.cxx
@@ -161,7 +161,7 @@ MutableTreeDataModel::~MutableTreeDataModel()
 
 void MutableTreeDataModel::broadcast( broadcast_type eType, const Reference< XTreeNode >& xParentNode, const Reference< XTreeNode >* pNodes, sal_Int32 nNodes )
 {
-    ::cppu::OInterfaceContainerHelper* pIter = BrdcstHelper.getContainer( XTreeDataModelListener::static_type() );
+    ::cppu::OInterfaceContainerHelper* pIter = BrdcstHelper.getContainer( cppu::UnoType<XTreeDataModelListener>::get() );
     if( pIter )
     {
         Reference< XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) );
@@ -235,14 +235,14 @@ Reference< XTreeNode > SAL_CALL MutableTreeDataModel::getRoot(  ) throw (Runtime
 
 void SAL_CALL MutableTreeDataModel::addTreeDataModelListener( const Reference< XTreeDataModelListener >& xListener ) throw (RuntimeException)
 {
-    BrdcstHelper.addListener( XTreeDataModelListener::static_type(), xListener );
+    BrdcstHelper.addListener( cppu::UnoType<XTreeDataModelListener>::get(), xListener );
 }
 
 //---------------------------------------------------------------------
 
 void SAL_CALL MutableTreeDataModel::removeTreeDataModelListener( const Reference< XTreeDataModelListener >& xListener ) throw (RuntimeException)
 {
-    BrdcstHelper.removeListener( XTreeDataModelListener::static_type(), xListener );
+    BrdcstHelper.removeListener( cppu::UnoType<XTreeDataModelListener>::get(), xListener );
 }
 
 //---------------------------------------------------------------------
@@ -266,14 +266,14 @@ void SAL_CALL MutableTreeDataModel::dispose() throw (RuntimeException)
 
 void SAL_CALL MutableTreeDataModel::addEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException)
 {
-    BrdcstHelper.addListener( XEventListener::static_type(), xListener );
+    BrdcstHelper.addListener( cppu::UnoType<XEventListener>::get(), xListener );
 }
 
 //---------------------------------------------------------------------
 
 void SAL_CALL MutableTreeDataModel::removeEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException)
 {
-    BrdcstHelper.removeListener( XEventListener::static_type(), xListener );
+    BrdcstHelper.removeListener( cppu::UnoType<XEventListener>::get(), xListener );
 }
 
 //---------------------------------------------------------------------
diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx
index 60c72390faec..6927e98792b0 100644
--- a/toolkit/source/controls/unocontrolcontainer.cxx
+++ b/toolkit/source/controls/unocontrolcontainer.cxx
@@ -576,7 +576,7 @@ uno::Sequence< ::sal_Int32 > SAL_CALL UnoControlContainer::getIdentifiers(  ) th
 // container::XElementAccess
 uno::Type SAL_CALL UnoControlContainer::getElementType(  ) throw (uno::RuntimeException)
 {
-    return awt::XControlModel::static_type();
+    return cppu::UnoType<awt::XControlModel>::get();
 }
 
 ::sal_Bool SAL_CALL UnoControlContainer::hasElements(  ) throw (uno::RuntimeException)