clang-tidy readability-misleading-indentation

Change-Id: I4673fc7c694924b41d048a1918ddb8b0e0af1f79
Reviewed-on: https://gerrit.libreoffice.org/61935
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

68 files changed, 406 insertions, 414 deletions

diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx b/accessibility/source/extended/AccessibleGridControlBase.cxx
index daa93e64db65..dbf25022ca35 100644
--- a/accessibility/source/extended/AccessibleGridControlBase.cxx
+++ b/accessibility/source/extended/AccessibleGridControlBase.cxx
@@ -398,15 +398,15 @@ sal_Int32 SAL_CALL AccessibleGridControlBase::getForeground(  )
     {
         if ( pInst->IsControlForeground() )
             nColor = pInst->GetControlForeground();
-    else
-    {
-        vcl::Font aFont;
-        if ( pInst->IsControlFont() )
-            aFont = pInst->GetControlFont();
         else
-            aFont = pInst->GetFont();
-        nColor = aFont.GetColor();
-    }
+        {
+            vcl::Font aFont;
+            if ( pInst->IsControlFont() )
+                aFont = pInst->GetControlFont();
+            else
+                aFont = pInst->GetFont();
+            nColor = aFont.GetColor();
+        }
     }
     return sal_Int32(nColor);
 }
@@ -422,7 +422,7 @@ sal_Int32 SAL_CALL AccessibleGridControlBase::getBackground(  )
     {
         if ( pInst->IsControlBackground() )
             nColor = pInst->GetControlBackground();
-    else
+        else
             nColor = pInst->GetBackground().GetColor();
     }
     return sal_Int32(nColor);
diff --git a/accessibility/source/extended/accessiblelistbox.cxx b/accessibility/source/extended/accessiblelistbox.cxx
index 0f194f0d404a..0ef5168141a5 100644
--- a/accessibility/source/extended/accessiblelistbox.cxx
+++ b/accessibility/source/extended/accessiblelistbox.cxx
@@ -384,7 +384,7 @@ namespace accessibility
         {
             if( bHasButtons )
                 nCase = 2;
-             else
+            else
                 nCase = 3;
         }
         return nCase;
diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx
index 943047213a1c..8e11b4587e10 100644
--- a/accessibility/source/extended/accessiblelistboxentry.cxx
+++ b/accessibility/source/extended/accessiblelistboxentry.cxx
@@ -385,7 +385,7 @@ namespace accessibility
         {
             if( bHasButtons )
                 nCase = 2;
-             else
+            else
                 nCase = 3;
         }
         return nCase;
diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx
index dd9a02cb5c89..f9c645ba15c9 100644
--- a/avmedia/source/framework/mediacontrol.cxx
+++ b/avmedia/source/framework/mediacontrol.cxx
@@ -296,10 +296,9 @@ IMPL_LINK( MediaControl, implSelectHdl, ToolBox*, p, void )
         if( p->GetCurItemId() == AVMEDIA_TOOLBOXITEM_OPEN )
         {
             OUString aURL;
-
-             if (MediaWindow::executeMediaURLDialog(GetFrameWeld(), aURL, nullptr))
-             {
-                 if( !MediaWindow::isMediaURL( aURL, ""/*TODO?*/, true ) )
+            if (MediaWindow::executeMediaURLDialog(GetFrameWeld(), aURL, nullptr))
+            {
+                if( !MediaWindow::isMediaURL( aURL, ""/*TODO?*/, true ) )
                     MediaWindow::executeFormatErrorBox(GetFrameWeld());
                 else
                 {
diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx
index 4de7036237b2..dba938e96eec 100644
--- a/basic/source/sbx/sbxvalue.cxx
+++ b/basic/source/sbx/sbxvalue.cxx
@@ -1415,97 +1415,97 @@ bool SbxValue::LoadData( SvStream& r, sal_uInt16 )
             OUString aVal = read_uInt16_lenPrefixed_uInt8s_ToOUString(r,
                 RTL_TEXTENCODING_ASCII_US);
             if( !aVal.isEmpty() )
-                    aData.pOUString = new OUString( aVal );
-                else
-                    aData.pOUString = nullptr; // JSM 1995-09-22
-                break;
-            }
-            case SbxERROR:
-            case SbxUSHORT:
-                r.ReadUInt16( aData.nUShort ); break;
-            case SbxOBJECT:
+                aData.pOUString = new OUString( aVal );
+            else
+                aData.pOUString = nullptr; // JSM 1995-09-22
+            break;
+        }
+        case SbxERROR:
+        case SbxUSHORT:
+            r.ReadUInt16( aData.nUShort ); break;
+        case SbxOBJECT:
+        {
+            sal_uInt8 nMode;
+            r.ReadUChar( nMode );
+            switch( nMode )
             {
-                sal_uInt8 nMode;
-                r.ReadUChar( nMode );
-                switch( nMode )
-                {
-                    case 0:
-                        aData.pObj = nullptr;
-                        break;
-                    case 1:
-                        aData.pObj = SbxBase::Load( r );
-                        return ( aData.pObj != nullptr );
-                    case 2:
-                        aData.pObj = this;
-                        break;
-                }
-                break;
+                case 0:
+                    aData.pObj = nullptr;
+                    break;
+                case 1:
+                    aData.pObj = SbxBase::Load( r );
+                    return ( aData.pObj != nullptr );
+                case 2:
+                    aData.pObj = this;
+                    break;
             }
-            case SbxCHAR:
+            break;
+        }
+        case SbxCHAR:
+        {
+            char c;
+            r.ReadChar( c );
+            aData.nChar = c;
+            break;
+        }
+        case SbxBYTE:
+            r.ReadUChar( aData.nByte ); break;
+        case SbxULONG:
+            r.ReadUInt32( aData.nULong ); break;
+        case SbxINT:
+        {
+            sal_uInt8 n;
+            r.ReadUChar( n );
+            // Match the Int on this system?
+            if( n > SAL_TYPES_SIZEOFINT )
             {
-                char c;
-                r.ReadChar( c );
-                aData.nChar = c;
-                break;
+                r.ReadInt32( aData.nLong );
+                aData.eType = SbxLONG;
             }
-            case SbxBYTE:
-                r.ReadUChar( aData.nByte ); break;
-            case SbxULONG:
-                r.ReadUInt32( aData.nULong ); break;
-            case SbxINT:
-            {
-                sal_uInt8 n;
-                r.ReadUChar( n );
-                // Match the Int on this system?
-                if( n > SAL_TYPES_SIZEOFINT )
-                {
-                    r.ReadInt32( aData.nLong );
-                    aData.eType = SbxLONG;
-                }
-                else {
-                    sal_Int32 nInt;
-                    r.ReadInt32( nInt );
-                    aData.nInt = nInt;
-                }
-                break;
+            else {
+                sal_Int32 nInt;
+                r.ReadInt32( nInt );
+                aData.nInt = nInt;
             }
-            case SbxUINT:
+            break;
+        }
+        case SbxUINT:
+        {
+            sal_uInt8 n;
+            r.ReadUChar( n );
+            // Match the UInt on this system?
+            if( n > SAL_TYPES_SIZEOFINT )
             {
-                sal_uInt8 n;
-                r.ReadUChar( n );
-                // Match the UInt on this system?
-                if( n > SAL_TYPES_SIZEOFINT )
-                {
-                    r.ReadUInt32( aData.nULong );
-                    aData.eType = SbxULONG;
-                }
-                else {
-                    sal_uInt32 nUInt;
-                    r.ReadUInt32( nUInt );
-                    aData.nUInt = nUInt;
-                }
-                break;
+                r.ReadUInt32( aData.nULong );
+                aData.eType = SbxULONG;
             }
-            case SbxEMPTY:
-            case SbxNULL:
-            case SbxVOID:
-                break;
-            case SbxDATAOBJECT:
-                r.ReadInt32( aData.nLong );
-                break;
-            // #78919 For backwards compatibility
-            case SbxWSTRING:
-            case SbxWCHAR:
-                break;
-            default:
-                aData.clear(SbxNULL);
-                ResetFlag(SbxFlagBits::Fixed);
-                SAL_WARN( "basic.sbx", "Loaded a non-supported data type" );
-
-                return false;
+            else {
+                sal_uInt32 nUInt;
+                r.ReadUInt32( nUInt );
+                aData.nUInt = nUInt;
+            }
+            break;
         }
-        return true;
+        case SbxEMPTY:
+        case SbxNULL:
+        case SbxVOID:
+            break;
+        case SbxDATAOBJECT:
+            r.ReadInt32( aData.nLong );
+            break;
+        // #78919 For backwards compatibility
+        case SbxWSTRING:
+        case SbxWCHAR:
+            break;
+        default:
+            aData.clear(SbxNULL);
+            ResetFlag(SbxFlagBits::Fixed);
+            SAL_WARN( "basic.sbx", "Loaded a non-supported data type" );
+
+            return false;
     }
+    return true;
+}
 
     bool SbxValue::StoreData( SvStream& r ) const
     {
diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx
index 79557fd69789..bfe6824fcb12 100644
--- a/connectivity/source/drivers/evoab2/NResultSet.cxx
+++ b/connectivity/source/drivers/evoab2/NResultSet.cxx
@@ -1023,7 +1023,7 @@ sal_Bool SAL_CALL OEvoabResultSet::previous(  )
         m_nIndex--;
         return true;
     }
-        else
+    else
         return false;
 }
 
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index 7d9ca005c071..6b4b4351fb46 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -876,8 +876,8 @@ OSQLParseNode* OSQLParser::convertNode(sal_Int32 nType, OSQLParseNode* pLiteral)
                 case DataType::DATE:
                 case DataType::TIME:
                 case DataType::TIMESTAMP:
-                if ( m_xFormatter.is() )
-                    pReturn = buildDate( nType, pReturn);
+                    if ( m_xFormatter.is() )
+                        pReturn = buildDate( nType, pReturn);
                     else
                         m_sErrorMessage = m_pContext->getErrorMessage(IParseContext::ErrorCode::InvalidDateCompare);
                     break;
