loplugin:indentation in vcl

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

45 files changed, 140 insertions, 143 deletions

diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx
index c1634351f0ad..8b49913d394f 100644
--- a/vcl/source/app/help.cxx
+++ b/vcl/source/app/help.cxx
@@ -462,7 +462,7 @@ IMPL_LINK( HelpTextWindow, TimerHdl, Timer*, pTimer, void)
     else
     {
         SAL_WARN_IF( pTimer != &maHideTimer, "vcl", "HelpTextWindow::TimerHdl with bad Timer" );
-          ImplDestroyHelpWindow( true );
+        ImplDestroyHelpWindow( true );
     }
 }
 
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index c543732630de..1c91dc01a721 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -221,7 +221,7 @@ int ImplSVMain()
             SolarMutexReleaser aReleaser;
             pSVData->mxAccessBridge->dispose();
         }
-      pSVData->mxAccessBridge.clear();
+        pSVData->mxAccessBridge.clear();
     }
 
 #if HAVE_FEATURE_OPENGL
diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx
index dc1a66e530f9..a18b50e75191 100644
--- a/vcl/source/control/ctrl.cxx
+++ b/vcl/source/control/ctrl.cxx
@@ -288,7 +288,7 @@ void Control::AppendLayoutData( const Control& rSubControl ) const
     for( n = 1; n < nLines; n++ )
         mpControlData->mpLayoutData->m_aLineIndices.push_back( rSubControl.mpControlData->mpLayoutData->m_aLineIndices[n] + nCurrentIndex );
     int nRectangles = rSubControl.mpControlData->mpLayoutData->m_aUnicodeBoundRects.size();
