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

...use cppu::UnoType instead.

Change-Id: I507914b30ef8acda910ee4ecc0589fd328eb6f31

5 files changed, 12 insertions, 12 deletions

diff --git a/forms/source/component/Columns.cxx b/forms/source/component/Columns.cxx
index 1064ea051712..3ee43c5b334a 100644
--- a/forms/source/component/Columns.cxx
+++ b/forms/source/component/Columns.cxx
@@ -155,21 +155,21 @@ Sequence<Type> SAL_CALL OGridColumn::getTypes() throw(RuntimeException)
 {
     TypeBag aTypes( OGridColumn_BASE::getTypes() );
     // erase the types which we do not support
-    aTypes.removeType( XFormComponent::static_type() );
-    aTypes.removeType( XServiceInfo::static_type() );
-    aTypes.removeType( XBindableValue::static_type() );
-    aTypes.removeType( XPropertyContainer::static_type() );
+    aTypes.removeType( cppu::UnoType<XFormComponent>::get() );
+    aTypes.removeType( cppu::UnoType<XServiceInfo>::get() );
+    aTypes.removeType( cppu::UnoType<XBindableValue>::get() );
+    aTypes.removeType( cppu::UnoType<XPropertyContainer>::get() );
 
     // but re-add their base class(es)
-    aTypes.addType( XChild::static_type() );
+    aTypes.addType( cppu::UnoType<XChild>::get() );
 
     Reference< XTypeProvider > xProv;
     if ( query_aggregation( m_xAggregate, xProv ))
         aTypes.addTypes( xProv->getTypes() );
 
-    aTypes.removeType( XTextRange::static_type() );
-    aTypes.removeType( XSimpleText::static_type() );
-    aTypes.removeType( XText::static_type() );
+    aTypes.removeType( cppu::UnoType<XTextRange>::get() );
+    aTypes.removeType( cppu::UnoType<XSimpleText>::get() );
+    aTypes.removeType( cppu::UnoType<XText>::get() );
 
     return aTypes.getTypes();
 }
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index 88f7e5ded170..c03147252006 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -370,7 +370,7 @@ ODatabaseForm::ODatabaseForm( const ODatabaseForm& _cloneSource )
         try
         {
             Reference< XPropertySet > xSourceProps( const_cast< ODatabaseForm& >( _cloneSource ).queryAggregation(
-                XPropertySet::static_type() ), UNO_QUERY_THROW );
+                cppu::UnoType<XPropertySet>::get() ), UNO_QUERY_THROW );
             Reference< XPropertySetInfo > xSourcePSI( xSourceProps->getPropertySetInfo(), UNO_SET_THROW );
             Reference< XPropertyState > xSourcePropState( xSourceProps, UNO_QUERY );
 
diff --git a/forms/source/component/FormsCollection.cxx b/forms/source/component/FormsCollection.cxx
index db118d82e77f..396e747e664f 100644
--- a/forms/source/component/FormsCollection.cxx
+++ b/forms/source/component/FormsCollection.cxx
@@ -65,7 +65,7 @@ Sequence<Type> SAL_CALL OFormsCollection::getTypes() throw(RuntimeException)
 //------------------------------------------------------------------
 OFormsCollection::OFormsCollection(const Reference<XComponentContext>& _rxFactory)
     :FormsCollectionComponentBase( m_aMutex )
-    ,OInterfaceContainer( _rxFactory, m_aMutex, XForm::static_type() )
+    ,OInterfaceContainer( _rxFactory, m_aMutex, cppu::UnoType<XForm>::get() )
     ,OFormsCollection_BASE()
 {
     DBG_CTOR(OFormsCollection, NULL);
diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
index 696ff231ff64..a39b59e4944d 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -1749,7 +1749,7 @@ namespace frm
         Any aReturn = OListBoxControl_BASE::queryInterface( _rType );
 
         if  (   !aReturn.hasValue()
-            ||  _rType.equals( XTypeProvider::static_type() )
+            ||  _rType.equals( cppu::UnoType<XTypeProvider>::get() )
             )
             aReturn = OBoundControl::queryAggregation( _rType );
 
diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx
index bab4df85f176..2acb2ef02526 100644
--- a/forms/source/misc/InterfaceContainer.cxx
+++ b/forms/source/misc/InterfaceContainer.cxx
@@ -1304,7 +1304,7 @@ Sequence<Type> SAL_CALL OFormComponents::getTypes() throw(RuntimeException)
 //------------------------------------------------------------------------------
 OFormComponents::OFormComponents(const Reference<XComponentContext>& _rxFactory)
     :FormComponentsBase( m_aMutex )
-    ,OInterfaceContainer( _rxFactory, m_aMutex, XFormComponent::static_type() )
+    ,OInterfaceContainer( _rxFactory, m_aMutex, cppu::UnoType<XFormComponent>::get() )
     ,OFormComponents_BASE()
 {
 }