diff --git a/cpputools/source/unoexe/unoexe.cxx b/cpputools/source/unoexe/unoexe.cxx
index 9ed418c2149b..c6db2c891db2 100644
--- a/cpputools/source/unoexe/unoexe.cxx
+++ b/cpputools/source/unoexe/unoexe.cxx
@@ -112,7 +112,7 @@ static bool readOption( OUString * pValue, const sal_Char * pOpt,
         ++(*pnIndex);
         return true;
     }
-      else if (aArg.indexOf(aOpt) == 1)
+    else if (aArg.indexOf(aOpt) == 1)
     {
         *pValue = aArg.copy(1 + aOpt.getLength());
         SAL_INFO("cpputools.unoexe", "> identified option -" << pOpt << " = " << aArg);
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index bb12ccb57341..cb4562e22b3b 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -2115,7 +2115,7 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet* rSet )
         rSet->Put( aNewItem );
         bModified = true;
     }
-     else if ( SfxItemState::DEFAULT == rOldSet.GetItemState( nWhich, false ) )
+    else if ( SfxItemState::DEFAULT == rOldSet.GetItemState( nWhich, false ) )
         rSet->InvalidateItem(nWhich);
 
     bChanged = true;
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 19d103c6fd71..bbd756c7ca30 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -1402,9 +1402,9 @@ bool SvxNumberFormatTabPage::Click_Impl(weld::Button& rIB)
         if ( nFmtLbSelPos != SELPOS_NONE )
         {
             if(bOneAreaFlag)                  //@@ ???
-                    SetCategory(0);
-                else
-                    SetCategory(nCatLbSelPos );
+                SetCategory(0);
+            else
+                SetCategory(nCatLbSelPos );
 
             m_xLbFormat->select(static_cast<sal_uInt16>(nFmtLbSelPos));
             m_xEdFormat->set_text( aFormat );
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index e605156daebc..fd7599d788fd 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -3372,7 +3372,7 @@ void OQueryDesignView::fillFunctionInfo(  const ::connectivity::OSQLParseNode* p
                 nDataType = DataType::FLOAT;
             else if ( SQL_ISTOKEN(pCastTarget, REAL) )
                 nDataType = DataType::REAL;
-           else if ( SQL_ISTOKEN(pCastTarget, DOUBLE) )
+            else if ( SQL_ISTOKEN(pCastTarget, DOUBLE) )
                 nDataType = DataType::DOUBLE;
             else if ( SQL_ISTOKEN(pCastTarget, BOOLEAN) )
                 nDataType = DataType::BOOLEAN;
diff --git a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
index 5fc918cea17c..cac61db4d7fd 100644
--- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
@@ -245,9 +245,8 @@ sal_Int8 OTableWindowListBox::AcceptDrop( const AcceptDropEvent& _rEvt )
                     ScrollUpHdl( nullptr );
                 }
             }