-        tools::Rectangle aRel = const_cast<Control&>(rSubControl).GetWindowExtentsRelative( const_cast<Control*>(this) );
+    tools::Rectangle aRel = const_cast<Control&>(rSubControl).GetWindowExtentsRelative( const_cast<Control*>(this) );
     for( n = 0; n < nRectangles; n++ )
     {
         tools::Rectangle aRect = rSubControl.mpControlData->mpLayoutData->m_aUnicodeBoundRects[n];
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index d444bc8c678e..43d6520bfbab 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -741,7 +741,7 @@ bool NumericField::set_property(const OString &rKey, const OUString &rValue)
 
 bool NumericField::PreNotify( NotifyEvent& rNEvt )
 {
-        if ( (rNEvt.GetType() == MouseNotifyEvent::KEYINPUT) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() )
+    if ( (rNEvt.GetType() == MouseNotifyEvent::KEYINPUT) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() )
     {
         if ( ImplNumericProcessKeyInput( *rNEvt.GetKeyEvent(), IsStrictFormat(), IsUseThousandSep(), ImplGetLocaleDataWrapper() ) )
             return true;
diff --git a/vcl/source/control/imgctrl.cxx b/vcl/source/control/imgctrl.cxx
index 29d7f171ad39..0dff697a6391 100644
--- a/vcl/source/control/imgctrl.cxx
+++ b/vcl/source/control/imgctrl.cxx
@@ -154,7 +154,7 @@ void ImageControl::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSiz
 {
     const Point     aPos  = pDev->LogicToPixel( rPos );
     const Size      aSize = pDev->LogicToPixel( rSize );
-          tools::Rectangle aRect( aPos, aSize );
+    tools::Rectangle aRect( aPos, aSize );
 
     pDev->Push();
     pDev->SetMapMode();
diff --git a/vcl/source/control/notebookbar.cxx b/vcl/source/control/notebookbar.cxx
index e7b94551c5cc..e55ea57547c3 100644
--- a/vcl/source/control/notebookbar.cxx
+++ b/vcl/source/control/notebookbar.cxx
@@ -196,8 +196,8 @@ void NotebookBar::UpdateBackground()
 {
     const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
     const BitmapEx& aPersona = rStyleSettings.GetPersonaHeader();
-        Wallpaper aWallpaper(aPersona);
-        aWallpaper.SetStyle(WallpaperStyle::TopRight);
+    Wallpaper aWallpaper(aPersona);
+    aWallpaper.SetStyle(WallpaperStyle::TopRight);
     if (!aPersona.IsEmpty())
         {
             SetBackground(aWallpaper);
diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index f64622354fdf..3ba002e6cdff 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -125,7 +125,7 @@ void ImpVclMEdit::ImpUpdateSrollBarVis( WinBits nWinStyle )
     const bool bHaveHScroll = (nullptr != mpHScrollBar);
     const bool bHaveScrollBox = (nullptr != mpScrollBox);
 
-          bool bNeedVScroll = ( nWinStyle & WB_VSCROLL ) == WB_VSCROLL;
+    bool bNeedVScroll = ( nWinStyle & WB_VSCROLL ) == WB_VSCROLL;
     const bool bNeedHScroll = ( nWinStyle & WB_HSCROLL ) == WB_HSCROLL;
 
     const bool bAutoVScroll = ( nWinStyle & WB_AUTOVSCROLL ) == WB_AUTOVSCROLL;
diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index d78e054a9a87..74bd19f35187 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -831,10 +831,10 @@ static Graphic ImpGetScaledGraphic( const Graphic& rGraphic, FilterConfigItem& r
                 aMap.SetScaleY( aFrac );
 
                 Size aOldSize = aBitmap.GetSizePixel();
-               aGraphic = rGraphic;
-               aGraphic.SetPrefMapMode( aMap );
-               aGraphic.SetPrefSize( Size( aOldSize.Width() * 100,
-                                           aOldSize.Height() * 100 ) );
+                aGraphic = rGraphic;
+                aGraphic.SetPrefMapMode( aMap );
+                aGraphic.SetPrefSize( Size( aOldSize.Width() * 100,
+                                            aOldSize.Height() * 100 ) );
             }
             // Size is set
             else if( nMode == 2 )
diff --git a/vcl/source/filter/wmf/emfwr.cxx b/vcl/source/filter/wmf/emfwr.cxx
index 52d86c92b188..c3200c53020d 100644
--- a/vcl/source/filter/wmf/emfwr.cxx
+++ b/vcl/source/filter/wmf/emfwr.cxx
@@ -595,13 +595,13 @@ void EMFWriter::ImplWriteExtent( long nExtent )
 void EMFWriter::ImplWritePoint( const Point& rPoint )
 {
     const Point aPoint( OutputDevice::LogicToLogic( rPoint, maVDev->GetMapMode(), maDestMapMode ));
-     m_rStm.WriteInt32( aPoint.X() ).WriteInt32( aPoint.Y() );
+    m_rStm.WriteInt32( aPoint.X() ).WriteInt32( aPoint.Y() );
 }
 
 void EMFWriter::ImplWriteSize( const Size& rSize)
 {
     const Size aSize( OutputDevice::LogicToLogic( rSize, maVDev->GetMapMode(), maDestMapMode ));
-     m_rStm.WriteInt32( aSize.Width() ).WriteInt32( aSize.Height() );
+    m_rStm.WriteInt32( aSize.Width() ).WriteInt32( aSize.Height() );
 }
 
 void EMFWriter::ImplWriteRect( const tools::Rectangle& rRect )
diff --git a/vcl/source/filter/wmf/wmfwr.cxx b/vcl/source/filter/wmf/wmfwr.cxx
index f787401fba1b..6b656970752f 100644
--- a/vcl/source/filter/wmf/wmfwr.cxx
+++ b/vcl/source/filter/wmf/wmfwr.cxx
@@ -1612,16 +1612,16 @@ void WMFWriter::WriteRecords( const GDIMetaFile & rMTF )
                 default:
                     // TODO: Implement more cases as necessary. Let's not bother with a warning.
                 break;
-          }
+            }
 
-          nWrittenActions++;
-          MayCallback();
+            nWrittenActions++;
+            MayCallback();
 
-          if (pWMF->GetError())
-            bStatus=false;
+            if (pWMF->GetError())
+                bStatus=false;
 
-          if(!bStatus)
-            break;
+            if(!bStatus)
+                break;
         }
     }
 }
diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx
index ef230704cd66..ade0a6607a8f 100644
--- a/vcl/source/fontsubset/cff.cxx
+++ b/vcl/source/fontsubset/cff.cxx
@@ -1109,10 +1109,10 @@ int CffSubsetterContext::convert2Type1Ops( CffLocal* pCffLocal, const U8* const
     writeType1Val( 0); // TODO: aSubsetterContext.getLeftSideBearing();
     writeType1Val( 1000/*###getCharWidth()###*/);
     writeTypeOp( TYPE1OP::HSBW);
-mbNeedClose = false;
-mbIgnoreHints = false;
-mnHintSize=mnHorzHintSize=mnStackIdx=0; maCharWidth=-1;//#######
-mnCntrMask = 0;
+    mbNeedClose = false;
+    mbIgnoreHints = false;
+    mnHintSize=mnHorzHintSize=mnStackIdx=0; maCharWidth=-1;//#######
+    mnCntrMask = 0;
     while( mpReadPtr < mpReadEnd)
         convertOneTypeOp();
 //  if( bActivePath)
@@ -1496,7 +1496,7 @@ int CffSubsetterContext::getGlyphSID( int nGlyphIndex) const
         return -1;
 
     // get the SID/CID from the Charset table
-     const U8* pReadPtr = mpBasePtr + mnCharsetBase;
+    const U8* pReadPtr = mpBasePtr + mnCharsetBase;
     const U8 nCSetFormat = *(pReadPtr++);
     int nGlyphsToSkip = nGlyphIndex - 1;
     switch( nCSetFormat) {
@@ -1566,7 +1566,7 @@ const char* CffSubsetterContext::getGlyphName( int nGlyphIndex)
              sprintf( aDefaultGlyphName, "bad%03d", nSID);
     }
 
-     return pGlyphName;
+    return pGlyphName;
 }
 
 class Type1Emitter
@@ -1984,10 +1984,10 @@ void CffSubsetterContext::emitAsType1( Type1Emitter& rEmitter,
     rEmitter.emitAllCrypted();
 
     // mark stop of eexec encryption
-     if( rEmitter.mbPfbSubset) {
+    if( rEmitter.mbPfbSubset) {
         const int nEExecLen = rEmitter.tellPos() - nEExecSegTell;
         rEmitter.updateLen( nEExecSegTell-4, nEExecLen);
-     }
+    }
 
     // create PFB footer
     static const char aPfxFooter[] = "\x80\x01\x14\x02\x00\x00\n" // TODO: check segment len
diff --git a/vcl/source/gdi/gradient.cxx b/vcl/source/gdi/gradient.cxx
index 3dd7ded0b141..e60009519a34 100644
--- a/vcl/source/gdi/gradient.cxx
+++ b/vcl/source/gdi/gradient.cxx
@@ -145,8 +145,8 @@ void Gradient::GetBoundRect( const tools::Rectangle& rRect, tools::Rectangle& rB
                           fHeight * fabs( sin( fAngle ) );
         double  fDY     = fHeight * fabs( cos( fAngle ) ) +
                           fWidth  * fabs( sin( fAngle ) );
-                fDX     = (fDX - fWidth)  * 0.5 + 0.5;
-                fDY     = (fDY - fHeight) * 0.5 + 0.5;
+        fDX     = (fDX - fWidth)  * 0.5 + 0.5;
+        fDY     = (fDY - fHeight) * 0.5 + 0.5;
         aRect.AdjustLeft( -static_cast<long>(fDX) );
         aRect.AdjustRight(static_cast<long>(fDX) );
         aRect.AdjustTop( -static_cast<long>(fDY) );
diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index 8a6bbbd5cf76..91abacfde3be 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -1458,7 +1458,7 @@ void MetaBmpAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     if( !!maBmp )
     {
         MetaAction::Write(rOStm, pData);
-    VersionCompat aCompat(rOStm, StreamMode::WRITE, 1);
+        VersionCompat aCompat(rOStm, StreamMode::WRITE, 1);
         WriteDIB(maBmp, rOStm, false, true);
         WritePair( rOStm, maPt );
     }
diff --git a/vcl/source/gdi/pdfextoutdevdata.cxx b/vcl/source/gdi/pdfextoutdevdata.cxx
index f41b743cbaaf..df90d4592c80 100644
--- a/vcl/source/gdi/pdfextoutdevdata.cxx
+++ b/vcl/source/gdi/pdfextoutdevdata.cxx
@@ -149,7 +149,7 @@ void GlobalSyncData::PlayGlobalActions( PDFWriter& rWriter )
         {
             case PDFExtOutDevDataSync::CreateNamedDest : //i56629
             {
-                 rWriter.Push( PushFlags::MAPMODE );
+                rWriter.Push( PushFlags::MAPMODE );
                 rWriter.SetMapMode( mParaMapModes.front() );
                 mParaMapModes.pop_front();
                 mParaIds.push_back( rWriter.CreateNamedDest( mParaOUStrings.front(), mParaRects.front(), mParaInts.front(), mParaDestAreaTypes.front() ) );
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index cdcfdc00bd3b..fdfc4cdabade 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -5401,8 +5401,8 @@ sal_Int32 PDFWriterImpl::emitInfoDict( )
             aLine.append( "\n" );
         }
 
-         aLine.append( "/CreationDate" );
-         appendLiteralStringEncrypt( m_aCreationDateString, nObject, aLine );
+        aLine.append( "/CreationDate" );
+        appendLiteralStringEncrypt( m_aCreationDateString, nObject, aLine );
         aLine.append( ">>\nendobj\n\n" );
         if( ! writeBuffer( aLine.getStr(), aLine.getLength() ) )
             nObject = 0;
diff --git a/vcl/source/graphic/UnoGraphicDescriptor.cxx b/vcl/source/graphic/UnoGraphicDescriptor.cxx
index 68d3b45b6451..7d89a8b7ca70 100644
--- a/vcl/source/graphic/UnoGraphicDescriptor.cxx
+++ b/vcl/source/graphic/UnoGraphicDescriptor.cxx
@@ -319,7 +319,7 @@ void GraphicDescriptor::_getPropertyValues( const comphelper::PropertyMapEntry**
                 else
                     aMimeType = maMimeType;
 
-                 *pValues <<= aMimeType;
+                *pValues <<= aMimeType;
             }
             break;
 
diff --git a/vcl/source/outdev/gradient.cxx b/vcl/source/outdev/gradient.cxx
index 630d99234273..fad0604920e0 100644
--- a/vcl/source/outdev/gradient.cxx
+++ b/vcl/source/outdev/gradient.cxx
@@ -293,14 +293,14 @@ void OutputDevice::DrawLinearGradient( const tools::Rectangle& rRect,
     long    nEndRed     = aEndCol.GetRed();
     long    nEndGreen   = aEndCol.GetGreen();
     long    nEndBlue    = aEndCol.GetBlue();
-            nFactor     = rGradient.GetStartIntensity();
-            nStartRed   = (nStartRed   * nFactor) / 100;
-            nStartGreen = (nStartGreen * nFactor) / 100;
-            nStartBlue  = (nStartBlue  * nFactor) / 100;
-            nFactor     = rGradient.GetEndIntensity();
-            nEndRed     = (nEndRed   * nFactor) / 100;
-            nEndGreen   = (nEndGreen * nFactor) / 100;
-            nEndBlue    = (nEndBlue  * nFactor) / 100;
+    nFactor     = rGradient.GetStartIntensity();
+    nStartRed   = (nStartRed   * nFactor) / 100;
+    nStartGreen = (nStartGreen * nFactor) / 100;
+    nStartBlue  = (nStartBlue  * nFactor) / 100;
+    nFactor     = rGradient.GetEndIntensity();
+    nEndRed     = (nEndRed   * nFactor) / 100;
+    nEndGreen   = (nEndGreen * nFactor) / 100;
+    nEndBlue    = (nEndBlue  * nFactor) / 100;
 
     // gradient style axial has exchanged start and end colors
     if ( !bLinear)
@@ -651,14 +651,14 @@ void OutputDevice::DrawLinearGradientToMetafile( const tools::Rectangle& rRect,
     long    nEndRed     = aEndCol.GetRed();
     long    nEndGreen   = aEndCol.GetGreen();
     long    nEndBlue    = aEndCol.GetBlue();
-            nFactor     = rGradient.GetStartIntensity();
-            nStartRed   = (nStartRed   * nFactor) / 100;
-            nStartGreen = (nStartGreen * nFactor) / 100;
-            nStartBlue  = (nStartBlue  * nFactor) / 100;
-            nFactor     = rGradient.GetEndIntensity();
-            nEndRed     = (nEndRed   * nFactor) / 100;
-            nEndGreen   = (nEndGreen * nFactor) / 100;
-            nEndBlue    = (nEndBlue  * nFactor) / 100;
+    nFactor     = rGradient.GetStartIntensity();
+    nStartRed   = (nStartRed   * nFactor) / 100;
+    nStartGreen = (nStartGreen * nFactor) / 100;
+    nStartBlue  = (nStartBlue  * nFactor) / 100;
+    nFactor     = rGradient.GetEndIntensity();
+    nEndRed     = (nEndRed   * nFactor) / 100;
+    nEndGreen   = (nEndGreen * nFactor) / 100;
+    nEndBlue    = (nEndBlue  * nFactor) / 100;
 
     // gradient style axial has exchanged start and end colors
     if ( !bLinear)
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index 054c92d068e8..45b9848c051a 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -281,7 +281,7 @@ void OutputDevice::ImplDrawTextDirect( SalLayout& rSalLayout,
     {
         long w = IsVirtual() ? mnOutWidth : mpGraphics->GetGraphicsWidth();
         long x = rSalLayout.DrawBase().X();
-           rSalLayout.DrawBase().setX( w - 1 - x );
+        rSalLayout.DrawBase().setX( w - 1 - x );
         if( !IsRTLEnabled() )
         {
             OutputDevice *pOutDevRef = this;
diff --git a/vcl/source/treelist/svimpbox.cxx b/vcl/source/treelist/svimpbox.cxx
index cdd18ce04ed1..e8d927634960 100644
--- a/vcl/source/treelist/svimpbox.cxx
+++ b/vcl/source/treelist/svimpbox.cxx
@@ -1019,8 +1019,8 @@ void SvImpLBox::DrawNet(vcl::RenderContext& rRenderContext)
 
     // for platforms that don't have nets, DrawNativeControl does nothing and returns true
     // so that SvImpLBox::DrawNet() doesn't draw anything either
-     if (rRenderContext.IsNativeControlSupported(ControlType::ListNet, ControlPart::Entire))
-     {
+    if (rRenderContext.IsNativeControlSupported(ControlType::ListNet, ControlPart::Entire))
+    {
         ImplControlValue aControlValue;
         if (rRenderContext.DrawNativeControl(ControlType::ListNet, ControlPart::Entire,
                                              tools::Rectangle(), ControlState::ENABLED, aControlValue, OUString()))
diff --git a/vcl/source/treelist/transfer.cxx b/vcl/source/treelist/transfer.cxx
index 40110d951b43..cc7b97ba02df 100644
--- a/vcl/source/treelist/transfer.cxx
+++ b/vcl/source/treelist/transfer.cxx
@@ -2093,7 +2093,7 @@ TransferableDataHelper TransferableDataHelper::CreateFromSelection( vcl::Window*
     DBG_ASSERT( pWindow, "Window pointer is NULL" );
 
     Reference< XClipboard > xSelection;
-       TransferableDataHelper   aRet;
+    TransferableDataHelper   aRet;
 
     if( pWindow )
         xSelection = pWindow->GetPrimarySelection();
diff --git a/vcl/source/treelist/transfer2.cxx b/vcl/source/treelist/transfer2.cxx
index a5a698e076f0..9d959d02bf8c 100644
--- a/vcl/source/treelist/transfer2.cxx
+++ b/vcl/source/treelist/transfer2.cxx
@@ -387,12 +387,12 @@ void TransferDataContainer::CopyINetBookmark( const INetBookmark& rBkmk )
     else
         *pImpl->pBookmk = rBkmk;
 
-     AddFormat( SotClipboardFormatId::STRING );
-     AddFormat( SotClipboardFormatId::SOLK );
-     AddFormat( SotClipboardFormatId::NETSCAPE_BOOKMARK );
-     AddFormat( SotClipboardFormatId::FILECONTENT );
-     AddFormat( SotClipboardFormatId::FILEGRPDESCRIPTOR );
-     AddFormat( SotClipboardFormatId::UNIFORMRESOURCELOCATOR );
+    AddFormat( SotClipboardFormatId::STRING );
+    AddFormat( SotClipboardFormatId::SOLK );
+    AddFormat( SotClipboardFormatId::NETSCAPE_BOOKMARK );
+    AddFormat( SotClipboardFormatId::FILECONTENT );
+    AddFormat( SotClipboardFormatId::FILEGRPDESCRIPTOR );
+    AddFormat( SotClipboardFormatId::UNIFORMRESOURCELOCATOR );
 }
 
 
@@ -408,7 +408,7 @@ void TransferDataContainer::CopyAnyData( SotClipboardFormatId nFormatId,
         memcpy( aSeq.getArray(), pData, nLen );
         aEntry.aAny <<= aSeq;
         pImpl->aFmtList.push_back( aEntry );
-         AddFormat( nFormatId );
+        AddFormat( nFormatId );
     }
 }
 
@@ -428,7 +428,7 @@ void TransferDataContainer::CopyString( SotClipboardFormatId nFmt, const OUStrin
         aEntry.nId = nFmt;
         aEntry.aAny <<= rStr;
         pImpl->aFmtList.push_back( aEntry );
-         AddFormat( aEntry.nId );
+        AddFormat( aEntry.nId );
     }
 }
 
diff --git a/vcl/source/window/accel.cxx b/vcl/source/window/accel.cxx
index a988a4966bc2..3a5e31baf8d2 100644
--- a/vcl/source/window/accel.cxx
+++ b/vcl/source/window/accel.cxx
@@ -173,7 +173,7 @@ void Accelerator::ImplInsertAccel( sal_uInt16 nItemId, const vcl::KeyCode& rKeyC
         sal_uInt16 nCode1;
         sal_uInt16 nCode2;
         sal_uInt16 nCode3;
-                sal_uInt16 nCode4;
+        sal_uInt16 nCode4;
         ImplGetKeyCode( rKeyCode.GetFunction(), nCode1, nCode2, nCode3, nCode4 );
         if ( nCode1 )
             ImplInsertAccel( nItemId, vcl::KeyCode( nCode1, nCode1 ), bEnable, pAutoAccel );
diff --git a/vcl/source/window/accessibility.cxx b/vcl/source/window/accessibility.cxx
index de117cce9554..a4e800373347 100644
--- a/vcl/source/window/accessibility.cxx
+++ b/vcl/source/window/accessibility.cxx
@@ -421,7 +421,7 @@ sal_uInt16 Window::GetAccessibleRole() const
 
 void Window::SetAccessibleName( const OUString& rName )
 {
-   if ( !mpWindowImpl->mpAccessibleInfos )
+    if ( !mpWindowImpl->mpAccessibleInfos )
         mpWindowImpl->mpAccessibleInfos.reset( new ImplAccessibleInfos );
 
     OUString oldName = GetAccessibleName();
@@ -506,7 +506,7 @@ OUString Window::getDefaultAccessibleName() const
 
 void Window::SetAccessibleDescription( const OUString& rDescription )
 {
-   if ( ! mpWindowImpl->mpAccessibleInfos )
+    if ( ! mpWindowImpl->mpAccessibleInfos )
         mpWindowImpl->mpAccessibleInfos.reset( new ImplAccessibleInfos );
 
     SAL_WARN_IF( mpWindowImpl->mpAccessibleInfos->pAccessibleDescription, "vcl", "AccessibleDescription already set!" );
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 0798c634df90..beb003238bda 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -892,18 +892,18 @@ bool Dialog::ImplStartExecute()
             std::abort();
         }
 
-    if (bKitActive)
-    {
-        if(const vcl::ILibreOfficeKitNotifier* pNotifier = GetLOKNotifier())
+        if (bKitActive)
         {
-            std::vector<vcl::LOKPayloadItem> aItems;
-            aItems.emplace_back("type", "dialog");
-            aItems.emplace_back("size", GetSizePixel().toString());
-            if (!GetText().isEmpty())
-                aItems.emplace_back("title", GetText().toUtf8());
-            pNotifier->notifyWindow(GetLOKWindowId(), "created", aItems);
+            if(const vcl::ILibreOfficeKitNotifier* pNotifier = GetLOKNotifier())
+            {
+                std::vector<vcl::LOKPayloadItem> aItems;
+                aItems.emplace_back("type", "dialog");
+                aItems.emplace_back("size", GetSizePixel().toString());
+                if (!GetText().isEmpty())
+                    aItems.emplace_back("title", GetText().toUtf8());
+                pNotifier->notifyWindow(GetLOKWindowId(), "created", aItems);
+            }
         }
-    }
 
 #ifdef DBG_UTIL
         vcl::Window* pParent = GetParent();
diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx
index cb039abba23e..d6e73910805d 100644
--- a/vcl/source/window/dlgctrl.cxx
+++ b/vcl/source/window/dlgctrl.cxx
@@ -1005,7 +1005,7 @@ void Window::ImplDlgCtrlNextWindow()
             ((pDlgCtrlParent->GetStyle() & (WB_DIALOGCONTROL | WB_NODIALOGCONTROL)) != WB_DIALOGCONTROL) )
         pDlgCtrlParent = pDlgCtrlParent->ImplGetParent();
 
-if ( !pDlgCtrlParent || (GetStyle() & WB_NODIALOGCONTROL) || ((pDlgCtrlParent->GetStyle() & (WB_DIALOGCONTROL | WB_NODIALOGCONTROL)) != WB_DIALOGCONTROL) )
+    if ( !pDlgCtrlParent || (GetStyle() & WB_NODIALOGCONTROL) || ((pDlgCtrlParent->GetStyle() & (WB_DIALOGCONTROL | WB_NODIALOGCONTROL)) != WB_DIALOGCONTROL) )
         return;
 
     // lookup window in child list
diff --git a/vcl/source/window/dndlistenercontainer.cxx b/vcl/source/window/dndlistenercontainer.cxx
index bc0934a1ed1a..5d430629c254 100644
--- a/vcl/source/window/dndlistenercontainer.cxx
+++ b/vcl/source/window/dndlistenercontainer.cxx
@@ -174,7 +174,7 @@ sal_uInt32 DNDListenerContainer::fireDragExitEvent()
 
                 if( xListener.is() )
                 {
-                       xListener->dragExit( aEvent );
+                    xListener->dragExit( aEvent );
                     nRet++;
                 }
             }
@@ -222,7 +222,7 @@ sal_uInt32 DNDListenerContainer::fireDragOverEvent( const Reference< XDropTarget
                 {
                     if( m_xDropTargetDragContext.is() )
                         xListener->dragOver( aEvent );
-                      nRet++;
+                    nRet++;
                 }
             }
             catch (const RuntimeException&)
@@ -345,7 +345,7 @@ sal_uInt32 DNDListenerContainer::fireDropActionChangedEvent( const Reference< XD
                 {
                     if( m_xDropTargetDragContext.is() )
                         xListener->dropActionChanged( aEvent );
-                       nRet++;
+                    nRet++;
                 }
             }
             catch (const RuntimeException&)
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 4509ad496557..2f9b87822c00 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -1529,8 +1529,8 @@ Size Menu::ImplCalcSize( vcl::Window* pWin )
             // SubMenu?
             if (!IsMenuBar() && pData->pSubMenu)
             {
-                    if ( nFontHeight > nWidth )
-                        nWidth += nFontHeight;
+                if ( nFontHeight > nWidth )
+                    nWidth += nFontHeight;
 
                 pData->aSz.setHeight( std::max( std::max( nFontHeight, pData->aSz.Height() ), nMinMenuItemHeight ) );
             }
diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index 0031baf60937..ea8216bc7313 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -1313,12 +1313,12 @@ void Window::Update()
 
         // trigger an update also for system windows on top of us,
         // otherwise holes would remain
-         vcl::Window* pUpdateOverlapWindow = ImplGetFirstOverlapWindow()->mpWindowImpl->mpFirstOverlap;
-         while ( pUpdateOverlapWindow )
-         {
+        vcl::Window* pUpdateOverlapWindow = ImplGetFirstOverlapWindow()->mpWindowImpl->mpFirstOverlap;
+        while ( pUpdateOverlapWindow )
+        {
              pUpdateOverlapWindow->Update();
              pUpdateOverlapWindow = pUpdateOverlapWindow->mpWindowImpl->mpNext;
-         }
+        }
 
         pUpdateWindow->ImplCallPaint(nullptr, pUpdateWindow->mpWindowImpl->mnPaintFlags);
         pUpdateWindow->LogicInvalidate(nullptr);
diff --git a/vcl/source/window/seleng.cxx b/vcl/source/window/seleng.cxx
index 53dff53e7fd5..a7ff02889bf6 100644
--- a/vcl/source/window/seleng.cxx
+++ b/vcl/source/window/seleng.cxx
@@ -158,7 +158,7 @@ bool SelectionEngine::SelMouseButtonDown( const MouseEvent& rMEvt )
                     pFunctionSet->DeselectAll();
                 else
                     pFunctionSet->DestroyAnchor();
-                   nFlags &= ~SelectionEngineFlags::HAS_ANCH; // bHasAnchor = false;
+                nFlags &= ~SelectionEngineFlags::HAS_ANCH; // bHasAnchor = false;
             }
             pFunctionSet->SetCursorAtPoint( aPos );
             // special case Single-Selection, to enable simple Select+Drag
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index f743186ebebf..cc8941503187 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.cxx
@@ -728,7 +728,7 @@ void SystemWindow::SetWindowStateData( const WindowStateData& rData )
                                 aState.mnX += displacement;
                                 aState.mnY += displacement;
                             }
-                        pWin = pSVData->maWinData.mpFirstFrame; // check new pos again
+                            pWin = pSVData->maWinData.mpFirstFrame; // check new pos again
                         }
                     }
                     pWin = pWin->mpWindowImpl->mpFrameData->mpNextFrame;
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index a464566cac06..8c560439b406 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -3646,8 +3646,8 @@ Reference< css::rendering::XCanvas > Window::ImplGetCanvas( bool bSpriteCanvas )
 
         }
         else
-        {
 #endif
+        {
             xCanvas.set( xCanvasFactory->createInstanceWithArgumentsAndContext(
                              bSpriteCanvas ?
                              OUString( "com.sun.star.rendering.SpriteCanvas" ) :
@@ -3656,9 +3656,7 @@ Reference< css::rendering::XCanvas > Window::ImplGetCanvas( bool bSpriteCanvas )
                              xContext ),
                          UNO_QUERY );
 
-#ifdef _WIN32
         }
-#endif
         mpWindowImpl->mxCanvas = xCanvas;
     }
 
diff --git a/vcl/unx/generic/app/i18n_cb.cxx b/vcl/unx/generic/app/i18n_cb.cxx
index 6dd8d0915f2d..b683015fe5a5 100644
--- a/vcl/unx/generic/app/i18n_cb.cxx
+++ b/vcl/unx/generic/app/i18n_cb.cxx
@@ -41,7 +41,7 @@
 int
 PreeditStartCallback ( XIC, XPointer client_data, XPointer )
 {
-      preedit_data_t* pPreeditData = reinterpret_cast<preedit_data_t*>(client_data);
+    preedit_data_t* pPreeditData = reinterpret_cast<preedit_data_t*>(client_data);
     if ( pPreeditData->eState == PreeditStatus::ActivationRequired )
     {
         pPreeditData->eState = PreeditStatus::Active;
@@ -109,8 +109,8 @@ Preedit_DeleteText(preedit_text_t *ptext, int from, int howmuch)
           ptext->nLength = from;
     }
 
-      // NULL-terminate the string
-      ptext->pUnicodeBuffer[ptext->nLength] = u'\0';
+    // NULL-terminate the string
+    ptext->pUnicodeBuffer[ptext->nLength] = u'\0';
 }
 
 // reallocate the textbuffer with sufficiently large size 2^x
@@ -148,9 +148,9 @@ Preedit_InsertText(preedit_text_t *pText, XIMText *pInsertText, int where)
     if (pInsertText->encoding_is_wchar)
     {
         wchar_t *pWCString = pInsertText->string.wide_char;
-          size_t nBytes = wcstombs ( nullptr, pWCString, 1024 /* don't care */);
-          pMBString = static_cast<char*>(alloca( nBytes + 1 ));
-          nMBLength = wcstombs ( pMBString, pWCString, nBytes + 1);
+        size_t nBytes = wcstombs ( nullptr, pWCString, 1024 /* don't care */);
+        pMBString = static_cast<char*>(alloca( nBytes + 1 ));
+        nMBLength = wcstombs ( pMBString, pWCString, nBytes + 1);
     }
     else
     {
@@ -163,17 +163,17 @@ Preedit_InsertText(preedit_text_t *pText, XIMText *pInsertText, int where)
 
     if (nEncoding != RTL_TEXTENCODING_UNICODE)
     {
-          rtl_TextToUnicodeConverter aConverter =
+        rtl_TextToUnicodeConverter aConverter =
                 rtl_createTextToUnicodeConverter( nEncoding );
-          rtl_TextToUnicodeContext aContext =
+        rtl_TextToUnicodeContext aContext =
                 rtl_createTextToUnicodeContext(aConverter);
 
-          sal_Size nBufferSize = nInsertTextLength * 2;
+        sal_Size nBufferSize = nInsertTextLength * 2;
 
-          pInsertTextString = static_cast<sal_Unicode*>(alloca(nBufferSize));
+        pInsertTextString = static_cast<sal_Unicode*>(alloca(nBufferSize));
 
-          sal_uInt32  nConversionInfo;
-          sal_Size    nConvertedChars;
+        sal_uInt32  nConversionInfo;
+        sal_Size    nConvertedChars;
 
         rtl_convertTextToUnicode( aConverter, aContext,
                 pMBString, nMBLength,
@@ -182,8 +182,8 @@ Preedit_InsertText(preedit_text_t *pText, XIMText *pInsertText, int where)
                 | RTL_TEXTTOUNICODE_FLAGS_INVALID_IGNORE,
                 &nConversionInfo, &nConvertedChars );
 
-          rtl_destroyTextToUnicodeContext(aConverter, aContext);
-          rtl_destroyTextToUnicodeConverter(aConverter);
+        rtl_destroyTextToUnicodeContext(aConverter, aContext);
+        rtl_destroyTextToUnicodeConverter(aConverter);
 
     }
     else
@@ -291,9 +291,9 @@ Preedit_FeedbackToSAL ( const XIMFeedback* pfeedback, int nlength, std::vector<E
         // copy in list
         psalattr[npos] = nval;
         noldval = nval;
-      }
-      // return list of sal attributes
-     return psalattr;
+    }
+    // return list of sal attributes
+    return psalattr;
 }
 
 void
diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx
index 1282881f442b..9954988e7af5 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -1334,7 +1334,7 @@ bool SelectionManager::getPasteDataTypes( Atom selection, Sequence< DataFlavor >
         bSuccess = rTypes.hasElements();
         if( bHaveText && ! bHaveUTF16 )
         {
-               int i = 0;
+            int i = 0;
 
             int nNewFlavors = rTypes.getLength()+1;
             Sequence< DataFlavor > aTemp( nNewFlavors );
diff --git a/vcl/unx/generic/gdi/gdiimpl.cxx b/vcl/unx/generic/gdi/gdiimpl.cxx
index e0a4879ff6fb..29f7323dbb1b 100644
--- a/vcl/unx/generic/gdi/gdiimpl.cxx
+++ b/vcl/unx/generic/gdi/gdiimpl.cxx
@@ -1362,11 +1362,11 @@ void X11SalGraphicsImpl::drawPolyPolygon( sal_uInt32 nPoly,
                             pGC,
                             aXRect.x, aXRect.y, aXRect.width, aXRect.height );
         }
-   }
+    }
 
-   if( mnPenColor != SALCOLOR_NONE )
-       for( sal_uInt32 i = 0; i < nPoly; i++ )
-           drawPolyLine( pPoints[i], pPtAry[i], true );
+    if( mnPenColor != SALCOLOR_NONE )
+        for( sal_uInt32 i = 0; i < nPoly; i++ )
+            drawPolyLine( pPoints[i], pPtAry[i], true );
 }
 
 bool X11SalGraphicsImpl::drawPolyLineBezier( sal_uInt32, const SalPoint*, const PolyFlags* )
diff --git a/vcl/unx/generic/gdi/salvd.cxx b/vcl/unx/generic/gdi/salvd.cxx
index a162a694f818..5d422b6433ed 100644
--- a/vcl/unx/generic/gdi/salvd.cxx
+++ b/vcl/unx/generic/gdi/salvd.cxx
@@ -155,7 +155,7 @@ X11SalVirtualDevice::X11SalVirtualDevice(SalGraphics const * pGraphics, long &nD
             pColormap = new SalColormap( pDisplay_, pXRenderFormat->colormap, m_nXScreen );
         else
             pColormap = new SalColormap( nBitCount );
-         bDeleteColormap = true;
+        bDeleteColormap = true;
     }
     else if( nBitCount != pDisplay_->GetVisual( m_nXScreen ).GetDepth() )
     {
diff --git a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
index 42bf6d0a98b9..b0a6b9935fdb 100644
--- a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
+++ b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
@@ -196,8 +196,8 @@ FT_FaceRec_* FreetypeFontInfo::GetFaceFT()
             maFaceFT = nullptr;
     }
 
-   ++mnRefCount;
-   return maFaceFT;
+    ++mnRefCount;
+    return maFaceFT;
 }
 
 void FreetypeFontInfo::ReleaseFaceFT()
