loplugin: improve indentation

Change-Id: Idb847766d93dc222d6c55889616da21eeac212ee

85 files changed, 328 insertions, 382 deletions

diff --git a/accessibility/source/extended/AccessibleGridControlHeader.cxx b/accessibility/source/extended/AccessibleGridControlHeader.cxx
index 3f431f9c49d5..0bc164962a6c 100644
--- a/accessibility/source/extended/AccessibleGridControlHeader.cxx
+++ b/accessibility/source/extended/AccessibleGridControlHeader.cxx
@@ -67,7 +67,7 @@ AccessibleGridControlHeader::getAccessibleChild( sal_Int32 nChildIndex )
     ::osl::MutexGuard aGuard( getOslMutex() );
 
     if (nChildIndex<0 || nChildIndex>=getAccessibleChildCount())
-    throw IndexOutOfBoundsException();
+        throw IndexOutOfBoundsException();
     ensureIsAlive();
     Reference< XAccessible > xChild;
     if(m_eObjType == svt::table::TCTYPE_COLUMNHEADERBAR)
diff --git a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
index 8232bd99011f..dcc29fb45696 100644
--- a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
+++ b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
@@ -217,8 +217,8 @@ namespace accessibility
             Reference< XAccessibleContext > xMyContext( m_aContext );
             if ( !xMyContext.is() )
             {
-            Reference< XAccessibleContext > xInnerContext = m_xControlAccessible->getAccessibleContext();
-            Reference< XAccessible > xMe( this );
+                Reference< XAccessibleContext > xInnerContext = m_xControlAccessible->getAccessibleContext();
+                Reference< XAccessible > xMe( this );
 
                 xMyContext = new EditBrowseBoxTableCell( m_xParent, xMe, xInnerContext, *m_pBrowseBox, m_xFocusWindow, m_nRowPos, m_nColPos );
                 m_aContext = xMyContext;
diff --git a/basctl/source/dlged/dlgedfunc.cxx b/basctl/source/dlged/dlgedfunc.cxx
index a53d68a1f46a..e13977183604 100644
--- a/basctl/source/dlged/dlgedfunc.cxx
+++ b/basctl/source/dlged/dlgedfunc.cxx
@@ -61,14 +61,12 @@ void DlgEdFunc::ForceScroll( const Point& rPos )
     {
         if( rPos.X() < aOutRect.Left() )
             nDeltaX = -nDeltaX;
-        else
-        if( rPos.X() <= aOutRect.Right() )
+        else if( rPos.X() <= aOutRect.Right() )
             nDeltaX = 0;
 
         if( rPos.Y() < aOutRect.Top() )
             nDeltaY = -nDeltaY;
-        else
-        if( rPos.Y() <= aOutRect.Bottom() )
+        else if( rPos.Y() <= aOutRect.Bottom() )
             nDeltaY = 0;
 
         if( nDeltaX )
diff --git a/basic/source/comp/exprnode.cxx b/basic/source/comp/exprnode.cxx
index 10c98942d492..49911c1ad344 100644
--- a/basic/source/comp/exprnode.cxx
+++ b/basic/source/comp/exprnode.cxx
@@ -313,11 +313,9 @@ void SbiExprNode::FoldConstants()
                     // Integer operations
                     sal_Bool err = sal_False;
                     if( nl > SbxMAXLNG ) err = sal_True, nl = SbxMAXLNG;
-                    else
-                    if( nl < SbxMINLNG ) err = sal_True, nl = SbxMINLNG;
+                    else if( nl < SbxMINLNG ) err = sal_True, nl = SbxMINLNG;
                     if( nr > SbxMAXLNG ) err = sal_True, nr = SbxMAXLNG;
-                    else
-                    if( nr < SbxMINLNG ) err = sal_True, nr = SbxMINLNG;
+                    else if( nr < SbxMINLNG ) err = sal_True, nr = SbxMINLNG;
                     ll = (long) nl; lr = (long) nr;
                     llMod = (long) (nl < 0 ? nl - 0.5 : nl + 0.5);
                     lrMod = (long) (nr < 0 ? nr - 0.5 : nr + 0.5);
@@ -431,8 +429,7 @@ void SbiExprNode::FoldConstants()
                 // Integer operation!
                 sal_Bool err = sal_False;
                 if( nVal > SbxMAXLNG ) err = sal_True, nVal = SbxMAXLNG;
-                else
-                if( nVal < SbxMINLNG ) err = sal_True, nVal = SbxMINLNG;
+                else if( nVal < SbxMINLNG ) err = sal_True, nVal = SbxMINLNG;
                 if( err )
                 {
                     pGen->GetParser()->Error( SbERR_MATH_OVERFLOW );
diff --git a/basic/source/runtime/stdobj1.cxx b/basic/source/runtime/stdobj1.cxx
index 6b8f6a9bf7c6..50c13c703151 100644
--- a/basic/source/runtime/stdobj1.cxx
+++ b/basic/source/runtime/stdobj1.cxx
@@ -73,8 +73,7 @@ void SbStdPicture::PropType( SbxVariable* pVar, SbxArray*, sal_Bool bWrite )
 
     if( eType == GRAPHIC_BITMAP )
         nType = 1;
-    else
-    if( eType != GRAPHIC_NONE )
+    else if( eType != GRAPHIC_NONE )
         nType = 2;
 
     pVar->PutInteger( nType );
diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index f9784e442f65..19784f4ec900 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -435,8 +435,7 @@ bool ImpConvStringExt( OUString& rSrc, SbxDataType eTargetType )
                 aNewString = OUString::valueOf( (sal_Int32)SbxTRUE );
                 bChanged = true;
             }
-            else
-            if( rSrc.equalsIgnoreAsciiCase("false") )
+            else if( rSrc.equalsIgnoreAsciiCase("false") )
             {
                 aNewString = OUString::valueOf( (sal_Int32)SbxFALSE );
                 bChanged = true;
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index a03796fd42fa..0b6092d1c8d4 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -1183,13 +1183,15 @@ void CombiColumnLineChartDialogController::fillExtraControls( const ChartTypePar
     sal_Int32 nNumLines = 0;
 
     if(xTemplateProps.is())
-    try
     {
-        xTemplateProps->getPropertyValue( "NumberOfLines" ) >>= nNumLines;
-    }
-    catch( const uno::Exception & ex )
-    {
-        ASSERT_EXCEPTION( ex );
+        try
+        {
+            xTemplateProps->getPropertyValue( "NumberOfLines" ) >>= nNumLines;
+        }
+        catch( const uno::Exception & ex )
+        {
+            ASSERT_EXCEPTION( ex );
+        }
     }
     if( nNumLines < 0 )
         nNumLines = 0;
diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx
index a651eb8abeab..3bd3a13afc82 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.cxx
@@ -400,7 +400,7 @@ void DataLabelResources::Reset(const SfxItemSet& rInAttrs)
         m_aDC_Dial.SetRotation( nDegrees );
     }
     else
-    m_aDC_Dial.SetRotation( 0 );
+        m_aDC_Dial.SetRotation( 0 );
 
     EnableControls();
 }
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index a00d529d7411..4fe20ec4fbba 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -1016,7 +1016,7 @@ bool lcl_isFormatObjectCommand( const OString& aCommand )
         || aCommand == "FormatMajorGrid"
         || aCommand == "FormatMinorGrid"
         )
-    return true;
+        return true;
 
     // else
     return false;
diff --git a/comphelper/source/misc/storagehelper.cxx b/comphelper/source/misc/storagehelper.cxx
index 9b4cb0904451..8efb112500e3 100644
--- a/comphelper/source/misc/storagehelper.cxx
+++ b/comphelper/source/misc/storagehelper.cxx
@@ -249,8 +249,7 @@ sal_Int32 OStorageHelper::GetXStorageFormat(
     {
         nResult = SOFFICE_FILEFORMAT_60;
     }
-    else
-    if (
+    else if (
         aMediaType.equalsIgnoreAsciiCaseAscii(MIMETYPE_OASIS_OPENDOCUMENT_TEXT_ASCII        ) ||
         aMediaType.equalsIgnoreAsciiCaseAscii(MIMETYPE_OASIS_OPENDOCUMENT_TEXT_WEB_ASCII    ) ||
         aMediaType.equalsIgnoreAsciiCaseAscii(MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_ASCII ) ||
diff --git a/connectivity/source/drivers/calc/Cservices.cxx b/connectivity/source/drivers/calc/Cservices.cxx
index 217863e2a919..8c1fc82f713c 100644
--- a/connectivity/source/drivers/calc/Cservices.cxx
+++ b/connectivity/source/drivers/calc/Cservices.cxx
@@ -61,12 +61,14 @@ struct ProviderRequest
             )
     {
         if (!xRet.is() && (Implname == sImplementationName))
-        try
-        {
-            xRet = creator( xServiceManager, sImplementationName,Factory, Services,0);
-        }
-        catch(...)
         {
+            try
+            {
+                xRet = creator( xServiceManager, sImplementationName,Factory, Services,0);
+            }
+            catch(...)
+            {
+            }
         }
         return xRet.is();
     }
diff --git a/connectivity/source/drivers/dbase/Dservices.cxx b/connectivity/source/drivers/dbase/Dservices.cxx
index 15cc9d4a814f..7f861137d7d1 100644
--- a/connectivity/source/drivers/dbase/Dservices.cxx
+++ b/connectivity/source/drivers/dbase/Dservices.cxx
@@ -61,12 +61,14 @@ struct ProviderRequest
             )
     {
         if (!xRet.is() && (Implname == sImplementationName))
-        try
-        {
-            xRet = creator( xServiceManager, sImplementationName,Factory, Services,0);
-        }
-        catch(...)
         {
+            try
+            {
+                xRet = creator( xServiceManager, sImplementationName,Factory, Services,0);
+            }
+            catch(...)
+            {
+            }
         }
         return xRet.is();
     }
diff --git a/connectivity/source/drivers/flat/Eservices.cxx b/connectivity/source/drivers/flat/Eservices.cxx
index db3667c27b44..7ef8a28e1cf6 100644
--- a/connectivity/source/drivers/flat/Eservices.cxx
+++ b/connectivity/source/drivers/flat/Eservices.cxx
@@ -61,12 +61,14 @@ struct ProviderRequest
             )
     {
         if (!xRet.is() && (Implname == sImplementationName))
-        try
-        {
-            xRet = creator( xServiceManager, sImplementationName,Factory, Services,0);
-        }
-        catch(...)
         {
+            try
+            {
+                xRet = creator( xServiceManager, sImplementationName,Factory, Services,0);
+            }
+            catch(...)
+            {
+            }
         }
         return xRet.is();
     }
diff --git a/connectivity/source/drivers/hsqldb/Hservices.cxx b/connectivity/source/drivers/hsqldb/Hservices.cxx
index 86269c1bd1ca..0a7ef5b2c048 100644
--- a/connectivity/source/drivers/hsqldb/Hservices.cxx
+++ b/connectivity/source/drivers/hsqldb/Hservices.cxx
@@ -62,12 +62,14 @@ struct ProviderRequest
             )
     {
         if (!xRet.is() && (Implname == sImplementationName))
-        try
-        {
-            xRet = creator( xServiceManager, sImplementationName,Factory, Services,0);
-        }
-        catch(...)
         {
+            try
+            {
+                xRet = creator( xServiceManager, sImplementationName,Factory, Services,0);
+            }
+            catch(...)
+            {
+            }
         }
         return xRet.is();
     }
diff --git a/connectivity/source/drivers/jdbc/jservices.cxx b/connectivity/source/drivers/jdbc/jservices.cxx
index 2d29006d7d61..90302e3a0004 100644
--- a/connectivity/source/drivers/jdbc/jservices.cxx
+++ b/connectivity/source/drivers/jdbc/jservices.cxx
@@ -61,12 +61,14 @@ struct ProviderRequest
             )
     {
         if (!xRet.is() && (Implname == sImplementationName))
-        try
-        {
-            xRet = creator( xServiceManager, sImplementationName,Factory, Services,0);
-        }
-        catch(...)
         {
+            try
+            {
+                xRet = creator( xServiceManager, sImplementationName,Factory, Services,0);
+            }
+            catch(...)
+            {
+            }
         }
         return xRet.is();
     }
