loplugin:flatten in svx

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

1 files changed, 149 insertions, 149 deletions

diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index b1449a811d93..352faf0b1caa 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -495,25 +495,25 @@ void GalleryBrowser2::ShowContextMenu(const CommandEvent& rCEvt)
     Point aSelPos;
     const sal_uInt32 nItemId = ImplGetSelectedItemId( rCEvt.IsMouseEvent() ? &aMousePos : nullptr, aSelPos );
 
-    if( mpCurTheme && nItemId && ( nItemId <= mpCurTheme->GetObjectCount() ) )
-    {
-        ImplSelectItemId( nItemId );
+    if( !(mpCurTheme && nItemId && ( nItemId <= mpCurTheme->GetObjectCount() )) )
+        return;
 
-        css::uno::Reference< css::frame::XFrame > xFrame( GetFrame() );
-        if ( xFrame.is() )
-        {
-            weld::Widget* pParent = GetViewWindow();
-            mnCurActionPos = nItemId - 1;
-            rtl::Reference< GalleryThemePopup > xPopup(
-                new GalleryThemePopup(
-                    pParent,
-                    mpCurTheme,
-                    mnCurActionPos,
-                    GALLERYBROWSERMODE_PREVIEW == GetMode(),
-                    this ) );
-            xPopup->ExecutePopup(pParent, aSelPos);
-        }
-    }
+    ImplSelectItemId( nItemId );
+
+    css::uno::Reference< css::frame::XFrame > xFrame( GetFrame() );
+    if ( !xFrame.is() )
+        return;
+
+    weld::Widget* pParent = GetViewWindow();
+    mnCurActionPos = nItemId - 1;
+    rtl::Reference< GalleryThemePopup > xPopup(
+        new GalleryThemePopup(
+            pParent,
+            mpCurTheme,
+            mnCurActionPos,
+            GALLERYBROWSERMODE_PREVIEW == GetMode(),
+            this ) );
+    xPopup->ExecutePopup(pParent, aSelPos);
 }
 
 bool GalleryBrowser2::ViewBoxHasFocus() const
