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

...use cppu::UnoType instead.

Change-Id: I507914b30ef8acda910ee4ecc0589fd328eb6f31

12 files changed, 25 insertions, 25 deletions

diff --git a/vcl/unx/gtk/a11y/atkaction.cxx b/vcl/unx/gtk/a11y/atkaction.cxx
index 20183299742e..fb613daffc68 100644
--- a/vcl/unx/gtk/a11y/atkaction.cxx
+++ b/vcl/unx/gtk/a11y/atkaction.cxx
@@ -55,7 +55,7 @@ static accessibility::XAccessibleAction*
     {
         if( !pWrap->mpAction && pWrap->mpContext )
         {
-            uno::Any any = pWrap->mpContext->queryInterface( accessibility::XAccessibleAction::static_type(NULL) );
+            uno::Any any = pWrap->mpContext->queryInterface( cppu::UnoType<accessibility::XAccessibleAction>::get() );
             pWrap->mpAction = reinterpret_cast< accessibility::XAccessibleAction * > (any.pReserved);
             pWrap->mpAction->acquire();
         }
diff --git a/vcl/unx/gtk/a11y/atkcomponent.cxx b/vcl/unx/gtk/a11y/atkcomponent.cxx
index 8f18b49ac8a0..53797f3350a3 100644
--- a/vcl/unx/gtk/a11y/atkcomponent.cxx
+++ b/vcl/unx/gtk/a11y/atkcomponent.cxx
@@ -36,7 +36,7 @@ static accessibility::XAccessibleComponent*
     {
         if( !pWrap->mpComponent && pWrap->mpContext )
         {
-            uno::Any any = pWrap->mpContext->queryInterface( accessibility::XAccessibleComponent::static_type(NULL) );
+            uno::Any any = pWrap->mpContext->queryInterface( cppu::UnoType<accessibility::XAccessibleComponent>::get() );
             pWrap->mpComponent = reinterpret_cast< accessibility::XAccessibleComponent * > (any.pReserved);
             pWrap->mpComponent->acquire();
         }
diff --git a/vcl/unx/gtk/a11y/atkeditabletext.cxx b/vcl/unx/gtk/a11y/atkeditabletext.cxx
index ed0675ec35f4..d72988f09f89 100644
--- a/vcl/unx/gtk/a11y/atkeditabletext.cxx
+++ b/vcl/unx/gtk/a11y/atkeditabletext.cxx
@@ -37,7 +37,7 @@ static accessibility::XAccessibleEditableText*
     {
         if( !pWrap->mpEditableText && pWrap->mpContext )
         {
-            uno::Any any = pWrap->mpContext->queryInterface( accessibility::XAccessibleEditableText::static_type(NULL) );
+            uno::Any any = pWrap->mpContext->queryInterface( cppu::UnoType<accessibility::XAccessibleEditableText>::get() );
             pWrap->mpEditableText = reinterpret_cast< accessibility::XAccessibleEditableText * > (any.pReserved);
             pWrap->mpEditableText->acquire();
         }
diff --git a/vcl/unx/gtk/a11y/atkhypertext.cxx b/vcl/unx/gtk/a11y/atkhypertext.cxx
index 864057d10687..f1fac6be1889 100644
--- a/vcl/unx/gtk/a11y/atkhypertext.cxx
+++ b/vcl/unx/gtk/a11y/atkhypertext.cxx
@@ -201,7 +201,7 @@ static accessibility::XAccessibleHypertext*
     {
         if( !pWrap->mpHypertext && pWrap->mpContext )
         {
-            uno::Any any = pWrap->mpContext->queryInterface( accessibility::XAccessibleHypertext::static_type(NULL) );
+            uno::Any any = pWrap->mpContext->queryInterface( cppu::UnoType<accessibility::XAccessibleHypertext>::get() );
             pWrap->mpHypertext = reinterpret_cast< accessibility::XAccessibleHypertext * > (any.pReserved);
             pWrap->mpHypertext->acquire();
         }
diff --git a/vcl/unx/gtk/a11y/atkimage.cxx b/vcl/unx/gtk/a11y/atkimage.cxx
index 9a14c819ed99..b413daae130d 100644
--- a/vcl/unx/gtk/a11y/atkimage.cxx
+++ b/vcl/unx/gtk/a11y/atkimage.cxx
@@ -46,7 +46,7 @@ static accessibility::XAccessibleImage*
     {
         if( !pWrap->mpImage && pWrap->mpContext )
         {
-            uno::Any any = pWrap->mpContext->queryInterface( accessibility::XAccessibleImage::static_type(NULL) );
+            uno::Any any = pWrap->mpContext->queryInterface( cppu::UnoType<accessibility::XAccessibleImage>::get() );
             pWrap->mpImage = reinterpret_cast< accessibility::XAccessibleImage * > (any.pReserved);
             pWrap->mpImage->acquire();
         }
diff --git a/vcl/unx/gtk/a11y/atkselection.cxx b/vcl/unx/gtk/a11y/atkselection.cxx
index 8132118377b6..1d0994131cef 100644
--- a/vcl/unx/gtk/a11y/atkselection.cxx
+++ b/vcl/unx/gtk/a11y/atkselection.cxx
@@ -34,7 +34,7 @@ static accessibility::XAccessibleSelection*
     {
         if( !pWrap->mpSelection && pWrap->mpContext )
         {
-            uno::Any any = pWrap->mpContext->queryInterface( accessibility::XAccessibleSelection::static_type(NULL) );
+            uno::Any any = pWrap->mpContext->queryInterface( cppu::UnoType<accessibility::XAccessibleSelection>::get() );
             pWrap->mpSelection = reinterpret_cast< accessibility::XAccessibleSelection * > (any.pReserved);
             pWrap->mpSelection->acquire();
         }
diff --git a/vcl/unx/gtk/a11y/atktable.cxx b/vcl/unx/gtk/a11y/atktable.cxx
index 60bb7fed2043..bf30e41eabdb 100644
--- a/vcl/unx/gtk/a11y/atktable.cxx
+++ b/vcl/unx/gtk/a11y/atktable.cxx
@@ -65,7 +65,7 @@ static accessibility::XAccessibleTable*
     {
         if( !pWrap->mpTable && pWrap->mpContext )
         {
-            uno::Any any = pWrap->mpContext->queryInterface( accessibility::XAccessibleTable::static_type(NULL) );
+            uno::Any any = pWrap->mpContext->queryInterface( cppu::UnoType<accessibility::XAccessibleTable>::get() );
             pWrap->mpTable = reinterpret_cast< accessibility::XAccessibleTable * > (any.pReserved);
             pWrap->mpTable->acquire();
         }
diff --git a/vcl/unx/gtk/a11y/atktext.cxx b/vcl/unx/gtk/a11y/atktext.cxx
index bbcb420c7a19..a11e4abca878 100644
--- a/vcl/unx/gtk/a11y/atktext.cxx
+++ b/vcl/unx/gtk/a11y/atktext.cxx
@@ -152,7 +152,7 @@ static accessibility::XAccessibleText*
     {
         if( !pWrap->mpText && pWrap->mpContext )
         {
-            uno::Any any = pWrap->mpContext->queryInterface( accessibility::XAccessibleText::static_type(NULL) );
+            uno::Any any = pWrap->mpContext->queryInterface( cppu::UnoType<accessibility::XAccessibleText>::get() );
             pWrap->mpText = reinterpret_cast< accessibility::XAccessibleText * > (any.pReserved);
             pWrap->mpText->acquire();
         }
@@ -173,7 +173,7 @@ static accessibility::XAccessibleTextMarkup*
     {
         if( !pWrap->mpTextMarkup && pWrap->mpContext )
         {
-            uno::Any any = pWrap->mpContext->queryInterface( accessibility::XAccessibleTextMarkup::static_type(NULL) );
+            uno::Any any = pWrap->mpContext->queryInterface( cppu::UnoType<accessibility::XAccessibleTextMarkup>::get() );
             /* Since this not a dedicated interface in Atk and thus has not
              * been queried during wrapper initialization, we need to check
              * the return value here.
@@ -202,7 +202,7 @@ static accessibility::XAccessibleTextAttributes*
     {
         if( !pWrap->mpTextAttributes && pWrap->mpContext )
         {
-            uno::Any any = pWrap->mpContext->queryInterface( accessibility::XAccessibleTextAttributes::static_type(NULL) );
+            uno::Any any = pWrap->mpContext->queryInterface( cppu::UnoType<accessibility::XAccessibleTextAttributes>::get() );
             /* Since this not a dedicated interface in Atk and thus has not
              * been queried during wrapper initialization, we need to check
              * the return value here.
@@ -230,7 +230,7 @@ static accessibility::XAccessibleMultiLineText*
     {
         if( !pWrap->mpMultiLineText && pWrap->mpContext )
         {
-            uno::Any any = pWrap->mpContext->queryInterface( accessibility::XAccessibleMultiLineText::static_type(NULL) );
+            uno::Any any = pWrap->mpContext->queryInterface( cppu::UnoType<accessibility::XAccessibleMultiLineText>::get() );
             /* Since this not a dedicated interface in Atk and thus has not
              * been queried during wrapper initialization, we need to check
              * the return value here.
diff --git a/vcl/unx/gtk/a11y/atktextattributes.cxx b/vcl/unx/gtk/a11y/atktextattributes.cxx
index 54a2d6cb5dc6..365f1c9cdd2e 100644
--- a/vcl/unx/gtk/a11y/atktextattributes.cxx
+++ b/vcl/unx/gtk/a11y/atktextattributes.cxx
@@ -219,7 +219,7 @@ static accessibility::XAccessibleComponent*
     {
         if( !pWrap->mpComponent && pWrap->mpContext )
         {
-            uno::Any any = pWrap->mpContext->queryInterface( accessibility::XAccessibleComponent::static_type(NULL) );
+            uno::Any any = pWrap->mpContext->queryInterface( cppu::UnoType<accessibility::XAccessibleComponent>::get() );
             pWrap->mpComponent = reinterpret_cast< accessibility::XAccessibleComponent * > (any.pReserved);
             pWrap->mpComponent->acquire();
         }
diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx
index adeda2b7828f..d487a67e6125 100644
--- a/vcl/unx/gtk/a11y/atkutil.cxx
+++ b/vcl/unx/gtk/a11y/atkutil.cxx
@@ -97,7 +97,7 @@ atk_wrapper_focus_idle_handler (gpointer data)
                 AtkObjectWrapper* wrapper_obj = ATK_OBJECT_WRAPPER (atk_obj);
                 if( wrapper_obj && !wrapper_obj->mpText && wrapper_obj->mpContext )
                 {
-                    uno::Any any = wrapper_obj->mpContext->queryInterface( accessibility::XAccessibleText::static_type(NULL) );
+                    uno::Any any = wrapper_obj->mpContext->queryInterface( cppu::UnoType<accessibility::XAccessibleText>::get() );
                     if ( typelib_TypeClass_INTERFACE == any.pType->eTypeClass &&
                          any.pReserved != 0 )
                     {
diff --git a/vcl/unx/gtk/a11y/atkvalue.cxx b/vcl/unx/gtk/a11y/atkvalue.cxx
index 46abdfd480a9..44416fa19982 100644
--- a/vcl/unx/gtk/a11y/atkvalue.cxx
+++ b/vcl/unx/gtk/a11y/atkvalue.cxx
@@ -35,7 +35,7 @@ static accessibility::XAccessibleValue*
     {
         if( !pWrap->mpValue && pWrap->mpContext )
         {
-            uno::Any any = pWrap->mpContext->queryInterface( accessibility::XAccessibleValue::static_type(NULL) );
+            uno::Any any = pWrap->mpContext->queryInterface( cppu::UnoType<accessibility::XAccessibleValue>::get() );
             pWrap->mpValue = reinterpret_cast< accessibility::XAccessibleValue * > (any.pReserved);
             pWrap->mpValue->acquire();
         }
diff --git a/vcl/unx/gtk/a11y/atkwrapper.cxx b/vcl/unx/gtk/a11y/atkwrapper.cxx
index a87fe6ce1c30..aab0961b5b34 100644
--- a/vcl/unx/gtk/a11y/atkwrapper.cxx
+++ b/vcl/unx/gtk/a11y/atkwrapper.cxx
@@ -652,53 +652,53 @@ const struct {
         const char          *name;
         GInterfaceInitFunc   aInit;
         GetGIfaceType        aGetGIfaceType;
-        const uno::Type &  (*aGetUnoType) (void *);
+        const uno::Type &  (*aGetUnoType) ();
 } aTypeTable[] = {
 // re-location heaven:
     {
         "Comp", (GInterfaceInitFunc) componentIfaceInit,
         atk_component_get_type,
-        accessibility::XAccessibleComponent::static_type
+        cppu::UnoType<accessibility::XAccessibleComponent>::get
     },
     {
         "Act",  (GInterfaceInitFunc) actionIfaceInit,
         atk_action_get_type,
-        accessibility::XAccessibleAction::static_type
+        cppu::UnoType<accessibility::XAccessibleAction>::get
     },
     {
         "Txt",  (GInterfaceInitFunc) textIfaceInit,
         atk_text_get_type,
-        accessibility::XAccessibleText::static_type
+        cppu::UnoType<accessibility::XAccessibleText>::get
     },
     {
         "Val",  (GInterfaceInitFunc) valueIfaceInit,
         atk_value_get_type,
-        accessibility::XAccessibleValue::static_type
+        cppu::UnoType<accessibility::XAccessibleValue>::get
     },
     {
         "Tab",  (GInterfaceInitFunc) tableIfaceInit,
         atk_table_get_type,
-        accessibility::XAccessibleTable::static_type
+        cppu::UnoType<accessibility::XAccessibleTable>::get
     },
     {
         "Edt",  (GInterfaceInitFunc) editableTextIfaceInit,
         atk_editable_text_get_type,
-        accessibility::XAccessibleEditableText::static_type
+        cppu::UnoType<accessibility::XAccessibleEditableText>::get
     },
     {
         "Img",  (GInterfaceInitFunc) imageIfaceInit,
         atk_image_get_type,
-        accessibility::XAccessibleImage::static_type
+        cppu::UnoType<accessibility::XAccessibleImage>::get
     },
     {
         "Hyp",  (GInterfaceInitFunc) hypertextIfaceInit,
         atk_hypertext_get_type,
-        accessibility::XAccessibleHypertext::static_type
+        cppu::UnoType<accessibility::XAccessibleHypertext>::get
     },
     {
         "Sel",  (GInterfaceInitFunc) selectionIfaceInit,
         atk_selection_get_type,
-        accessibility::XAccessibleSelection::static_type
+        cppu::UnoType<accessibility::XAccessibleSelection>::get
     }
     // AtkDocument is a nastily broken interface (so far)
     //  we could impl. get_document_type perhaps though.
@@ -715,7 +715,7 @@ ensureTypeFor( uno::XInterface *pAccessible )
 
     for( i = 0; i < aTypeTableSize; i++ )
     {
-        if( isOfType( pAccessible, aTypeTable[i].aGetUnoType(0) ) )
+        if( isOfType( pAccessible, aTypeTable[i].aGetUnoType() ) )
         {
             aTypeName += aTypeTable[i].name;
             bTypes[i] = TRUE;