diff --git a/connectivity/source/drivers/kab/KServices.cxx b/connectivity/source/drivers/kab/KServices.cxx
index 2e1a6bc5e812..66badd5bb624 100644
--- a/connectivity/source/drivers/kab/KServices.cxx
+++ b/connectivity/source/drivers/kab/KServices.cxx
@@ -62,12 +62,14 @@ struct ProviderRequest
             )
     {
         if (!xRet.is() && (Implname == sImplementationName))
-        try
-        {
-            xRet = creator( xServiceManager, sImplementationName,Factory, Services,0);
-        }
-        catch(...)
         {
+            try
+            {
+                xRet = creator( xServiceManager, sImplementationName,Factory, Services,0);
+            }
+            catch(...)
+            {
+            }
         }
         return xRet.is();
     }
diff --git a/connectivity/source/drivers/mysql/Yservices.cxx b/connectivity/source/drivers/mysql/Yservices.cxx
index ff6fe08804b1..dfb5215311a5 100644
--- a/connectivity/source/drivers/mysql/Yservices.cxx
+++ b/connectivity/source/drivers/mysql/Yservices.cxx
@@ -61,12 +61,14 @@ struct ProviderRequest
             )
     {
         if (!xRet.is() && (Implname == sImplementationName))
-        try
-        {
-            xRet = creator( xServiceManager, sImplementationName,Factory, Services,0);
-        }
-        catch(...)
         {
+            try
+            {
+                xRet = creator( xServiceManager, sImplementationName,Factory, Services,0);
+            }
+            catch(...)
+            {
+            }
         }
         return xRet.is();
     }
diff --git a/connectivity/source/drivers/odbc/oservices.cxx b/connectivity/source/drivers/odbc/oservices.cxx
index 73837a73084d..014030c08bf9 100644
--- a/connectivity/source/drivers/odbc/oservices.cxx
+++ b/connectivity/source/drivers/odbc/oservices.cxx
@@ -62,12 +62,14 @@ struct ProviderRequest
             )
     {
         if (!xRet.is() && (Implname == sImplementationName))
-        try
-        {
-            xRet = creator( xServiceManager, sImplementationName,Factory, Services,0);
-        }
-        catch(...)
         {
+            try
+            {
+                xRet = creator( xServiceManager, sImplementationName,Factory, Services,0);
+            }
+            catch(...)
+            {
+            }
         }
         return xRet.is();
     }
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index 5ab87fa18d71..7acb62cf734c 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -814,7 +814,7 @@ OSQLParseNode* OSQLParser::convertNode(sal_Int32 nType,OSQLParseNode*& pLiteral)
                 case DataType::TIME:
                 case DataType::TIMESTAMP:
                     if (m_xFormatter.is())
-                    pReturn = buildDate( nType, pReturn);
+                        pReturn = buildDate( nType, pReturn);
                     break;
                 default:
                     m_sErrorMessage = m_pContext->getErrorMessage(IParseContext::ERROR_INVALID_COMPARE);
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 9b3d92dbd6dd..b9a24f10dfa7 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -787,7 +787,7 @@ namespace cppcanvas
                     sal_Unicode *chars = (sal_Unicode *) alloca( sizeof( sal_Unicode ) * length );
 
                     for( sal_uInt32 i = 0; i < length; i++ )
-                    s >> chars[ i ];
+                        s >> chars[ i ];
 
                     family = ::rtl::OUString( chars, length );
                     EMFP_DEBUG (printf ("EMF+\tfamily: %s\n", rtl::OUStringToOString( family, RTL_TEXTENCODING_UTF8).getStr()));
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index 1f3872bba33e..9f436a612077 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -1839,7 +1839,7 @@ namespace cppcanvas
                             }
                             EMFP_DEBUG (printf ("EMF+ passed to canvas mtf renderer, size: %u\n", (unsigned int)pAct->GetDataSize ()));
                             if (count < limit)
