loplugin:flatten in ucb

Change-Id: Ica7e5d3b5a5cec065f35f99d62b3b6604323601a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100009
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

1 files changed, 70 insertions, 70 deletions

diff --git a/ucb/source/cacher/contentresultsetwrapper.cxx b/ucb/source/cacher/contentresultsetwrapper.cxx
index d6a6cdf1727c..6699fc9df710 100644
--- a/ucb/source/cacher/contentresultsetwrapper.cxx
+++ b/ucb/source/cacher/contentresultsetwrapper.cxx
@@ -539,28 +539,28 @@ void SAL_CALL ContentResultSetWrapper::addPropertyChangeListener( const OUString
     bool bNeedRegister = !m_pPropertyChangeListeners->
                         getContainedTypes().hasElements();
     m_pPropertyChangeListeners->addInterface( aPropertyName, xListener );
-    if( bNeedRegister )
+    if( !bNeedRegister )
+        return;
+
+    impl_init_xPropertySetOrigin();
     {
-        impl_init_xPropertySetOrigin();
-        {
-            osl::Guard< osl::Mutex > aGuard( m_aMutex );
-            if( !m_xPropertySetOrigin.is() )
-            {
-                OSL_FAIL( "broadcaster was disposed already" );
-                return;
-            }
-        }
-        try
-        {
-            m_xPropertySetOrigin->addPropertyChangeListener(
-                OUString(), static_cast< XPropertyChangeListener * >( m_xMyListenerImpl.get() ) );
-        }
-        catch( Exception& )
+        osl::Guard< osl::Mutex > aGuard( m_aMutex );
+        if( !m_xPropertySetOrigin.is() )
         {
-            m_pPropertyChangeListeners->removeInterface( aPropertyName, xListener );
-            throw;
+            OSL_FAIL( "broadcaster was disposed already" );
+            return;
         }
     }
+    try
+    {
+        m_xPropertySetOrigin->addPropertyChangeListener(
+            OUString(), static_cast< XPropertyChangeListener * >( m_xMyListenerImpl.get() ) );
+    }
+    catch( Exception& )
+    {
+        m_pPropertyChangeListeners->removeInterface( aPropertyName, xListener );
+        throw;
+    }
 }
 
 
@@ -584,28 +584,28 @@ void SAL_CALL ContentResultSetWrapper::addVetoableChangeListener( const OUString
     bool bNeedRegister = !m_pVetoableChangeListeners->
                         getContainedTypes().hasElements();
     m_pVetoableChangeListeners->addInterface( rPropertyName, xListener );
-    if( bNeedRegister )
+    if( !bNeedRegister )
+        return;
+
+    impl_init_xPropertySetOrigin();
     {
-        impl_init_xPropertySetOrigin();
-        {
-            osl::Guard< osl::Mutex > aGuard( m_aMutex );
-            if( !m_xPropertySetOrigin.is() )
-            {
-                OSL_FAIL( "broadcaster was disposed already" );
-                return;
-            }
-        }
-        try
-        {
-            m_xPropertySetOrigin->addVetoableChangeListener(
-                OUString(), static_cast< XVetoableChangeListener * >( m_xMyListenerImpl.get() ) );
-        }
-        catch( Exception& )
+        osl::Guard< osl::Mutex > aGuard( m_aMutex );
+        if( !m_xPropertySetOrigin.is() )
         {
-            m_pVetoableChangeListeners->removeInterface( rPropertyName, xListener );
-            throw;
+            OSL_FAIL( "broadcaster was disposed already" );
+            return;
         }
     }
+    try
+    {
+        m_xPropertySetOrigin->addVetoableChangeListener(
+            OUString(), static_cast< XVetoableChangeListener * >( m_xMyListenerImpl.get() ) );
+    }
+    catch( Exception& )
+    {
+        m_pVetoableChangeListeners->removeInterface( rPropertyName, xListener );
+        throw;
+    }
 }
 
 
@@ -638,27 +638,27 @@ void SAL_CALL ContentResultSetWrapper::removePropertyChangeListener( const OUStr
 
     m_pPropertyChangeListeners->removeInterface( rPropertyName, xListener );
 
-    if( !m_pPropertyChangeListeners->getContainedTypes().hasElements() )
+    if( m_pPropertyChangeListeners->getContainedTypes().hasElements() )
+        return;
+
+    impl_init_xPropertySetOrigin();
     {
-        impl_init_xPropertySetOrigin();
-        {
-            osl::Guard< osl::Mutex > aGuard( m_aMutex );
-            if( !m_xPropertySetOrigin.is() )
-            {
-                OSL_FAIL( "broadcaster was disposed already" );
-                return;
-            }
-        }
-        try
-        {
-            m_xPropertySetOrigin->removePropertyChangeListener(
-                OUString(), static_cast< XPropertyChangeListener * >( m_xMyListenerImpl.get() ) );
-        }
-        catch( Exception& )
+        osl::Guard< osl::Mutex > aGuard( m_aMutex );
+        if( !m_xPropertySetOrigin.is() )
         {
-            OSL_FAIL( "could not remove PropertyChangeListener" );
+            OSL_FAIL( "broadcaster was disposed already" );
+            return;
         }
     }
+    try
+    {
+        m_xPropertySetOrigin->removePropertyChangeListener(
+            OUString(), static_cast< XPropertyChangeListener * >( m_xMyListenerImpl.get() ) );
+    }
+    catch( Exception& )
+    {
+        OSL_FAIL( "could not remove PropertyChangeListener" );
+    }
 }
 
 
@@ -691,27 +691,27 @@ void SAL_CALL ContentResultSetWrapper::removeVetoableChangeListener( const OUStr
 
     m_pVetoableChangeListeners->removeInterface( rPropertyName, xListener );
 
-    if( !m_pVetoableChangeListeners->getContainedTypes().hasElements() )
+    if( m_pVetoableChangeListeners->getContainedTypes().hasElements() )
+        return;
+
+    impl_init_xPropertySetOrigin();
     {
-        impl_init_xPropertySetOrigin();
-        {
-            osl::Guard< osl::Mutex > aGuard( m_aMutex );
-            if( !m_xPropertySetOrigin.is() )
-            {
-                OSL_FAIL( "broadcaster was disposed already" );
-                return;
-            }
-        }
-        try
-        {
-            m_xPropertySetOrigin->removeVetoableChangeListener(
-                OUString(), static_cast< XVetoableChangeListener * >( m_xMyListenerImpl.get() ) );
-        }
-        catch( Exception& )
+        osl::Guard< osl::Mutex > aGuard( m_aMutex );
+        if( !m_xPropertySetOrigin.is() )
         {
-            OSL_FAIL( "could not remove VetoableChangeListener" );
+            OSL_FAIL( "broadcaster was disposed already" );
+            return;
         }
     }
+    try
+    {
+        m_xPropertySetOrigin->removeVetoableChangeListener(
+            OUString(), static_cast< XVetoableChangeListener * >( m_xMyListenerImpl.get() ) );
+    }
+    catch( Exception& )
+    {
+        OSL_FAIL( "could not remove VetoableChangeListener" );
+    }
 }