Formatting changes across all modules

+ Removed comment cruft
+ Tab formatting in number of files
+ Some commented out code removed
+ Tab characters replaced with spaces
+ Newline cleanup in quite a few files
+ Tweak header guard #endifs

Change-Id: I3208ff2f047da890edcc49b73389aca22442f5fc
Reviewed-on: https://gerrit.libreoffice.org/22221
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>

14 files changed, 36 insertions, 45 deletions

diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index d8ba5cefd8e1..e3863bc8f182 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -4822,7 +4822,6 @@ void Test::testFuncINDIRECT()
     m_pDoc->DeleteTab(0);
 }
 
-// --------------------------------------------------------------------------
 // Test case for tdf#83365 - Access across spreadsheet returns Err:504
 //
 void Test::testFuncINDIRECT2()
diff --git a/sc/source/filter/inc/lotfntbf.hxx b/sc/source/filter/inc/lotfntbf.hxx
index 230a9a77530e..d207d7619191 100644
--- a/sc/source/filter/inc/lotfntbf.hxx
+++ b/sc/source/filter/inc/lotfntbf.hxx
@@ -74,13 +74,13 @@ private:
 
     static void             MakeFont( ENTRY* pEntry );
 public:
-	const static sal_uInt16	nSize = 8;
+    const static sal_uInt16 nSize = 8;
     void                    Fill( const sal_uInt8 nIndex, SfxItemSet& rItemSet );
     void                    SetName( const sal_uInt16 nIndex, const OUString& rName );
     void                    SetHeight( const sal_uInt16 nIndex, const sal_uInt16 nHeight );
     void                    SetType( const sal_uInt16 nIndex, const sal_uInt16 nType );
 private:
-	ENTRY					pData[ nSize ];
+    ENTRY                   pData[ nSize ];
 };
 
 #endif
diff --git a/sc/source/filter/inc/tokstack.hxx b/sc/source/filter/inc/tokstack.hxx
index 59051350a404..e51df0c08d52 100644
--- a/sc/source/filter/inc/tokstack.hxx
+++ b/sc/source/filter/inc/tokstack.hxx
@@ -174,14 +174,14 @@ private:
 #if 0
         bool                        GrowError();
 #endif
-		bool						GrowTripel( sal_uInt16 nByMin = 1 );
+        bool                        GrowTripel( sal_uInt16 nByMin = 1 );
         bool                        GrowId();
         bool                        GrowElement();
         bool                        GrowExt();
         bool                        GrowNlf();
         bool                        GrowMatrix();
-		bool						GetElement( const sal_uInt16 nId );
-		bool						GetElementRek( const sal_uInt16 nId );
+        bool                        GetElement( const sal_uInt16 nId );
+        bool                        GetElementRek( const sal_uInt16 nId );
 public:
     TokenPool( svl::SharedStringPool& rSPool );
                                     ~TokenPool();
@@ -291,7 +291,7 @@ inline TokenPool& TokenPool::operator <<( const TokenId& rId )
         "-TokenPool::operator <<: TokenId in DefToken-Range!" );
 
     if( nP_IdAkt >= nP_Id )
-		if (!GrowId())
+        if (!GrowId())
             return *this;
 
     pP_Id[ nP_IdAkt ] = ( ( sal_uInt16 ) rId ) - 1;
@@ -306,7 +306,7 @@ inline TokenPool& TokenPool::operator <<( const DefTokenId eId )
         "-TokenPool::operator<<: enum too large!" );
 
     if( nP_IdAkt >= nP_Id )
-		if (!GrowId())
+        if (!GrowId())
             return *this;
 
     pP_Id[ nP_IdAkt ] = ( ( sal_uInt16 ) eId ) + nScTokenOff;
