[Libreoffice-commits] core.git: cppuhelper/source

[Stephan Bergmann (via logerrit)]

 cppuhelper/source/factory.cxx |    6 ------
 1 file changed, 6 deletions(-)

New commits:
commit ca3ba86fe17227089d797f4f46cf228af97de3b3
Author:     Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Thu Jan 12 21:39:16 2023 +0100
Commit:     Stephan Bergmann <sberg...@redhat.com>
CommitDate: Thu Jan 12 21:38:06 2023 +0000

    Fix aggregating OFactoryComponentHelper::queryInterface
    
    4bfc00aca2441082842f91dfba15886258674227 "#67468# factories support
    XUnloadingPreference now" had added the check for XUnloadingPreference 
there,
    but that's already covered by OFactoryComponentHelper::queryAggregation
    delegating to OSingleFactoryHelper::queryInterface.  (And as
    OFactoryComponentHelper is inheriting XAggregation via OComponentHelper, the
    only thing that OFactoryComponentHelper::queryInterface shall do is 
delegate to
    OComponentHelper::queryInterface.)
    
    Change-Id: Iebe507e88791d1e2390d042a8a9c152512ce212a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145420
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sberg...@redhat.com>

diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx
index c8efcab0e604..c4797f85504a 100644
--- a/cppuhelper/source/factory.cxx
+++ b/cppuhelper/source/factory.cxx
@@ -298,12 +298,6 @@ protected:
 
 Any SAL_CALL OFactoryComponentHelper::queryInterface( const Type & rType )
 {
-    if( rType == cppu::UnoType<XUnloadingPreference>::get() )
-    {
-        return Any(
-            Reference< XUnloadingPreference >(
-                static_cast< XUnloadingPreference * >(this) ) );
-    }
     return OComponentHelper::queryInterface( rType );
 }