-
-           // scroll down if the pointer is on the lower scroll area
-           else if( aTopScrollArea.IsInside(m_aMousePos) )
+            // scroll down if the pointer is on the lower scroll area
+            else if( aTopScrollArea.IsInside(m_aMousePos) )
             {
                 if( !m_aScrollTimer.IsActive() )
                 {
diff --git a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
index e7f8a2927806..2ef5295ec68a 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
@@ -251,7 +251,7 @@ void CommandEnvironmentImpl::handle(
             abort = false;
         }
     }
-       else if (request >>= instExc)
+    else if (request >>= instExc)
     {
         //Only if the unopgk was started with gui + extension then we user is asked.
         //In console mode there is no asking.
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index c94a015b635c..309975c92c16 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -4238,7 +4238,7 @@ sal_uInt32 EscherGraphicProvider::GetBlibID( SvStream& rPicOutStrm, GraphicObjec
                 rPicOutStrm.WriteUInt32( 0x7f90000 | static_cast<sal_uInt16>( mvBlibEntrys.size() << 4 ) )
                            .WriteUInt32( 0 );
                 nAtomSize = rPicOutStrm.Tell();
-                 if ( eBlibType == PNG )
+                if ( eBlibType == PNG )
                     rPicOutStrm.WriteUInt16( 0x0606 );
                 else if ( eBlibType == WMF )
                     rPicOutStrm.WriteUInt16( 0x0403 );
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index ed1e0b5ad95c..88f212fbb609 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -530,7 +530,7 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >&
                     rFilterData[ nData ].Value >>= mnDefaultLinkAction;
                 else if ( rFilterData[ nData ].Name == "ConvertOOoTargetToPDFTarget" )
                     rFilterData[ nData ].Value >>= mbConvertOOoTargetToPDFTarget;
-                 else if ( rFilterData[ nData ].Name == "ExportBookmarksToPDFDestination" )
+                else if ( rFilterData[ nData ].Name == "ExportBookmarksToPDFDestination" )
                     rFilterData[ nData ].Value >>= mbExportBmkToDest;
                 else if ( rFilterData[ nData ].Name == "ExportBookmarks" )
                     rFilterData[ nData ].Value >>= mbExportBookmarks;
diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx
index 04017f25a783..29bbdeaceddf 100644
--- a/framework/source/accelerators/acceleratorconfiguration.cxx
+++ b/framework/source/accelerators/acceleratorconfiguration.cxx
@@ -1258,8 +1258,8 @@ void XCUBasedAcceleratorConfiguration::reloadChanged( const OUString& sPrimarySe
             aKeyEvent.Modifiers |= css::awt::KeyModifier::MOD1;
         else if ( sToken[i] == "MOD2" )
             aKeyEvent.Modifiers |= css::awt::KeyModifier::MOD2;
-                else if ( sToken[i] == "MOD3" )
-                        aKeyEvent.Modifiers |= css::awt::KeyModifier::MOD3;
+        else if ( sToken[i] == "MOD3" )
+             aKeyEvent.Modifiers |= css::awt::KeyModifier::MOD3;
     }
 
     css::uno::Reference< css::container::XNameAccess > xKey;
diff --git a/framework/source/fwe/xml/statusbardocumenthandler.cxx b/framework/source/fwe/xml/statusbardocumenthandler.cxx
index 497170750b6f..b8bf232da2ce 100644
--- a/framework/source/fwe/xml/statusbardocumenthandler.cxx
+++ b/framework/source/fwe/xml/statusbardocumenthandler.cxx
@@ -379,25 +379,25 @@ void SAL_CALL OReadStatusBarDocumentHandler::startElement(
                     aErrorMessage += "Required attribute statusbar:url must have a value!";
                     throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
                 }
-                        else
-                        {
-                            Sequence< PropertyValue > aStatusbarItemProp( 6 );
-                            aStatusbarItemProp[0].Name = ITEM_DESCRIPTOR_COMMANDURL;
-                            aStatusbarItemProp[1].Name = ITEM_DESCRIPTOR_HELPURL;
-                            aStatusbarItemProp[2].Name = ITEM_DESCRIPTOR_OFFSET;
-                            aStatusbarItemProp[3].Name = ITEM_DESCRIPTOR_STYLE;
-                            aStatusbarItemProp[4].Name = ITEM_DESCRIPTOR_WIDTH;
-                            aStatusbarItemProp[5].Name = ITEM_DESCRIPTOR_TYPE;
-
-                            aStatusbarItemProp[0].Value <<= aCommandURL;
-                            aStatusbarItemProp[1].Value <<= aHelpURL;
-                            aStatusbarItemProp[2].Value <<= nOffset;
-                            aStatusbarItemProp[3].Value <<= nItemBits;
-                            aStatusbarItemProp[4].Value <<= nWidth;
-                            aStatusbarItemProp[5].Value <<= css::ui::ItemType::DEFAULT;
-
-                            m_aStatusBarItems->insertByIndex( m_aStatusBarItems->getCount(), makeAny( aStatusbarItemProp ) );
-                       }
+                else
+                {
+                    Sequence< PropertyValue > aStatusbarItemProp( 6 );
+                    aStatusbarItemProp[0].Name = ITEM_DESCRIPTOR_COMMANDURL;
+                    aStatusbarItemProp[1].Name = ITEM_DESCRIPTOR_HELPURL;
+                    aStatusbarItemProp[2].Name = ITEM_DESCRIPTOR_OFFSET;
+                    aStatusbarItemProp[3].Name = ITEM_DESCRIPTOR_STYLE;
+                    aStatusbarItemProp[4].Name = ITEM_DESCRIPTOR_WIDTH;
+                    aStatusbarItemProp[5].Name = ITEM_DESCRIPTOR_TYPE;
+
+                    aStatusbarItemProp[0].Value <<= aCommandURL;
+                    aStatusbarItemProp[1].Value <<= aHelpURL;
+                    aStatusbarItemProp[2].Value <<= nOffset;
+                    aStatusbarItemProp[3].Value <<= nItemBits;
+                    aStatusbarItemProp[4].Value <<= nWidth;
+                    aStatusbarItemProp[5].Value <<= css::ui::ItemType::DEFAULT;
+
+                    m_aStatusBarItems->insertByIndex( m_aStatusBarItems->getCount(), makeAny( aStatusbarItemProp ) );
+               }
             }
             break;
 
diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx
index fb33eead886f..6fa345c339cd 100644
--- a/framework/source/services/sessionlistener.cxx
+++ b/framework/source/services/sessionlistener.cxx
@@ -264,11 +264,11 @@ void SAL_CALL SessionListener::initialize(const Sequence< Any  >& args)
 
 void SAL_CALL SessionListener::statusChanged(const frame::FeatureStateEvent& event)
 {
-   SAL_INFO("fwk.session", "SessionListener::statusChanged");
+    SAL_INFO("fwk.session", "SessionListener::statusChanged");
 
-   SAL_INFO("fwk.session.debug", "  ev.Feature = " << event.FeatureURL.Complete <<
-                                 ", ev.Descript = " << event.FeatureDescriptor);
-   if ( event.FeatureURL.Complete == "vnd.sun.star.autorecovery:/doSessionRestore" )
+    SAL_INFO("fwk.session.debug", "  ev.Feature = " << event.FeatureURL.Complete <<
+                                  ", ev.Descript = " << event.FeatureDescriptor);
+    if ( event.FeatureURL.Complete == "vnd.sun.star.autorecovery:/doSessionRestore" )
     {
         if (event.FeatureDescriptor == "update")
             m_bRestored = true; // a document was restored
diff --git a/hwpfilter/source/hcode.cxx b/hwpfilter/source/hcode.cxx
index 7dd7408ffe56..836a39ab0d18 100644
--- a/hwpfilter/source/hcode.cxx
+++ b/hwpfilter/source/hcode.cxx
@@ -895,13 +895,13 @@ int hcharconv(hchar ch, hchar *dest, int codeType)
     if (ch < 128){
          dest[0] = ch;
         return 1;
-     }
+    }
     if (IsHangul(ch))
     {
-          hchar ch2 = ch;
+        hchar ch2 = ch;
         if (codeType == KS)
             ch = cdkssm2ks_han(ch);
-          else if( codeType == UNICODE ){
+        else if( codeType == UNICODE ){
                 if( ch2 == 0xd3c5 ){
                     dest[0] = 0xd55c;
                     return 1 ;
@@ -909,8 +909,8 @@ int hcharconv(hchar ch, hchar *dest, int codeType)
                 int res = kssm_hangul_to_ucs2(ch, dest);
                //printf("hcharconv Hangul[%04x]\n",dest[0]);
                 return res;
-          }
-          dest[0] = ch;
+        }
+        dest[0] = ch;
         return 1;
     }
       /* Chinese characters have a value of 4888 kinds from 0x4000. */
@@ -938,12 +938,12 @@ int hcharconv(hchar ch, hchar *dest, int codeType)
             lo = sal::static_int_cast<unsigned char>(index % (0xFE - 0xA1 + 1) + 0xA1);
             ch = (hi << 8) | lo;
         }
-          else if(codeType == UNICODE){
+        else if(codeType == UNICODE){
                 hi = sal::static_int_cast<unsigned char>(index / (0xFE - 0xA1 + 1) + 0xCA);
                 lo = sal::static_int_cast<unsigned char>(index % (0xFE - 0xA1 + 1) + 0xA1);
                 ch = (hi << 8) | lo;
                 ch = ksc5601_han_to_ucs2(ch);
-          }
+        }
         else
         {
             hi = sal::static_int_cast<unsigned char>(index / (0x100 - 0x31 - 0x11 - 2) + 0xE0);
@@ -1321,7 +1321,7 @@ char *hcolor2str(uchar color, uchar shade, char *buf, bool bIsChar)
     {
         // nothing special here, just copy
     }
-     else
+    else
     {
         unsigned int srclen = strlen(src);
         if (3 < srclen)
diff --git a/hwpfilter/source/hwpfile.cxx b/hwpfilter/source/hwpfile.cxx
index 258ea9370ef5..2ceefc481c2f 100644
--- a/hwpfilter/source/hwpfile.cxx
+++ b/hwpfilter/source/hwpfile.cxx
@@ -217,20 +217,20 @@ void HWPFile::ReadParaList(std::vector < HWPPara* > &aplist)
     unsigned char prev_etcflag = 0;
     while (spNode->Read(*this, 0))
     {
-         if( !(spNode->etcflag & 0x04) ){
-          tmp_etcflag = spNode->etcflag;
-          spNode->etcflag = prev_etcflag;
-          prev_etcflag = tmp_etcflag;
-         }
+        if( !(spNode->etcflag & 0x04) ){
+            tmp_etcflag = spNode->etcflag;
+            spNode->etcflag = prev_etcflag;
+            prev_etcflag = tmp_etcflag;
+        }
         if (spNode->nch && spNode->reuse_shape)
         {
             if (!aplist.empty()){
-                     spNode->pshape = aplist.back()->pshape;
-                }
-                else{
-                     spNode->nch = 0;
-                     spNode->reuse_shape = 0;
-                }
+                 spNode->pshape = aplist.back()->pshape;
+            }
+            else{
+                 spNode->nch = 0;
+                 spNode->reuse_shape = 0;
+            }
         }
         spNode->pshape->pagebreak = spNode->etcflag;
         if (spNode->nch)
@@ -258,12 +258,12 @@ void HWPFile::ReadParaList(std::vector< std::unique_ptr<HWPPara> > &aplist, unsi
         if (spNode->nch && spNode->reuse_shape)
         {
             if (!aplist.empty()){
-                     spNode->pshape = aplist.back()->pshape;
-                }
-                else{
-                     spNode->nch = 0;
-                     spNode->reuse_shape = 0;
-                }
+                spNode->pshape = aplist.back()->pshape;
+            }
+            else{
+                spNode->nch = 0;
+                spNode->reuse_shape = 0;
+            }
         }
         spNode->pshape->pagebreak = spNode->etcflag;
         if (spNode->nch)
diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx
index d02f7b21d2c4..9e427591cd3c 100644
--- a/hwpfilter/source/hwpreader.cxx
+++ b/hwpfilter/source/hwpreader.cxx
@@ -1370,19 +1370,19 @@ void HwpReader::parseCharShape(CharShape const * cshape)
         padd("fo:font-style", sXML_CDATA, "italic");
         padd("style:font-style-asian", sXML_CDATA, "italic");
     }
-     else{
+    else{
         padd("fo:font-style", sXML_CDATA, "normal");
         padd("style:font-style-asian", sXML_CDATA, "normal");
-     }
+    }
     if (cshape->attr >> 1 & 0x01)
     {
         padd("fo:font-weight", sXML_CDATA, "bold");
         padd("style:font-weight-asian", sXML_CDATA, "bold");
     }
-     else{
+    else{
         padd("fo:font-weight", sXML_CDATA, "normal");
         padd("style:font-weight-asian", sXML_CDATA, "normal");
-     }
+    }
     if (cshape->attr >> 2 & 0x01)
         padd("style:text-underline", sXML_CDATA, "single");
     if (cshape->attr >> 3 & 0x01)
@@ -1463,7 +1463,7 @@ void HwpReader::parseParaShape(ParaShape const * pshape)
 
     if( pshape->pagebreak & 0x02 || pshape->pagebreak & 0x04)
         padd("fo:break-before", sXML_CDATA, "page");
-     else if( pshape->pagebreak & 0x01 )
+    else if( pshape->pagebreak & 0x01 )
         padd("fo:break-before", sXML_CDATA, "column");
 
 }
@@ -3565,10 +3565,10 @@ void HwpReader::makeTextBox(TxtBox * hbox)
         rstartEl("text:p", mxList.get());
         mxList->clear();
     }
-     else{
+    else{
          padd("draw:z-index", sXML_CDATA,
               ascii(Int2Str(hbox->zorder, "%d", buf)));
-     }
+    }
 
     padd("draw:style-name", sXML_CDATA,
         ascii(Int2Str(hbox->style.boxnum, "Txtbox%d", buf)));
diff --git a/l10ntools/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx
index 872d2c29ded0..dd0ddf2a9529 100644
--- a/l10ntools/source/cfgmerge.cxx
+++ b/l10ntools/source/cfgmerge.cxx
@@ -187,7 +187,7 @@ void CfgParser::ExecuteAnalyzedToken( int nToken, char *pToken )
             sTokenName = sToken.getToken(1, '<').getToken(0, '>').
                 getToken(0, ' ');
 
-              if ( !IsTokenClosed( sToken )) {
+            if ( !IsTokenClosed( sToken )) {
                 OString sSearch;
                 switch ( nToken ) {
                     case CFG_TOKEN_PACKAGE:
diff --git a/l10ntools/source/xrmmerge.cxx b/l10ntools/source/xrmmerge.cxx
index f866a460b06f..45899a4995d4 100644
--- a/l10ntools/source/xrmmerge.cxx
+++ b/l10ntools/source/xrmmerge.cxx
@@ -84,9 +84,8 @@ int InitXrmExport( const char* pFilename)
 
     if ( bMergeMode )
         pParser = new XRMResMerge( sMergeSrc, sOutputFile, sFilename );
-      else if (!sOutputFile.isEmpty()) {
+    else if (!sOutputFile.isEmpty())
         pParser = new XRMResExport( sOutputFile, sInputFileName );
-    }
 
     return 1;
 }
diff --git a/package/source/xstor/owriteablestream.cxx b/package/source/xstor/owriteablestream.cxx
index c14e2f47cb5e..8fe6446b50db 100644
--- a/package/source/xstor/owriteablestream.cxx
+++ b/package/source/xstor/owriteablestream.cxx
@@ -1595,7 +1595,7 @@ void OWriteStream_Impl::CommitStreamRelInfo( const uno::Reference< embed::XStora
                 xPropSet->setPropertyValue("MediaType",
                     uno::makeAny( OUString("application/vnd.openxmlformats-package.relationships+xml" ) ) );
 
-                  if ( m_nRelInfoStatus == RELINFO_CHANGED_STREAM )
+                if ( m_nRelInfoStatus == RELINFO_CHANGED_STREAM )
                     m_nRelInfoStatus = RELINFO_NO_INIT;
                 else
                 {
diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx
index 562d040febe5..c3c9a0ae7022 100644
--- a/package/source/xstor/xstorage.cxx
+++ b/package/source/xstor/xstorage.cxx
@@ -1729,7 +1729,7 @@ void OStorage_Impl::CommitRelInfo( const uno::Reference< container::XNameContain
                     uno::makeAny( OUString( "application/vnd.openxmlformats-package.relationships+xml" ) ) );
 
                 m_xNewRelInfoStream.clear();
-                  if ( m_nRelInfoStatus == RELINFO_CHANGED_STREAM )
+                if ( m_nRelInfoStatus == RELINFO_CHANGED_STREAM )
                 {
                     m_aRelInfo = uno::Sequence< uno::Sequence< beans::StringPair > >();
                     m_nRelInfoStatus = RELINFO_NO_INIT;
diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx
index e11ba27ccf19..4065942f34bd 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -1035,7 +1035,7 @@ bool openDialogFormula_nothrow( OUString& _in_out_rFormula
                 OUString sFormula = aDlg->getCurrentFormula();
                 if ( sFormula[0] == '=' )
                     _in_out_rFormula = "rpt:" + sFormula.copy(1);
-                 else
+                else
                     _in_out_rFormula = "rpt:" + sFormula;
             }
         }
diff --git a/sal/qa/osl/process/osl_Thread.cxx b/sal/qa/osl/process/osl_Thread.cxx
index 4f1df88b337f..770b82691286 100644
--- a/sal/qa/osl/process/osl_Thread.cxx
+++ b/sal/qa/osl/process/osl_Thread.cxx
@@ -105,7 +105,6 @@ void StopWatch::stop()
 // pre: Timer should be started
 // post: Timer will stopped
 
-    // gettimeofday(&t2, 0);                         // Ask timer
     osl_getSystemTime( &t2 );
     t_print("# %u %u nsecs\n", static_cast<unsigned>(t2.Seconds), static_cast<unsigned>(t2.Nanosec));
 
@@ -113,18 +112,13 @@ void StopWatch::stop()
     {                                // check if started.
         m_nSeconds = static_cast<sal_Int32>(t2.Seconds) - static_cast<sal_Int32>(t1.Seconds);
         if ( t2.Nanosec > t1.Nanosec )
-               m_nNanoSec = static_cast<sal_Int32>(t2.Nanosec) - static_cast<sal_Int32>(t1.Nanosec);
-           else
-           {
-        m_nNanoSec = 1000000000 + static_cast<sal_Int32>(t2.Nanosec) - static_cast<sal_Int32>(t1.Nanosec);
-                m_nSeconds -= 1;
-    }
-    t_print("# %u %u nsecs\n", static_cast<unsigned>(m_nSeconds), static_cast<unsigned>(m_nNanoSec) );
-        //if (m_nNanoSec < 0)
-        //{
-            //m_nNanoSec += 1000000000;
-            //m_nSeconds -= 1;
-        //}
+            m_nNanoSec = static_cast<sal_Int32>(t2.Nanosec) - static_cast<sal_Int32>(t1.Nanosec);
+        else
+        {
+            m_nNanoSec = 1000000000 + static_cast<sal_Int32>(t2.Nanosec) - static_cast<sal_Int32>(t1.Nanosec);
+            m_nSeconds -= 1;
+        }
+        t_print("# %u %u nsecs\n", static_cast<unsigned>(m_nSeconds), static_cast<unsigned>(m_nNanoSec) );
         m_bIsValid = true;
         m_bIsRunning = false;
     }
diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx
index bb66f56c8b6e..3449e6bf2eab 100644
--- a/sc/source/core/data/dpoutput.cxx
+++ b/sc/source/core/data/dpoutput.cxx
@@ -256,7 +256,7 @@ void ScDPOutputImpl::OutputBlockFrame ( SCCOL nStartCol, SCROW nStartRow, SCCOL
     else
         aBox.SetLine(&aLine,  SvxBoxItemLine::RIGHT);
 
-     if ( nEndRow == mnTabEndRow ) //bottom
+    if ( nEndRow == mnTabEndRow ) //bottom
         aBox.SetLine(&aOutLine,  SvxBoxItemLine::BOTTOM);
     else
         aBox.SetLine(&aLine,  SvxBoxItemLine::BOTTOM);
diff --git a/sc/source/core/opencl/op_financial.cxx b/sc/source/core/opencl/op_financial.cxx
index 960175eb3709..c276e680f8ba 100644
--- a/sc/source/core/opencl/op_financial.cxx
+++ b/sc/source/core/opencl/op_financial.cxx
@@ -2374,10 +2374,10 @@ void OpNPV::GenSlidingWindowFunction(std::stringstream &ss,
     //while (i-- > 1)
     for (size_t i = 1; i < vSubArguments.size(); i++)
     {
-      FormulaToken *pCur = vSubArguments[i]->GetFormulaToken();
-      assert(pCur);
-      if (pCur->GetType() == formula::svDoubleVectorRef)
-      {
+        FormulaToken *pCur = vSubArguments[i]->GetFormulaToken();
+        assert(pCur);
+        if (pCur->GetType() == formula::svDoubleVectorRef)
+        {
             const formula::DoubleVectorRefToken* pDVR =
             static_cast<const formula::DoubleVectorRefToken *>(pCur);
             size_t nCurWindowSize = pDVR->GetRefRowSize();
diff --git a/sc/source/core/opencl/op_math.cxx b/sc/source/core/opencl/op_math.cxx
index 62968ce75369..7f8305ecf708 100644
--- a/sc/source/core/opencl/op_math.cxx
+++ b/sc/source/core/opencl/op_math.cxx
@@ -2700,7 +2700,7 @@ void OpConvert::GenSlidingWindowFunction(
 void OpProduct::GenSlidingWindowFunction(std::stringstream &ss,
             const std::string &sSymName, SubArguments &vSubArguments)
 {
-       ss << "\ndouble " << sSymName;
+    ss << "\ndouble " << sSymName;
     ss << "_"<< BinFuncName() <<"( ";
     for (size_t i = 0; i < vSubArguments.size(); i++)
     {
@@ -2722,52 +2722,52 @@ void OpProduct::GenSlidingWindowFunction(std::stringstream &ss,
             static_cast<const formula::DoubleVectorRefToken *>(pCur);
             size_t nCurWindowSize = pDVR->GetRefRowSize();
 
-             ss << "    for (int i = ";
-             if (!pDVR->IsStartFixed() && pDVR->IsEndFixed())
-             {
+            ss << "    for (int i = ";
+            if (!pDVR->IsStartFixed() && pDVR->IsEndFixed())
+            {
                  ss << "gid0; i < " << pDVR->GetArrayLength();
                  ss << " && i < " << nCurWindowSize  << "; i++)\n";
                  ss << "    {\n";
-             }
-             else if (pDVR->IsStartFixed() && !pDVR->IsEndFixed())
-             {
+            }
+            else if (pDVR->IsStartFixed() && !pDVR->IsEndFixed())
+            {
                  ss << "0; i < " << pDVR->GetArrayLength();
                  ss << " && i < gid0+" << nCurWindowSize << "; i++)\n";
                  ss << "    {\n";
-             }
-             else if (!pDVR->IsStartFixed() && !pDVR->IsEndFixed())
-             {
+            }
+            else if (!pDVR->IsStartFixed() && !pDVR->IsEndFixed())
+            {
                  ss << "0; i + gid0 < " <<  pDVR->GetArrayLength();
                  ss << " &&  i < " << nCurWindowSize << "; i++)\n";
                  ss << "    {\n";
-              }
-              else if (pDVR->IsStartFixed() && pDVR->IsEndFixed())
-              {
+            }
+            else if (pDVR->IsStartFixed() && pDVR->IsEndFixed())
+            {
 
                  ss << "0; i < " << pDVR->GetArrayLength() << "; i++)\n";
                  ss << "    {\n";
-              }
-              ss << "if(!isnan("<<rArg->GenSlidingWindowDeclRef()<<"))\n";
-              ss << "product = product*";
-              ss << rArg->GenSlidingWindowDeclRef()<<";\n";
-              ss << "    }\n";
             }
-            else if (pCur->GetType() == formula::svSingleVectorRef)
-            {
-                ss << "if(!isnan("<<rArg->GenSlidingWindowDeclRef()<<"))\n";
-                ss << "product = product*";
-                ss << rArg->GenSlidingWindowDeclRef()<<";\n";
+            ss << "if(!isnan("<<rArg->GenSlidingWindowDeclRef()<<"))\n";
+            ss << "product = product*";
+            ss << rArg->GenSlidingWindowDeclRef()<<";\n";
+            ss << "    }\n";
+        }
+        else if (pCur->GetType() == formula::svSingleVectorRef)
+        {
+            ss << "if(!isnan("<<rArg->GenSlidingWindowDeclRef()<<"))\n";
+            ss << "product = product*";
+            ss << rArg->GenSlidingWindowDeclRef()<<";\n";
 
-            }
-            else
-            {
-                ss << "if(!isnan("<<rArg->GenSlidingWindowDeclRef()<<"))\n";
-                ss << "product = product*";
-                ss << rArg->GenSlidingWindowDeclRef()<<";\n";
-            }
         }
-        ss << "    return product;\n";
-        ss << "}";
+        else
+        {
+            ss << "if(!isnan("<<rArg->GenSlidingWindowDeclRef()<<"))\n";
+            ss << "product = product*";
+            ss << rArg->GenSlidingWindowDeclRef()<<";\n";
+        }
+    }
+    ss << "    return product;\n";
+    ss << "}";
 }
 void OpAverageIf::GenSlidingWindowFunction(std::stringstream &ss,
     const std::string &sSymName, SubArguments &vSubArguments)
@@ -2904,7 +2904,7 @@ void OpAverageIf::GenSlidingWindowFunction(std::stringstream &ss,
             ss << "    }\n";
         }
     }
-      else
+    else
     {
         CheckSubArgumentIsNan(ss,vSubArguments, 0);
         ss << "        if ( isequal( tmp0 , tmp1 ) ) \n";
diff --git a/sc/source/core/opencl/op_statistical.cxx b/sc/source/core/opencl/op_statistical.cxx
index afe9de6a5ee8..79d27e5ef5e7 100644
--- a/sc/source/core/opencl/op_statistical.cxx
+++ b/sc/source/core/opencl/op_statistical.cxx
@@ -3959,30 +3959,29 @@ void OpChiInv::GenSlidingWindowFunction(
             if (!pDVR->IsStartFixed() && pDVR->IsEndFixed()) {
                 ss << "gid0; i < " << pDVR->GetArrayLength();
                 ss << " && i < " << nCurWindowSize  << "; i++){\n";
-                } else if (pDVR->IsStartFixed() && !pDVR->IsEndFixed()) {
+            } else if (pDVR->IsStartFixed() && !pDVR->IsEndFixed()) {
                 ss << "0; i < " << pDVR->GetArrayLength();
                 ss << " && i < gid0+"<< nCurWindowSize << "; i++){\n";
-                } else if (!pDVR->IsStartFixed() && !pDVR->IsEndFixed()){
+            } else if (!pDVR->IsStartFixed() && !pDVR->IsEndFixed()){
                 ss << "0; i + gid0 < " << pDVR->GetArrayLength();
                 ss << " &&  i < "<< nCurWindowSize << "; i++){\n";
-                }
-                else {
+            } else {
                 ss << "0; i < "<< nCurWindowSize << "; i++){\n";
-                }
             }
-            else if (pCur->GetType() == formula::svSingleVectorRef)
-            {
+        }
+        else if (pCur->GetType() == formula::svSingleVectorRef)
+        {
                 const formula::SingleVectorRefToken* pSVR =
                     static_cast< const formula::SingleVectorRefToken* >(pCur);
                 ss << "if (gid0 < " << pSVR->GetArrayLength() << "){\n";
-            }
-            else if (pCur->GetType() == formula::svDouble)
-            {
-                ss << "{\n";
-            }
+        }
+        else if (pCur->GetType() == formula::svDouble)
+        {
+            ss << "{\n";
+        }
 
-            if(ocPush==vSubArguments[i]->GetFormulaToken()->GetOpCode())
-            {
+        if(ocPush==vSubArguments[i]->GetFormulaToken()->GetOpCode())
+        {
                 ss << "if (isnan(";
                 ss << vSubArguments[i]->GenSlidingWindowDeclRef();
                 ss << "))\n";
@@ -3990,13 +3989,13 @@ void OpChiInv::GenSlidingWindowFunction(
                 ss << "else\n";
                 ss <<"tmp"<<i<<"="<<vSubArguments[i]->GenSlidingWindowDeclRef();
                 ss << ";\n}\n";
-            }
-            else
-            {
+        }
+        else
+        {
                ss << "tmp"<<i<<"="<<vSubArguments[i]->GenSlidingWindowDeclRef();
                ss << ";\n";
-            }
-            }
+        }
+    }
     ss << "    tmp1 = floor(tmp1);";
     ss << "    if (tmp1 < 1.0 || tmp0 <= 0.0 || tmp0 > 1.0 )\n";
     ss << "    {\n";
diff --git a/sc/source/filter/lotus/lotform.cxx b/sc/source/filter/lotus/lotform.cxx
index f25fc57e1562..f696c063e6d0 100644
--- a/sc/source/filter/lotus/lotform.cxx
+++ b/sc/source/filter/lotus/lotform.cxx
@@ -639,7 +639,7 @@ void LotusToSc::Convert( std::unique_ptr<ScTokenArray>& rpErg, sal_Int32& rRest
                     else aStack << aPool.Store( ScfTools::ReadLongDouble( aIn ) );
                     break;
             case FT_Snum:
-                    if ( bWK123 )
+                if ( bWK123 )
                 {
                          sal_uInt32   nValue;
 
@@ -654,7 +654,7 @@ void LotusToSc::Convert( std::unique_ptr<ScTokenArray>& rpErg, sal_Int32& rRest
                         aStack << aPool.Store( SnumToDouble( nVal ) );
                 }
                 break;
-                default:
+            default:
                     SAL_WARN( "sc.filter", "*LotusToSc::Convert(): unknown enum!" );
         }
     }
diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
index dc1dc0cac7bc..faff13dda9f7 100644
--- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
+++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
@@ -1690,9 +1690,9 @@ bool ScAccessibleSpreadsheet::GetFormulaCurrentFocusCell(ScAddress &addr)
 uno::Reference < XAccessible > ScAccessibleSpreadsheet::GetActiveCell()
 {
     if( m_mapSelectionSend.find( maActiveCell ) != m_mapSelectionSend.end() )
-            return m_mapSelectionSend[maActiveCell];
-        else
-            return getAccessibleCellAt(maActiveCell.Row(), maActiveCell .Col());
+        return m_mapSelectionSend[maActiveCell];
+    else
+        return getAccessibleCellAt(maActiveCell.Row(), maActiveCell .Col());
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/vba/vbafont.cxx b/sc/source/ui/vba/vbafont.cxx
index 1d82ded74aad..bd0f410de6fe 100644
--- a/sc/source/ui/vba/vbafont.cxx
+++ b/sc/source/ui/vba/vbafont.cxx
@@ -79,12 +79,12 @@ ScVbaFont::setColorIndex( const uno::Any& _colorindex )
     // handled properly here
 
     if ( !nIndex || ( nIndex == excel::XlColorIndex::xlColorIndexAutomatic ) )
-        {
+    {
         nIndex = 1;  // check default ( assume black )
-                ScVbaFont_BASE::setColorIndex( uno::makeAny( nIndex ) );
-        }
-        else
-            ScVbaFont_BASE::setColorIndex( _colorindex );
+        ScVbaFont_BASE::setColorIndex( uno::makeAny( nIndex ) );
+    }
+    else
+        ScVbaFont_BASE::setColorIndex( _colorindex );
 }
 
 uno::Any SAL_CALL
diff --git a/sc/source/ui/vba/vbaworksheets.cxx b/sc/source/ui/vba/vbaworksheets.cxx
index 46b2bc880c58..81870ab6a3a6 100644
--- a/sc/source/ui/vba/vbaworksheets.cxx
+++ b/sc/source/ui/vba/vbaworksheets.cxx
@@ -230,7 +230,7 @@ ScVbaWorksheets::Add( const uno::Any& Before, const uno::Any& After,
 
     if ( Before.hasValue() )
     {
-            if ( Before >>= xBeforeAfterSheet )
+        if ( Before >>= xBeforeAfterSheet )
             aStringSheet = xBeforeAfterSheet->getName();
         else
             Before >>= aStringSheet;
@@ -238,7 +238,7 @@ ScVbaWorksheets::Add( const uno::Any& Before, const uno::Any& After,
 
     if (aStringSheet.isEmpty() && After.hasValue() )
     {
-            if ( After >>= xBeforeAfterSheet )
+        if ( After >>= xBeforeAfterSheet )
             aStringSheet = xBeforeAfterSheet->getName();
         else
             After >>= aStringSheet;
diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx
index ec9206921c9c..0438ce1467f4 100644
--- a/sc/source/ui/view/preview.cxx
+++ b/sc/source/ui/view/preview.cxx
@@ -890,7 +890,7 @@ void ScPreview::DoInvalidate()
     //  If the whole GetState of the shell is called
     //  The Invalidate must come behind asynchronously
 
-   if (bInGetState)
+    if (bInGetState)
         Application::PostUserEvent( LINK( this, ScPreview, InvalidateHdl ), nullptr, true );
     else
         StaticInvalidate();     // Immediately
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index acb9a8ba3d57..7e7e40b95fd6 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -441,8 +441,8 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, bool bInner )
                 {
                     nTabSize = pTabControl->GetSizePixel().Width();
 
-                     if ( aViewData.GetHSplitMode() != SC_SPLIT_FIX ) // left Scrollbar
-                     {
+                    if ( aViewData.GetHSplitMode() != SC_SPLIT_FIX ) // left Scrollbar
+                    {
                         if (nTabSize > nSizeLt-SC_SCROLLBAR_MIN)
                             nTabSize = nSizeLt-SC_SCROLLBAR_MIN;
                         if (nTabSize < SC_TABBAR_MIN)
diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx
index ba955827015d..e0fbd782619b 100644
--- a/sc/source/ui/view/tabvwshf.cxx
+++ b/sc/source/ui/view/tabvwshf.cxx
@@ -795,38 +795,39 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
                             {
                                 ScMarkData::iterator itr = rMark.begin(), itrEnd = rMark.end();
                                 for (; itr != itrEnd; ++itr)
+                                {
+                                    if ( !pDoc->IsTabProtected(*itr) )
                                     {
-                                        if ( !pDoc->IsTabProtected(*itr) )
-                                        {
-                                            ScUndoTabColorInfo aTabColorInfo(*itr);
-                                            aTabColorInfo.maNewTabBgColor = aSelectedColor;
-                                            pTabColorList->push_back(aTabColorInfo);
-                                        }
+                                        ScUndoTabColorInfo aTabColorInfo(*itr);
+                                        aTabColorInfo.maNewTabBgColor = aSelectedColor;
+                                        pTabColorList->push_back(aTabColorInfo);
                                     }
-                                    bDone = SetTabBgColor( *pTabColorList );
                                 }
-                                else
-                                {
-                                    bDone = SetTabBgColor( aSelectedColor, nCurrentTab ); //ScViewFunc.SetTabBgColor
-                                }
-                                if ( bDone )
-                                {
-                                    rReq.AppendItem( SvxColorItem( aTabBgColor, nSlot ) );
-                                    rReq.Done();
-                                }
-                                else
+                                bDone = SetTabBgColor( *pTabColorList );
+                            }
+                            else
+                            {
+                                bDone = SetTabBgColor( aSelectedColor, nCurrentTab ); //ScViewFunc.SetTabBgColor
+                            }
+
+                            if ( bDone )
+                            {
+                                rReq.AppendItem( SvxColorItem( aTabBgColor, nSlot ) );
+                                rReq.Done();
+                            }
+                            else
+                            {
+                                if( rReq.IsAPI() )
                                 {
-                                    if( rReq.IsAPI() )
-                                    {
 #if HAVE_FEATURE_SCRIPTING
-                                        StarBASIC::Error( ERRCODE_BASIC_SETPROP_FAILED );
+                                    StarBASIC::Error( ERRCODE_BASIC_SETPROP_FAILED );
 #endif
-                                    }
                                 }
                             }
                         }
                     }
                 }
+            }
                 break;
 
         case FID_TAB_EVENTS:
diff --git a/scripting/source/provider/MasterScriptProvider.cxx b/scripting/source/provider/MasterScriptProvider.cxx
index 7f91fb83da12..fa4b53100fa8 100644
--- a/scripting/source/provider/MasterScriptProvider.cxx
+++ b/scripting/source/provider/MasterScriptProvider.cxx
@@ -559,9 +559,9 @@ MasterScriptProvider::removeByName( const OUString& Name )
 
         Reference< container::XNameContainer > xCont( m_xMSPPkg, UNO_QUERY_THROW );
         xCont->removeByName( Name );
-   }
-   else
-   {
+    }
+    else
+    {
         if ( Name.isEmpty() )
         {
             throw lang::IllegalArgumentException( "Name not set!!",
@@ -625,9 +625,9 @@ MasterScriptProvider::hasByName( const OUString& aName )
             throw RuntimeException( "PackageMasterScriptProvider is unitialised" );
         }
 
-   }
-   else
-   {
+    }
+    else
+    {
         if ( aName.isEmpty() )
         {
             throw lang::IllegalArgumentException( "Name not set!!",
diff --git a/scripting/source/provider/ProviderCache.cxx b/scripting/source/provider/ProviderCache.cxx
index eeaac5fd44eb..f669a9cc3a31 100644
--- a/scripting/source/provider/ProviderCache.cxx
+++ b/scripting/source/provider/ProviderCache.cxx
@@ -71,11 +71,11 @@ ProviderCache::getProvider( const OUString& providerName )
         {
             provider = h_it->second.provider;
         }
-    else
-    {
-        // need to create provider and insert into hash
+        else
+        {
+            // need to create provider and insert into hash
             provider = createProvider( h_it->second );
-    }
+        }
     }
     return provider;
 }
diff --git a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
index 494c7825f5d1..5534a57164ed 100644
--- a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
+++ b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
@@ -40,10 +40,10 @@ class AnimatorAccess
 public:
     virtual void AddRun (const std::shared_ptr<PageObjectRun>& rRun) = 0;
     virtual void RemoveRun (const std::shared_ptr<PageObjectRun>& rRun) = 0;
-    virtual model::SlideSorterModel& GetModel (void) const = 0;
-    virtual view::SlideSorterView& GetView (void) const = 0;
-    virtual std::shared_ptr<controller::Animator> GetAnimator (void) = 0;
-    virtual VclPtr<sd::Window> GetContentWindow (void) = 0;
+    virtual model::SlideSorterModel& GetModel () const = 0;
+    virtual view::SlideSorterView& GetView () const = 0;
+    virtual std::shared_ptr<controller::Animator> GetAnimator () = 0;
+    virtual VclPtr<sd::Window> GetContentWindow () = 0;
 
 protected:
     ~AnimatorAccess() COVERITY_NOEXCEPT_FALSE {}
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index fd703a97b9ce..7760e132519b 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -2523,7 +2523,7 @@ void SdDrawPage::getBackground(Any& rValue)
 {
     const SfxItemSet& rFillAttributes = GetPage()->getSdrPageProperties().GetItemSet();
 
-       if(drawing::FillStyle_NONE == rFillAttributes.Get(XATTR_FILLSTYLE).GetValue())
+    if(drawing::FillStyle_NONE == rFillAttributes.Get(XATTR_FILLSTYLE).GetValue())
     {
         // no fill set (switched off by drawing::FillStyle_NONE), clear rValue to represent this
         rValue.clear();
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index ebc67bcd8a81..7af12dbb6aa0 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -1840,26 +1840,26 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
                 }
             }
             else if (pArgs->Count () != 4)
-                 {
+            {
 #if HAVE_FEATURE_SCRIPTING
-                     StarBASIC::FatalError (ERRCODE_BASIC_WRONG_ARGS);
+                 StarBASIC::FatalError (ERRCODE_BASIC_WRONG_ARGS);
 #endif
-                     Cancel();
-                     rReq.Ignore ();
-                     break;
-                 }
-                 else
-                 {
-                     const SfxStringItem* pLayerName = rReq.GetArg<SfxStringItem>(ID_VAL_LAYERNAME);
-                     const SfxBoolItem* pIsVisible = rReq.GetArg<SfxBoolItem>(ID_VAL_ISVISIBLE);
-                     const SfxBoolItem* pIsLocked = rReq.GetArg<SfxBoolItem>(ID_VAL_ISLOCKED);
-                     const SfxBoolItem* pIsPrintable = rReq.GetArg<SfxBoolItem>(ID_VAL_ISPRINTABLE);
-
-                     aLayerName   = pLayerName->GetValue ();
-                     bIsVisible   = pIsVisible->GetValue ();
-                     bIsLocked    = pIsLocked->GetValue ();
-                     bIsPrintable = pIsPrintable->GetValue ();
-                 }
+                 Cancel();
+                 rReq.Ignore ();
+                 break;
+            }
+            else
+            {
+                 const SfxStringItem* pLayerName = rReq.GetArg<SfxStringItem>(ID_VAL_LAYERNAME);
+                 const SfxBoolItem* pIsVisible = rReq.GetArg<SfxBoolItem>(ID_VAL_ISVISIBLE);
+                 const SfxBoolItem* pIsLocked = rReq.GetArg<SfxBoolItem>(ID_VAL_ISLOCKED);
+                 const SfxBoolItem* pIsPrintable = rReq.GetArg<SfxBoolItem>(ID_VAL_ISPRINTABLE);
+
+                 aLayerName   = pLayerName->GetValue ();
+                 bIsVisible   = pIsVisible->GetValue ();
+                 bIsLocked    = pIsLocked->GetValue ();
+                 bIsPrintable = pIsPrintable->GetValue ();
+            }
 
             OUString aPrevLayer = mpDrawView->GetActiveLayer();
             SdrLayer* pLayer;
diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx
index aa2d41b41440..74e405cffe0a 100644
--- a/sd/source/ui/view/sdview4.cxx
+++ b/sd/source/ui/view/sdview4.cxx
@@ -492,7 +492,7 @@ IMPL_LINK_NOARG(View, DropInsertFileHdl, Timer *, void)
             }
             else
 #endif
-                if( mnAction & DND_ACTION_LINK )
+            if( mnAction & DND_ACTION_LINK )
                 static_cast< DrawViewShell* >( mpViewSh )->InsertURLButton( aCurrentDropFile, aCurrentDropFile, OUString(), &maDropPos );
             else
             {
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 4cebc868e2bd..fe951607c1a5 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -1906,14 +1906,14 @@ void SfxMedium::TransactedTransferForFS_Impl( const INetURLObject& aSource,
                 pImpl->m_eError = ERRCODE_IO_GENERAL;
             }
 
-               if ( bResult )
-               {
+            if ( bResult )
+            {
                 if ( pImpl->pTempFile )
                 {
                     pImpl->pTempFile->EnableKillingFile();
                     pImpl->pTempFile.reset();
                 }
-               }
+            }
             else if ( bTransactStarted )
             {
                 UseBackupToRestore_Impl( aOriginalContent, xDummyEnv );
diff --git a/sot/source/base/formats.cxx b/sot/source/base/formats.cxx
index 47fba4010095..98424bd9e5d2 100644
--- a/sot/source/base/formats.cxx
+++ b/sot/source/base/formats.cxx
@@ -1550,8 +1550,8 @@ sal_uInt8 SotExchange::GetExchangeAction( const DataFlavorExVector& rDataFlavorE
             }
             rDefaultAction = nUserAction;
     }
-      else
-            rDefaultAction = nUserAction;
+    else
+        rDefaultAction = nUserAction;
 
     switch( nUserAction )
     {
diff --git a/svgio/source/svgreader/svgnode.cxx b/svgio/source/svgreader/svgnode.cxx
index fb7ab0728488..61b0a9138fa9 100644
--- a/svgio/source/svgreader/svgnode.cxx
+++ b/svgio/source/svgreader/svgnode.cxx
@@ -527,11 +527,11 @@ namespace svgio
                                 rTarget.append(aNewTarget);
                             }
                         }
-                     }
-                     else if(!pCandidate)
-                     {
+                    }
+                    else if(!pCandidate)
+                    {
                         OSL_ENSURE(false, "Null-Pointer in child node list (!)");
-                     }
+                    }
                 }
 
                 if(!rTarget.empty())
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index f6018223344c..190af932b858 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -1498,7 +1498,7 @@ void SvTreeListBox::SetTabs()
     {
         if( bHasButtons )
             nCase = NODE_AND_CHECK_BUTTONS;
-         else
+        else
             nCase = CHECK_BUTTONS;
     }
 
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index 206c75ba48b9..44c01059684d 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -1954,8 +1954,8 @@ bool TransferableDataHelper::GetFileList( FileList& rFileList )
                             rFileList.AppendFile( OStringToOUString(aDiskString, RTL_TEXTENCODING_UTF8) );
 
                     bRet = true;
-                 }
-                 else
+                }
+                else
                     bRet = ( ReadFileList( *xStm, rFileList ).GetError() == ERRCODE_NONE );
             }
         }
diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx
index 99428e8b1317..eefe226838d4 100644
--- a/svtools/source/table/tablecontrol_impl.cxx
+++ b/svtools/source/table/tablecontrol_impl.cxx
@@ -1446,24 +1446,24 @@ namespace svt { namespace table
                         int prevRow = getRowSelectedNumber(m_aSelectedRows, m_nCurRow);
                         int nextRow = getRowSelectedNumber(m_aSelectedRows, m_nCurRow-1);
                         if(prevRow>-1)
-                         {
+                        {
                              //if m_nCurRow isn't the upper one, can move up, otherwise not
                             if(m_nCurRow>0)
                                  m_nCurRow--;
-                             else
+                            else
                                  return bSuccess = true;
                              //if nextRow already selected, deselect it, otherwise select it
-                             if(nextRow>-1 && m_aSelectedRows[nextRow] == m_nCurRow)
-                             {
+                            if(nextRow>-1 && m_aSelectedRows[nextRow] == m_nCurRow)
+                            {
                                  m_aSelectedRows.erase(m_aSelectedRows.begin()+prevRow);
                                  invalidateRow( m_nCurRow + 1 );
-                             }
-                             else
+                            }
+                            else
                             {
                                  m_aSelectedRows.push_back(m_nCurRow);
                                  invalidateRow( m_nCurRow );
-                             }
-                         }
+                            }
+                        }
                         else
                         {
                             if(m_nCurRow>0)
diff --git a/svtools/source/uno/svtxgridcontrol.cxx b/svtools/source/uno/svtxgridcontrol.cxx
index 1d92c659623a..5841480b5f7d 100644
--- a/svtools/source/uno/svtxgridcontrol.cxx
+++ b/svtools/source/uno/svtxgridcontrol.cxx
@@ -793,8 +793,8 @@ void SVTXGridControl::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent
         {
             // TODO: this doesn't belong here. It belongs into the TableControl/_Impl, so A11Y also
             // works when the control is used outside the UNO context
-             if ( pTable->GetRowCount()>0 )
-             {
+            if ( pTable->GetRowCount()>0 )
+            {
                 pTable->commitCellEventIfAccessibleAlive(
                     AccessibleEventId::STATE_CHANGED,
                     makeAny( AccessibleStateType::FOCUSED ),
@@ -813,7 +813,7 @@ void SVTXGridControl::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent
                     makeAny( AccessibleStateType::FOCUSED ),
                     Any()
                 );
-             }
+            }
         }
         break;
 
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index f558a95880bd..394215401a3e 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -827,7 +827,7 @@ void OutlineTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt1
                 cChar = pLevelSettings->sBulletChar[0];
             if( AllSettings::GetLayoutRTL() )
             {
-                            if( 0 == i && cChar == BulletsTypeMgr::aDynamicBulletTypes[5] )
+                if( 0 == i && cChar == BulletsTypeMgr::aDynamicBulletTypes[5] )
                     cChar = BulletsTypeMgr::aDynamicRTLBulletTypes[5];
                 else if( 1 == i )
                 {
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 565acb6d60fd..f08c1fe6e199 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -2438,8 +2438,7 @@ OUString SwCursorShell::GetSelText() const
             aText = buf.makeStringAndClear();
         }
     }
-    else
-    if( m_pCurrentCursor->GetPoint()->nNode.GetIndex() ==
+    else if( m_pCurrentCursor->GetPoint()->nNode.GetIndex() ==
         m_pCurrentCursor->GetMark()->nNode.GetIndex() )
     {
         SwTextNode* pTextNd = m_pCurrentCursor->GetNode().GetTextNode();
diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx
index 8b2247eacc05..8b2dfc35fdd5 100644
--- a/sw/source/core/frmedt/fews.cxx
+++ b/sw/source/core/frmedt/fews.cxx
@@ -242,7 +242,8 @@ FrameTypeFlags SwFEShell::GetFrameType( const Point *pPt, bool bStopAtFly ) cons
     {
         switch ( pFrame->GetType() )
         {
-            case SwFrameType::Column:    if( pFrame->GetUpper()->IsSctFrame() )
+            case SwFrameType::Column:
+                                if( pFrame->GetUpper()->IsSctFrame() )
                                 {
                                     // Check, if isn't not only a single column
                                     // from a section with footnotes at the end.
@@ -254,17 +255,20 @@ FrameTypeFlags SwFEShell::GetFrameType( const Point *pPt, bool bStopAtFly ) cons
                                 else // only pages and frame columns
                                     nReturn |= FrameTypeFlags::COLUMN;
                                 break;
-            case SwFrameType::Page:      nReturn |= FrameTypeFlags::PAGE;
+            case SwFrameType::Page:
+                                nReturn |= FrameTypeFlags::PAGE;
                                 if( static_cast<const SwPageFrame*>(pFrame)->IsFootnotePage() )
                                     nReturn |= FrameTypeFlags::FTNPAGE;
                                 break;
             case SwFrameType::Header:    nReturn |= FrameTypeFlags::HEADER;      break;
             case SwFrameType::Footer:    nReturn |= FrameTypeFlags::FOOTER;      break;
-            case SwFrameType::Body:      if( pFrame->GetUpper()->IsPageFrame() ) // not for ColumnFrames
+            case SwFrameType::Body:
+                                if( pFrame->GetUpper()->IsPageFrame() ) // not for ColumnFrames
                                     nReturn |= FrameTypeFlags::BODY;
                                 break;
             case SwFrameType::Ftn:       nReturn |= FrameTypeFlags::FOOTNOTE;    break;
-            case SwFrameType::Fly:       if( static_cast<const SwFlyFrame*>(pFrame)->IsFlyLayFrame() )
+            case SwFrameType::Fly:
+                                if( static_cast<const SwFlyFrame*>(pFrame)->IsFlyLayFrame() )
                                     nReturn |= FrameTypeFlags::FLY_FREE;
                                 else if ( static_cast<const SwFlyFrame*>(pFrame)->IsFlyAtContentFrame() )
                                     nReturn |= FrameTypeFlags::FLY_ATCNT;
diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx
index 7f9b462159f6..9163098fee18 100644
--- a/sw/source/core/layout/flycnt.cxx
+++ b/sw/source/core/layout/flycnt.cxx
@@ -675,13 +675,13 @@ static const SwFrame * lcl_CalcDownDist( SwDistance &rRet,
                             nPrtHeight = pLay->getFrameArea().Left() + pLay->getFramePrintArea().Left()
                                          + pLay->getFramePrintArea().Width() - pSect->getFrameArea().Left()
                                          - pSect->getFrameArea().Width();
-                         }
-                         else
-                         {
-                             nFrameTop = pSect->getFrameArea().Left();
-                             nPrtHeight = pSect->getFrameArea().Left() - pLay->getFrameArea().Left()
+                        }
+                        else
+                        {
+                            nFrameTop = pSect->getFrameArea().Left();
+                            nPrtHeight = pSect->getFrameArea().Left() - pLay->getFrameArea().Left()
                                      - pLay->getFramePrintArea().Left();
-                          }
+                        }
                     }
                     else
                     {
diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx
index 6d1bd3e0fa45..94151fa3671f 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -346,8 +346,8 @@ void SwPageFrame::CheckDirection( bool bVert )
 
                 if(SvxFrameDirection::Vertical_RL_TB == nDir)
                     mbVertLR = false;
-                    else if(SvxFrameDirection::Vertical_LR_TB==nDir)
-                       mbVertLR = true;
+                else if(SvxFrameDirection::Vertical_LR_TB==nDir)
+                    mbVertLR = true;
             }
         }
 
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index 36ae515e767a..c8648be49808 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -350,12 +350,12 @@ void SwFrame::CheckDir( SvxFrameDirection nDir, bool bVert, bool bOnlyBiDi, bool
             mbVertLR = false;
         }
         else
-           {
+        {
             mbVertical = true;
             if(SvxFrameDirection::Vertical_RL_TB == nDir)
                 mbVertLR = false;
-               else if(SvxFrameDirection::Vertical_LR_TB==nDir)
-                       mbVertLR = true;
+            else if(SvxFrameDirection::Vertical_LR_TB==nDir)
+                mbVertLR = true;
         }
     }
     else
diff --git a/sw/source/core/text/itradj.cxx b/sw/source/core/text/itradj.cxx
index 79cd1978dbdf..b4fca7913754 100644
--- a/sw/source/core/text/itradj.cxx
+++ b/sw/source/core/text/itradj.cxx
@@ -632,8 +632,8 @@ void SwTextAdjuster::CalcFlyAdjust( SwLineLayout *pCurrent )
                          if( !pPos->IsMarginPortion() )
                               static_cast<SwGluePortion*>(pPos)->MoveHalfGlue( pGlue );
                          }
-                     }
-                     else
+                    }
+                    else
                         static_cast<SwGluePortion*>(pPos)->MoveHalfGlue( pGlue );
                 }
             }
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index f0f3646a38da..dddeed9b40df 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -1332,43 +1332,43 @@ SwLinePortion *SwTextFormatter::NewPortion( SwTextFormatInfo &rInf )
                 SAL_FALLTHROUGH;
             default        :
                 {
-                SwTabPortion* pLastTabPortion = rInf.GetLastTab();
-                if ( pLastTabPortion && cChar == rInf.GetTabDecimal() )
-                {
-                    // Abandon dec. tab position if line is full
-                    // We have a decimal tab portion in the line and the next character has to be
-                    // aligned at the tab stop position. We store the width from the beginning of
-                    // the tab stop portion up to the portion containing the decimal separator:
-                  if (GetTextFrame()->GetDoc().getIDocumentSettingAccess().get(DocumentSettingId::TAB_COMPAT) /*rInf.GetVsh()->IsTabCompat();*/ &&
-                         POR_TABDECIMAL == pLastTabPortion->GetWhichPor() )
+                    SwTabPortion* pLastTabPortion = rInf.GetLastTab();
+                    if ( pLastTabPortion && cChar == rInf.GetTabDecimal() )
                     {
-                        OSL_ENSURE( rInf.X() >= pLastTabPortion->GetFix(), "Decimal tab stop position cannot be calculated" );
-                        const sal_uInt16 nWidthOfPortionsUpToDecimalPosition = static_cast<sal_uInt16>(rInf.X() - pLastTabPortion->GetFix() );
-                        static_cast<SwTabDecimalPortion*>(pLastTabPortion)->SetWidthOfPortionsUpToDecimalPosition( nWidthOfPortionsUpToDecimalPosition );
-                        rInf.SetTabDecimal( 0 );
+                        // Abandon dec. tab position if line is full
+                        // We have a decimal tab portion in the line and the next character has to be
+                        // aligned at the tab stop position. We store the width from the beginning of
+                        // the tab stop portion up to the portion containing the decimal separator:
+                        if (GetTextFrame()->GetDoc().getIDocumentSettingAccess().get(DocumentSettingId::TAB_COMPAT) /*rInf.GetVsh()->IsTabCompat();*/ &&
+                             POR_TABDECIMAL == pLastTabPortion->GetWhichPor() )
+                        {
+                            OSL_ENSURE( rInf.X() >= pLastTabPortion->GetFix(), "Decimal tab stop position cannot be calculated" );
+                            const sal_uInt16 nWidthOfPortionsUpToDecimalPosition = static_cast<sal_uInt16>(rInf.X() - pLastTabPortion->GetFix() );
+                            static_cast<SwTabDecimalPortion*>(pLastTabPortion)->SetWidthOfPortionsUpToDecimalPosition( nWidthOfPortionsUpToDecimalPosition );
+                            rInf.SetTabDecimal( 0 );
+                        }
+                        else
+                            rInf.SetFull( rInf.GetLastTab()->Format( rInf ) );
                     }
-                    else
-                        rInf.SetFull( rInf.GetLastTab()->Format( rInf ) );
-                }
 
-                if( rInf.GetRest() )
-                {
-                    if( rInf.IsFull() )
+                    if( rInf.GetRest() )
                     {
-                        rInf.SetNewLine(true);
-                        return nullptr;
+                        if( rInf.IsFull() )
+                        {
+                            rInf.SetNewLine(true);
+                            return nullptr;
+                        }
+                        pPor = rInf.GetRest();
+                        rInf.SetRest(nullptr);
                     }
-                    pPor = rInf.GetRest();
-                    rInf.SetRest(nullptr);
-                }
-                else
-                {
-                    if( rInf.IsFull() )
-                        return nullptr;
-                    pPor = NewTextPortion( rInf );
+                    else
+                    {
+                        if( rInf.IsFull() )
+                            return nullptr;
+                        pPor = NewTextPortion( rInf );
+                    }
+                    break;
                 }
-                break;
-            }
         }
 
         // if a portion is created despite there being a pending RestPortion,
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index 8cf7246243d7..a5b6b4576bda 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -319,7 +319,7 @@ short SwOutlineTabDialog::Ok()
             const SfxPoolItem & rItem =
                 rTextColl.GetFormatAttr(RES_PARATR_NUMRULE, false);
 
-           if (static_cast<sal_uInt8>(GetLevel(rTextColl.GetName())) == MAXLEVEL)
+            if (static_cast<sal_uInt8>(GetLevel(rTextColl.GetName())) == MAXLEVEL)
             {
                 if(rTextColl.IsAssignedToListLevelOfOutlineStyle())
                 {
diff --git a/sw/source/uibase/docvw/srcedtw.cxx b/sw/source/uibase/docvw/srcedtw.cxx
index dcf094fe22fb..288bcd774716 100644
--- a/sw/source/uibase/docvw/srcedtw.cxx
+++ b/sw/source/uibase/docvw/srcedtw.cxx
@@ -443,9 +443,9 @@ void  TextViewOutWin::Command( const CommandEvent& rCEvt )
 
         default:
             if ( pTextView )
-            pTextView->Command( rCEvt );
-        else
-            Window::Command(rCEvt);
+                pTextView->Command( rCEvt );
+            else
+                Window::Command(rCEvt);
     }
 }
 
diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx
index ac0510ad59f1..4f4bdf5dffe8 100644
--- a/tools/source/generic/poly.cxx
+++ b/tools/source/generic/poly.cxx
@@ -110,8 +110,8 @@ ImplPolygon::ImplPolygon( const tools::Rectangle& rRect )
          mxPointAry[2] = rRect.BottomRight();
          mxPointAry[3] = rRect.BottomLeft();
          mxPointAry[4] = rRect.TopLeft();
-     }
-     else
+    }
+    else
         mnPoints = 0;
 }
 