-                            processEMFPlus( pAct, rFactoryParms, rStates.getState(), rCanvas );
+                                processEMFPlus( pAct, rFactoryParms, rStates.getState(), rCanvas );
                             count ++;
                         } else if( pAct->GetComment().equalsL(RTL_CONSTASCII_STRINGPARAM("EMF_PLUS_HEADER_INFO")) ) {
                             EMFP_DEBUG (printf ("EMF+ passed to canvas mtf renderer - header info, size: %u\n", (unsigned int)pAct->GetDataSize ()));
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 7508e0b8cb11..6603538c4b3a 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -117,15 +117,13 @@ sal_Bool SfxStylesInfo_Impl::parseStyleCommand(SfxStyleInfo_Impl& aStyle)
     ::rtl::OUString sArg = sCmdArgs.copy(0, i);
     if (sArg.indexOf(CMDURL_SPART_ONLY) == 0)
         aStyle.sStyle = sArg.copy(LEN_SPART, sArg.getLength()-LEN_SPART);
-    else
-    if (sArg.indexOf(CMDURL_FPART_ONLY) == 0)
+    else if (sArg.indexOf(CMDURL_FPART_ONLY) == 0)
         aStyle.sFamily = sArg.copy(LEN_FPART, sArg.getLength()-LEN_FPART);
 
     sArg = sCmdArgs.copy(i+1, sCmdArgs.getLength()-i-1);
     if (sArg.indexOf(CMDURL_SPART_ONLY) == 0)
         aStyle.sStyle = sArg.copy(LEN_SPART, sArg.getLength()-LEN_SPART);
-    else
-    if (sArg.indexOf(CMDURL_FPART_ONLY) == 0)
+    else if (sArg.indexOf(CMDURL_FPART_ONLY) == 0)
         aStyle.sFamily = sArg.copy(LEN_FPART, sArg.getLength()-LEN_FPART);
 
     if (!(aStyle.sFamily.isEmpty() || aStyle.sStyle.isEmpty()))
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index 36253d3b185d..bca33d8f9e02 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -688,10 +688,8 @@ short SfxInsertFloatingFrameDialog::Execute()
                 else
                     xSet->setPropertyValue( "FrameIsScrollingMode", makeAny( (sal_Bool) ( eScroll == ScrollingYes) ) );
 
-                    xSet->setPropertyValue( "FrameIsBorder", makeAny( bHasBorder ) );
-
+                xSet->setPropertyValue( "FrameIsBorder", makeAny( bHasBorder ) );
                 xSet->setPropertyValue( "FrameMarginWidth", makeAny( sal_Int32( lMarginWidth ) ) );
-
                 xSet->setPropertyValue( "FrameMarginHeight", makeAny( sal_Int32( lMarginHeight ) ) );
 
                 if ( bIPActive )
diff --git a/desktop/unx/source/splashx.c b/desktop/unx/source/splashx.c
index e231a8eb84f4..2a5f654eaee0 100644
--- a/desktop/unx/source/splashx.c
+++ b/desktop/unx/source/splashx.c
@@ -455,7 +455,7 @@ static void suppress_decorations(struct splash* splash)
         XChangeProperty( splash->display, splash->win, atom_type, XA_ATOM, 32,
                          PropModeReplace, (unsigned char*)&atom_splash, 1 );
     //else
-        suppress_decorations_motif(splash); // FIXME: Unconditional until Metacity/compiz's SPLASH handling is fixed
+    suppress_decorations_motif(splash); // FIXME: Unconditional until Metacity/compiz's SPLASH handling is fixed
 }
 
 // Create the window
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index f7a6e807672e..cbc0272c9379 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -1111,8 +1111,7 @@ void SvxFontHeightItem::SetHeight( sal_uInt32 nNewHeight, const sal_uInt16 nNewP
     if( SFX_MAPUNIT_RELATIVE != eUnit )
         nHeight = nNewHeight + ::ItemToControl( (short)nNewProp, eUnit,
                                                 SFX_FUNIT_TWIP );
-    else
-    if( 100 != nNewProp )
+    else if( 100 != nNewProp )
         nHeight = sal_uInt32(( nNewHeight * nNewProp ) / 100 );
     else
         nHeight = nNewHeight;
@@ -1131,8 +1130,7 @@ void SvxFontHeightItem::SetHeight( sal_uInt32 nNewHeight, sal_uInt16 nNewProp,
                 ::ControlToItem( ::ItemToControl((short)nNewProp, eMetric,
                                         SFX_FUNIT_TWIP ), SFX_FUNIT_TWIP,
                                         eCoreMetric );
-    else
-    if( 100 != nNewProp )
+    else if( 100 != nNewProp )
         nHeight = sal_uInt32(( nNewHeight * nNewProp ) / 100 );
     else
         nHeight = nNewHeight;
diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx
index ed33a1e56ea9..34a464f3df4a 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -1324,14 +1324,11 @@ FilterCache::EItemFlushState FilterCache::impl_specifyFlushOperation(const css::
     // !? ... such situation can occur, if an item was added and(!) removed before it was flushed :-)
     if (!bExistsInConfigLayer && !bExistsInMemory)
         eState = E_ITEM_UNCHANGED;
-    else
-    if (!bExistsInConfigLayer && bExistsInMemory)
+    else if (!bExistsInConfigLayer && bExistsInMemory)
         eState = E_ITEM_ADDED;
-    else
-    if (bExistsInConfigLayer && bExistsInMemory)
+    else if (bExistsInConfigLayer && bExistsInMemory)
         eState = E_ITEM_CHANGED;
-    else
-    if (bExistsInConfigLayer && !bExistsInMemory)
+    else if (bExistsInConfigLayer && !bExistsInMemory)
         eState = E_ITEM_REMOVED;
 
     return eState;
diff --git a/filter/source/graphicfilter/epict/epict.cxx b/filter/source/graphicfilter/epict/epict.cxx
index 23feea383de4..9b95717af7cb 100644
--- a/filter/source/graphicfilter/epict/epict.cxx
+++ b/filter/source/graphicfilter/epict/epict.cxx
@@ -2143,10 +2143,10 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
         MayCallback();
 
         if (pPict->GetError())
-        bStatus=sal_False;
+            bStatus=sal_False;
 
         if (bStatus==sal_False)
-        break;
+            break;
     }
 }
 
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index 217974fdfa88..75adc97ca68e 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -2134,7 +2134,7 @@ void EscherPropertyContainer::LookForPolarHandles( const MSO_SPT eShapeType, sal
 sal_Bool EscherPropertyContainer::GetAdjustmentValue( const com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue & rkProp, sal_Int32 nIndex, sal_Int32 nAdjustmentsWhichNeedsToBeConverted, sal_Int32& nValue )
 {
     if ( rkProp.State != beans::PropertyState_DIRECT_VALUE )
-    return sal_False;
+        return sal_False;
 
     sal_Bool bUseFixedFloat = ( nAdjustmentsWhichNeedsToBeConverted & ( 1 << nIndex ) ) != 0;
     if ( rkProp.Value.getValueTypeClass() == uno::TypeClass_DOUBLE )
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 18247bfa6131..cc8de5869794 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -5485,8 +5485,7 @@ void SvxMSDffManager::CheckTxBxStoryChain()
                 nChain = pObj->nTxBxComp;
                 bSetReplaceFALSE = !pObj->bReplaceByFly;
             }
-            else
-            if( !pObj->bReplaceByFly )
+            else if( !pObj->bReplaceByFly )
             {
                 // object that must NOT be replaced by frame?
                 bSetReplaceFALSE = sal_True;
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 99f662c5bb69..41bf1777cffd 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -1072,29 +1072,30 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi
                 pTObj->SetMergedItem( SdrTextAutoGrowHeightItem( bFitShapeToText ) );
             }
 
-                pTObj->SetMergedItem( SdrTextVertAdjustItem( eTVA ) );
-                pTObj->SetMergedItem( SdrTextHorzAdjustItem( eTHA ) );
+            pTObj->SetMergedItem( SdrTextVertAdjustItem( eTVA ) );
+            pTObj->SetMergedItem( SdrTextHorzAdjustItem( eTHA ) );
 
-                if ( nMinFrameHeight < 0 )
-                    nMinFrameHeight = 0;
+            if ( nMinFrameHeight < 0 )
+                nMinFrameHeight = 0;
             if ( !pTObj->ISA( SdrObjCustomShape ) )
                 pTObj->SetMergedItem( SdrTextMinFrameHeightItem( nMinFrameHeight ) );
 
-                if ( nMinFrameWidth < 0 )
-                    nMinFrameWidth = 0;
+            if ( nMinFrameWidth < 0 )
+                nMinFrameWidth = 0;
             if ( !pTObj->ISA( SdrObjCustomShape ) )
                 pTObj->SetMergedItem( SdrTextMinFrameWidthItem( nMinFrameWidth ) );
 
-                // set margins at the borders of the textbox
-                pTObj->SetMergedItem( SdrTextLeftDistItem( nTextLeft ) );
-                pTObj->SetMergedItem( SdrTextRightDistItem( nTextRight ) );
-                pTObj->SetMergedItem( SdrTextUpperDistItem( nTextTop ) );
-                pTObj->SetMergedItem( SdrTextLowerDistItem( nTextBottom ) );
-                pTObj->SetMergedItem( SdrTextFixedCellHeightItem( sal_True ) );
+            // set margins at the borders of the textbox
+            pTObj->SetMergedItem( SdrTextLeftDistItem( nTextLeft ) );
+            pTObj->SetMergedItem( SdrTextRightDistItem( nTextRight ) );
+            pTObj->SetMergedItem( SdrTextUpperDistItem( nTextTop ) );
+            pTObj->SetMergedItem( SdrTextLowerDistItem( nTextBottom ) );
+            pTObj->SetMergedItem( SdrTextFixedCellHeightItem( sal_True ) );
+
+            if ( !pTObj->ISA( SdrObjCustomShape ) )
+                pTObj->SetSnapRect( rTextRect );
+            pTObj = ReadObjText( &aTextObj, pTObj, rData.pPage );
 
-                if ( !pTObj->ISA( SdrObjCustomShape ) )
-                    pTObj->SetSnapRect( rTextRect );
-                pTObj = ReadObjText( &aTextObj, pTObj, rData.pPage );
                 if ( pTObj )
                 {
                     /* check if our new snaprect makes trouble,
diff --git a/forms/source/xforms/binding.cxx b/forms/source/xforms/binding.cxx
index dfcbe0d95d05..a0a3ad536f86 100644
--- a/forms/source/xforms/binding.cxx
+++ b/forms/source/xforms/binding.cxx
@@ -1063,18 +1063,14 @@ Binding::Any_t Binding::getValue( const Type_t& rType )
         throw IncompatibleTypesException( EXCEPT( "type unsupported" ) );
 
     // return string value (if present; else return empty Any)
-        Binding::Any_t result = Any();
-        if(maBindingExpression.hasValue()) {
-            rtl::OUString pathExpr(maBindingExpression.getString());
-            Convert &rConvert = Convert::get();
-            result = rConvert.toAny(pathExpr,rType);
-        }
-
-//      return maBindingExpression.hasValue()
-  //      ? Convert::get().toAny( maBindingExpression.getString(), rType )
-    //    : Any();
+    Binding::Any_t result = Any();
+    if(maBindingExpression.hasValue()) {
+        rtl::OUString pathExpr(maBindingExpression.getString());
+        Convert &rConvert = Convert::get();
+        result = rConvert.toAny(pathExpr,rType);
+    }
 
-        return result;
+    return result;
 }
 
 void Binding::setValue( const Any_t& aValue )
diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx
index 1809a9e82631..010f1e3e361c 100644
--- a/framework/source/dispatch/closedispatcher.cxx
+++ b/framework/source/dispatch/closedispatcher.cxx
@@ -379,8 +379,7 @@ IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback)
     sal_Bool bSuccess = sal_False;
     if (bCloseFrame)
         bSuccess = implts_closeFrame();
-    else
-    if (bEstablishBackingMode)
+    else if (bEstablishBackingMode)
     #if defined MACOSX
     {
         // on mac close down, quickstarter keeps the process alive
@@ -408,8 +407,7 @@ IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback)
     #else
         bSuccess = implts_establishBackingMode();
     #endif
-    else
-    if (bTerminateApp)
+    else if (bTerminateApp)
         bSuccess = implts_terminateApplication();
 
     if (
diff --git a/framework/source/fwi/classes/converter.cxx b/framework/source/fwi/classes/converter.cxx
index e61c0084654e..9083a877084b 100644
--- a/framework/source/fwi/classes/converter.cxx
+++ b/framework/source/fwi/classes/converter.cxx
@@ -70,11 +70,9 @@ OUStringList Converter::convert_seqOUString2OUStringList( const css::uno::Sequen
     // write year formated as "YYYY"
     if (nYear<10)
         sBuffer.appendAscii("000");
-    else
-    if (nYear<100)
+    else if (nYear<100)
         sBuffer.appendAscii("00");
-    else
-    if (nYear<1000)
+    else if (nYear<1000)
         sBuffer.appendAscii("0");
     sBuffer.append( (sal_Int32)nYear );
 
diff --git a/framework/source/jobs/helponstartup.cxx b/framework/source/jobs/helponstartup.cxx
index 0d90cf279467..d5f4fd8637e4 100644
--- a/framework/source/jobs/helponstartup.cxx
+++ b/framework/source/jobs/helponstartup.cxx
@@ -163,9 +163,8 @@ css::uno::Any SAL_CALL HelpOnStartup::execute(const css::uno::Sequence< css::bea
     // a)
     if (sCurrentHelpURL.isEmpty())
         bShowIt = sal_True;
-    else
     // b)
-    if (bCurrentHelpURLIsAnyDefaultURL)
+    else if (bCurrentHelpURLIsAnyDefaultURL)
         bShowIt = sal_True;
 
     if (bShowIt)
@@ -194,11 +193,9 @@ void SAL_CALL HelpOnStartup::disposing(const css::lang::EventObject& aEvent)
 
     if (aEvent.Source == m_xModuleManager)
         m_xModuleManager.clear();
-    else
-    if (aEvent.Source == m_xDesktop)
+    else if (aEvent.Source == m_xDesktop)
         m_xDesktop.clear();
-    else
-    if (aEvent.Source == m_xConfig)
+    else if (aEvent.Source == m_xConfig)
         m_xConfig.clear();
 
     aLock.unlock();
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 79cf9a87b71f..e1415dff7c8d 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -1334,11 +1334,9 @@ void AutoRecovery::implts_flushConfigItem(const AutoRecovery::TDocumentInfo& rIn
 
             if (! impl_enoughDiscSpace(nMinSpaceConfigSave))
                 AutoRecovery::impl_showFullDiscError();
-            else
-            if (nRetry > RETRY_STORE_ON_MIGHT_FULL_DISC_USEFULL)
+            else if (nRetry > RETRY_STORE_ON_MIGHT_FULL_DISC_USEFULL)
                 nRetry = RETRY_STORE_ON_MIGHT_FULL_DISC_USEFULL;
-            else
-            if (nRetry <= GIVE_UP_RETRY)
+            else if (nRetry <= GIVE_UP_RETRY)
                 throw; // force stacktrace to know if there exist might other reasons, why an AutoSave can fail !!!
 
             --nRetry;
@@ -1479,8 +1477,7 @@ void AutoRecovery::implts_updateTimer()
             nMilliSeconds = m_nAutoSaveTimeIntervall;  // [ms]
         #endif
     }
-    else
-    if (m_eTimerType == AutoRecovery::E_POLL_FOR_USER_IDLE)
+    else if (m_eTimerType == AutoRecovery::E_POLL_FOR_USER_IDLE)
     {
         nMilliSeconds = MIN_TIME_FOR_USER_IDLE;
         #if OSL_DEBUG_LEVEL > 1
@@ -1488,8 +1485,7 @@ void AutoRecovery::implts_updateTimer()
             nMilliSeconds = 300; // let us some time, to finish this method .-)
         #endif
     }
-    else
-    if (m_eTimerType == AutoRecovery::E_POLL_TILL_AUTOSAVE_IS_ALLOWED)
+    else if (m_eTimerType == AutoRecovery::E_POLL_TILL_AUTOSAVE_IS_ALLOWED)
         nMilliSeconds = 300; // there is a minimum time frame, where the user can loose some key input data!
 
     m_aTimer.SetTimeout(nMilliSeconds);
@@ -2370,11 +2366,9 @@ void AutoRecovery::implts_saveOneDoc(const ::rtl::OUString&
 
             if (! impl_enoughDiscSpace(nMinSpaceDocSave))
                 AutoRecovery::impl_showFullDiscError();
-            else
-            if (nRetry > RETRY_STORE_ON_MIGHT_FULL_DISC_USEFULL)
+            else if (nRetry > RETRY_STORE_ON_MIGHT_FULL_DISC_USEFULL)
                 nRetry = RETRY_STORE_ON_MIGHT_FULL_DISC_USEFULL;
-            else
-            if (nRetry <= GIVE_UP_RETRY)
+            else if (nRetry <= GIVE_UP_RETRY)
                 throw; // force stacktrace to know if there exist might other reasons, why an AutoSave can fail !!!
 
             --nRetry;
@@ -2500,15 +2494,13 @@ AutoRecovery::ETimerType AutoRecovery::implts_openDocs(const DispatchParams& aPa
         {
             sLoadOriginalURL = rInfo.OrgURL;
         }
-        else
-        if (!rInfo.TemplateURL.isEmpty())
+        else if (!rInfo.TemplateURL.isEmpty())
         {
             sLoadOriginalURL = rInfo.TemplateURL;
             lDescriptor[::comphelper::MediaDescriptor::PROP_ASTEMPLATE()]   <<= sal_True;
             lDescriptor[::comphelper::MediaDescriptor::PROP_TEMPLATENAME()] <<= rInfo.TemplateURL;
         }
-        else
-        if (!rInfo.FactoryURL.isEmpty())
+        else if (!rInfo.FactoryURL.isEmpty())
         {
             sLoadOriginalURL = rInfo.FactoryURL;
             lDescriptor[::comphelper::MediaDescriptor::PROP_ASTEMPLATE()] <<= sal_True;
diff --git a/framework/source/services/dispatchhelper.cxx b/framework/source/services/dispatchhelper.cxx
index be645c7b849d..86565ee1383f 100644
--- a/framework/source/services/dispatchhelper.cxx
+++ b/framework/source/services/dispatchhelper.cxx
@@ -142,8 +142,7 @@ css::uno::Any SAL_CALL DispatchHelper::executeDispatch(
         xNotifyDispatch->dispatchWithNotification(aURL, aArguments, xListener);
         aResult = m_aResult;
     }
-    else
-    if (xDispatch.is())
+    else if (xDispatch.is())
     {
         // dispatch it without any chance to get a result
         xDispatch->dispatch( aURL, aArguments );
diff --git a/framework/source/xml/acceleratorconfigurationreader.cxx b/framework/source/xml/acceleratorconfigurationreader.cxx
index af6a65e80952..1a6a38a19e9a 100644
--- a/framework/source/xml/acceleratorconfigurationreader.cxx
+++ b/framework/source/xml/acceleratorconfigurationreader.cxx
@@ -258,8 +258,7 @@ AcceleratorConfigurationReader::EXMLElement AcceleratorConfigurationReader::impl
 
     if (sElement.equals(NS_ELEMENT_ACCELERATORLIST))
         eElement = E_ELEMENT_ACCELERATORLIST;
-    else
-    if (sElement.equals(NS_ELEMENT_ITEM))
+    else if (sElement.equals(NS_ELEMENT_ITEM))
         eElement = E_ELEMENT_ITEM;
     else
         throw css::uno::RuntimeException(
@@ -276,20 +275,15 @@ AcceleratorConfigurationReader::EXMLAttribute AcceleratorConfigurationReader::im
 
     if (sAttribute.equals(NS_ATTRIBUTE_KEYCODE))
         eAttribute = E_ATTRIBUTE_KEYCODE;
-    else
-    if (sAttribute.equals(NS_ATTRIBUTE_MOD_SHIFT))
+    else if (sAttribute.equals(NS_ATTRIBUTE_MOD_SHIFT))
         eAttribute = E_ATTRIBUTE_MOD_SHIFT;
-    else
-    if (sAttribute.equals(NS_ATTRIBUTE_MOD_MOD1))
+    else if (sAttribute.equals(NS_ATTRIBUTE_MOD_MOD1))
         eAttribute = E_ATTRIBUTE_MOD_MOD1;
-    else
-    if (sAttribute.equals(NS_ATTRIBUTE_MOD_MOD2))
+    else if (sAttribute.equals(NS_ATTRIBUTE_MOD_MOD2))
         eAttribute = E_ATTRIBUTE_MOD_MOD2;
-    else
-    if (sAttribute.equals(NS_ATTRIBUTE_MOD_MOD3))
+    else if (sAttribute.equals(NS_ATTRIBUTE_MOD_MOD3))
         eAttribute = E_ATTRIBUTE_MOD_MOD3;
-    else
-    if (sAttribute.equals(NS_ATTRIBUTE_URL))
+    else if (sAttribute.equals(NS_ATTRIBUTE_URL))
         eAttribute = E_ATTRIBUTE_URL;
     else
         throw css::uno::RuntimeException(
diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx
index 201c1f5af61d..b4fd937aea4e 100644
--- a/hwpfilter/source/hwpreader.cxx
+++ b/hwpfilter/source/hwpreader.cxx
@@ -1479,8 +1479,8 @@ void HwpReader::makePStyle(ParaShape * pshape)
         {
             if( i > 0 && pshape->tabs[i].position == 0. )
                 break;
-                if( pshape->tabs[i].position <= tab_margin )
-                    continue;
+            if( pshape->tabs[i].position <= tab_margin )
+                continue;
             padd(ascii("style:position"), sXML_CDATA,
                 Double2Str(WTMM(pshape->tabs[i].position - tab_margin )) + ascii("mm"));
             if( pshape->tabs[i].type )
@@ -2750,11 +2750,11 @@ void HwpReader::make_text_p0(HWPPara * para, sal_Bool bParaStart)
                 firstspace = 0;
             else
                 firstspace = 1;
-                res = hcharconv(para->hhstr[n]->hh, dest, UNICODE);
-                for( int j = 0 ; j < res; j++ )
-                {
-                    str.push_back(dest[j]);
-                }
+            res = hcharconv(para->hhstr[n]->hh, dest, UNICODE);
+            for( int j = 0 ; j < res; j++ )
+            {
+                str.push_back(dest[j]);
+            }
         }
     }
 }
@@ -2833,11 +2833,11 @@ void HwpReader::make_text_p1(HWPPara * para,sal_Bool bParaStart)
                 firstspace = 0;
             else
                 firstspace = 1;
-                res = hcharconv(para->hhstr[n]->hh, dest, UNICODE);
-                for( int j = 0 ; j < res; j++ )
-                {
-                    str.push_back(dest[j]);
-                }
+            res = hcharconv(para->hhstr[n]->hh, dest, UNICODE);
+            for( int j = 0 ; j < res; j++ )
+            {
+                str.push_back(dest[j]);
+            }
         }
     }
 }
@@ -2914,11 +2914,11 @@ void HwpReader::make_text_p3(HWPPara * para,sal_Bool bParaStart)
                 firstspace = 0;
             else
                 firstspace = 1;
-                res = hcharconv(para->hhstr[n]->hh, dest, UNICODE);
-                for( int j = 0 ; j < res; j++ )
-                {
-                    str.push_back(dest[j]);
-                }
+            res = hcharconv(para->hhstr[n]->hh, dest, UNICODE);
+            for( int j = 0 ; j < res; j++ )
+            {
+                str.push_back(dest[j]);
+            }
         }
         else if (para->hhstr[n]->hh == CH_FIELD)
         {
@@ -3672,19 +3672,19 @@ void HwpReader::makeFormula(TxtBox * hbox)
                 cshape = pPar->GetCharShape(n);
             if (l >= sizeof(mybuf)-7)
                 break;
-                res = hcharconv(pPar->hhstr[n]->hh, dest, UNICODE);
-                for( int j = 0 ; j < res; j++ ){
-                    c = dest[j];
-                    if( c < 32 )
-                         c = ' ';
-                    if( c < 256 )
-                         mybuf[l++] = sal::static_int_cast<char>(c);
-                    else
-                    {
-                         mybuf[l++] = sal::static_int_cast<char>((c >> 8) & 0xff);
-                         mybuf[l++] = sal::static_int_cast<char>(c & 0xff);
-                    }
+            res = hcharconv(pPar->hhstr[n]->hh, dest, UNICODE);
+            for( int j = 0 ; j < res; j++ ){
+                c = dest[j];
+                if( c < 32 )
+                    c = ' ';
+                if( c < 256 )
+                    mybuf[l++] = sal::static_int_cast<char>(c);
+                else
+                {
+                    mybuf[l++] = sal::static_int_cast<char>((c >> 8) & 0xff);
+                    mybuf[l++] = sal::static_int_cast<char>(c & 0xff);
                 }
+            }
         }
         if (l >= sizeof(mybuf)-7)
             break;
diff --git a/i18npool/source/calendar/calendar_hijri.cxx b/i18npool/source/calendar/calendar_hijri.cxx
index 511929575c4d..f13bb0b79887 100644
--- a/i18npool/source/calendar/calendar_hijri.cxx
+++ b/i18npool/source/calendar/calendar_hijri.cxx
@@ -73,7 +73,7 @@ void Calendar_hijri::mapToGregorian() throw(RuntimeException)
         sal_Int32 month = (sal_Int32)fieldSetValue[CalendarFieldIndex::MONTH] + 1;
         sal_Int32 year = (sal_Int32)fieldSetValue[CalendarFieldIndex::YEAR];
         if (fieldSetValue[CalendarFieldIndex::ERA] == 0)
-        year *= -1;
+            year *= -1;
 
         ToGregorian(&day, &month, &year);
 
@@ -282,16 +282,16 @@ Calendar_hijri::getGregorianDay(sal_Int32 lJulianDay, sal_Int32 *pnDay, sal_Int3
     /* ...and the month, adjusting it if necessary */
     *pnMonth = lFactorE - 1;
     if (*pnMonth > 12)
-    (*pnMonth) -= 12;
+        (*pnMonth) -= 12;
 
     /* ...and similarly for the year */
     *pnYear = lFactorC - 4715;
     if (*pnMonth > 2)
-    (*pnYear)--;
+        (*pnYear)--;
 
-// Negative year adjustments
+    // Negative year adjustments
     if (*pnYear <= 0)
-    (*pnYear)--;
+        (*pnYear)--;
 }
 
 double
diff --git a/i18npool/source/calendar/calendar_jewish.cxx b/i18npool/source/calendar/calendar_jewish.cxx
index 96f2b6b5bf36..2f537356adf2 100644
--- a/i18npool/source/calendar/calendar_jewish.cxx
+++ b/i18npool/source/calendar/calendar_jewish.cxx
@@ -269,7 +269,7 @@ void Calendar_jewish::mapToGregorian() throw(RuntimeException)
     if (fieldSet & FIELDS) {
         sal_Int16 y = fieldSetValue[CalendarFieldIndex::YEAR];
         if (fieldSetValue[CalendarFieldIndex::ERA] == 0)
-        y = 1 - y;
+            y = 1 - y;
         HebrewDate Temp(fieldSetValue[CalendarFieldIndex::MONTH] + 1, fieldSetValue[CalendarFieldIndex::DAY_OF_MONTH], y);
         GregorianDate gd(Temp);
 
diff --git a/i18npool/source/search/textsearch.cxx b/i18npool/source/search/textsearch.cxx
index 314dd5b0e0b5..03f2121d239f 100644
--- a/i18npool/source/search/textsearch.cxx
+++ b/i18npool/source/search/textsearch.cxx
@@ -124,14 +124,12 @@ void TextSearch::setOptions( const SearchOptions& rOptions ) throw( RuntimeExcep
     sSrchStr = aSrchPara.searchString;
 
     // use transliteration here
-    if ( xTranslit.is() &&
-     aSrchPara.transliterateFlags & SIMPLE_TRANS_MASK )
+    if ( xTranslit.is() && aSrchPara.transliterateFlags & SIMPLE_TRANS_MASK )
         sSrchStr = xTranslit->transliterateString2String(
-                aSrchPara.searchString, 0, aSrchPara.searchString.getLength());
+            aSrchPara.searchString, 0, aSrchPara.searchString.getLength());
 
-    if ( xTranslit2.is() &&
-     aSrchPara.transliterateFlags & COMPLEX_TRANS_MASK )
-    sSrchStr2 = xTranslit2->transliterateString2String(
+    if ( xTranslit2.is() && aSrchPara.transliterateFlags & COMPLEX_TRANS_MASK )
+        sSrchStr2 = xTranslit2->transliterateString2String(
             aSrchPara.searchString, 0, aSrchPara.searchString.getLength());
 
     // When start or end of search string is a complex script type, we need to
@@ -213,13 +211,13 @@ SearchResult TextSearch::searchForward( const OUString& searchStr, sal_Int32 sta
         for ( int k = 0; k < sres.startOffset.getLength(); k++ )
         {
             if (sres.startOffset[k])
-          sres.startOffset[k] = offset[sres.startOffset[k]];
+                sres.startOffset[k] = offset[sres.startOffset[k]];
             // JP 20.6.2001: end is ever exclusive and then don't return
             //               the position of the next character - return the
             //               next position behind the last found character!
             //               "a b c" find "b" must return 2,3 and not 2,4!!!
             if (sres.endOffset[k])
-          sres.endOffset[k] = offset[sres.endOffset[k]-1] + 1;
+                sres.endOffset[k] = offset[sres.endOffset[k]-1] + 1;
         }
     }
     else
@@ -295,20 +293,20 @@ SearchResult TextSearch::searchBackward( const OUString& searchStr, sal_Int32 st
         newStartPos = in_str.getLength();
 
         if( endPos )
-        newEndPos = FindPosInSeq_Impl( offset, endPos );
+            newEndPos = FindPosInSeq_Impl( offset, endPos );
 
         sres = (this->*fnBackward)( in_str, newStartPos, newEndPos );
 
         for ( int k = 0; k < sres.startOffset.getLength(); k++ )
         {
             if (sres.startOffset[k])
-          sres.startOffset[k] = offset[sres.startOffset[k] - 1] + 1;
+                sres.startOffset[k] = offset[sres.startOffset[k] - 1] + 1;
             // JP 20.6.2001: end is ever exclusive and then don't return
             //               the position of the next character - return the
             //               next position behind the last found character!
             //               "a b c" find "b" must return 2,3 and not 2,4!!!
             if (sres.endOffset[k])
-          sres.endOffset[k] = offset[sres.endOffset[k]];
+                sres.endOffset[k] = offset[sres.endOffset[k]];
         }
     }
     else
diff --git a/linguistic/source/hyphdsp.cxx b/linguistic/source/hyphdsp.cxx
index 757e836fc126..e66d89000693 100644
--- a/linguistic/source/hyphdsp.cxx
+++ b/linguistic/source/hyphdsp.cxx
@@ -607,8 +607,7 @@ Reference< XPossibleHyphens > SAL_CALL
                         rMgr.AddLngSvcEvtBroadcaster( xBroadcaster );
 
                     if (xHyph.is()  &&  xHyph->hasLocale( rLocale ))
-                    xRes = xHyph->createPossibleHyphens( aChkWord, rLocale,
-                                rProperties );
+                        xRes = xHyph->createPossibleHyphens( aChkWord, rLocale, rProperties );
 
                     pEntry->nLastTriedSvcIndex = (sal_Int16) i;
                     ++i;
diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx
index 44b25a7c2d81..dcdcc84366ee 100644
--- a/registry/source/regimpl.cxx
+++ b/registry/source/regimpl.cxx
@@ -1716,8 +1716,7 @@ RegError ORegistry::dumpKey(const OUString& sPath, const OUString& sName, sal_In
 
     if (_err == store_E_NotExists)
         return REG_KEY_NOT_EXISTS;
-    else
-    if (_err == store_E_WrongFormat)
+    else if (_err == store_E_WrongFormat)
         return REG_INVALID_KEY;
 
     fprintf(stdout, "%s/ %s\n", sIndent.getStr(), OUStringToOString(sName, RTL_TEXTENCODING_UTF8).getStr());
diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx
index 255c22d2db93..5aa268f92554 100644
--- a/sc/source/ui/drawfunc/fuins2.cxx
+++ b/sc/source/ui/drawfunc/fuins2.cxx
@@ -491,7 +491,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView*
         {
             const SfxPoolItem* pItem;
             if( pReqArgs->HasItem( FN_PARAM_5, &pItem ) )
-            aRangeString = ::rtl::OUString( ((const SfxStringItem*)pItem)->GetValue());
+                aRangeString = ::rtl::OUString( ((const SfxStringItem*)pItem)->GetValue());
 
             aPositionRange = pViewSh->GetViewData()->GetCurPos();
         }
diff --git a/sc/source/ui/vba/vbapalette.cxx b/sc/source/ui/vba/vbapalette.cxx
index 226597911fea..738393591e62 100644
--- a/sc/source/ui/vba/vbapalette.cxx
+++ b/sc/source/ui/vba/vbapalette.cxx
@@ -61,8 +61,8 @@ public:
 
     virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
     {
-    if ( Index < 0 || Index >= getCount() )
-        throw lang::IndexOutOfBoundsException();
+        if ( Index < 0 || Index >= getCount() )
+            throw lang::IndexOutOfBoundsException();
         return uno::makeAny( sal_Int32( spnDefColorTable8[ Index ] ) );
     }
 
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index 918f6b26c7ff..6f252763c629 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -2828,7 +2828,7 @@ ScVbaRange::PasteSpecial( const uno::Any& Paste, const uno::Any& Operation, cons
 {
     if ( m_Areas->getCount() > 1 )
         throw uno::RuntimeException( rtl::OUString( "That command cannot be used on multiple selections"  ), uno::Reference< uno::XInterface >() );
-        ScDocShell* pShell = getScDocShell();
+    ScDocShell* pShell = getScDocShell();
 
         uno::Reference< frame::XModel > xModel( ( pShell ? pShell->GetModel() : NULL ), uno::UNO_QUERY_THROW );
     uno::Reference< view::XSelectionSupplier > xSelection( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
@@ -4061,7 +4061,7 @@ ScVbaRange::getLeft() throw (uno::RuntimeException)
     // helperapi returns the first ranges left ( and top below )
     if ( m_Areas->getCount() > 1 )
         return getArea( 0 )->getLeft();
-        awt::Point aPoint = getPosition();
+    awt::Point aPoint = getPosition();
     return uno::makeAny( lcl_hmmToPoints( aPoint.X ) );
 }
 
@@ -4072,7 +4072,7 @@ ScVbaRange::getTop() throw (uno::RuntimeException)
     // helperapi returns the first ranges top
     if ( m_Areas->getCount() > 1 )
         return getArea( 0 )->getTop();
-        awt::Point aPoint= getPosition();
+    awt::Point aPoint= getPosition();
     return uno::makeAny( lcl_hmmToPoints( aPoint.Y ) );
 }
 
diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
index 1db84831ff25..75c9ddbd896e 100644
--- a/sc/source/ui/view/cellsh2.cxx
+++ b/sc/source/ui/view/cellsh2.cxx
@@ -409,8 +409,8 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
                             aSortParam.bHasHeader = static_cast<const SfxBoolItem*>(pItem)->GetValue();
                         if ( pArgs->GetItemState( SID_SORT_CASESENS, sal_True, &pItem ) == SFX_ITEM_SET )
                             aSortParam.bCaseSens = static_cast<const SfxBoolItem*>(pItem)->GetValue();
-                    if ( pArgs->GetItemState( SID_SORT_NATURALSORT, true, &pItem ) == SFX_ITEM_SET )
-                        aSortParam.bNaturalSort = static_cast<const SfxBoolItem*>(pItem)->GetValue();
+                        if ( pArgs->GetItemState( SID_SORT_NATURALSORT, true, &pItem ) == SFX_ITEM_SET )
+                            aSortParam.bNaturalSort = static_cast<const SfxBoolItem*>(pItem)->GetValue();
                         if ( pArgs->GetItemState( SID_SORT_ATTRIBS, true, &pItem ) == SFX_ITEM_SET )
                             aSortParam.bIncludePattern = static_cast<const SfxBoolItem*>(pItem)->GetValue();
                         if ( pArgs->GetItemState( SID_SORT_USERDEF, sal_True, &pItem ) == SFX_ITEM_SET )
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index 2b3c32e73e28..6d4478f1dc8b 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -298,8 +298,7 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq )
             String sFamily = ((const SfxStringItem*)pFamItem)->GetValue();
             if (sFamily.CompareToAscii("CellStyles") == COMPARE_EQUAL)
                 eFamily = SFX_STYLE_FAMILY_PARA;
-            else
-            if (sFamily.CompareToAscii("PageStyles") == COMPARE_EQUAL)
+            else if (sFamily.CompareToAscii("PageStyles") == COMPARE_EQUAL)
                 eFamily = SFX_STYLE_FAMILY_PAGE;
         }
 
diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx
index 4ba7d3845179..de815dc7c5fc 100644
--- a/sd/source/filter/eppt/pptx-epptbase.cxx
+++ b/sd/source/filter/eppt/pptx-epptbase.cxx
@@ -994,17 +994,20 @@ sal_Bool PPTWriterBase::ContainsOtherShapeThanPlaceholders( sal_Bool bForOOMLX )
     sal_Bool bOtherThanPlaceHolders = sal_False;
 
     if ( nShapes )
-    for ( sal_uInt32 nIndex = 0; ( nIndex < nShapes ) && ( bOtherThanPlaceHolders == sal_False ); nIndex++ ) {
-        if ( GetShapeByIndex( nIndex ) && mType != "drawing.Page" ) {
-        if( bForOOMLX &&
-            ( mType == "presentation.Page" ||
-              mType == "presentation.Notes" ) ) {
-            Reference< XSimpleText > rXText( mXShape, UNO_QUERY );
-
-            if( rXText.is() && !rXText->getString().isEmpty() )
-            bOtherThanPlaceHolders = sal_True;
-        } else
-            bOtherThanPlaceHolders = sal_True;
+        for ( sal_uInt32 nIndex = 0; ( nIndex < nShapes ) && ( bOtherThanPlaceHolders == sal_False ); nIndex++ )
+        {
+            if ( GetShapeByIndex( nIndex ) && mType != "drawing.Page" )
+            {
+                if( bForOOMLX &&
+                        ( mType == "presentation.Page" ||
+                        mType == "presentation.Notes" ) ) {
+                    Reference< XSimpleText > rXText( mXShape, UNO_QUERY );
+
+                if( rXText.is() && !rXText->getString().isEmpty() )
+                    bOtherThanPlaceHolders = sal_True;
+            }
+            else
+                bOtherThanPlaceHolders = sal_True;
         }
         DBG(printf("mType == %s\n", mType.getStr()));
     }
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx
index e7bfb73883a5..fb616f657545 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -492,7 +492,7 @@ const char* PowerPointExport::Get8Direction( sal_uInt8 nDirection )
     const char* pDirection = GetSideDirection( nDirection );
 
     if( !pDirection )
-    pDirection = GetCornerDirection( nDirection );
+        pDirection = GetCornerDirection( nDirection );
 
     return pDirection;
 }
@@ -509,11 +509,11 @@ void PowerPointExport::WriteTransition( FSHelperPtr pFS )
     sal_uInt8 nDirection = 0;
 
     if( GETA( TransitionType ) && ( mAny >>= nTransitionType ) &&
-    GETA( TransitionSubtype ) && ( mAny >>= nTransitionSubtype ) )
-    nPPTTransitionType = GetTransition( nTransitionType, nTransitionSubtype, eFadeEffect, nDirection );
+            GETA( TransitionSubtype ) && ( mAny >>= nTransitionSubtype ) )
+        nPPTTransitionType = GetTransition( nTransitionType, nTransitionSubtype, eFadeEffect, nDirection );
 
     if( !nPPTTransitionType && eFadeEffect != FadeEffect_NONE )
-    nPPTTransitionType = GetTransition( eFadeEffect, nDirection );
+        nPPTTransitionType = GetTransition( eFadeEffect, nDirection );
 
     if( nPPTTransitionType ) {
     AnimationSpeed animationSpeed = AnimationSpeed_MEDIUM;
@@ -657,7 +657,7 @@ void PowerPointExport::WriteTransition( FSHelperPtr pFS )
 void PowerPointExport::WriteAnimationProperty( FSHelperPtr pFS, const Any& rAny )
 {
     if( !rAny.hasValue() )
-    return;
+        return;
 
     switch( rAny.getValueType().getTypeClass() ) {
     case TypeClass_STRING:
@@ -674,7 +674,7 @@ void PowerPointExport::WriteAnimateValues( FSHelperPtr pFS, const Reference< XAn
 {
     const Sequence< double > aKeyTimes = rXAnimate->getKeyTimes();
     if( aKeyTimes.getLength() <= 0 )
-    return;
+        return;
     const Sequence< Any > aValues = rXAnimate->getValues();
     const OUString& sFormula = rXAnimate->getFormula();
     const OUString& rAttributeName = rXAnimate->getAttributeName();
@@ -693,10 +693,10 @@ void PowerPointExport::WriteAnimateValues( FSHelperPtr pFS, const Reference< XAn
         pFS->startElementNS( XML_p, XML_val, FSEND );
         ValuePair aPair;
         if( aValues[ i ] >>= aPair ) {
-        WriteAnimationProperty( pFS, AnimationExporter::convertAnimateValue( aPair.First, rAttributeName ) );
-        WriteAnimationProperty( pFS, AnimationExporter::convertAnimateValue( aPair.Second, rAttributeName ) );
+            WriteAnimationProperty( pFS, AnimationExporter::convertAnimateValue( aPair.First, rAttributeName ) );
+            WriteAnimationProperty( pFS, AnimationExporter::convertAnimateValue( aPair.Second, rAttributeName ) );
         } else
-        WriteAnimationProperty( pFS, AnimationExporter::convertAnimateValue( aValues[ i ], rAttributeName ) );
+            WriteAnimationProperty( pFS, AnimationExporter::convertAnimateValue( aValues[ i ], rAttributeName ) );
 
         pFS->endElementNS( XML_p, XML_val );
         pFS->endElementNS( XML_p, XML_tav );
@@ -709,7 +709,7 @@ void PowerPointExport::WriteAnimateValues( FSHelperPtr pFS, const Reference< XAn
 void PowerPointExport::WriteAnimateTo( FSHelperPtr pFS, Any aValue, const OUString& rAttributeName )
 {
     if( !aValue.hasValue() )
-    return;
+        return;
 
     DBG(printf("to attribute name: %s\n", USS( rAttributeName )));
 
@@ -723,7 +723,7 @@ void PowerPointExport::WriteAnimateTo( FSHelperPtr pFS, Any aValue, const OUStri
 void PowerPointExport::WriteAnimationAttributeName( FSHelperPtr pFS, const OUString& rAttributeName )
 {
     if( rAttributeName.isEmpty() )
-    return;
+        return;
 
     pFS->startElementNS( XML_p, XML_attrNameLst, FSEND );
 
@@ -731,11 +731,11 @@ void PowerPointExport::WriteAnimationAttributeName( FSHelperPtr pFS, const OUStr
 
     const char* sAttributeName = NULL;
     if ( rAttributeName == "Visibility" ) {
-    sAttributeName = "style.visibility";
+        sAttributeName = "style.visibility";
     } else if ( rAttributeName == "X" ) {
-    sAttributeName = "ppt_x";
+        sAttributeName = "ppt_x";
     } else if ( rAttributeName == "Y" ) {
-    sAttributeName = "ppt_y";
+        sAttributeName = "ppt_y";
     }
 
     pFS->startElementNS( XML_p, XML_attrName, FSEND );
@@ -773,7 +773,7 @@ void PowerPointExport::WriteAnimationNodeAnimate( FSHelperPtr pFS, const Referen
 {
     Reference< XAnimate > rXAnimate( rXNode, UNO_QUERY );
     if( !rXAnimate.is() )
-    return;
+        return;
 
     const char* pCalcMode = NULL;
     const char* pValueType = NULL;
@@ -814,7 +814,7 @@ void PowerPointExport::WriteAnimationNodeAnimateInside( FSHelperPtr pFS, const R
 {
     Reference< XAnimate > rXAnimate( rXNode, UNO_QUERY );
     if( !rXAnimate.is() )
-    return;
+        return;
 
     const char* pAdditive = NULL;
 
@@ -935,7 +935,7 @@ void PowerPointExport::WriteAnimationCondition( FSHelperPtr pFS, Any& rAny, sal_
         DBG(printf ("event offset: %f\n", fDelay));
     } else if( aEvent.Offset >>= eTiming ) {
         if( eTiming == Timing_INDEFINITE )
-        pDelay = "indefinite";
+            pDelay = "indefinite";
         DBG(printf ("event offset timing: %d\n", eTiming));
     }
     }
@@ -1200,12 +1200,12 @@ void PowerPointExport::WriteAnimationNode( FSHelperPtr pFS, const Reference< XAn
     }
 
     if( pMethod ) {
-    (this->*(pMethod))( pFS, rXNode, xmlNodeType, bMainSeqChild );
-    return;
+        (this->*(pMethod))( pFS, rXNode, xmlNodeType, bMainSeqChild );
+        return;
     }
 
     if( xmlNodeType == -1 )
-    return;
+        return;
 
     pFS->startElementNS( XML_p, xmlNodeType, FSEND );
 
@@ -1451,7 +1451,7 @@ void PowerPointExport::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNu
 void PowerPointExport::ImplWriteNotes( sal_uInt32 nPageNum )
 {
     if( !mbCreateNotes || !ContainsOtherShapeThanPlaceholders( sal_True ) )
-    return;
+        return;
 
     DBG(printf("write Notes %" SAL_PRIuUINT32 "\n----------------\n", nPageNum));
 
@@ -1658,11 +1658,11 @@ void PowerPointExport::ImplWritePPTXLayout( sal_Int32 nOffset, sal_uInt32 nMaste
     mXShapes = Reference< XShapes >( xSlide, UNO_QUERY );
 
     if( mLayoutInfo[ nOffset ].mnFileIdArray.size() < mnMasterPages ) {
-    mLayoutInfo[ nOffset ].mnFileIdArray.resize( mnMasterPages );
+        mLayoutInfo[ nOffset ].mnFileIdArray.resize( mnMasterPages );
     }
 
     if( mLayoutInfo[ nOffset ].mnFileIdArray[ nMasterNum ] != 0 )
-    return;
+        return;
 
     FSHelperPtr pFS
         = openFragmentStreamWithSerializer( OUStringBuffer()
@@ -1738,7 +1738,7 @@ void PowerPointExport::WriteShapeTree( FSHelperPtr pFS, PageType ePageType, sal_
 ShapeExport& PowerPointShapeExport::WritePageShape( Reference< XShape > xShape, PageType ePageType, sal_Bool bPresObj )
 {
     if( ( ePageType == NOTICE && bPresObj ) || ePageType == LAYOUT )
-    return WritePlaceholderShape( xShape, SlideImage );
+        return WritePlaceholderShape( xShape, SlideImage );
 
     return WriteTextShape( xShape );
 }
@@ -1810,7 +1810,7 @@ ShapeExport& PowerPointShapeExport::WritePlaceholderShape( Reference< XShape > x
     WritePresetShape( "rect" );
     Reference< XPropertySet > xProps( xShape, UNO_QUERY );
     if( xProps.is() )
-    WriteBlipFill( xProps, "GraphicURL" );
+        WriteBlipFill( xProps, "GraphicURL" );
     mpFS->endElementNS( XML_p, XML_spPr );
 
     WriteTextBox( xShape, XML_p );
@@ -2112,8 +2112,8 @@ sal_Bool PowerPointExport::WriteNotesMaster()
 
     Reference< XPropertySet > aXBackgroundPropSet;
     if( ImplGetPropertyValue( mXPagePropSet, rtl::OUString( "Background" ) ) &&
-    ( mAny >>= aXBackgroundPropSet ) )
-    ImplWriteBackground( pFS, aXBackgroundPropSet );
+            ( mAny >>= aXBackgroundPropSet ) )
+        ImplWriteBackground( pFS, aXBackgroundPropSet );
 
     WriteShapeTree( pFS, NOTICE, sal_True );
 
@@ -2145,7 +2145,7 @@ sal_Bool PowerPointExport::WriteNotesMaster()
 sal_Bool PowerPointExport::ImplCreateMainNotes()
 {
     if( mbCreateNotes )
-    return WriteNotesMaster();
+        return WriteNotesMaster();
 
     return sal_True;
 }
diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx
index 3ab54fb528b0..91e7789e2439 100644
--- a/sd/source/ui/app/sdmod.cxx
+++ b/sd/source/ui/app/sdmod.cxx
@@ -116,7 +116,7 @@ SdModule::~SdModule()
     delete pSearchItem;
 
     if( pNumberFormatter )
-    delete pNumberFormatter;
+        delete pNumberFormatter;
 
     ::sd::DrawDocShell* pDocShell = PTR_CAST(::sd::DrawDocShell, SfxObjectShell::Current());
     if( pDocShell )
diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx
index fe790dd2d86c..91d06f32ca85 100644
--- a/sd/source/ui/func/futempl.cxx
+++ b/sd/source/ui/func/futempl.cxx
@@ -116,8 +116,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
     {
         nFamily = ( (const SfxUInt16Item &) pArgs->Get( SID_STYLE_FAMILY ) ).GetValue();
     }
-    else
-    if( pArgs && SFX_ITEM_SET == pArgs->GetItemState( SID_STYLE_FAMILYNAME,
+    else if( pArgs && SFX_ITEM_SET == pArgs->GetItemState( SID_STYLE_FAMILYNAME,
         sal_False, &pItem ))
     {
         String sFamily = ( (const SfxStringItem &) pArgs->Get( SID_STYLE_FAMILYNAME ) ).GetValue();
diff --git a/sd/source/ui/slideshow/slideshowviewimpl.cxx b/sd/source/ui/slideshow/slideshowviewimpl.cxx
index c7007772ca97..7fbc12ef120d 100644
--- a/sd/source/ui/slideshow/slideshowviewimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowviewimpl.cxx
@@ -479,7 +479,7 @@ awt::Rectangle SAL_CALL SlideShowView::getCanvasArea(  ) throw (RuntimeException
     awt::Rectangle aRectangle;
 
     if( mxWindow.is() )
-    return mxWindow->getPosSize();
+        return mxWindow->getPosSize();
 
     aRectangle.X = aRectangle.Y = aRectangle.Width = aRectangle.Height = 0;
 
diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
index a8de717b5ac7..a0ea086e83e2 100644
--- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
+++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
@@ -981,9 +981,9 @@ void SlideSorterController::PageNameHasChanged (int nPageIndex, const String& rs
 
     // Get a pointer to the corresponding accessible object and notify
     // that of the name change.
-        SharedSdWindow pWindow (mrSlideSorter.GetContentWindow());
-        if ( ! pWindow)
-            return;
+    SharedSdWindow pWindow (mrSlideSorter.GetContentWindow());
+    if ( ! pWindow)
+        return;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
         xAccessible (pWindow->GetAccessible(sal_False));
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index e6fd041bae9f..1b40a74c800b 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -1699,18 +1699,20 @@ void SfxStoringHelper::SetDocInfoState(
         {
             uno::Any aValue = xPropSet->getPropertyValue( pProps[i].Name );
             if ( pProps[i].Attributes & ::com::sun::star::beans::PropertyAttribute::REMOVABLE )
-            try
-            {
-                // QUESTION: DefaultValue?!
-                xContainer->addProperty( pProps[i].Name, pProps[i].Attributes, aValue );
-            }
-            catch (beans::PropertyExistException const&) {}
-            try
             {
-                // it is possible that the propertysets from XML and binary files differ; we shouldn't break then
-                xSet->setPropertyValue( pProps[i].Name, aValue );
+                try
+                {
+                    // QUESTION: DefaultValue?!
+                    xContainer->addProperty( pProps[i].Name, pProps[i].Attributes, aValue );
+                }
+                catch (beans::PropertyExistException const&) {}
+                try
+                {
+                    // it is possible that the propertysets from XML and binary files differ; we shouldn't break then
+                    xSet->setPropertyValue( pProps[i].Name, aValue );
+                }
+                catch ( const uno::Exception& ) {}
             }
-            catch ( const uno::Exception& ) {}
         }
 
         // sigh... have to set these manually i'm afraid... wonder why
diff --git a/sfx2/source/view/userinputinterception.cxx b/sfx2/source/view/userinputinterception.cxx
index dd0a95ed8ca8..2e8d33d9091c 100644
--- a/sfx2/source/view/userinputinterception.cxx
+++ b/sfx2/source/view/userinputinterception.cxx
@@ -82,8 +82,8 @@ namespace sfx2
                 _rEvent.Modifiers |= KeyModifier::MOD1;
             if ( _rVclEvent.IsMod2() )
                 _rEvent.Modifiers |= KeyModifier::MOD2;
-                if ( _rVclEvent.IsMod3() )
-                        _rEvent.Modifiers |= KeyModifier::MOD3;
+            if ( _rVclEvent.IsMod3() )
+                _rEvent.Modifiers |= KeyModifier::MOD3;
         }
 
         void lcl_initKeyEvent( KeyEvent& rEvent, const ::KeyEvent& rEvt )
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 4a4cfcec82ab..88f87635d9d4 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -555,18 +555,15 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
 
                 if ( nId == SID_MAIL_SENDDOC )
                     eResult = aModel.SaveAndSend( xFrame, rtl::OUString() );
-                else
-                if ( nId == SID_MAIL_SENDDOCASPDF )
+                else if ( nId == SID_MAIL_SENDDOCASPDF )
                     eResult = aModel.SaveAndSend( xFrame, rtl::OUString( "pdf_Portable_Document_Format" ));
-                else
-                if ( nId == SID_MAIL_SENDDOCASMS )
+                else if ( nId == SID_MAIL_SENDDOCASMS )
                 {
                     aDocType = impl_searchFormatTypeForApp(xFrame, E_MS_DOC);
                     if (!aDocType.isEmpty())
                         eResult = aModel.SaveAndSend( xFrame, aDocType );
                 }
-                else
-                if ( nId == SID_MAIL_SENDDOCASOOO )
+                else if ( nId == SID_MAIL_SENDDOCASOOO )
                 {
                     aDocType = impl_searchFormatTypeForApp(xFrame, E_OOO_DOC);
                     if (!aDocType.isEmpty())
diff --git a/shell/source/unix/exec/shellexecentry.cxx b/shell/source/unix/exec/shellexecentry.cxx
index ca4caf461bda..13b10ac268f8 100644
--- a/shell/source/unix/exec/shellexecentry.cxx
+++ b/shell/source/unix/exec/shellexecentry.cxx
@@ -70,7 +70,7 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL syssh_component_getFactory(
     }
 
     if (xFactory.is())
-    xFactory->acquire();
+        xFactory->acquire();
 
     return xFactory.get();
 }
diff --git a/svl/source/items/slstitm.cxx b/svl/source/items/slstitm.cxx
index 004f8a73f958..ea34fde877e8 100644
--- a/svl/source/items/slstitm.cxx
+++ b/svl/source/items/slstitm.cxx
@@ -218,8 +218,7 @@ void SfxStringListItem::SetString( const XubString& rStr )
 
     if ( pImp && (pImp->nRefCount == 1) )
         delete pImp;
-    else
-    if( pImp )
+    else if( pImp )
         pImp->nRefCount--;
     pImp = new SfxImpStringList;
 
@@ -278,8 +277,7 @@ void SfxStringListItem::SetStringList( const com::sun::star::uno::Sequence< rtl:
 
     if ( pImp && (pImp->nRefCount == 1) )
         delete pImp;
-    else
-    if( pImp )
+    else if( pImp )
         pImp->nRefCount--;
     pImp = new SfxImpStringList;
 
diff --git a/svtools/bmpmaker/bmpcore.cxx b/svtools/bmpmaker/bmpcore.cxx
index 7e8247c67afe..22be38edcc15 100644
--- a/svtools/bmpmaker/bmpcore.cxx
+++ b/svtools/bmpmaker/bmpcore.cxx
@@ -102,13 +102,13 @@ void BmpCreator::ImplCreate( const ::std::vector< DirEntry >& rInDirs,
         else
             aPrefix = String( aName, 0, 2 );
 
-            String aNumStr(rtl::OUString::createFromAscii(rLang.maLangDir));
+        String aNumStr(rtl::OUString::createFromAscii(rLang.maLangDir));
 
-            if( aNumStr.Len() == 1 )
-                aNumStr.Insert( '0', 0 );
+        if( aNumStr.Len() == 1 )
+            aNumStr.Insert( '0', 0 );
 
-            aName = DirEntry( aName ).GetBase();
-            aName += String( RTL_CONSTASCII_USTRINGPARAM( ".bmp" ) );
+        aName = DirEntry( aName ).GetBase();
+        aName += String( RTL_CONSTASCII_USTRINGPARAM( ".bmp" ) );
 
         // create output file name
         aOutFile += DirEntry( aName );
diff --git a/svtools/source/dialogs/ServerDetailsControls.cxx b/svtools/source/dialogs/ServerDetailsControls.cxx
index 3bdae1bdc8c0..a9e3e4dd9060 100644
--- a/svtools/source/dialogs/ServerDetailsControls.cxx
+++ b/svtools/source/dialogs/ServerDetailsControls.cxx
@@ -126,7 +126,7 @@ INetURLObject HostDetailsContainer::getUrl( )
         if ( !sPath.isEmpty( ) )
             if ( sPath.indexOf( '/' ) != 0 )
                 sUrl += "/";
-            sUrl += sPath;
+        sUrl += sPath;
     }
 
     return INetURLObject( sUrl );
@@ -235,7 +235,7 @@ INetURLObject SmbDetailsContainer::getUrl( )
         if ( !sPath.isEmpty( ) )
             if ( sPath.indexOf( '/' ) != 0 )
                 sUrl += "/";
-            sUrl += sPath;
+        sUrl += sPath;
     }
 
     return INetURLObject( sUrl );
diff --git a/svtools/source/misc/acceleratorexecute.cxx b/svtools/source/misc/acceleratorexecute.cxx
index d68fc58bfff7..6bd32c9e3e89 100644
--- a/svtools/source/misc/acceleratorexecute.cxx
+++ b/svtools/source/misc/acceleratorexecute.cxx
@@ -224,7 +224,7 @@ css::awt::KeyEvent AcceleratorExecute::st_VCLKey2AWTKey(const KeyCode& aVCLKey)
         aAWTKey.Modifiers |= css::awt::KeyModifier::MOD1;
     if (aVCLKey.IsMod2())
         aAWTKey.Modifiers |= css::awt::KeyModifier::MOD2;
-        if (aVCLKey.IsMod3())
+    if (aVCLKey.IsMod3())
         aAWTKey.Modifiers |= css::awt::KeyModifier::MOD3;
     return aAWTKey;
 }
diff --git a/svtools/source/toolpanel/tabbargeometry.cxx b/svtools/source/toolpanel/tabbargeometry.cxx
index 0eb4fddd1b12..43036233ed90 100644
--- a/svtools/source/toolpanel/tabbargeometry.cxx
+++ b/svtools/source/toolpanel/tabbargeometry.cxx
@@ -141,8 +141,7 @@ namespace svt
                 lcl_mirrorHorizontally( aReference, aResult );
             }
         }
-        else
-        if  ( i_eTargetAlignment == TABS_BOTTOM )
+        else if  ( i_eTargetAlignment == TABS_BOTTOM )
         {
             lcl_mirrorVertically( m_aReference, aResult );
         }
@@ -169,8 +168,7 @@ namespace svt
 
             lcl_rotate( aReference, aResult, false );
         }
-        else
-        if  ( i_eTargetAlignment == TABS_BOTTOM )
+        else if  ( i_eTargetAlignment == TABS_BOTTOM )
         {
             lcl_mirrorVertically( m_aReference, aResult );
         }
diff --git a/svtools/source/toolpanel/toolpaneldeck.cxx b/svtools/source/toolpanel/toolpaneldeck.cxx
index b07e0de8c773..957e47432bd3 100644
--- a/svtools/source/toolpanel/toolpaneldeck.cxx
+++ b/svtools/source/toolpanel/toolpaneldeck.cxx
@@ -252,15 +252,13 @@ namespace svt
         case ACTION_ACTIVATE_PREV:
             if ( !aCurrentPanel && ( nPanelCount > 0 ) )
                 aActivatePanel = nPanelCount - 1;
-            else
-            if ( !!aCurrentPanel && ( *aCurrentPanel > 0 ) )
+            else if ( !!aCurrentPanel && ( *aCurrentPanel > 0 ) )
                 aActivatePanel = *aCurrentPanel - 1;
             break;
         case ACTION_ACTIVATE_NEXT:
             if ( !aCurrentPanel && ( nPanelCount > 0 ) )
                 aActivatePanel = 0;
-            else
-            if ( !!aCurrentPanel && ( *aCurrentPanel < nPanelCount - 1 ) )
+            else if ( !!aCurrentPanel && ( *aCurrentPanel < nPanelCount - 1 ) )
                 aActivatePanel = *aCurrentPanel + 1;
             break;
         case ACTION_ACTIVATE_LAST:
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index dfe9aee667eb..f0aa24a975b6 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -451,16 +451,13 @@ ERecoveryState RecoveryCore::mapDocState2RecoverState(sal_Int32 eDocState)
        )
         eRecState = E_RECOVERY_IS_IN_PROGRESS;
     // red
-    else
-    if ((eDocState & E_DAMAGED) == E_DAMAGED)
+    else if ((eDocState & E_DAMAGED) == E_DAMAGED)
         eRecState = E_RECOVERY_FAILED;
     // yellow
-    else
-    if ((eDocState & E_INCOMPLETE) == E_INCOMPLETE)
+    else if ((eDocState & E_INCOMPLETE) == E_INCOMPLETE)
         eRecState = E_ORIGINAL_DOCUMENT_RECOVERED;
     // green
-    else
-    if ((eDocState & E_SUCCEDED) == E_SUCCEDED)
+    else if ((eDocState & E_SUCCEDED) == E_SUCCEDED)
         eRecState = E_SUCCESSFULLY_RECOVERED;
 
     return eRecState;
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index e931007c20f4..93cf2f45eea7 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -1048,7 +1048,7 @@ void SAL_CALL Cell::setPropertyValue( const OUString& rPropertyName, const Any&
                 if(!(rValue >>= nMode))
                     throw IllegalArgumentException();
 
-                    eMode = (BitmapMode)nMode;
+                eMode = (BitmapMode)nMode;
             }
 
             mpProperties->SetObjectItem( XFillBmpStretchItem( eMode == BitmapMode_STRETCH ) );
diff --git a/toolkit/source/helper/vclunohelper.cxx b/toolkit/source/helper/vclunohelper.cxx
index 3802d29ea212..deda11ed238e 100644
--- a/toolkit/source/helper/vclunohelper.cxx
+++ b/toolkit/source/helper/vclunohelper.cxx
@@ -666,7 +666,7 @@ awt::MouseEvent VCLUnoHelper::createMouseEvent( const ::MouseEvent& _rVclEvent,
     if ( _rVclEvent.IsShift() )
         aMouseEvent.Modifiers |= ::com::sun::star::awt::KeyModifier::SHIFT;
     if ( _rVclEvent.IsMod1() )
-    aMouseEvent.Modifiers |= ::com::sun::star::awt::KeyModifier::MOD1;
+        aMouseEvent.Modifiers |= ::com::sun::star::awt::KeyModifier::MOD1;
     if ( _rVclEvent.IsMod2() )
         aMouseEvent.Modifiers |= ::com::sun::star::awt::KeyModifier::MOD2;
 
diff --git a/unotools/source/config/moduleoptions.cxx b/unotools/source/config/moduleoptions.cxx
index 9023d8d700b6..0a119b8e4b40 100644
--- a/unotools/source/config/moduleoptions.cxx
+++ b/unotools/source/config/moduleoptions.cxx
@@ -1367,26 +1367,19 @@ SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByModel(const css::u
     ::rtl::OUString aModule;
     if (m_pDataContainer->IsModuleInstalled(SvtModuleOptions::E_SWRITER))
         aModule = m_pDataContainer->GetFactoryShortName(SvtModuleOptions::E_WRITER);
-    else
-    if (m_pDataContainer->IsModuleInstalled(SvtModuleOptions::E_SCALC))
+    else if (m_pDataContainer->IsModuleInstalled(SvtModuleOptions::E_SCALC))
         aModule = m_pDataContainer->GetFactoryShortName(SvtModuleOptions::E_CALC);
-    else
-    if (m_pDataContainer->IsModuleInstalled(SvtModuleOptions::E_SIMPRESS))
+    else if (m_pDataContainer->IsModuleInstalled(SvtModuleOptions::E_SIMPRESS))
         aModule = m_pDataContainer->GetFactoryShortName(SvtModuleOptions::E_IMPRESS);
-    else
-    if (m_pDataContainer->IsModuleInstalled(SvtModuleOptions::E_SDATABASE))
+    else if (m_pDataContainer->IsModuleInstalled(SvtModuleOptions::E_SDATABASE))
         aModule = m_pDataContainer->GetFactoryShortName(SvtModuleOptions::E_DATABASE);
-    else
-    if (m_pDataContainer->IsModuleInstalled(SvtModuleOptions::E_SDRAW))
+    else if (m_pDataContainer->IsModuleInstalled(SvtModuleOptions::E_SDRAW))
         aModule = m_pDataContainer->GetFactoryShortName(SvtModuleOptions::E_DRAW);
-    else
-    if (m_pDataContainer->IsModuleInstalled(SvtModuleOptions::E_SWEB))
+    else if (m_pDataContainer->IsModuleInstalled(SvtModuleOptions::E_SWEB))
         aModule = m_pDataContainer->GetFactoryShortName(SvtModuleOptions::E_WRITERWEB);
-    else
-    if (m_pDataContainer->IsModuleInstalled(SvtModuleOptions::E_SGLOBAL))
+    else if (m_pDataContainer->IsModuleInstalled(SvtModuleOptions::E_SGLOBAL))
         aModule = m_pDataContainer->GetFactoryShortName(SvtModuleOptions::E_WRITERGLOBAL);
-    else
-    if (m_pDataContainer->IsModuleInstalled(SvtModuleOptions::E_SMATH))
+    else if (m_pDataContainer->IsModuleInstalled(SvtModuleOptions::E_SMATH))
         aModule = m_pDataContainer->GetFactoryShortName(SvtModuleOptions::E_MATH);
     return aModule;
 }
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index 713e565b2cce..3ad471bb2765 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -963,9 +963,9 @@ UUIInteractionHelper::getInteractionHandlerList(
                                 xHierNameAccess( xInterface, uno::UNO_QUERY );
 
             if ( !xHierNameAccess.is() )
-            throw uno::RuntimeException(OUString(
-                        "config access does not implement XHierarchicalNameAccess"),
-                uno::Reference< uno::XInterface >());
+                throw uno::RuntimeException(OUString(
+                    "config access does not implement XHierarchicalNameAccess"),
+                    uno::Reference< uno::XInterface >());
 
             // Iterate over children.
             for ( sal_Int32 n = 0; n < nCount; ++n )
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 709c52daf4c0..29f98622dbf6 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -3872,9 +3872,9 @@ Image CheckBox::GetCheckImage( const AllSettings& rSettings, sal_uInt16 nFlags )
         ResMgr* pResMgr = ImplGetResMgr();
         pSVData->maCtrlData.mpCheckImgList = new ImageList();
         if( pResMgr )
-        LoadThemedImageList( rStyleSettings,
-                 pSVData->maCtrlData.mpCheckImgList,
-                 ResId( SV_RESID_BITMAP_CHECK+nStyle, *pResMgr ), 9 );
+            LoadThemedImageList( rStyleSettings,
+                pSVData->maCtrlData.mpCheckImgList,
+                ResId( SV_RESID_BITMAP_CHECK+nStyle, *pResMgr ), 9 );
         pSVData->maCtrlData.mnCheckStyle = nStyle;
     }
 
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index 2425147a13a7..61fa49caa611 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -2794,9 +2794,9 @@ void ImplWin::ImplDraw( bool bLayout )
 
             ImplControlValue aControlValue;
             if ( !pWin->IsEnabled() )
-            nState &= ~CTRL_STATE_ENABLED;
+                nState &= ~CTRL_STATE_ENABLED;
             if ( pWin->HasFocus() )
-            nState |= CTRL_STATE_FOCUSED;
+                nState |= CTRL_STATE_FOCUSED;
 
             // The listbox is painted over the entire control including the
             // border, but ImplWin does not contain the border => correction
diff --git a/vcl/source/filter/FilterConfigCache.cxx b/vcl/source/filter/FilterConfigCache.cxx
index edc3a38bb5d6..53d0ef822fda 100644
--- a/vcl/source/filter/FilterConfigCache.cxx
+++ b/vcl/source/filter/FilterConfigCache.cxx
@@ -191,8 +191,7 @@ void FilterConfigCache::ImplInit()
                 continue;
             if (lFlags[0].equalsIgnoreAsciiCase("import"))
                 aEntry.nFlags = 1;
-            else
-            if (lFlags[0].equalsIgnoreAsciiCase("export"))
+            else if (lFlags[0].equalsIgnoreAsciiCase("export"))
                 aEntry.nFlags = 2;
 
             ::rtl::OUString sFormatName;
diff --git a/vcl/source/filter/jpeg/jpegc.c b/vcl/source/filter/jpeg/jpegc.c
index e70aa53224fc..0f92948b45da 100644
--- a/vcl/source/filter/jpeg/jpegc.c
+++ b/vcl/source/filter/jpeg/jpegc.c
@@ -188,7 +188,7 @@ void ReadJPEG( void* pJPEGReader, void* pIStm, long* pLines )
             }
             /* PENDING ??? */
             if ( cinfo.err->msg_code == 113 )
-            break;
+                break;
 
             pTmp += nAlignedWidth;
         }
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 396c727b501c..956cd85a0276 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -3487,7 +3487,7 @@ std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitEmbeddedFont( const Physical
                         nLength2 = nEndBinaryIndex - nBeginBinaryIndex + 1; // include the last byte
                         for( it = aSections.begin(); it != aSections.end(); ++it )
                             if( *it > nBeginBinaryIndex && *it < nEndBinaryIndex )
-                            nLength2 -= 6;
+                                nLength2 -= 6;
                     }
                     else
                     {
diff --git a/vcl/unx/generic/app/i18n_keysym.cxx b/vcl/unx/generic/app/i18n_keysym.cxx
index b0b127d0d1a5..a720658335a2 100644
--- a/vcl/unx/generic/app/i18n_keysym.cxx
+++ b/vcl/unx/generic/app/i18n_keysym.cxx
@@ -343,8 +343,7 @@ KeysymToUnicode (KeySym nKeySym)
         keymap_t const* p_map = NULL;
         if (n_byte3 < INITIAL_KEYMAPS)
             p_map = p_keymap[n_byte3];
-        else
-        if (n_byte3 == 255)
+        else if (n_byte3 == 255)
             p_map = &keymap255;
 
         if ((p_map != NULL) && (n_byte4 >= p_map->first) && (n_byte4 <= p_map->last) )
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index e748bc203e85..60a0ad2426b8 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -259,8 +259,7 @@ sal_Bool SalDisplay::BestVisual( Display     *pDisplay,
         {
             bUsable = sal_False;
         }
-        else
-        if( pVInfos[i].c_class == TrueColor )
+        else if( pVInfos[i].c_class == TrueColor )
         {
             nTrueColor = 2048;
             if( pVInfos[i].depth == 24 )
@@ -2320,7 +2319,7 @@ extern "C"
             i_pEvent->xproperty.window == pSalDisplay->GetDrawable( pSalDisplay->GetDefaultXScreen() ) &&
             i_pEvent->xproperty.atom == pSalDisplay->getWMAdaptor()->getAtom( WMAdaptor::SAL_GETTIMEEVENT )
             )
-        return True;
+            return True;
 
         return False;
     }
diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx
index d4cccb2488bc..77f0cc09ecd1 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -956,22 +956,21 @@ bool SelectionManager::getPasteData( Atom selection, Atom type, Sequence< sal_In
                     && aEvent.xproperty.atom == selection )
                     bAdjustTime = true;
             }
-            else
-            if( XCheckTypedEvent( m_pDisplay,
+            else if( XCheckTypedEvent( m_pDisplay,
                                   SelectionClear,
                                   &aEvent
                                   ) )
             {
                 bHandle = true;
             }
-            else
-            if( XCheckTypedEvent( m_pDisplay,
+            else if( XCheckTypedEvent( m_pDisplay,
                                   SelectionRequest,
                                   &aEvent
                                   ) )
+            {
                 bHandle = true;
-            else
-            if( XCheckTypedEvent( m_pDisplay,
+            }
+            else if( XCheckTypedEvent( m_pDisplay,
                                   SelectionNotify,
                                   &aEvent
                                   ) )
diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx
index 2907b44bf03e..da7023bbf70f 100644
--- a/vcl/unx/generic/gdi/salgdi.cxx
+++ b/vcl/unx/generic/gdi/salgdi.cxx
@@ -464,8 +464,7 @@ BOOL X11SalGraphics::GetDitherPixmap( SalColor nSalColor )
             XFreePixmap (GetXDisplay(), hBrush_);
         hBrush_ = limitXCreatePixmap( GetXDisplay(), GetDrawable(), 8, 8, 8 );
     }
-    else
-    if( !hBrush_ )
+    else if( !hBrush_ )
         hBrush_ = limitXCreatePixmap( GetXDisplay(), GetDrawable(), 8, 8, 8 );
 
     // put the ximage to the pixmap
diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx
index fb7027eab594..391da493e039 100644
--- a/vcl/unx/generic/gdi/salgdi3.cxx
+++ b/vcl/unx/generic/gdi/salgdi3.cxx
@@ -171,7 +171,7 @@ bool X11SalGraphics::setFont( const FontSelectPattern *pEntry, int nFallbackLeve
 
     // return early if there is no new font
     if( !pEntry )
-    return false;
+        return false;
 
     bFontVertical_ = pEntry->mbVertical;
 
diff --git a/vcl/unx/generic/gdi/salvd.cxx b/vcl/unx/generic/gdi/salvd.cxx
index f24104970001..80b1e64985b8 100644
--- a/vcl/unx/generic/gdi/salvd.cxx
+++ b/vcl/unx/generic/gdi/salvd.cxx
@@ -104,11 +104,9 @@ void X11SalGraphics::Init( X11SalVirtualDevice *pDevice, SalColormap* pColormap,
         if( bDeleteColormap )
             m_pDeleteColormap = pColormap;
     }
-    else
-    if( nDeviceDepth == nVisualDepth )
+    else if( nDeviceDepth == nVisualDepth )
         m_pColormap = &pDisplay->GetColormap( m_nXScreen );
-    else
-    if( nDeviceDepth == 1 )
+    else if( nDeviceDepth == 1 )
         m_pColormap = m_pDeleteColormap = new SalColormap();
 
     if (m_pDeleteColormap != pOrigDeleteColormap)
diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx
index e1e1ca9d286e..6db49042a578 100644
--- a/vcl/unx/generic/printer/printerinfomanager.cxx
+++ b/vcl/unx/generic/printer/printerinfomanager.cxx
@@ -608,7 +608,7 @@ void PrinterInfoManager::initialize()
 
         if( m_aPrinters.find( aPrinterName ) != m_aPrinters.end() )
             // probably user made this one permanent in padmin
-        continue;
+            continue;
 
         String aCmd( m_aSystemPrintCommand );
         aCmd.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "(PRINTER)" ) ), it->m_aQueue );
@@ -710,7 +710,7 @@ bool PrinterInfoManager::writePrinterConfig()
     {
         if( ! it->second.m_bModified )
             // printer was not changed, do nothing
-        continue;
+            continue;
 
         // don't save autoqueue printers
         sal_Int32 nIndex = 0;
@@ -973,7 +973,7 @@ void PrinterInfoManager::fillFontSubstitutions( PrinterInfo& rInfo ) const
 
     if( ! rInfo.m_bPerformFontSubstitution ||
         ! rInfo.m_aFontSubstitutes.size() )
-    return;
+        return;
 
     ::std::list< FastPrintFontInfo > aFonts;
     ::boost::unordered_map< OUString, ::std::list< FastPrintFontInfo >, OUStringHash > aPrinterFonts;
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index c35109b4bfbc..50f2aef1d185 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -2596,10 +2596,10 @@ static sal_uInt16 sal_GetCode( int state )
     if( state & Mod1Mask )
         nCode |= KEY_MOD2;
 
-        // Map Meta/Super modifier to MOD3 on all Unix systems
-        // except Mac OS X
-        if( (state & Mod3Mask) )
-            nCode |= KEY_MOD3;
+    // Map Meta/Super modifier to MOD3 on all Unix systems
+    // except Mac OS X
+    if( (state & Mod3Mask) )
+        nCode |= KEY_MOD3;
 
     return nCode;
 }
@@ -3217,8 +3217,7 @@ long X11SalFrame::HandleKeyEvent( XKeyEvent *pEvent )
         pString = &nKeyString;
         nSize = 1;
     }
-    else
-    if (nLen > 0 && nEncoding != RTL_TEXTENCODING_UNICODE)
+    else if (nLen > 0 && nEncoding != RTL_TEXTENCODING_UNICODE)
     {
         // create text converter
         rtl_TextToUnicodeConverter aConverter =
@@ -3244,8 +3243,7 @@ long X11SalFrame::HandleKeyEvent( XKeyEvent *pEvent )
 
         pString = pBuffer;
     }
-    else
-    if (nLen > 0 /* nEncoding == RTL_TEXTENCODING_UNICODE */)
+    else if (nLen > 0 /* nEncoding == RTL_TEXTENCODING_UNICODE */)
     {
         pString = (sal_Unicode*)pPrintable;
           nSize = nLen;
diff --git a/vcl/unx/generic/window/salobj.cxx b/vcl/unx/generic/window/salobj.cxx
index d5b00023ad5c..16b4e22feeea 100644
--- a/vcl/unx/generic/window/salobj.cxx
+++ b/vcl/unx/generic/window/salobj.cxx
@@ -436,8 +436,8 @@ static sal_uInt16 sal_GetCode( int state )
         nCode |= KEY_MOD1;
     if( state & Mod1Mask )
         nCode |= KEY_MOD2;
-        if( state & Mod3Mask )
-                nCode |= KEY_MOD3;
+    if( state & Mod3Mask )
+        nCode |= KEY_MOD3;
 
     return nCode;
 }
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index 249b9f6cd8d8..07f6fb3f70e4 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -4190,7 +4190,7 @@ uno::Reference<accessibility::XAccessibleEditableText>
         uno::Reference< accessibility::XAccessible > xChild = xContext->getAccessibleChild(i);
         if (!xChild.is())
             continue;
-            uno::Reference< accessibility::XAccessibleContext > xChildContext = xChild->getAccessibleContext();
+        uno::Reference< accessibility::XAccessibleContext > xChildContext = xChild->getAccessibleContext();
         if (!xChildContext.is())
             continue;
         uno::Reference< accessibility::XAccessibleEditableText > xText = FindFocus(xChildContext);
diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx
index 8f6c26b9a047..7b8b4eeba2d7 100644
--- a/vcl/unx/kde/salnativewidgets-kde.cxx
+++ b/vcl/unx/kde/salnativewidgets-kde.cxx
@@ -1100,7 +1100,7 @@ QToolBar *WidgetPainter::toolBar( const Rectangle& rControlRegion, sal_Bool bHor
 QToolButton *WidgetPainter::toolButton( const Rectangle& rControlRegion)
 {
     if ( !m_pToolButton )
-    m_pToolButton = new QToolButton( NULL, "tool_button" );
+        m_pToolButton = new QToolButton( NULL, "tool_button" );
 
     QRect qRect = region2QRect( rControlRegion );
 
@@ -1155,7 +1155,7 @@ QPopupMenu *WidgetPainter::popupMenu( const Rectangle& rControlRegion)
 QProgressBar *WidgetPainter::progressBar( const Rectangle& rControlRegion )
 {
     if ( !m_pProgressBar )
-    m_pProgressBar = new QProgressBar( NULL, "progress_bar" );
+        m_pProgressBar = new QProgressBar( NULL, "progress_bar" );
 
     QRect qRect = region2QRect( rControlRegion );
 
@@ -1299,9 +1299,9 @@ sal_Bool KDESalGraphics::hitTestNativeControl( ControlType nType, ControlPart nP
             QStyle::CC_ScrollBar, pScrollBar,
             QStyle::SC_ScrollBarAddPage ).right() + 1 );
         if ( qRectAddLine.width() > qRectSubLine.width() )
-        bTwoSubButtons = sal_True;
+            bTwoSubButtons = sal_True;
         if ( qRectSubLine.left() > kapp->style().querySubControlMetrics( QStyle::CC_ScrollBar, pScrollBar, QStyle::SC_ScrollBarSubPage ).left() )
-        bPlatinumStyle = sal_True;
+            bPlatinumStyle = sal_True;
     }
     else
     {
@@ -1309,9 +1309,9 @@ sal_Bool KDESalGraphics::hitTestNativeControl( ControlType nType, ControlPart nP
             QStyle::CC_ScrollBar, pScrollBar,
             QStyle::SC_ScrollBarAddPage ).bottom() + 1 );
         if ( qRectAddLine.height() > qRectSubLine.height() )
-        bTwoSubButtons = sal_True;
+            bTwoSubButtons = sal_True;
         if ( qRectSubLine.top() > kapp->style().querySubControlMetrics( QStyle::CC_ScrollBar, pScrollBar, QStyle::SC_ScrollBarSubPage ).top() )
-        bPlatinumStyle = sal_True;
+            bPlatinumStyle = sal_True;
     }
 
     switch ( nPart )
@@ -1678,11 +1678,11 @@ sal_Bool KDESalGraphics::getNativeControlRegion( ControlType nType, ControlPart
             // Workaround for Platinum and 3 button style scroll bars.
             // It makes the right/down button bigger.
             if ( nPart == PART_BUTTON_RIGHT )
-            qRect.setLeft( kapp->style().querySubControlMetrics(
+                qRect.setLeft( kapp->style().querySubControlMetrics(
                     QStyle::CC_ScrollBar, pWidget,
                     QStyle::SC_ScrollBarAddPage ).right() + 1 );
             else
-            qRect.setTop( kapp->style().querySubControlMetrics(
+                qRect.setTop( kapp->style().querySubControlMetrics(
                     QStyle::CC_ScrollBar, pWidget,
                     QStyle::SC_ScrollBarAddPage ).bottom() + 1 );