incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arie...@apache.org
Subject svn commit: r1242336 - in /incubator/ooo/trunk/main/framework/source/fwe/classes: actiontriggercontainer.cxx actiontriggerpropertyset.cxx actiontriggerseparatorpropertyset.cxx rootactiontriggercontainer.cxx
Date Thu, 09 Feb 2012 14:28:08 GMT
Author: arielch
Date: Thu Feb  9 14:28:08 2012
New Revision: 1242336

URL: http://svn.apache.org/viewvc?rev=1242336&view=rev
Log:
i67068 - add XTypeProvider to queryInterface

Modified:
    incubator/ooo/trunk/main/framework/source/fwe/classes/actiontriggercontainer.cxx
    incubator/ooo/trunk/main/framework/source/fwe/classes/actiontriggerpropertyset.cxx
    incubator/ooo/trunk/main/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx
    incubator/ooo/trunk/main/framework/source/fwe/classes/rootactiontriggercontainer.cxx

Modified: incubator/ooo/trunk/main/framework/source/fwe/classes/actiontriggercontainer.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/framework/source/fwe/classes/actiontriggercontainer.cxx?rev=1242336&r1=1242335&r2=1242336&view=diff
==============================================================================
--- incubator/ooo/trunk/main/framework/source/fwe/classes/actiontriggercontainer.cxx (original)
+++ incubator/ooo/trunk/main/framework/source/fwe/classes/actiontriggercontainer.cxx Thu Feb
 9 14:28:08 2012
@@ -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 ActionTriggerC
 			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 ) ) ;
 

Modified: incubator/ooo/trunk/main/framework/source/fwe/classes/actiontriggerpropertyset.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/framework/source/fwe/classes/actiontriggerpropertyset.cxx?rev=1242336&r1=1242335&r2=1242336&view=diff
==============================================================================
--- incubator/ooo/trunk/main/framework/source/fwe/classes/actiontriggerpropertyset.cxx (original)
+++ incubator/ooo/trunk/main/framework/source/fwe/classes/actiontriggerpropertyset.cxx Thu
Feb  9 14:28:08 2012
@@ -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;

Modified: incubator/ooo/trunk/main/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx?rev=1242336&r1=1242335&r2=1242336&view=diff
==============================================================================
--- incubator/ooo/trunk/main/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx
(original)
+++ incubator/ooo/trunk/main/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx
Thu Feb  9 14:28:08 2012
@@ -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;

Modified: incubator/ooo/trunk/main/framework/source/fwe/classes/rootactiontriggercontainer.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/framework/source/fwe/classes/rootactiontriggercontainer.cxx?rev=1242336&r1=1242335&r2=1242336&view=diff
==============================================================================
--- incubator/ooo/trunk/main/framework/source/fwe/classes/rootactiontriggercontainer.cxx (original)
+++ incubator/ooo/trunk/main/framework/source/fwe/classes/rootactiontriggercontainer.cxx Thu
Feb  9 14:28:08 2012
@@ -305,8 +305,6 @@ Sequence< Type > SAL_CALL RootActionTrig
 			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
) ,



Mime
View raw message