From a1d39bb1c9d8be03d3d2e496ce4cb6c86fd2d4d6 Mon Sep 17 00:00:00 2001 From: Ariel Constenla-Haile Date: Thu, 9 Feb 2012 13:28:08 +0000 Subject: i67068 - add XTypeProvider to queryInterface --- framework/source/fwe/classes/actiontriggercontainer.cxx | 5 ++--- framework/source/fwe/classes/actiontriggerpropertyset.cxx | 3 ++- framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx | 3 ++- framework/source/fwe/classes/rootactiontriggercontainer.cxx | 2 -- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/framework/source/fwe/classes/actiontriggercontainer.cxx b/framework/source/fwe/classes/actiontriggercontainer.cxx index cc9976ff20a9..3454d7cb7202 100644 --- a/framework/source/fwe/classes/actiontriggercontainer.cxx +++ b/framework/source/fwe/classes/actiontriggercontainer.cxx @@ -54,7 +54,8 @@ throw ( RuntimeException ) Any a = ::cppu::queryInterface( aType , SAL_STATIC_CAST( XMultiServiceFactory*, this ), - SAL_STATIC_CAST( XServiceInfo* , this )); + SAL_STATIC_CAST( XServiceInfo* , this ), + SAL_STATIC_CAST( XTypeProvider* , this )); if( a.hasValue() ) { @@ -154,8 +155,6 @@ Sequence< Type > SAL_CALL ActionTriggerContainer::getTypes() throw ( RuntimeExce static ::cppu::OTypeCollection aTypeCollection( ::getCppuType(( const Reference< XMultiServiceFactory >*)NULL ) , ::getCppuType(( const Reference< XIndexContainer >*)NULL ) , - ::getCppuType(( const Reference< XIndexAccess >*)NULL ) , - ::getCppuType(( const Reference< XIndexReplace >*)NULL ) , ::getCppuType(( const Reference< XServiceInfo >*)NULL ) , ::getCppuType(( const Reference< XTypeProvider >*)NULL ) ) ; diff --git a/framework/source/fwe/classes/actiontriggerpropertyset.cxx b/framework/source/fwe/classes/actiontriggerpropertyset.cxx index 7449a56813ef..78437de31817 100644 --- a/framework/source/fwe/classes/actiontriggerpropertyset.cxx +++ b/framework/source/fwe/classes/actiontriggerpropertyset.cxx @@ -77,7 +77,8 @@ throw ( RuntimeException ) { Any a = ::cppu::queryInterface( aType , - SAL_STATIC_CAST( XServiceInfo*, this )); + SAL_STATIC_CAST( XServiceInfo*, this ), + SAL_STATIC_CAST( XTypeProvider*, this )); if( a.hasValue() ) return a; diff --git a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx index 4c7ae368af18..23215dbbf84f 100644 --- a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx +++ b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx @@ -70,7 +70,8 @@ throw ( RuntimeException ) { Any a = ::cppu::queryInterface( aType , - SAL_STATIC_CAST( XServiceInfo*, this )); + SAL_STATIC_CAST( XServiceInfo*, this ), + SAL_STATIC_CAST( XTypeProvider*, this )); if( a.hasValue() ) return a; diff --git a/framework/source/fwe/classes/rootactiontriggercontainer.cxx b/framework/source/fwe/classes/rootactiontriggercontainer.cxx index 4c9501a723dd..a8a321a5ec78 100644 --- a/framework/source/fwe/classes/rootactiontriggercontainer.cxx +++ b/framework/source/fwe/classes/rootactiontriggercontainer.cxx @@ -305,8 +305,6 @@ Sequence< Type > SAL_CALL RootActionTriggerContainer::getTypes() throw ( Runtime static ::cppu::OTypeCollection aTypeCollection( ::getCppuType(( const Reference< XMultiServiceFactory >*)NULL ) , ::getCppuType(( const Reference< XIndexContainer >*)NULL ) , - ::getCppuType(( const Reference< XIndexAccess >*)NULL ) , - ::getCppuType(( const Reference< XIndexReplace >*)NULL ) , ::getCppuType(( const Reference< XServiceInfo >*)NULL ) , ::getCppuType(( const Reference< XTypeProvider >*)NULL ) , ::getCppuType(( const Reference< XUnoTunnel >*)NULL ) , -- cgit