summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Specht <oliver.specht@cib.de>2015-12-18 15:39:50 +0100
committerStephan Bergmann <sbergman@redhat.com>2016-01-18 08:52:53 +0000
commit6183ae17b58ba747b529ad8c1b70ae5fd6e27e5a (patch)
treeedee99535e0a2fcfa23538b9be7092ad487138ff
parent8e885d4f5e203a5b198960c09839b9c34cf51f25 (diff)
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 <ci@libreoffice.org> Reviewed-by: Oliver Specht <oliver.specht@cib.de> (cherry picked from commit 7b02cfef9507dd2f0e9bec61bb5b78b75dc852e9) Reviewed-on: https://gerrit.libreoffice.org/21565 Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
-rw-r--r--stoc/source/inspect/introspection.cxx16
1 files changed, 1 insertions, 15 deletions
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<css::beans::XIntrospectionAccess> 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<Type>(&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();