loplugin:indentation improve checks for brace alignment

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

8 files changed, 36 insertions, 29 deletions

diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
index f12352f1c596..e24c6b73f201 100644
--- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
@@ -488,7 +488,7 @@ Reference<XAccessibleRelationSet> SAL_CALL SvxRectCtlChildAccessibleContext::get
 {
     rtl::Reference<utl::AccessibleRelationSetHelper> pRelationSetHelper = new utl::AccessibleRelationSetHelper;
     if( mxParent.is() )
-      {
+    {
         uno::Sequence< uno::Reference< uno::XInterface > > aSequence { mxParent };
         pRelationSetHelper->AddRelation( css::accessibility::AccessibleRelation( css::accessibility::AccessibleRelationType::MEMBER_OF, aSequence ) );
     }
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index b644a2d51422..3990fe4766e0 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -1154,7 +1154,7 @@ void GalleryBrowser2::Execute(std::string_view rIdent)
             weld::Widget* pParent = GetViewWindow();
             TransferableDataHelper aDataHelper(TransferableDataHelper::CreateFromClipboard(pParent->get_clipboard()));
             mpCurTheme->InsertTransferable( aDataHelper.GetTransferable(), mnCurActionPos );
-         }
+        }
     }
 }
 
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index ed603c0de66e..7f7ce9980255 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -96,7 +96,7 @@ bool GallerySvDrawImport( SvStream& rIStm, SdrModel& rModel )
             // recall to read as XML
             bRet = GallerySvDrawImport( aMemStm, rModel );
         }
-     }
+    }
     else
     {
         // read as XML
diff --git a/svx/source/sdr/animation/scheduler.cxx b/svx/source/sdr/animation/scheduler.cxx
index 2b8ce885c151..2e3ea1d4a057 100644
--- a/svx/source/sdr/animation/scheduler.cxx
+++ b/svx/source/sdr/animation/scheduler.cxx
@@ -138,7 +138,7 @@ namespace sdr::animation
                 mnDeltaTime = 0;
                 triggerEvents();
                 checkTimeout();
-             }
+            }
         }
 
         void Scheduler::InsertEvent(Event& rNew)
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index 06a7ea4d207f..438639e092a2 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -664,27 +664,30 @@ sal_uInt16 OutlineTypeMgr::GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 /*m
                     bNotMatch = true;
                     break;
                 }
-                }else if ((eNumType&(~LINK_TOKEN)) == SVX_NUM_BITMAP ) {
-                        const SvxBrushItem* pBrsh1 = aFmt.GetBrush();
-                        const SvxBrushItem* pBrsh2 = _pSet->pBrushItem;
-                        bool bIsMatch = false;
-                        if (pBrsh1==pBrsh2) bIsMatch = true;
-                        if (pBrsh1 && pBrsh2) {
-                            const Graphic* pGrf1 = pBrsh1->GetGraphic();
-                            const Graphic* pGrf2 = pBrsh2->GetGraphic();
-                            if (pGrf1==pGrf2) bIsMatch = true;
-                            if (pGrf1 && pGrf2) {
-                                if ( pGrf1->GetBitmapEx() == pGrf2->GetBitmapEx() &&
-                                     _pSet->aSize == aFmt.GetGraphicSize())
-                                    bIsMatch = true;
-                            }
-                        }
-                        if (!bIsMatch) {
-                            bNotMatch = true;
-                            break;
-                        }
-                } else
-                {
+            }
+            else if ((eNumType&(~LINK_TOKEN)) == SVX_NUM_BITMAP )
+            {
+                const SvxBrushItem* pBrsh1 = aFmt.GetBrush();
+                const SvxBrushItem* pBrsh2 = _pSet->pBrushItem;
+                bool bIsMatch = false;
+                if (pBrsh1==pBrsh2) bIsMatch = true;
+                if (pBrsh1 && pBrsh2) {
+                    const Graphic* pGrf1 = pBrsh1->GetGraphic();
+                    const Graphic* pGrf2 = pBrsh2->GetGraphic();
+                    if (pGrf1==pGrf2) bIsMatch = true;
+                    if (pGrf1 && pGrf2) {
+                        if ( pGrf1->GetBitmapEx() == pGrf2->GetBitmapEx() &&
+                                _pSet->aSize == aFmt.GetGraphicSize())
+                            bIsMatch = true;
+                    }
+                }
+                if (!bIsMatch) {
+                    bNotMatch = true;
+                    break;
+                }
+            }
+            else
+            {
                 if (!(sPrefix == _pSet->sPrefix &&
                       sLclSuffix == _pSet->sSuffix &&
                       eNumType == eNType &&
@@ -697,7 +700,7 @@ sal_uInt16 OutlineTypeMgr::GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 /*m
                     bNotMatch = true;
                     break;
                 }
-                }
+            }
         }
         if ( !bNotMatch )
             return iDex+1;
diff --git a/svx/source/svdraw/svditer.cxx b/svx/source/svdraw/svditer.cxx
index 810732e2b16c..397244efe1d6 100644
--- a/svx/source/svdraw/svditer.cxx
+++ b/svx/source/svdraw/svditer.cxx
@@ -89,7 +89,8 @@ SdrObjListIter::SdrObjListIter( const SdrMarkList& rMarkList, SdrIterMode eMode
 }
 
 void SdrObjListIter::ImpProcessObjectList(const SdrObjList& rObjList, SdrIterMode eMode)
-{    for(size_t nIdx(0), nCount(rObjList.GetObjCount()); nIdx < nCount; ++nIdx)
+{
+    for(size_t nIdx(0), nCount(rObjList.GetObjCount()); nIdx < nCount; ++nIdx)
     {
         const SdrObject* pSdrObject(mbUseZOrder
             ? rObjList.GetObj(nIdx)
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index 06aa2d615127..54464406febe 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -2123,8 +2123,11 @@ void SvxTableController::getSelectedCells( CellPos& rFirst, CellPos& rLast )
         rLast.mnCol = std::max( maCursorFirstPos.mnCol, maCursorLastPos.mnCol );
         rLast.mnRow = std::max( maCursorFirstPos.mnRow, maCursorLastPos.mnRow );
 
+        if( !mxTable.is() )
+            return;
+
         bool bExt = false;
-        if( mxTable.is() ) do
+        do
         {
             bExt = false;
             for( sal_Int32 nRow = rFirst.mnRow; nRow <= rLast.mnRow && !bExt; nRow++ )
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index 29ea67e50781..3a9279a96dcf 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -343,7 +343,7 @@ Graphic SvXMLGraphicOutputStream::GetGraphic()
     {
         mpOStm.reset();
         mpTmp.reset();
-     }
+    }
     return aGraphic;
 }