1 files changed, 5 insertions, 10 deletions
diff --git a/UnoControls/source/controls/OConnectionPointHelper.cxx b/UnoControls/source/controls/OConnectionPointHelper.cxx
index b6ddaaa513a0..b17edc2ba3da 100644
--- a/UnoControls/source/controls/OConnectionPointHelper.cxx
+++ b/UnoControls/source/controls/OConnectionPointHelper.cxx
@@ -52,7 +52,6 @@ OConnectionPointHelper::~OConnectionPointHelper()
 }
 
 //  XInterface
-
 Any SAL_CALL OConnectionPointHelper::queryInterface( const Type& aType )
 {
     // Attention:
@@ -64,18 +63,15 @@ Any SAL_CALL OConnectionPointHelper::queryInterface( const Type& aType )
                                         )
                 );
 
-    // If searched interface not supported by this class ...
-    if ( !aReturn.hasValue() )
-    {
-        // ... ask baseclasses.
-        aReturn = OWeakObject::queryInterface( aType );
-    }
+    if (aReturn.hasValue())
+        return aReturn;
 
-    return aReturn;
+    // If searched interface not supported by this class ...
+    // ... ask baseclasses.
+    return OWeakObject::queryInterface(aType);
 }
 
 //  XInterface
-
 void SAL_CALL OConnectionPointHelper::acquire() noexcept
 {
     // Attention:
@@ -86,7 +82,6 @@ void SAL_CALL OConnectionPointHelper::acquire() noexcept
 }
 
 //  XInterface
-
 void SAL_CALL OConnectionPointHelper::release() noexcept
 {
     // Attention: