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

...use cppu::UnoType instead.

Change-Id: I507914b30ef8acda910ee4ecc0589fd328eb6f31

5 files changed, 16 insertions, 16 deletions

diff --git a/dbaccess/source/core/dataaccess/connection.cxx b/dbaccess/source/core/dataaccess/connection.cxx
index 23d1a089356f..e275cbb0e73a 100644
--- a/dbaccess/source/core/dataaccess/connection.cxx
+++ b/dbaccess/source/core/dataaccess/connection.cxx
@@ -434,11 +434,11 @@ Sequence< Type > OConnection::getTypes() throw (RuntimeException)
     lcl_copyTypes( aNormalizedTypes, ::connectivity::OConnectionWrapper::getTypes() );
 
     if ( !m_bSupportsViews )
-        aNormalizedTypes.erase( XViewsSupplier::static_type() );
+        aNormalizedTypes.erase( cppu::UnoType<XViewsSupplier>::get() );
     if ( !m_bSupportsUsers )
-        aNormalizedTypes.erase( XUsersSupplier::static_type() );
+        aNormalizedTypes.erase( cppu::UnoType<XUsersSupplier>::get() );
     if ( !m_bSupportsGroups )
-        aNormalizedTypes.erase( XGroupsSupplier::static_type() );
+        aNormalizedTypes.erase( cppu::UnoType<XGroupsSupplier>::get() );
 
     Sequence< Type > aSupportedTypes( aNormalizedTypes.size() );
     ::std::copy( aNormalizedTypes.begin(), aNormalizedTypes.end(), aSupportedTypes.getArray() );