@@ -630,83 +630,83 @@ void GalleryBrowser2::SelectTheme( const OUString& rThemeName )
 
 void GalleryBrowser2::SetMode( GalleryBrowserMode eMode )
 {
-    if( GetMode() != eMode )
-    {
-        meLastMode = GetMode();
+    if( GetMode() == eMode )
+        return;
 
-        switch( eMode )
+    meLastMode = GetMode();
+
+    switch( eMode )
+    {
+        case GALLERYBROWSERMODE_ICON:
         {
-            case GALLERYBROWSERMODE_ICON:
-            {
-                mxListView->hide();
+            mxListView->hide();
 
-                mxPreview->Hide();
-                mxPreview->SetGraphic( Graphic() );
-                GalleryPreview::PreviewMedia( INetURLObject() );
+            mxPreview->Hide();
+            mxPreview->SetGraphic( Graphic() );
+            GalleryPreview::PreviewMedia( INetURLObject() );
 
-                mxIconView->Show();
+            mxIconView->Show();
 
-                mxIconButton->set_sensitive(true);
-                mxListButton->set_sensitive(true);
+            mxIconButton->set_sensitive(true);
+            mxListButton->set_sensitive(true);
 
-                mxIconButton->set_active(true);
-                mxListButton->set_active(false);
-            }
-            break;
+            mxIconButton->set_active(true);
+            mxListButton->set_active(false);
+        }
+        break;
 
-            case GALLERYBROWSERMODE_LIST:
-            {
-                mxIconView->Hide();
+        case GALLERYBROWSERMODE_LIST:
+        {
+            mxIconView->Hide();
 
-                mxPreview->Hide();
-                mxPreview->SetGraphic( Graphic() );
-                GalleryPreview::PreviewMedia( INetURLObject() );
+            mxPreview->Hide();
+            mxPreview->SetGraphic( Graphic() );
+            GalleryPreview::PreviewMedia( INetURLObject() );
 
-                mxListView->show();
-                UpdateRows(true);
+            mxListView->show();
+            UpdateRows(true);
 
-                mxIconButton->set_sensitive(true);
-                mxListButton->set_sensitive(true);
+            mxIconButton->set_sensitive(true);
+            mxListButton->set_sensitive(true);
 
-                mxIconButton->set_active(false);
-                mxListButton->set_active(true);
-            }
-            break;
+            mxIconButton->set_active(false);
+            mxListButton->set_active(true);
+        }
+        break;
 
-            case GALLERYBROWSERMODE_PREVIEW:
-            {
-                Graphic     aGraphic;
-                Point       aSelPos;
-                const sal_uInt32 nItemId = ImplGetSelectedItemId( nullptr, aSelPos );
+        case GALLERYBROWSERMODE_PREVIEW:
+        {
+            Graphic     aGraphic;
+            Point       aSelPos;
+            const sal_uInt32 nItemId = ImplGetSelectedItemId( nullptr, aSelPos );
 
-                if( nItemId )
-                {
-                    const sal_uInt32 nPos = nItemId - 1;
+            if( nItemId )
+            {
+                const sal_uInt32 nPos = nItemId - 1;
 
-                    mxIconView->Hide();
-                    mxListView->hide();
+                mxIconView->Hide();
+                mxListView->hide();
 
-                    if( mpCurTheme )
-                        mpCurTheme->GetGraphic( nPos, aGraphic );
+                if( mpCurTheme )
+                    mpCurTheme->GetGraphic( nPos, aGraphic );
 
-                    mxPreview->SetGraphic( aGraphic );
-                    mxPreview->Show();
+                mxPreview->SetGraphic( aGraphic );
+                mxPreview->Show();
 
-                    if( mpCurTheme && mpCurTheme->GetObjectKind( nPos ) == SgaObjKind::Sound )
-                        GalleryPreview::PreviewMedia( mpCurTheme->GetObjectURL( nPos ) );
+                if( mpCurTheme && mpCurTheme->GetObjectKind( nPos ) == SgaObjKind::Sound )
+                    GalleryPreview::PreviewMedia( mpCurTheme->GetObjectURL( nPos ) );
 
-                    mxIconButton->set_sensitive(false);
-                    mxListButton->set_sensitive(false);
-                }
+                mxIconButton->set_sensitive(false);
+                mxListButton->set_sensitive(false);
             }
-            break;
-
-            default:
-                break;
         }
+        break;
 
-        GalleryBrowser2::meInitMode = meMode = eMode;
+        default:
+            break;
     }
+
+    GalleryBrowser2::meInitMode = meMode = eMode;
 }
 
 weld::Widget* GalleryBrowser2::GetViewWindow() const
@@ -728,51 +728,51 @@ weld::Widget* GalleryBrowser2::GetViewWindow() const
 
 void GalleryBrowser2::Travel( GalleryBrowserTravel eTravel )
 {
-    if( mpCurTheme )
+    if( !mpCurTheme )
+        return;
+
+    Point       aSelPos;
+    const sal_uInt32 nItemId = ImplGetSelectedItemId( nullptr, aSelPos );
+
+    if( !nItemId )
+        return;
+
+    sal_uInt32 nNewItemId = nItemId;
+
+    switch( eTravel )
     {
-        Point       aSelPos;
-        const sal_uInt32 nItemId = ImplGetSelectedItemId( nullptr, aSelPos );
+        case GalleryBrowserTravel::First:     nNewItemId = 1; break;
+        case GalleryBrowserTravel::Last:      nNewItemId = mpCurTheme->GetObjectCount(); break;
+        case GalleryBrowserTravel::Previous:  nNewItemId--; break;
+        case GalleryBrowserTravel::Next:      nNewItemId++; break;
+        default:
+            break;
+    }
 
-        if( nItemId )
-        {
-            sal_uInt32 nNewItemId = nItemId;
+    if( nNewItemId < 1 )
+        nNewItemId = 1;
+    else if( nNewItemId > mpCurTheme->GetObjectCount() )
+        nNewItemId = mpCurTheme->GetObjectCount();
 
-            switch( eTravel )
-            {
-                case GalleryBrowserTravel::First:     nNewItemId = 1; break;
-                case GalleryBrowserTravel::Last:      nNewItemId = mpCurTheme->GetObjectCount(); break;
-                case GalleryBrowserTravel::Previous:  nNewItemId--; break;
-                case GalleryBrowserTravel::Next:      nNewItemId++; break;
-                default:
-                    break;
-            }
+    if( nNewItemId == nItemId )
+        return;
 
-            if( nNewItemId < 1 )
-                nNewItemId = 1;
-            else if( nNewItemId > mpCurTheme->GetObjectCount() )
-                nNewItemId = mpCurTheme->GetObjectCount();
+    ImplSelectItemId( nNewItemId );
+    ImplUpdateInfoBar();
 
-            if( nNewItemId != nItemId )
-            {
-                ImplSelectItemId( nNewItemId );
-                ImplUpdateInfoBar();
+    if( GALLERYBROWSERMODE_PREVIEW != GetMode() )
+        return;
 
-                if( GALLERYBROWSERMODE_PREVIEW == GetMode() )
-                {
-                    Graphic     aGraphic;
-                    const sal_uInt32 nPos = nNewItemId - 1;
+    Graphic     aGraphic;
+    const sal_uInt32 nPos = nNewItemId - 1;
 
-                    mpCurTheme->GetGraphic( nPos, aGraphic );
-                    mxPreview->SetGraphic( aGraphic );
+    mpCurTheme->GetGraphic( nPos, aGraphic );
+    mxPreview->SetGraphic( aGraphic );
 
-                    if( SgaObjKind::Sound == mpCurTheme->GetObjectKind( nPos ) )
-                        GalleryPreview::PreviewMedia( mpCurTheme->GetObjectURL( nPos ) );
+    if( SgaObjKind::Sound == mpCurTheme->GetObjectKind( nPos ) )
+        GalleryPreview::PreviewMedia( mpCurTheme->GetObjectURL( nPos ) );
 
-                    mxPreview->Invalidate();
-                }
-            }
-        }
-    }
+    mxPreview->Invalidate();
 }
 
 void GalleryBrowser2::ImplUpdateViews( sal_uInt16 nSelectionId )
@@ -1099,61 +1099,61 @@ void GalleryBrowser2::Execute(const OString &rIdent)
     Point       aSelPos;
     const sal_uInt32 nItemId = ImplGetSelectedItemId( nullptr, aSelPos );
 
-    if( mpCurTheme && nItemId )
-    {
-        mnCurActionPos = nItemId - 1;
+    if( !(mpCurTheme && nItemId) )
+        return;
 
-        if (rIdent == "preview")
-            SetMode( ( GALLERYBROWSERMODE_PREVIEW != GetMode() ) ? GALLERYBROWSERMODE_PREVIEW : meLastMode );
-        else if (rIdent == "delete")
+    mnCurActionPos = nItemId - 1;
+
+    if (rIdent == "preview")
+        SetMode( ( GALLERYBROWSERMODE_PREVIEW != GetMode() ) ? GALLERYBROWSERMODE_PREVIEW : meLastMode );
+    else if (rIdent == "delete")
+    {
+        if (!mpCurTheme->IsReadOnly())
         {
-            if (!mpCurTheme->IsReadOnly())
+            std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetViewWindow(), "svx/ui/querydeleteobjectdialog.ui"));
+            std::unique_ptr<weld::MessageDialog> xQuery(xBuilder->weld_message_dialog("QueryDeleteObjectDialog"));
+            if (xQuery->run() == RET_YES)
             {
-                std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetViewWindow(), "svx/ui/querydeleteobjectdialog.ui"));
-                std::unique_ptr<weld::MessageDialog> xQuery(xBuilder->weld_message_dialog("QueryDeleteObjectDialog"));
-                if (xQuery->run() == RET_YES)
-                {
-                    mpCurTheme->RemoveObject( mnCurActionPos );
-                }
+                mpCurTheme->RemoveObject( mnCurActionPos );
             }
         }