diff --git a/vbahelper/source/vbahelper/vbacommandbars.cxx b/vbahelper/source/vbahelper/vbacommandbars.cxx
index dfd0f2fa565e..42ee3f6ee365 100644
--- a/vbahelper/source/vbahelper/vbacommandbars.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbars.cxx
@@ -67,8 +67,8 @@ public:
             // iteration code? ( e.g. ScVbaCommandBars::Item(...) )
             // and we at least should return here ( something ) it seems
             return uno::makeAny( xCommandBar );
-         }
-         else
+        }
+        else
             return nextElement();
     }
 };
diff --git a/vcl/source/app/IconThemeSelector.cxx b/vcl/source/app/IconThemeSelector.cxx
index cf18f5f2c687..d0454c37fb34 100644
--- a/vcl/source/app/IconThemeSelector.cxx
+++ b/vcl/source/app/IconThemeSelector.cxx
@@ -51,24 +51,24 @@ IconThemeSelector::IconThemeSelector()
 /*static*/ OUString
 IconThemeSelector::GetIconThemeForDesktopEnvironment(const OUString& desktopEnvironment)
 {
-    OUString r;
 #ifdef _WIN32
-    r = "colibre";
     (void)desktopEnvironment;
+    return OUString("colibre");
 #else
+    OUString r;
     if ( desktopEnvironment.equalsIgnoreAsciiCase("kde4") ||
          desktopEnvironment.equalsIgnoreAsciiCase("kde5") ||
          desktopEnvironment.equalsIgnoreAsciiCase("lxqt") ) {
         r = "breeze";
-    } else
-    if ( desktopEnvironment.equalsIgnoreAsciiCase("macosx") ) {
+    }
+    else if ( desktopEnvironment.equalsIgnoreAsciiCase("macosx") ) {
 #if MPL_HAVE_SUBSET
         r = "tango";
 #else
         r = "breeze";
 #endif
-    } else
-    if ( desktopEnvironment.equalsIgnoreAsciiCase("gnome") ||
+    }
+    else if ( desktopEnvironment.equalsIgnoreAsciiCase("gnome") ||
          desktopEnvironment.equalsIgnoreAsciiCase("mate") ||
          desktopEnvironment.equalsIgnoreAsciiCase("unity") ) {
         r = "elementary";
@@ -76,9 +76,8 @@ IconThemeSelector::GetIconThemeForDesktopEnvironment(const OUString& desktopEnvi
     {
         r = FALLBACK_ICON_THEME_ID;
     }
-#endif
-
     return r;
+#endif // _WIN32
 }
 
 OUString
diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx
index 3c19112a6f72..5f233c13b862 100644
--- a/vcl/source/fontsubset/cff.cxx
+++ b/vcl/source/fontsubset/cff.cxx
@@ -2002,7 +2002,7 @@ void CffSubsetterContext::emitAsType1( Type1Emitter& rEmitter,
         "0000000000000000000000000000000000000000000000000000000000000000\n"
         "cleartomark\n"
         "\x80\x03";
-     if( rEmitter.mbPfbSubset)
+    if( rEmitter.mbPfbSubset)
         rEmitter.emitRawData( aPfxFooter, sizeof(aPfxFooter)-1);
     else
         rEmitter.emitRawData( aPfxFooter+6, sizeof(aPfxFooter)-9);
diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx
index fbd4624ce4b8..462b41cda50f 100644
--- a/vcl/source/outdev/bitmap.cxx
+++ b/vcl/source/outdev/bitmap.cxx
@@ -456,8 +456,8 @@ Bitmap OutputDevice::GetBitmap( const Point& rSrcPt, const Size& rSize ) const
                         }
 
                         aBmp = aVDev->GetBitmap( Point(), aVDev->GetOutputSizePixel() );
-                     }
-                     else
+                    }
+                    else
                         bClipped = false;
                 }
                 else
