From e54777276d28e6bbceefa07e260926c81790938c Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Mon, 3 Aug 2020 08:41:49 +0200
Subject: loplugin:flatten in configmgr..i18nutil

Change-Id: Idaeed33df4f1dd1b2acbdaf8a895c5d56c3ca14c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99980
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 cppu/source/typelib/typelib.cxx | 90 ++++++++++++++++++++---------------------
 1 file changed, 45 insertions(+), 45 deletions(-)

(limited to 'cppu')

diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx
index d9f445272510..8b8f7d1b32f1 100644
--- a/cppu/source/typelib/typelib.cxx
+++ b/cppu/source/typelib/typelib.cxx
@@ -1366,68 +1366,68 @@ extern "C" void SAL_CALL typelib_typedescription_release(
 {
     sal_Int32 ref = osl_atomic_decrement( &pTD->nRefCount );
     OSL_ASSERT(ref >= 0);
-    if (0 == ref)
+    if (0 != ref)
+        return;
+
+    TypeDescriptor_Init_Impl &rInit = Init::get();
+    if( TYPELIB_TYPEDESCRIPTIONREFERENCE_ISREALLYWEAK( pTD->eTypeClass ) )
     {
-        TypeDescriptor_Init_Impl &rInit = Init::get();
-        if( TYPELIB_TYPEDESCRIPTIONREFERENCE_ISREALLYWEAK( pTD->eTypeClass ) )
+        if( pTD->pWeakRef )
         {
-            if( pTD->pWeakRef )
             {
-                {
                 MutexGuard aGuard( rInit.getMutex() );
                 // remove this description from the weak reference
                 pTD->pWeakRef->pType = nullptr;
-                }
-                typelib_typedescriptionreference_release( pTD->pWeakRef );
             }
+            typelib_typedescriptionreference_release( pTD->pWeakRef );
         }
-        else
+    }
+    else
+    {
+        // this description is a reference too, so remove it from the hash table
+        if( rInit.pWeakMap )
         {
-            // this description is a reference too, so remove it from the hash table
-            if( rInit.pWeakMap )
+            MutexGuard aGuard( rInit.getMutex() );
+            WeakMap_Impl::iterator aIt = rInit.pWeakMap->find( pTD->pTypeName->buffer );
+            if( aIt != rInit.pWeakMap->end() && static_cast<void *>((*aIt).second) == static_cast<void *>(pTD) )
             {
-                MutexGuard aGuard( rInit.getMutex() );
-                WeakMap_Impl::iterator aIt = rInit.pWeakMap->find( pTD->pTypeName->buffer );
-                if( aIt != rInit.pWeakMap->end() && static_cast<void *>((*aIt).second) == static_cast<void *>(pTD) )
-                {
-                    // remove only if it contains the same object
-                    rInit.pWeakMap->erase( aIt );
-                }
+                // remove only if it contains the same object
+                rInit.pWeakMap->erase( aIt );
             }
         }
+    }
 
-        typelib_typedescription_destructExtendedMembers( pTD );
-        rtl_uString_release( pTD->pTypeName );
+    typelib_typedescription_destructExtendedMembers( pTD );
+    rtl_uString_release( pTD->pTypeName );
 
 #if OSL_DEBUG_LEVEL > 0
-        switch( pTD->eTypeClass )
-        {
-        case typelib_TypeClass_SEQUENCE:
-            osl_atomic_decrement( &rInit.nIndirectTypeDescriptionCount );
-            break;
-        case typelib_TypeClass_STRUCT:
-        case typelib_TypeClass_EXCEPTION:
-            osl_atomic_decrement( &rInit.nCompoundTypeDescriptionCount );
-            break;
-        case typelib_TypeClass_INTERFACE:
-            osl_atomic_decrement( &rInit.nInterfaceTypeDescriptionCount );
-            break;
-        case typelib_TypeClass_INTERFACE_METHOD:
-            osl_atomic_decrement( &rInit.nInterfaceMethodTypeDescriptionCount );
-            break;
-        case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-            osl_atomic_decrement( &rInit.nInterfaceAttributeTypeDescriptionCount );
-            break;
-        case typelib_TypeClass_ENUM:
-            osl_atomic_decrement( &rInit.nEnumTypeDescriptionCount );
-            break;
-        default:
-            osl_atomic_decrement( &rInit.nTypeDescriptionCount );
-        }
+    switch( pTD->eTypeClass )
+    {
+    case typelib_TypeClass_SEQUENCE:
+        osl_atomic_decrement( &rInit.nIndirectTypeDescriptionCount );
+        break;
+    case typelib_TypeClass_STRUCT:
+    case typelib_TypeClass_EXCEPTION:
+        osl_atomic_decrement( &rInit.nCompoundTypeDescriptionCount );
+        break;
+    case typelib_TypeClass_INTERFACE:
+        osl_atomic_decrement( &rInit.nInterfaceTypeDescriptionCount );
+        break;
+    case typelib_TypeClass_INTERFACE_METHOD:
+        osl_atomic_decrement( &rInit.nInterfaceMethodTypeDescriptionCount );
+        break;
+    case typelib_TypeClass_INTERFACE_ATTRIBUTE:
+        osl_atomic_decrement( &rInit.nInterfaceAttributeTypeDescriptionCount );
+        break;
+    case typelib_TypeClass_ENUM:
+        osl_atomic_decrement( &rInit.nEnumTypeDescriptionCount );
+        break;
+    default:
+        osl_atomic_decrement( &rInit.nTypeDescriptionCount );
+    }
 #endif
 
-        freeTypeDescription(pTD);
-    }
+    freeTypeDescription(pTD);
 }
 
 
-- 
cgit