diff --git a/vcl/unx/generic/glyphs/glyphcache.cxx b/vcl/unx/generic/glyphs/glyphcache.cxx
index b541fe1861fe..3578e99174b1 100644
--- a/vcl/unx/generic/glyphs/glyphcache.cxx
+++ b/vcl/unx/generic/glyphs/glyphcache.cxx
@@ -128,10 +128,10 @@ bool GlyphCache::IFSD_Equal::operator()(const rtl::Reference<LogicalFontInstance
     if( nAWidth != nBWidth )
         return false;
 
-   if (rA.meLanguage != rB.meLanguage)
+    if (rA.meLanguage != rB.meLanguage)
         return false;
    // check for features
-   if ((rA.maTargetName.indexOf(FontSelectPattern::FEAT_PREFIX)
+    if ((rA.maTargetName.indexOf(FontSelectPattern::FEAT_PREFIX)
         != -1 ||
         rB.maTargetName.indexOf(FontSelectPattern::FEAT_PREFIX)
         != -1) && rA.maTargetName != rB.maTargetName)
diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index 2401855b892c..5922aab5f3ca 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -410,7 +410,7 @@ void PPDParser::scanPPDDir( const OUString& rDir )
                             {
                                 if( aFileName.endsWithIgnoreAsciiCaseAsciiL( rSuffix.pSuffix, rSuffix.nSuffixLen ) )
                                 {
-                                (*rPPDCache.pAllPPDFiles)[ aFileName.copy( 0, aFileName.getLength() - rSuffix.nSuffixLen ) ] = aPPDFile.PathToFileName();
+                                    (*rPPDCache.pAllPPDFiles)[ aFileName.copy( 0, aFileName.getLength() - rSuffix.nSuffixLen ) ] = aPPDFile.PathToFileName();
                                     break;
                                 }
                             }
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index f4a24cfe6458..59e5370736f1 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -1879,10 +1879,10 @@ void X11SalFrame::SetSize( const Size &rSize )
 {
     if( rSize.Width() > 0 && rSize.Height() > 0 )
     {
-         if( ! ( nStyle_ & SalFrameStyleFlags::SIZEABLE )
+        if( ! ( nStyle_ & SalFrameStyleFlags::SIZEABLE )
             && ! IsChildWindow()
             && ( nStyle_ & (SalFrameStyleFlags::FLOAT|SalFrameStyleFlags::OWNERDRAWDECORATION) ) != SalFrameStyleFlags::FLOAT )
-         {
+        {
             XSizeHints* pHints = XAllocSizeHints();
             long nSupplied = 0;
             XGetWMNormalHints( GetXDisplay(),
@@ -1899,7 +1899,7 @@ void X11SalFrame::SetSize( const Size &rSize )
                                GetShellWindow(),
                                pHints );
             XFree( pHints );
-         }
+        }
         XResizeWindow( GetXDisplay(), IsSysChildWindow() ? GetWindow() : GetShellWindow(), rSize.Width(), rSize.Height() );
         if( GetWindow() != GetShellWindow() )
         {
@@ -1929,20 +1929,20 @@ void X11SalFrame::SetPosSize( const tools::Rectangle &rPosSize )
     if( !values.width || !values.height )
         return;
 
-     if( mpParent && ! IsSysChildWindow() )
-     {
+    if( mpParent && ! IsSysChildWindow() )
+    {
         if( AllSettings::GetLayoutRTL() )
             values.x = mpParent->maGeometry.nWidth-values.width-1-values.x;
 
-         ::Window aChild;
-         // coordinates are relative to parent, so translate to root coordinates
-         XTranslateCoordinates( GetDisplay()->GetDisplay(),
+        ::Window aChild;
+        // coordinates are relative to parent, so translate to root coordinates
+        XTranslateCoordinates( GetDisplay()->GetDisplay(),
                                 mpParent->GetWindow(),
                                 GetDisplay()->GetRootWindow( m_nXScreen ),
                                 values.x, values.y,
                                 &values.x, &values.y,
                                 & aChild );
-     }
+    }
 
     bool bMoved = false;
     bool bSized = false;
@@ -2351,7 +2351,7 @@ void X11SalFrame::SetInputContext( SalInputContext* pContext )
         mpInputContext.reset( new SalI18N_InputContext( this ) );
         if (mpInputContext->UseContext())
         {
-              mpInputContext->ExtendEventMask( GetShellWindow() );
+            mpInputContext->ExtendEventMask( GetShellWindow() );
             if (mbInputFocus)
                 mpInputContext->SetICFocus( this );
         }
@@ -3247,7 +3247,7 @@ bool X11SalFrame::HandleKeyEvent( XKeyEvent *pEvent )
     else if (nLen > 0 /* nEncoding == RTL_TEXTENCODING_UNICODE */)
     {
         pString = reinterpret_cast<sal_Unicode*>(pPrintable);
-          nSize = nLen;
+        nSize = nLen;
     }
     else
     {
diff --git a/vcl/unx/glxtest.cxx b/vcl/unx/glxtest.cxx
index 8b5265c88709..38d70aa490e2 100644
--- a/vcl/unx/glxtest.cxx
+++ b/vcl/unx/glxtest.cxx
@@ -173,7 +173,7 @@ static void glxtest()
   XSetErrorHandler(x_error_handler);
 
   ///// Get a visual /////
-   int attribs[] = {
+  int attribs[] = {
       GLX_RGBA,
       GLX_RED_SIZE, 1,
       GLX_GREEN_SIZE, 1,
diff --git a/vcl/unx/gtk/a11y/atkfactory.cxx b/vcl/unx/gtk/a11y/atkfactory.cxx
index c95830f752df..3a776b20dcc7 100644
--- a/vcl/unx/gtk/a11y/atkfactory.cxx
+++ b/vcl/unx/gtk/a11y/atkfactory.cxx
@@ -70,8 +70,8 @@ atk_noop_object_wrapper_get_type()
         } ;
 
         type = g_type_register_static (ATK_TYPE_OBJECT, "OOoAtkNoOpObj", &typeInfo, GTypeFlags(0)) ;
-  }
-  return type;
+    }
+    return type;
 }
 
 static AtkObject*
@@ -139,7 +139,7 @@ wrapper_factory_create_accessible( GObject *obj )
 
         if( pWindow )
         {
-             uno::Reference< accessibility::XAccessible > xAccessible = pWindow->GetAccessible();
+            uno::Reference< accessibility::XAccessible > xAccessible = pWindow->GetAccessible();
             if( xAccessible.is() )
             {
                 AtkObject *accessible = ooo_wrapper_registry_get( xAccessible );
diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx
index 8aa3c0d80770..92905f6ec64b 100644
--- a/vcl/unx/gtk/a11y/atkutil.cxx
+++ b/vcl/unx/gtk/a11y/atkutil.cxx
@@ -784,9 +784,9 @@ ooo_atk_util_get_type()
         } ;
 
         type = g_type_register_static (parent_type, "OOoUtil", &typeInfo, GTypeFlags(0)) ;
-  }
+    }
 
-  return type;
+    return type;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index 0027a6e9a958..0ed5b6fe7d71 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -196,7 +196,7 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference< uno::XComponentContext
             setLabel( LISTBOX_##elem##_LABEL, aLabel ); \
             break
 
-          switch( i )
+        switch( i )
         {
             LABEL_LIST( VERSION );
             LABEL_LIST( TEMPLATE );
diff --git a/vcl/unx/gtk3/gtk3gtkdata.cxx b/vcl/unx/gtk3/gtk3gtkdata.cxx
index db810d745cd4..617506c9e38b 100644
--- a/vcl/unx/gtk3/gtk3gtkdata.cxx
+++ b/vcl/unx/gtk3/gtk3gtkdata.cxx
@@ -412,9 +412,9 @@ GtkSalData::~GtkSalData()
     Yield( true, true );
     g_warning ("TESTME: We used to have a stop-timer here, but the central code should do this");
 
-     // sanity check: at this point nobody should be yielding, but wake them
-     // up anyway before the condition they're waiting on gets destroyed.
-     m_aDispatchCondition.set();
+    // sanity check: at this point nobody should be yielding, but wake them
+    // up anyway before the condition they're waiting on gets destroyed.
+    m_aDispatchCondition.set();
 
     osl::MutexGuard g( m_aDispatchMutex );
     if (m_pUserEvent)
diff --git a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
index 4799b77e672b..1c3fa5aab7d4 100644
--- a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
@@ -2929,8 +2929,7 @@ vcl::Font pango_to_vcl(const PangoFontDescription* font, const css::lang::Locale
                   OUStringToOString( aInfo.m_aFamilyName, RTL_TEXTENCODING_ISO_8859_1 ).getStr() );
 #endif
 
-    int nPointHeight = 0;
-        nPointHeight = nPangoHeight/PANGO_SCALE;
+    int nPointHeight = nPangoHeight/PANGO_SCALE;
 
     vcl::Font aFont( aInfo.m_aFamilyName, Size( 0, nPointHeight ) );
     if( aInfo.m_eWeight != WEIGHT_DONTKNOW )