diff --git a/vcl/unx/generic/app/i18n_cb.cxx b/vcl/unx/generic/app/i18n_cb.cxx
index 0b6cdc49b3dd..6dd8d0915f2d 100644
--- a/vcl/unx/generic/app/i18n_cb.cxx
+++ b/vcl/unx/generic/app/i18n_cb.cxx
@@ -83,13 +83,12 @@ Preedit_DeleteText(preedit_text_t *ptext, int from, int howmuch)
 
     int to = from + howmuch;
 
-      if (to == static_cast<int>(ptext->nLength))
+    if (to == static_cast<int>(ptext->nLength))
     {
         // delete from the end of the text
         ptext->nLength = from;
-      }
-    else
-        if (to < static_cast<int>(ptext->nLength))
+    }
+    else if (to < static_cast<int>(ptext->nLength))
     {
         // cut out of the middle of the text
         memmove( static_cast<void*>(ptext->pUnicodeBuffer + from),
@@ -99,7 +98,7 @@ Preedit_DeleteText(preedit_text_t *ptext, int from, int howmuch)
                 static_cast<void*>(ptext->pCharStyle + to),
                 (ptext->nLength - to) * sizeof(XIMFeedback));
         ptext->nLength -= howmuch;
-      }
+    }
     else
     {
           // XXX this indicates an error, are we out of sync ?
diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx
index 4d639478938f..a23caf149fde 100644
--- a/xmloff/source/text/XMLTextFrameContext.cxx
+++ b/xmloff/source/text/XMLTextFrameContext.cxx
@@ -175,7 +175,7 @@ XMLTextFrameParam_Impl::XMLTextFrameParam_Impl(
         sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( rAttrName, &aLocalName );
         if ( XML_NAMESPACE_DRAW == nPrefix )
         {
-               if( IsXMLToken(aLocalName, XML_VALUE) )
+            if( IsXMLToken(aLocalName, XML_VALUE) )
             {
                 sValue = rValue;
                 bFoundValue=true;