[Libreoffice-commits] core.git: Branch 'libreoffice-5-1-0' - stoc/source

[Oliver Specht]

 stoc/source/inspect/introspection.cxx |   16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

New commits:
commit 1f32dd6754bf72615be76885f722ced3efaa0342
Author: Oliver Specht <oliver.spe...@cib.de>
Date:   Fri Dec 18 15:39:50 2015 +0100

    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 <c...@libreoffice.org>
    Reviewed-by: Oliver Specht <oliver.spe...@cib.de>
    (cherry picked from commit 7b02cfef9507dd2f0e9bec61bb5b78b75dc852e9)
    Reviewed-on: https://gerrit.libreoffice.org/21569
    Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
    Tested-by: Stephan Bergmann <sberg...@redhat.com>
    Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
    Reviewed-by: Eike Rathke <er...@redhat.com>

diff --git a/stoc/source/inspect/introspection.cxx 
b/stoc/source/inspect/introspection.cxx
index 65bb0ff..9f43c8c 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();
 
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits