diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2011-09-12 15:13:28 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2011-09-12 22:47:49 +0200 |
commit | 23b04dae8b5ff6dbc4c4b63bfe08079ac6ed74ef (patch) | |
tree | 18b609a1c6b9e09da816333b93c72a70f7ad5142 /basic | |
parent | 12e2e04977ddedcb2844b69a5060eb81be84d648 (diff) |
sb140: #i117698# no implementations of XIdlClassProvider remain, so code that checks for it can be removed
Diffstat (limited to 'basic')
-rw-r--r-- | basic/inc/pch/precompiled_basic.hxx | 1 | ||||
-rw-r--r-- | basic/source/classes/sbunoobj.cxx | 29 |
2 files changed, 0 insertions, 30 deletions
diff --git a/basic/inc/pch/precompiled_basic.hxx b/basic/inc/pch/precompiled_basic.hxx index 1b7a57032830..38f961cba37b 100644 --- a/basic/inc/pch/precompiled_basic.hxx +++ b/basic/inc/pch/precompiled_basic.hxx @@ -85,7 +85,6 @@ #include "com/sun/star/lang/XTypeProvider.hpp" #include "com/sun/star/reflection/XIdlArray.hpp" #include "com/sun/star/reflection/XIdlClass.hpp" -#include "com/sun/star/reflection/XIdlClassProvider.hpp" #include "com/sun/star/reflection/XIdlReflection.hpp" #include "com/sun/star/reflection/XTypeDescription.hpp" #include "com/sun/star/registry/XImplementationRegistration.hpp" diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index 360e78a3f5f9..57ad90b177e0 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -68,7 +68,6 @@ #include <com/sun/star/container/XHierarchicalNameAccess.hpp> #include <com/sun/star/reflection/XIdlArray.hpp> #include <com/sun/star/reflection/XIdlReflection.hpp> -#include <com/sun/star/reflection/XIdlClassProvider.hpp> #include <com/sun/star/reflection/XServiceConstructorDescription.hpp> #include <com/sun/star/bridge/oleautomation/NamedArgument.hpp> #include <com/sun/star/bridge/oleautomation/Date.hpp> @@ -1834,8 +1833,6 @@ bool checkUnoObjectType( SbUnoObject* pUnoObj, const ::rtl::OUString& rClass ) // get the interface from the Any const Reference< XInterface > x = *(Reference< XInterface >*)aToInspectObj.getValue(); - // address the XIdlClassProvider-Interface - Reference< XIdlClassProvider > xClassProvider( x, UNO_QUERY ); Reference< XTypeProvider > xTypeProvider( x, UNO_QUERY ); aRet.appendAscii( "Supported interfaces by object " ); @@ -1867,11 +1864,6 @@ bool checkUnoObjectType( SbUnoObject* pUnoObj, const ::rtl::OUString& rClass ) } } } - else if( xClassProvider.is() ) - { - - OSL_FAIL( "XClassProvider not supported in UNO3" ); - } } return aRet.makeStringAndClear(); } @@ -2441,27 +2433,6 @@ SbUnoObject::SbUnoObject( const rtl::OUString& aName_, const Any& aUnoObj_ ) { // Interface works always through the type in the Any bFatalError = sal_False; - - // Ask for the XIdlClassProvider-Interface - Reference< XIdlClassProvider > xClassProvider( x, UNO_QUERY ); - if( xClassProvider.is() ) - { - // Insert the real name of the class - if( aName_.getLength() == 0 ) - { - Sequence< Reference< XIdlClass > > szClasses = xClassProvider->getIdlClasses(); - sal_uInt32 nLen = szClasses.getLength(); - if( nLen ) - { - const Reference< XIdlClass > xImplClass = szClasses.getConstArray()[ 0 ]; - if( xImplClass.is() ) - { - aClassName_ = xImplClass->getName(); - bSetClassName = sal_True; - } - } - } - } } if( bSetClassName ) SetClassName( aClassName_ ); |