loplugin:flatten in UnoControls

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

1 files changed, 52 insertions, 52 deletions

diff --git a/UnoControls/source/base/basecontainercontrol.cxx b/UnoControls/source/base/basecontainercontrol.cxx
index dda72799d550..2f21979cc644 100644
--- a/UnoControls/source/base/basecontainercontrol.cxx
+++ b/UnoControls/source/base/basecontainercontrol.cxx
@@ -114,18 +114,18 @@ Any SAL_CALL BaseContainerControl::queryAggregation( const Type& aType )
 void SAL_CALL BaseContainerControl::createPeer( const   Reference< XToolkit >&      xToolkit    ,
                                                 const   Reference< XWindowPeer >&   xParent     )
 {
-    if ( !getPeer().is() )
-    {
-        // create own peer
-        BaseControl::createPeer( xToolkit, xParent );
+    if ( getPeer().is() )
+        return;
 
-        // create peers at all children
-        Sequence< Reference< XControl > >   seqControlList  = getControls();
+    // create own peer
+    BaseControl::createPeer( xToolkit, xParent );
 
-        for ( auto& rxControl : seqControlList )
-        {
-            rxControl->createPeer( xToolkit, getPeer() );
-        }
+    // create peers at all children
+    Sequence< Reference< XControl > >   seqControlList  = getControls();
+
+    for ( auto& rxControl : seqControlList )
+    {
+        rxControl->createPeer( xToolkit, getPeer() );
     }
 }
 
@@ -221,22 +221,22 @@ void SAL_CALL BaseContainerControl::addControl ( const OUString& rName, const Re
     // Send message to all listener
     OInterfaceContainerHelper* pInterfaceContainer = m_aListeners.getContainer( cppu::UnoType<XContainerListener>::get());
 
-    if (pInterfaceContainer)
-    {
-        // Build event
-        ContainerEvent  aEvent;
+    if (!pInterfaceContainer)
+        return;
 
-        aEvent.Source   = *this;
-        aEvent.Element <<= rControl;
+    // Build event
+    ContainerEvent  aEvent;
 
-        // Get all listener
-        OInterfaceIteratorHelper    aIterator (*pInterfaceContainer);
+    aEvent.Source   = *this;
+    aEvent.Element <<= rControl;
 
-        // Send event
-        while ( aIterator.hasMoreElements() )
-        {
-            static_cast<XContainerListener*>(aIterator.next())->elementInserted (aEvent);
-        }
+    // Get all listener
+    OInterfaceIteratorHelper    aIterator (*pInterfaceContainer);
+
+    // Send event
+    while ( aIterator.hasMoreElements() )
+    {
+        static_cast<XContainerListener*>(aIterator.next())->elementInserted (aEvent);
     }
 }
 
@@ -244,46 +244,46 @@ void SAL_CALL BaseContainerControl::addControl ( const OUString& rName, const Re
 
 void SAL_CALL BaseContainerControl::removeControl ( const Reference< XControl > & rControl )
 {
-    if ( rControl.is() )
-    {
-        // Ready for multithreading
-        MutexGuard aGuard (m_aMutex);
+    if ( !rControl.is() )
+        return;
+
+    // Ready for multithreading
+    MutexGuard aGuard (m_aMutex);
 
-        size_t nControls = maControlInfoList.size();
+    size_t nControls = maControlInfoList.size();
 
-        for ( size_t n = 0; n < nControls; n++ )
+    for ( size_t n = 0; n < nControls; n++ )
+    {
+        // Search for right control
+        IMPL_ControlInfo* pControl = maControlInfoList[ n ].get();
+        if ( rControl == pControl->xControl )
         {
-            // Search for right control
-            IMPL_ControlInfo* pControl = maControlInfoList[ n ].get();
-            if ( rControl == pControl->xControl )
-            {
-                //.is it found ... remove listener from control
-                pControl->xControl->removeEventListener (static_cast< XEventListener* >( static_cast< XWindowListener* >( this ) ));
-                pControl->xControl->setContext          ( Reference< XInterface >  ()   );
+            //.is it found ... remove listener from control
+            pControl->xControl->removeEventListener (static_cast< XEventListener* >( static_cast< XWindowListener* >( this ) ));
+            pControl->xControl->setContext          ( Reference< XInterface >  ()   );
 
-                // ... free memory
-                maControlInfoList.erase(maControlInfoList.begin() + n);
+            // ... free memory
+            maControlInfoList.erase(maControlInfoList.begin() + n);
 
-                // Send message to all other listener
-                OInterfaceContainerHelper * pInterfaceContainer = m_aListeners.getContainer( cppu::UnoType<XContainerListener>::get());
+            // Send message to all other listener
+            OInterfaceContainerHelper * pInterfaceContainer = m_aListeners.getContainer( cppu::UnoType<XContainerListener>::get());
 
-                if (pInterfaceContainer)
-                {
-                    ContainerEvent  aEvent;
+            if (pInterfaceContainer)
+            {
+                ContainerEvent  aEvent;
 
-                    aEvent.Source    = *this;
-                    aEvent.Element <<= rControl;
+                aEvent.Source    = *this;
+                aEvent.Element <<= rControl;
 
-                    OInterfaceIteratorHelper    aIterator (*pInterfaceContainer);
+                OInterfaceIteratorHelper    aIterator (*pInterfaceContainer);
 
-                    while ( aIterator.hasMoreElements() )
-                    {
-                        static_cast<XContainerListener*>(aIterator.next())->elementRemoved (aEvent);
-                    }
+                while ( aIterator.hasMoreElements() )
+                {
+                    static_cast<XContainerListener*>(aIterator.next())->elementRemoved (aEvent);
                 }
-                // Break "for" !
-                break;
             }
+            // Break "for" !
+            break;
         }
     }
 }