From 83e191e25da8a508a2dafad339c0ee58e97c5c8b Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Thu, 12 Dec 2013 11:09:57 +0100
Subject: Do not use C++-UNO internal static_type functions in client code

...use cppu::UnoType instead.

Change-Id: I507914b30ef8acda910ee4ecc0589fd328eb6f31
---
 vbahelper/source/msforms/vbacontrol.cxx              | 4 ++--
 vbahelper/source/msforms/vbacontrols.cxx             | 4 ++--
 vbahelper/source/msforms/vbamultipage.cxx            | 4 ++--
 vbahelper/source/msforms/vbapages.cxx                | 4 ++--
 vbahelper/source/vbahelper/vbacommandbarcontrols.cxx | 6 +++---
 vbahelper/source/vbahelper/vbacommandbars.cxx        | 2 +-
 vbahelper/source/vbahelper/vbadocumentsbase.cxx      | 2 +-
 vbahelper/source/vbahelper/vbashaperange.cxx         | 2 +-
 vbahelper/source/vbahelper/vbashapes.cxx             | 2 +-
 9 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'vbahelper')

diff --git a/vbahelper/source/msforms/vbacontrol.cxx b/vbahelper/source/msforms/vbacontrol.cxx
index ae0cc588cf17..b89d7163712a 100644
--- a/vbahelper/source/msforms/vbacontrol.cxx
+++ b/vbahelper/source/msforms/vbacontrol.cxx
@@ -576,7 +576,7 @@ void ScVbaControl::fireChangeEvent()
 {
     script::ScriptEvent evt;
     evt.ScriptType = "VBAInterop";
-    evt.ListenerType = form::XChangeListener::static_type(0);
+    evt.ListenerType = cppu::UnoType<form::XChangeListener>::get();
     evt.MethodName = "changed";
     fireEvent( evt );
 }
@@ -585,7 +585,7 @@ void ScVbaControl::fireClickEvent()
 {
     script::ScriptEvent evt;
     evt.ScriptType = "VBAInterop";
-    evt.ListenerType = awt::XActionListener::static_type(0);
+    evt.ListenerType = cppu::UnoType<awt::XActionListener>::get();
     evt.MethodName = "actionPerformed";
     fireEvent( evt );
 }
diff --git a/vbahelper/source/msforms/vbacontrols.cxx b/vbahelper/source/msforms/vbacontrols.cxx
index 7e9ded29e2dd..2aa3daf86ccf 100644
--- a/vbahelper/source/msforms/vbacontrols.cxx
+++ b/vbahelper/source/msforms/vbacontrols.cxx
@@ -114,7 +114,7 @@ public:
     // XElementAccess
     virtual uno::Type SAL_CALL getElementType(  ) throw (uno::RuntimeException)
     {
-        return awt::XControl::static_type(0);
+        return cppu::UnoType<awt::XControl>::get();
     }
 
     virtual ::sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException)
@@ -498,7 +498,7 @@ void SAL_CALL ScVbaControls::Remove( const uno::Any& StringKeyOrIndex )
 uno::Type
 ScVbaControls::getElementType() throw (uno::RuntimeException)
 {
-    return ooo::vba::msforms::XControl::static_type(0);
+    return cppu::UnoType<ooo::vba::msforms::XControl>::get();
 }
 
 VBAHELPER_IMPL_XHELPERINTERFACE( ScVbaControls, "ooo.vba.msforms.Controls" )
