From 7b02cfef9507dd2f0e9bec61bb5b78b75dc852e9 Mon Sep 17 00:00:00 2001 From: Oliver Specht Date: Fri, 18 Dec 2015 15:39:50 +0100 Subject: tdf#96223: introspection queries for XPropertySet again this patch removes the search by name for css::beans::XPropertySet because that fails if that is indirectly inherited e.g. with css::util::XSearchDescriptor Change-Id: I7f40b1d109d9bddc0987bea8eb3eda5b7f1aaaa9 Reviewed-on: https://gerrit.libreoffice.org/20792 Tested-by: Jenkins Reviewed-by: Oliver Specht --- stoc/source/inspect/introspection.cxx | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'stoc/source') diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx index 65bb0ff6ee96..9f43c8c6fbe8 100644 --- a/stoc/source/inspect/introspection.cxx +++ b/stoc/source/inspect/introspection.cxx @@ -1766,29 +1766,15 @@ css::uno::Reference Implementation::inspect( if( xTypeProvider.is() ) { SupportedTypesSeq = xTypeProvider->getTypes(); - sal_Int32 nTypeCount = SupportedTypesSeq.getLength(); - if( nTypeCount ) - { - const Type* pTypes = SupportedTypesSeq.getConstArray(); - for( sal_Int32 i = 0 ; i < nTypeCount ; i++ ) - { - if( pTypes[i].getTypeName() == "com.sun.star.beans.XPropertySet" ) - { - xPropSet.set( x, UNO_QUERY ); - break; - } - } - } } else { SAL_WARN( "stoc", "object of type \"" << aToInspectObj.getValueTypeName() << "\" lacks XTypeProvider"); SupportedTypesSeq = Sequence(&aToInspectObj.getValueType(), 1); - xPropSet.set( x, UNO_QUERY ); } - // Now try to get the PropertySetInfo + xPropSet.set( x, UNO_QUERY ); if( xPropSet.is() ) xPropSetInfo = xPropSet->getPropertySetInfo(); -- cgit