@@ -454,11 +454,11 @@ Sequence< sal_Int8 > OConnection::getImplementationId() throw (RuntimeException)
 // com::sun::star::uno::XInterface
 Any OConnection::queryInterface( const Type & rType ) throw (RuntimeException)
 {
-    if ( !m_bSupportsViews && rType.equals( XViewsSupplier::static_type() ) )
+    if ( !m_bSupportsViews && rType.equals( cppu::UnoType<XViewsSupplier>::get() ) )
         return Any();
-    else if ( !m_bSupportsUsers && rType.equals( XUsersSupplier::static_type() ) )
+    else if ( !m_bSupportsUsers && rType.equals( cppu::UnoType<XUsersSupplier>::get() ) )
         return Any();
-    else if ( !m_bSupportsGroups && rType.equals( XGroupsSupplier::static_type() ) )
+    else if ( !m_bSupportsGroups && rType.equals( cppu::UnoType<XGroupsSupplier>::get() ) )
         return Any();
     Any aReturn = OSubComponent::queryInterface( rType );
     if (!aReturn.hasValue())
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 21f16e8259dd..8d9c4b4c6e65 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -221,8 +221,8 @@ Any SAL_CALL ODatabaseDocument::queryInterface( const Type& _rType ) throw (Runt
     // which already contains macros. In this case, the database document itself is not
     // allowed to contain macros, too.
     if  (   !m_bAllowDocumentScripting
-        &&  (   _rType.equals( XEmbeddedScripts::static_type() )
-            ||  _rType.equals( XScriptInvocationContext::static_type() )
+        &&  (   _rType.equals( cppu::UnoType<XEmbeddedScripts>::get() )
+            ||  _rType.equals( cppu::UnoType<XScriptInvocationContext>::get() )
             )
         )
         return Any();
@@ -265,7 +265,7 @@ Sequence< Type > SAL_CALL ODatabaseDocument::getTypes(  ) throw (RuntimeExceptio
                 aTypes.getConstArray(),
                 aTypes.getConstArray() + aTypes.getLength(),
                 pStripTo,
-                ::std::bind2nd( ::std::equal_to< Type >(), XEmbeddedScripts::static_type() )
+                ::std::bind2nd( ::std::equal_to< Type >(), cppu::UnoType<XEmbeddedScripts>::get() )
             ) - pStripTo
         );
 
@@ -276,7 +276,7 @@ Sequence< Type > SAL_CALL ODatabaseDocument::getTypes(  ) throw (RuntimeExceptio
                 aTypes.getConstArray(),
                 aTypes.getConstArray() + aTypes.getLength(),
                 pStripTo,
-                ::std::bind2nd( ::std::equal_to< Type >(), XScriptInvocationContext::static_type() )
+                ::std::bind2nd( ::std::equal_to< Type >(), cppu::UnoType<XScriptInvocationContext>::get() )
             ) - pStripTo
         );
     }
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index 3e5a3c797b6f..9a2c0ecdc2a9 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -597,7 +597,7 @@ void SbaXDataBrowserController::startFrameListening( const Reference< XFrame >&
 
     Reference< XFrameActionListener >   xAggListener;
     if ( m_xFormControllerImpl.is() )
-        m_xFormControllerImpl->queryAggregation( XFrameActionListener::static_type() ) >>= xAggListener;
+        m_xFormControllerImpl->queryAggregation( cppu::UnoType<XFrameActionListener>::get() ) >>= xAggListener;
 
     if ( _rxFrame.is() && xAggListener.is() )
         _rxFrame->addFrameActionListener( xAggListener );
@@ -610,7 +610,7 @@ void SbaXDataBrowserController::stopFrameListening( const Reference< XFrame >& _
 
     Reference< XFrameActionListener >   xAggListener;
     if ( m_xFormControllerImpl.is() )
-        m_xFormControllerImpl->queryAggregation( XFrameActionListener::static_type() ) >>= xAggListener;
+        m_xFormControllerImpl->queryAggregation( cppu::UnoType<XFrameActionListener>::get() ) >>= xAggListener;
 
     if ( _rxFrame.is() && xAggListener.is() )
         _rxFrame->removeFrameActionListener( xAggListener );
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index 556599d3a669..6b2d8346eabe 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -240,7 +240,7 @@ SbaTableQueryBrowser::~SbaTableQueryBrowser()
 
 Any SAL_CALL SbaTableQueryBrowser::queryInterface(const Type& _rType) throw (RuntimeException)
 {
-    if ( _rType.equals( XScriptInvocationContext::static_type() ) )
+    if ( _rType.equals( cppu::UnoType<XScriptInvocationContext>::get() ) )
     {
         OSL_PRECOND( !!m_aDocScriptSupport, "SbaTableQueryBrowser::queryInterface: did not initialize this, yet!" );
         if ( !!m_aDocScriptSupport && *m_aDocScriptSupport )
@@ -269,7 +269,7 @@ Sequence< Type > SAL_CALL SbaTableQueryBrowser::getTypes(  ) throw (RuntimeExcep
             aTypes.getConstArray(),
             aTypes.getConstArray() + aTypes.getLength(),
             aStrippedTypes.getArray(),
-            ::std::bind2nd( ::std::equal_to< Type >(), XScriptInvocationContext::static_type() )
+            ::std::bind2nd( ::std::equal_to< Type >(), cppu::UnoType<XScriptInvocationContext>::get() )
         );
         aTypes = aStrippedTypes;
     }
diff --git a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
index 595f0949a363..a2a549a1cba4 100644
--- a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
+++ b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
@@ -211,7 +211,7 @@ namespace dbaui
 
     Any SAL_CALL DBSubComponentController::queryInterface(const Type& _rType) throw (RuntimeException)
     {
-        if ( _rType.equals( XScriptInvocationContext::static_type() ) )
+        if ( _rType.equals( cppu::UnoType<XScriptInvocationContext>::get() ) )
         {
             if ( m_pImpl->documentHasScriptSupport() )
                 return makeAny( Reference< XScriptInvocationContext >( this ) );
@@ -231,7 +231,7 @@ namespace dbaui
                 aTypes.getConstArray(),
                 aTypes.getConstArray() + aTypes.getLength(),
                 aStrippedTypes.getArray(),
-                ::std::bind2nd( ::std::equal_to< Type >(), XScriptInvocationContext::static_type() )
+                ::std::bind2nd( ::std::equal_to< Type >(), cppu::UnoType<XScriptInvocationContext>::get() )
             );
             aTypes = aStrippedTypes;
         }