toolkit: simplify deprecated XTypeProvider.getImplementationId

Change-Id: Ibe481aebad026f8c182052f1327bed8a1054cf7a

6 files changed, 6 insertions, 97 deletions

diff --git a/include/toolkit/controls/geometrycontrolmodel_impl.hxx b/include/toolkit/controls/geometrycontrolmodel_impl.hxx
index c035c2e6ea47..b8054dd27dc0 100644
--- a/include/toolkit/controls/geometrycontrolmodel_impl.hxx
+++ b/include/toolkit/controls/geometrycontrolmodel_impl.hxx
@@ -58,17 +58,7 @@ void OGeometryControlModel<CONTROLMODEL>::fillProperties(::com::sun::star::uno::
 template <class CONTROLMODEL>
 ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL OGeometryControlModel<CONTROLMODEL>::getImplementationId(  ) throw (::com::sun::star::uno::RuntimeException, std::exception)
 {
-    static ::cppu::OImplementationId * pId = NULL;
-    if ( !pId )
-    {
-        ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-        if ( !pId )
-        {
-            static ::cppu::OImplementationId s_aId;
-            pId = &s_aId;
-        }
-    }
-    return pId->getImplementationId();
+    return css::uno::Sequence<sal_Int8>();
 }
 
 
diff --git a/include/toolkit/helper/macros.hxx b/include/toolkit/helper/macros.hxx
index f6622cb3f225..22ae92f34bca 100644
--- a/include/toolkit/helper/macros.hxx
+++ b/include/toolkit/helper/macros.hxx
@@ -78,17 +78,7 @@ ClassName* ClassName::GetImplementation( const ::com::sun::star::uno::Reference<
 #define IMPL_IMPLEMENTATION_ID( ClassName ) \
 ::com::sun::star::uno::Sequence< sal_Int8 > ClassName::getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) \
 { \
-    static ::cppu::OImplementationId* pId = NULL; \
-    if( !pId ) \
-    { \
-        ::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ); \
-        if( ! pId ) \
-        { \
-            static ::cppu::OImplementationId id( false ); \
-            pId = &id; \
-        } \
-    } \
-    return (*pId).getImplementationId(); \
+    return css::uno::Sequence<sal_Int8>(); \
 }
 
 #define IMPL_XTYPEPROVIDER_START( ClassName )   \
diff --git a/toolkit/source/awt/vclxmenu.cxx b/toolkit/source/awt/vclxmenu.cxx
index 1a2bc62fad9d..64c780dc45e2 100644
--- a/toolkit/source/awt/vclxmenu.cxx
+++ b/toolkit/source/awt/vclxmenu.cxx
@@ -288,41 +288,7 @@ throw(css::uno::RuntimeException, std::exception)
 css::uno::Sequence< sal_Int8 > VCLXMenu::getImplementationId()
 throw(css::uno::RuntimeException, std::exception)
 {
-    ::osl::ResettableGuard < ::osl::Mutex > aGuard( GetMutex() );
-    const bool bIsPopupMenu = IsPopupMenu();
-    aGuard.clear();
-
-    static ::cppu::OImplementationId* pIdMenuBar = NULL;
-    static ::cppu::OImplementationId* pIdPopupMenu = NULL;
-
-    if ( bIsPopupMenu )
-    {
-        if( !pIdPopupMenu )
-        {
-            ::osl::Guard< ::osl::Mutex > aGlobalGuard( ::osl::Mutex::getGlobalMutex() );
-            if( !pIdPopupMenu )
-            {
-                static ::cppu::OImplementationId idPopupMenu( false );
-                pIdPopupMenu = &idPopupMenu;
-            }
-        }
-
-        return (*pIdPopupMenu).getImplementationId();
-    }
-    else
-    {
-        if( !pIdMenuBar )
-        {
-            ::osl::Guard< ::osl::Mutex > aGlobalGuard( ::osl::Mutex::getGlobalMutex() );
-            if( !pIdMenuBar )
-            {
-                static ::cppu::OImplementationId idMenuBar( false );
-                pIdMenuBar = &idMenuBar;
-            }
-        }
-
-        return (*pIdMenuBar).getImplementationId();
-    }
+    return css::uno::Sequence<sal_Int8>();
 }
 
 void VCLXMenu::addMenuListener(
diff --git a/toolkit/source/awt/vclxtopwindow.cxx b/toolkit/source/awt/vclxtopwindow.cxx
index 1c344383dd65..8636454012c4 100644
--- a/toolkit/source/awt/vclxtopwindow.cxx
+++ b/toolkit/source/awt/vclxtopwindow.cxx
@@ -277,36 +277,7 @@ Window* VCLXTopWindow::GetWindowImpl()
 
 ::com::sun::star::uno::Sequence< sal_Int8 > VCLXTopWindow::getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception)
 {
-    static ::cppu::OImplementationId* pId = NULL;
-    static ::cppu::OImplementationId* pIdWithHandle = NULL;
-    if ( isSystemDependentWindowPeer() )
-    {
-        if( !pIdWithHandle )
-        {
-            ::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() );
-            if( !pIdWithHandle )
-            {
-                static ::cppu::OImplementationId idWithHandle( false );
-                pIdWithHandle = &idWithHandle;
-            }
-        }
-
-        return (*pIdWithHandle).getImplementationId();
-    }
-    else
-    {
-        if( !pId )
-        {
-            ::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() );
-            if( !pId )
-            {
-                static ::cppu::OImplementationId id( false );
-                pId = &id;
-            }
-        }
-
-        return (*pId).getImplementationId();
-    }
+    return css::uno::Sequence<sal_Int8>();
 }
 
 ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > VCLXTopWindow::getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception)
diff --git a/toolkit/source/controls/geometrycontrolmodel.cxx b/toolkit/source/controls/geometrycontrolmodel.cxx
index 0525980f23dc..650b6319f8f9 100644
--- a/toolkit/source/controls/geometrycontrolmodel.cxx
+++ b/toolkit/source/controls/geometrycontrolmodel.cxx
@@ -580,16 +580,9 @@
         return new OCommonGeometryControlModel( _rxAggregateInstance, m_sServiceSpecifier );
     }
 
-    namespace
-    {
-        class theOCommonGeometryControlModelImplementationId :
-            public rtl::Static< ::cppu::OImplementationId, theOCommonGeometryControlModelImplementationId > {};
-    }
-
-
     Sequence< sal_Int8 > SAL_CALL OCommonGeometryControlModel::getImplementationId(  ) throw (RuntimeException, std::exception)
     {
-        return theOCommonGeometryControlModelImplementationId::get().getImplementationId();
+        return css::uno::Sequence<sal_Int8>();
     }
 
 
diff --git a/toolkit/source/controls/grid/sortablegriddatamodel.cxx b/toolkit/source/controls/grid/sortablegriddatamodel.cxx
index cd2e28c24e2b..8efdae7faab6 100644
--- a/toolkit/source/controls/grid/sortablegriddatamodel.cxx
+++ b/toolkit/source/controls/grid/sortablegriddatamodel.cxx
@@ -342,8 +342,7 @@ private:
 
     Sequence< ::sal_Int8 > SAL_CALL SortableGridDataModel::getImplementationId(  ) throw (RuntimeException, std::exception)
     {
-        static ::cppu::OImplementationId aId;
-        return aId.getImplementationId();
+        return css::uno::Sequence<sal_Int8>();
     }