diff --git a/vbahelper/source/msforms/vbamultipage.cxx b/vbahelper/source/msforms/vbamultipage.cxx
index 7cfbe97019e5..53f3df360eba 100644
--- a/vbahelper/source/msforms/vbamultipage.cxx
+++ b/vbahelper/source/msforms/vbamultipage.cxx
@@ -44,8 +44,8 @@ public:
     virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException)
     {
         // no Pages object yet #FIXME
-        //return msforms::XPage::static_type(0);
-        return uno::XInterface::static_type(0);
+        //return cppu::UnoType<msforms::XPage>::get();
+        return cppu::UnoType<uno::XInterface>::get();
     }
     virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException)
     {
diff --git a/vbahelper/source/msforms/vbapages.cxx b/vbahelper/source/msforms/vbapages.cxx
index 3b279835503d..fecf870b79e3 100644
--- a/vbahelper/source/msforms/vbapages.cxx
+++ b/vbahelper/source/msforms/vbapages.cxx
@@ -28,8 +28,8 @@ ScVbaPages::ScVbaPages( const uno::Reference< XHelperInterface >& xParent, const
 uno::Type SAL_CALL
 ScVbaPages::getElementType() throw (uno::RuntimeException)
 {
-    // return msforms::XPage::static_type(0);
-    return uno::XInterface::static_type(0);
+    // return cppu::UnoType<msforms::XPage>::get();
+    return cppu::UnoType<uno::XInterface>::get();
 }
 
 uno::Any
diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx b/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
index 12fbe00a9e91..5fc986e5677d 100644
--- a/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
@@ -106,7 +106,7 @@ uno::Sequence< beans::PropertyValue > ScVbaCommandBarControls::CreateToolbarItem
 uno::Type SAL_CALL
 ScVbaCommandBarControls::getElementType() throw ( uno::RuntimeException )
 {
-    return XCommandBarControl::static_type( 0 );
+    return cppu::UnoType<XCommandBarControl>::get();
 }
 
 uno::Reference< container::XEnumeration >
@@ -260,7 +260,7 @@ public:
         { throw lang::IndexOutOfBoundsException(); }
     // XElementAccess
     virtual uno::Type SAL_CALL getElementType(  ) throw (uno::RuntimeException)
-        { return XCommandBarControl::static_type( 0 ); }
+        { return cppu::UnoType<XCommandBarControl>::get(); }
     virtual ::sal_Bool SAL_CALL hasElements(  ) throw (::com::sun::star::uno::RuntimeException)
         { return false; }
 };
@@ -277,7 +277,7 @@ VbaDummyCommandBarControls::VbaDummyCommandBarControls(
 // XEnumerationAccess
 uno::Type SAL_CALL VbaDummyCommandBarControls::getElementType() throw ( uno::RuntimeException )
 {
-    return XCommandBarControl::static_type( 0 );
+    return cppu::UnoType<XCommandBarControl>::get();
 }
 
 uno::Reference< container::XEnumeration > VbaDummyCommandBarControls::createEnumeration() throw ( uno::RuntimeException )
diff --git a/vbahelper/source/vbahelper/vbacommandbars.cxx b/vbahelper/source/vbahelper/vbacommandbars.cxx
index a78757e56a11..37fe629b269b 100644
--- a/vbahelper/source/vbahelper/vbacommandbars.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbars.cxx
@@ -90,7 +90,7 @@ ScVbaCommandBars::~ScVbaCommandBars()
 uno::Type SAL_CALL
 ScVbaCommandBars::getElementType() throw ( uno::RuntimeException )
 {
-    return XCommandBar::static_type( 0 );
+    return cppu::UnoType<XCommandBar>::get();
 }
 
 uno::Reference< container::XEnumeration >
diff --git a/vbahelper/source/vbahelper/vbadocumentsbase.cxx b/vbahelper/source/vbahelper/vbadocumentsbase.cxx
index 3bfc5312e48c..73c4d13b53e8 100644
--- a/vbahelper/source/vbahelper/vbadocumentsbase.cxx
+++ b/vbahelper/source/vbahelper/vbadocumentsbase.cxx
@@ -167,7 +167,7 @@ public:
     //XElementAccess
     virtual uno::Type SAL_CALL getElementType(  ) throw (uno::RuntimeException)
     {
-        return frame::XModel::static_type(0);
+        return cppu::UnoType<frame::XModel>::get();
     }
 
     virtual ::sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException)
diff --git a/vbahelper/source/vbahelper/vbashaperange.cxx b/vbahelper/source/vbahelper/vbashaperange.cxx
index da02ffb8f1ed..c50b2d3118b2 100644
--- a/vbahelper/source/vbahelper/vbashaperange.cxx
+++ b/vbahelper/source/vbahelper/vbashaperange.cxx
@@ -363,7 +363,7 @@ void SAL_CALL ScVbaShapeRange::ZOrder( sal_Int32 ZOrderCmd ) throw (uno::Runtime
 uno::Type SAL_CALL
 ScVbaShapeRange::getElementType() throw (uno::RuntimeException)
 {
-    return msforms::XShape::static_type(0);
+    return cppu::UnoType<msforms::XShape>::get();
 }
 
 uno::Reference< container::XEnumeration > SAL_CALL
diff --git a/vbahelper/source/vbahelper/vbashapes.cxx b/vbahelper/source/vbahelper/vbashapes.cxx
index 1303eac17b2f..5e5d3322d148 100644
--- a/vbahelper/source/vbahelper/vbashapes.cxx
+++ b/vbahelper/source/vbahelper/vbashapes.cxx
@@ -105,7 +105,7 @@ ScVbaShapes::createCollectionObject( const css::uno::Any& aSource ) throw (uno::
 uno::Type
 ScVbaShapes::getElementType() throw (uno::RuntimeException)
 {
-    return ooo::vba::msforms::XShape::static_type(0);
+    return cppu::UnoType<ooo::vba::msforms::XShape>::get();
 }
 
 OUString
-- 
cgit