-        else if (rIdent == "title")
+    }
+    else if (rIdent == "title")
+    {
+        std::unique_ptr<SgaObject> pObj = mpCurTheme->AcquireObject( mnCurActionPos );
+
+        if( pObj )
         {
-            std::unique_ptr<SgaObject> pObj = mpCurTheme->AcquireObject( mnCurActionPos );
+            const OUString  aOldTitle( GetItemText( *pObj, GalleryItemFlags::Title ) );
 
-            if( pObj )
+            SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
+            ScopedVclPtr<AbstractTitleDialog> aDlg(pFact->CreateTitleDialog(GetViewWindow(), aOldTitle));
+            if( aDlg->Execute() == RET_OK )
             {
-                const OUString  aOldTitle( GetItemText( *pObj, GalleryItemFlags::Title ) );
+                OUString aNewTitle( aDlg->GetTitle() );
 
-                SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
-                ScopedVclPtr<AbstractTitleDialog> aDlg(pFact->CreateTitleDialog(GetViewWindow(), aOldTitle));
-                if( aDlg->Execute() == RET_OK )
+                if( ( aNewTitle.isEmpty() && !pObj->GetTitle().isEmpty() ) || ( aNewTitle != aOldTitle ) )
                 {
-                    OUString aNewTitle( aDlg->GetTitle() );
-
-                    if( ( aNewTitle.isEmpty() && !pObj->GetTitle().isEmpty() ) || ( aNewTitle != aOldTitle ) )
-                    {
-                        if( aNewTitle.isEmpty() )
-                            aNewTitle = "__<empty>__";
+                    if( aNewTitle.isEmpty() )
+                        aNewTitle = "__<empty>__";
 
-                        pObj->SetTitle( aNewTitle );
-                        mpCurTheme->InsertObject( *pObj );
-                    }
+                    pObj->SetTitle( aNewTitle );
+                    mpCurTheme->InsertObject( *pObj );
                 }
             }
         }
-        else if (rIdent == "copy")
-        {
-            mpCurTheme->CopyToClipboard(mnCurActionPos);
-        }
-        else if (rIdent == "paste")
+    }
+    else if (rIdent == "copy")
+    {
+        mpCurTheme->CopyToClipboard(mnCurActionPos);
+    }
+    else if (rIdent == "paste")
+    {
+        if( !mpCurTheme->IsReadOnly() )
         {
-            if( !mpCurTheme->IsReadOnly() )
-            {
-                TransferableDataHelper aDataHelper(TransferableDataHelper::CreateFromClipboard(GetSystemClipboard()));
-                mpCurTheme->InsertTransferable( aDataHelper.GetTransferable(), mnCurActionPos );
-             }
-        }
+            TransferableDataHelper aDataHelper(TransferableDataHelper::CreateFromClipboard(GetSystemClipboard()));
+            mpCurTheme->InsertTransferable( aDataHelper.GetTransferable(), mnCurActionPos );
+         }
     }
 }