@@ -318,7 +318,7 @@ inline TokenPool& TokenPool::operator <<( const DefTokenId eId )
 inline TokenPool& TokenPool::operator <<( TokenStack& rStack )
 {
     if( nP_IdAkt >= nP_Id )
-		if (!GrowId())
+        if (!GrowId())
             return *this;
 
     pP_Id[ nP_IdAkt ] = ( ( sal_uInt16 ) rStack.Get() ) - 1;
diff --git a/sc/source/filter/lotus/filter.cxx b/sc/source/filter/lotus/filter.cxx
index f0ad80ebadb0..06e9ba28662d 100644
--- a/sc/source/filter/lotus/filter.cxx
+++ b/sc/source/filter/lotus/filter.cxx
@@ -140,7 +140,7 @@ WKTYP ScanVersion(LotusContext &rContext, SvStream& aStream)
             aStream.ReadUInt16( nVersNr );
             if( aStream.IsEof() ) return eWK_Error;
             if( nVersNr == 0x0004 && nRecLen == 26 )
-			{	// 4 bytes of 26 read => skip 22 (read instead of seek to make IsEof() work just in case)
+            {   // 4 bytes of 26 read => skip 22 (read instead of seek to make IsEof() work just in case)
                 sal_Char aDummy[22];
                 aStream.Read( aDummy, 22 );
                 return aStream.IsEof() ? eWK_Error : eWK3;
diff --git a/sc/source/filter/lotus/lotattr.cxx b/sc/source/filter/lotus/lotattr.cxx
index 23b4c5d10e63..6f5575b2f8ee 100644
--- a/sc/source/filter/lotus/lotattr.cxx
+++ b/sc/source/filter/lotus/lotattr.cxx
@@ -172,7 +172,7 @@ void LotAttrCache::LotusToScBorderLine( sal_uInt8 nLine, ::editeng::SvxBorderLin
 const SvxColorItem& LotAttrCache::GetColorItem( const sal_uInt8 nLotIndex ) const
 {
     OSL_ENSURE( nLotIndex > 0 && nLotIndex < 7,
-		"-LotAttrCache::GetColorItem(): caller hast to check index!" );
+        "-LotAttrCache::GetColorItem(): caller hast to check index!" );
 
     return *ppColorItems[ nLotIndex - 1 ];
 }
@@ -180,7 +180,7 @@ const SvxColorItem& LotAttrCache::GetColorItem( const sal_uInt8 nLotIndex ) cons
 const Color& LotAttrCache::GetColor( const sal_uInt8 nLotIndex ) const
 {
     // color <-> index fits background, but not for fonts (0 <-> 7)!
-	OSL_ENSURE( nLotIndex < 8, "*LotAttrCache::GetColor(): Index > 7, caller hast to check index!" );
+    OSL_ENSURE( nLotIndex < 8, "*LotAttrCache::GetColor(): Index > 7, caller hast to check index!" );
 
     return pColTab[ nLotIndex ];
 }
diff --git a/sc/source/filter/lotus/lotread.cxx b/sc/source/filter/lotus/lotread.cxx
index a75dc992c2aa..58c5e18609ed 100644
--- a/sc/source/filter/lotus/lotread.cxx
+++ b/sc/source/filter/lotus/lotread.cxx
@@ -248,7 +248,7 @@ FltError ImportLotus::Read(SvStream& rIn)
     {
         pIn->ReadUInt16( nOp ).ReadUInt16( nRecLen );
 
-		if( pIn->IsEof() || nNextRec > SAL_MAX_UINT32 - nRecLen - 4 )
+        if( pIn->IsEof() || nNextRec > SAL_MAX_UINT32 - nRecLen - 4 )
             bRead = false;
         else
         {
diff --git a/sc/source/filter/oox/worksheetfragment.cxx b/sc/source/filter/oox/worksheetfragment.cxx
index cf783211b4d1..81ef2cfa1231 100644
--- a/sc/source/filter/oox/worksheetfragment.cxx
+++ b/sc/source/filter/oox/worksheetfragment.cxx
@@ -316,7 +316,7 @@ ContextHandlerRef WorksheetFragment::onCreateContext( sal_Int32 nElement, const
         // Only process an oleObject or control if outside a mc:AlternateContent
         // element OR if within a mc:Fallback. I suppose ideally we
         // should process the stuff within 'mc:Choice'
-	case XLS_TOKEN( controls ):
+    case XLS_TOKEN( controls ):
         case XLS_TOKEN( oleObjects ):
             if ( getCurrentElement() == XLS_TOKEN( controls ) )
             {
diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx
index 0c3e05dbc076..6d2e05b223ac 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -412,7 +412,6 @@ IMPL_LINK_NOARG_TYPED( ScCondFormatList, ScrollHdl, ScrollBar*, void )
     DoScroll(mpScrollBar->GetDelta());
 }
 
-// -------------------------------------------------------------------
 // Conditional Format Dialog
 //
 ScCondFormatDlg::ScCondFormatDlg(SfxBindings* pB, SfxChildWindow* pCW,
@@ -583,7 +582,6 @@ void ScCondFormatDlg::InvalidateRefData()
     mpLastEdit = nullptr;
 }
 
-// -------------------------------------------------------------
 // Close the Conditional Format Dialog
 //
 bool ScCondFormatDlg::Close()
@@ -591,7 +589,6 @@ bool ScCondFormatDlg::Close()
     return DoClose( ScCondFormatDlgWrapper::GetChildWindowId() );
 }
 
-// ------------------------------------------------------------------------
 // Occurs when the Conditional Format Dialog the OK button is pressed.
 //
 void ScCondFormatDlg::OkPressed()
@@ -615,7 +612,6 @@ void ScCondFormatDlg::OkPressed()
     Close();
 }
 
-// ------------------------------------------------------------------------
 // Occurs when the Conditional Format Dialog is cancelled.
 //
 void ScCondFormatDlg::CancelPressed()
@@ -630,7 +626,6 @@ void ScCondFormatDlg::CancelPressed()
     Close();
 }
 
-// ------------------------------------------------------------------------------
 // Parse xml string parameters used to initialize the Conditional Format Dialog
 // when it is created.
 //
@@ -706,7 +701,6 @@ bool ScCondFormatDlg::ParseXmlString(const OUString&    sXMLString,
     return bRetVal;
 }
 
-// ---------------------------------------------------------------------------------------
 // Generate xml string parameters used to initialize the Conditional Format Dialog
 // when it is created.
 //
@@ -787,7 +781,6 @@ IMPL_LINK_TYPED( ScCondFormatDlg, RangeGetFocusHdl, Control&, rControl, void )
     mpLastEdit = static_cast<formula::RefEdit*>(&rControl);
 }
 
-// ------------------------------------------------------
 // Conditional Format Dialog button click event handler.
 //
 IMPL_LINK_TYPED( ScCondFormatDlg, BtnPressedHdl, Button*, pBtn, void)
diff --git a/sc/source/ui/condformat/condformatmgr.cxx b/sc/source/ui/condformat/condformatmgr.cxx
index 30c213b43d41..e0fb268df0b9 100644
--- a/sc/source/ui/condformat/condformatmgr.cxx
+++ b/sc/source/ui/condformat/condformatmgr.cxx
@@ -146,7 +146,6 @@ ScConditionalFormatList* ScCondFormatManagerDlg::GetConditionalFormatList()
     return pList;
 }
 
-// ---------------------------------------------------------------
 // Get the current conditional format selected.
 //
 ScConditionalFormat* ScCondFormatManagerDlg::GetCondFormatSelected()
diff --git a/sc/source/ui/docshell/docsh6.cxx b/sc/source/ui/docshell/docsh6.cxx
index 732cfbb0db27..5f9dc0cc7b10 100644
--- a/sc/source/ui/docshell/docsh6.cxx
+++ b/sc/source/ui/docshell/docsh6.cxx
@@ -417,14 +417,14 @@ void ScDocShell::ReloadTabLinks()
         ::sfx2::SvBaseLink* pBase = pLinkManager->GetLinks()[i].get();
         if (ScTableLink* pTabLink = dynamic_cast<ScTableLink*>(pBase))
         {
-//			pTabLink->SetAddUndo(sal_False);		//! Undo's zusammenfassen
+//          pTabLink->SetAddUndo(sal_False);        //! Undo's zusammenfassen
 
-			// Painting only after Update() makes no sense:
-			// ScTableLink::Refresh() will post a Paint only is bDoPaint is true
+            // Painting only after Update() makes no sense:
+            // ScTableLink::Refresh() will post a Paint only is bDoPaint is true
             // pTabLink->SetPaint(false);          //  Paint nur einmal am Ende
             pTabLink->Update();
             //pTabLink->SetPaint(true);
-//			pTabLink->SetAddUndo(sal_True);
+//          pTabLink->SetAddUndo(sal_True);
             bAny = true;
         }
     }
diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx
index 66c3e177a481..06cdb5f2f048 100644
--- a/sc/source/ui/undo/undoblk3.cxx
+++ b/sc/source/ui/undo/undoblk3.cxx
@@ -1419,7 +1419,7 @@ void ScUndoRefreshLink::Undo()
         }
 
     pDocShell->PostPaintGridAll();
-	pDocShell->PostPaintExtras();
+    pDocShell->PostPaintExtras();
 
     EndUndo();
 }
@@ -1450,7 +1450,7 @@ void ScUndoRefreshLink::Redo()
         }
 
     pDocShell->PostPaintGridAll();
-	pDocShell->PostPaintExtras();
+    pDocShell->PostPaintExtras();
 
     EndUndo();
 }
diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx
index a77fdf603da3..a5e09ed1a6a3 100644
--- a/sc/source/ui/unoobj/appluno.cxx
+++ b/sc/source/ui/unoobj/appluno.cxx
@@ -556,8 +556,8 @@ static void lcl_FillSequence( uno::Sequence<beans::PropertyValue>& rSequence, co
     if (!rDesc.maDefArgNames.empty() && !rDesc.maDefArgDescs.empty() && rDesc.pDefArgFlags )
     {
         sal_uInt16 nCount = rDesc.nArgCount;
-		if (nCount >= PAIRED_VAR_ARGS)
-		    nCount -= PAIRED_VAR_ARGS - 2;
+        if (nCount >= PAIRED_VAR_ARGS)
+            nCount -= PAIRED_VAR_ARGS - 2;
         else if (nCount >= VAR_ARGS)
             nCount -= VAR_ARGS - 1;
         sal_uInt16 nSeqCount = rDesc.GetSuppressedArgCount();
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index 2fceedd72e5f..661b2ad21e70 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -384,18 +384,18 @@ ScVbaRangeAreas::createCollectionObject( const uno::Any& aSource )
 ScDocShell*
 getDocShellFromIf( const uno::Reference< uno::XInterface >& xIf ) throw ( uno::RuntimeException )
 {
-	ScCellRangesBase* pUno = ScCellRangesBase::getImplementation( xIf );
-	if ( !pUno )
+    ScCellRangesBase* pUno = ScCellRangesBase::getImplementation( xIf );
+    if ( !pUno )
             throw uno::RuntimeException("Failed to access underlying uno range object"  );
-	return pUno->GetDocShell();
+    return pUno->GetDocShell();
 }
 
 ScDocShell*
 getDocShellFromRange( const uno::Reference< table::XCellRange >& xRange ) throw ( uno::RuntimeException )
 {
-	// need the ScCellRangesBase to get docshell
+    // need the ScCellRangesBase to get docshell
     uno::Reference< uno::XInterface > xIf( xRange );
-	return getDocShellFromIf(xIf );
+    return getDocShellFromIf(xIf );
 }
 
 ScDocShell*
@@ -408,22 +408,22 @@ getDocShellFromRanges( const uno::Reference< sheet::XSheetCellRangeContainer >&
 
 uno::Reference< frame::XModel > getModelFromXIf( const uno::Reference< uno::XInterface >& xIf ) throw ( uno::RuntimeException )
 {
-	ScDocShell* pDocShell = getDocShellFromIf(xIf );
-	return pDocShell->GetModel();
+    ScDocShell* pDocShell = getDocShellFromIf(xIf );
+    return pDocShell->GetModel();
 }
 
 uno::Reference< frame::XModel > getModelFromRange( const uno::Reference< table::XCellRange >& xRange ) throw ( uno::RuntimeException )
 {
     // the XInterface for getImplementation can be any derived interface, no need for queryInterface
     uno::Reference< uno::XInterface > xIf( xRange );
-	return getModelFromXIf( xIf );
+    return getModelFromXIf( xIf );
 }
 
 ScDocument&
 getDocumentFromRange( const uno::Reference< table::XCellRange >& xRange )
 {
-	ScDocShell* pDocShell = getDocShellFromRange( xRange );
-	if ( !pDocShell )
+    ScDocShell* pDocShell = getDocShellFromRange( xRange );
+    if ( !pDocShell )
             throw uno::RuntimeException("Failed to access underlying docshell from uno range object" );
     ScDocument& rDoc = pDocShell->GetDocument();
     return rDoc;
@@ -1625,10 +1625,10 @@ ScVbaRange::ClearContents() throw (uno::RuntimeException, std::exception)
 void SAL_CALL
 ScVbaRange::ClearFormats() throw (uno::RuntimeException, std::exception)
 {
-	// FIXME: need to check if we need to combine FORMATTED
+    // FIXME: need to check if we need to combine FORMATTED
     using namespace ::com::sun::star::sheet::CellFlags;
-	sal_Int32 nFlags = HARDATTR | FORMATTED | EDITATTR;
-	ClearContents( nFlags, false );
+    sal_Int32 nFlags = HARDATTR | FORMATTED | EDITATTR;
+    ClearContents( nFlags, false );
 }
 
 void
@@ -4433,7 +4433,7 @@ ScVbaRange::AutoFilter( const uno::Any& aField, const uno::Any& Criteria1, const
         uno::Reference< beans::XPropertySet > xDBRangeProps( xDataBaseRange, uno::UNO_QUERY_THROW );
         // set autofilter
         xDBRangeProps->setPropertyValue( "AutoFilter", uno::Any(sal_True) );
-		// set header (autofilter always need column headers)
+        // set header (autofilter always need column headers)
         uno::Reference< beans::XPropertySet > xFiltProps( xDataBaseRange->getFilterDescriptor(), uno::UNO_QUERY_THROW );
         bool bHasColHeader = false;
         ScDocument* pDoc = pShell ? &pShell->GetDocument() : nullptr;
diff --git a/sc/source/ui/vba/vbaworkbook.cxx b/sc/source/ui/vba/vbaworkbook.cxx
index 2bd237a327a7..ba6c992c6fcf 100644
--- a/sc/source/ui/vba/vbaworkbook.cxx
+++ b/sc/source/ui/vba/vbaworkbook.cxx
@@ -218,7 +218,7 @@ uno::Reference< excel::XWorksheet >
 ScVbaWorkbook::getActiveSheet() throw (uno::RuntimeException, std::exception)
 {
     uno::Reference< frame::XModel > xModel( getCurrentExcelDoc( mxContext ), uno::UNO_SET_THROW );
-	uno::Reference< sheet::XSpreadsheetView > xView( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
+    uno::Reference< sheet::XSpreadsheetView > xView( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
     uno::Reference< sheet::XSpreadsheet > xSheet( xView->getActiveSheet(), uno::UNO_SET_THROW );
     // #162503# return the original sheet module wrapper object, instead of a new instance
     uno::Reference< excel::XWorksheet > xWorksheet( excel::getUnoSheetModuleObj( xSheet ), uno::UNO_QUERY );