diff options
author | Noel Grandin <noel@peralex.com> | 2014-02-18 13:54:55 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-02-19 13:05:00 +0200 |
commit | e23b79e4fbac856a7999ee17e6afa34201332840 (patch) | |
tree | 6a86576e808b48bb966c7c8fc0eee5e94f457b3c /sc/source/ui | |
parent | 9f516df4f523ad39a18aa4ede49028484044597f (diff) |
sal_Bool->bool, and remove unused parameters
Change-Id: I55a07cbcb7f388143f115d35b20daea96d1bed5d
Diffstat (limited to 'sc/source/ui')
-rw-r--r-- | sc/source/ui/docshell/olinefun.cxx | 60 | ||||
-rw-r--r-- | sc/source/ui/inc/olinefun.hxx | 24 | ||||
-rw-r--r-- | sc/source/ui/undo/undodat.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/unoobj/cellsuno.cxx | 14 | ||||
-rw-r--r-- | sc/source/ui/view/dbfunc3.cxx | 12 |
5 files changed, 56 insertions, 56 deletions
diff --git a/sc/source/ui/docshell/olinefun.cxx b/sc/source/ui/docshell/olinefun.cxx index 456c4579624b..389b398bb878 100644 --- a/sc/source/ui/docshell/olinefun.cxx +++ b/sc/source/ui/docshell/olinefun.cxx @@ -80,9 +80,9 @@ static void lcl_PaintWidthHeight( ScDocShell& rDocShell, SCTAB nTab, //------------------------------------------------------------------------ -sal_Bool ScOutlineDocFunc::MakeOutline( const ScRange& rRange, sal_Bool bColumns, sal_Bool bRecord, sal_Bool bApi ) +bool ScOutlineDocFunc::MakeOutline( const ScRange& rRange, bool bColumns, bool bRecord, bool bApi ) { - sal_Bool bSuccess = false; + bool bSuccess = false; SCCOL nStartCol = rRange.aStart.Col(); SCROW nStartRow = rRange.aStart.Row(); SCCOL nEndCol = rRange.aEnd.Col(); @@ -132,7 +132,7 @@ sal_Bool ScOutlineDocFunc::MakeOutline( const ScRange& rRange, sal_Bool bColumns rDocShell.PostPaint( 0,0,nTab, MAXCOL,MAXROW,nTab, nParts ); rDocShell.SetDocumentModified(); lcl_InvalidateOutliner( rDocShell.GetViewBindings() ); - bSuccess = sal_True; + bSuccess = true; } else { @@ -144,9 +144,9 @@ sal_Bool ScOutlineDocFunc::MakeOutline( const ScRange& rRange, sal_Bool bColumns return bSuccess; } -sal_Bool ScOutlineDocFunc::RemoveOutline( const ScRange& rRange, sal_Bool bColumns, sal_Bool bRecord, sal_Bool bApi ) +bool ScOutlineDocFunc::RemoveOutline( const ScRange& rRange, bool bColumns, bool bRecord, bool bApi ) { - sal_Bool bDone = false; + bool bDone = false; SCCOL nStartCol = rRange.aStart.Col(); SCROW nStartRow = rRange.aStart.Row(); @@ -197,7 +197,7 @@ sal_Bool ScOutlineDocFunc::RemoveOutline( const ScRange& rRange, sal_Bool bColum rDocShell.PostPaint( 0,0,nTab, MAXCOL,MAXROW,nTab, nParts ); rDocShell.SetDocumentModified(); - bDone = sal_True; + bDone = true; lcl_InvalidateOutliner( rDocShell.GetViewBindings() ); // es wird nicht wieder eingeblendet -> kein UpdatePageBreaks @@ -212,7 +212,7 @@ sal_Bool ScOutlineDocFunc::RemoveOutline( const ScRange& rRange, sal_Bool bColum return bDone; } -sal_Bool ScOutlineDocFunc::RemoveAllOutlines( SCTAB nTab, sal_Bool bRecord, sal_Bool bApi ) +bool ScOutlineDocFunc::RemoveAllOutlines( SCTAB nTab, bool bRecord ) { sal_Bool bSuccess = false; ScDocument* pDoc = rDocShell.GetDocument(); @@ -246,8 +246,8 @@ sal_Bool ScOutlineDocFunc::RemoveAllOutlines( SCTAB nTab, sal_Bool bRecord, sal_ pUndoDoc, pUndoTab ) ); } - SelectLevel( nTab, sal_True, pTable->GetColArray()->GetDepth(), false, false, bApi ); - SelectLevel( nTab, false, pTable->GetRowArray()->GetDepth(), false, false, bApi ); + SelectLevel( nTab, true, pTable->GetColArray()->GetDepth(), false, false ); + SelectLevel( nTab, false, pTable->GetRowArray()->GetDepth(), false, false ); pDoc->SetOutlineTable( nTab, NULL ); pDoc->UpdatePageBreaks( nTab ); @@ -267,7 +267,7 @@ sal_Bool ScOutlineDocFunc::RemoveAllOutlines( SCTAB nTab, sal_Bool bRecord, sal_ //------------------------------------------------------------------------ -sal_Bool ScOutlineDocFunc::AutoOutline( const ScRange& rRange, sal_Bool bRecord, sal_Bool bApi ) +bool ScOutlineDocFunc::AutoOutline( const ScRange& rRange, bool bRecord ) { SCCOL nStartCol = rRange.aStart.Col(); SCROW nStartRow = rRange.aStart.Row(); @@ -305,8 +305,8 @@ sal_Bool ScOutlineDocFunc::AutoOutline( const ScRange& rRange, sal_Bool bRecord, } // einblenden - SelectLevel( nTab, sal_True, pTable->GetColArray()->GetDepth(), false, false, bApi ); - SelectLevel( nTab, false, pTable->GetRowArray()->GetDepth(), false, false, bApi ); + SelectLevel( nTab, true, pTable->GetColArray()->GetDepth(), false, false ); + SelectLevel( nTab, false, pTable->GetRowArray()->GetDepth(), false, false ); pDoc->SetOutlineTable( nTab, NULL ); } @@ -328,13 +328,13 @@ sal_Bool ScOutlineDocFunc::AutoOutline( const ScRange& rRange, sal_Bool bRecord, rDocShell.SetDocumentModified(); lcl_InvalidateOutliner( rDocShell.GetViewBindings() ); - return sal_True; + return true; } //------------------------------------------------------------------------ -sal_Bool ScOutlineDocFunc::SelectLevel( SCTAB nTab, sal_Bool bColumns, sal_uInt16 nLevel, - sal_Bool bRecord, sal_Bool bPaint, sal_Bool /* bApi */ ) +bool ScOutlineDocFunc::SelectLevel( SCTAB nTab, bool bColumns, sal_uInt16 nLevel, + bool bRecord, bool bPaint ) { ScDocument* pDoc = rDocShell.GetDocument(); @@ -423,14 +423,14 @@ sal_Bool ScOutlineDocFunc::SelectLevel( SCTAB nTab, sal_Bool bColumns, sal_uInt1 rDocShell.SetDocumentModified(); lcl_InvalidateOutliner( rDocShell.GetViewBindings() ); - return sal_True; + return true; } //------------------------------------------------------------------------ -sal_Bool ScOutlineDocFunc::ShowMarkedOutlines( const ScRange& rRange, sal_Bool bRecord ) +bool ScOutlineDocFunc::ShowMarkedOutlines( const ScRange& rRange, bool bRecord ) { - sal_Bool bDone = false; + bool bDone = false; SCCOL nStartCol = rRange.aStart.Col(); SCROW nStartRow = rRange.aStart.Row(); @@ -523,7 +523,7 @@ sal_Bool ScOutlineDocFunc::ShowMarkedOutlines( const ScRange& rRange, sal_Bool b rDocShell.PostPaint( 0,0,nTab, MAXCOL,MAXROW,nTab, PAINT_GRID | PAINT_LEFT | PAINT_TOP ); rDocShell.SetDocumentModified(); - bDone = sal_True; + bDone = true; lcl_InvalidateOutliner( rDocShell.GetViewBindings() ); } @@ -531,9 +531,9 @@ sal_Bool ScOutlineDocFunc::ShowMarkedOutlines( const ScRange& rRange, sal_Bool b return bDone; } -sal_Bool ScOutlineDocFunc::HideMarkedOutlines( const ScRange& rRange, sal_Bool bRecord, sal_Bool bApi ) +bool ScOutlineDocFunc::HideMarkedOutlines( const ScRange& rRange, bool bRecord ) { - sal_Bool bDone = false; + bool bDone = false; SCCOL nStartCol = rRange.aStart.Col(); SCROW nStartRow = rRange.aStart.Row(); @@ -594,7 +594,7 @@ sal_Bool ScOutlineDocFunc::HideMarkedOutlines( const ScRange& rRange, sal_Bool b nEnd = pEntry->GetEnd(); if ( static_cast<SCCOLROW>(nStartCol)<=nEnd && static_cast<SCCOLROW>(nEndCol)>=nStart ) - HideOutline( nTab, sal_True, nColLevel, i, false, false, bApi ); + HideOutline( nTab, true, nColLevel, i, false, false ); } // Zeilen @@ -607,7 +607,7 @@ sal_Bool ScOutlineDocFunc::HideMarkedOutlines( const ScRange& rRange, sal_Bool b nEnd = pEntry->GetEnd(); if ( nStartRow<=nEnd && nEndRow>=nStart ) - HideOutline( nTab, false, nRowLevel, i, false, false, bApi ); + HideOutline( nTab, false, nRowLevel, i, false, false ); } pDoc->SetDrawPageSize(nTab); @@ -616,7 +616,7 @@ sal_Bool ScOutlineDocFunc::HideMarkedOutlines( const ScRange& rRange, sal_Bool b rDocShell.PostPaint( 0,0,nTab, MAXCOL,MAXROW,nTab, PAINT_GRID | PAINT_LEFT | PAINT_TOP ); rDocShell.SetDocumentModified(); - bDone = sal_True; + bDone = true; lcl_InvalidateOutliner( rDocShell.GetViewBindings() ); } @@ -626,8 +626,8 @@ sal_Bool ScOutlineDocFunc::HideMarkedOutlines( const ScRange& rRange, sal_Bool b //------------------------------------------------------------------------ -sal_Bool ScOutlineDocFunc::ShowOutline( SCTAB nTab, sal_Bool bColumns, sal_uInt16 nLevel, sal_uInt16 nEntry, - sal_Bool bRecord, sal_Bool bPaint, sal_Bool /* bApi */ ) +bool ScOutlineDocFunc::ShowOutline( SCTAB nTab, bool bColumns, sal_uInt16 nLevel, sal_uInt16 nEntry, + bool bRecord, bool bPaint ) { ScDocument* pDoc = rDocShell.GetDocument(); if (bRecord && !pDoc->IsUndoEnabled()) @@ -707,11 +707,11 @@ sal_Bool ScOutlineDocFunc::ShowOutline( SCTAB nTab, sal_Bool bColumns, sal_uInt1 lcl_InvalidateOutliner( rDocShell.GetViewBindings() ); - return sal_True; //! immer ??? + return true; //! immer ??? } -sal_Bool ScOutlineDocFunc::HideOutline( SCTAB nTab, sal_Bool bColumns, sal_uInt16 nLevel, sal_uInt16 nEntry, - sal_Bool bRecord, sal_Bool bPaint, sal_Bool /* bApi */ ) +bool ScOutlineDocFunc::HideOutline( SCTAB nTab, bool bColumns, sal_uInt16 nLevel, sal_uInt16 nEntry, + bool bRecord, bool bPaint ) { ScDocument* pDoc = rDocShell.GetDocument(); if (bRecord && !pDoc->IsUndoEnabled()) @@ -766,7 +766,7 @@ sal_Bool ScOutlineDocFunc::HideOutline( SCTAB nTab, sal_Bool bColumns, sal_uInt1 lcl_InvalidateOutliner( rDocShell.GetViewBindings() ); - return sal_True; //! immer ??? + return true; //! immer ??? } diff --git a/sc/source/ui/inc/olinefun.hxx b/sc/source/ui/inc/olinefun.hxx index c32ecabfc59e..17edeac72e65 100644 --- a/sc/source/ui/inc/olinefun.hxx +++ b/sc/source/ui/inc/olinefun.hxx @@ -37,21 +37,21 @@ public: ScOutlineDocFunc( ScDocShell& rDocSh ): rDocShell(rDocSh) {} ~ScOutlineDocFunc() {} - sal_Bool MakeOutline( const ScRange& rRange, sal_Bool bColumns, sal_Bool bRecord, sal_Bool bApi ); - sal_Bool RemoveOutline( const ScRange& rRange, sal_Bool bColumns, sal_Bool bRecord, sal_Bool bApi ); - sal_Bool RemoveAllOutlines( SCTAB nTab, sal_Bool bRecord, sal_Bool bApi ); - sal_Bool AutoOutline( const ScRange& rRange, sal_Bool bRecord, sal_Bool bApi ); + bool MakeOutline( const ScRange& rRange, bool bColumns, bool bRecord, bool bApi ); + bool RemoveOutline( const ScRange& rRange, bool bColumns, bool bRecord, bool bApi ); + bool RemoveAllOutlines( SCTAB nTab, bool bRecord ); + bool AutoOutline( const ScRange& rRange, bool bRecord ); - sal_Bool SelectLevel( SCTAB nTab, sal_Bool bColumns, sal_uInt16 nLevel, - sal_Bool bRecord, sal_Bool bPaint, sal_Bool bApi ); + bool SelectLevel( SCTAB nTab, bool bColumns, sal_uInt16 nLevel, + bool bRecord, bool bPaint ); - sal_Bool ShowMarkedOutlines( const ScRange& rRange, sal_Bool bRecord ); - sal_Bool HideMarkedOutlines( const ScRange& rRange, sal_Bool bRecord, sal_Bool bApi ); + bool ShowMarkedOutlines( const ScRange& rRange, bool bRecord ); + bool HideMarkedOutlines( const ScRange& rRange, bool bRecord ); - sal_Bool ShowOutline( SCTAB nTab, sal_Bool bColumns, sal_uInt16 nLevel, sal_uInt16 nEntry, - sal_Bool bRecord, sal_Bool bPaint, sal_Bool bApi ); - sal_Bool HideOutline( SCTAB nTab, sal_Bool bColumns, sal_uInt16 nLevel, sal_uInt16 nEntry, - sal_Bool bRecord, sal_Bool bPaint, sal_Bool bApi ); + bool ShowOutline( SCTAB nTab, bool bColumns, sal_uInt16 nLevel, sal_uInt16 nEntry, + bool bRecord, bool bPaint ); + bool HideOutline( SCTAB nTab, bool bColumns, sal_uInt16 nLevel, sal_uInt16 nEntry, + bool bRecord, bool bPaint ); }; diff --git a/sc/source/ui/undo/undodat.cxx b/sc/source/ui/undo/undodat.cxx index 56a2e1c27a37..7a1cbb9b4707 100644 --- a/sc/source/ui/undo/undodat.cxx +++ b/sc/source/ui/undo/undodat.cxx @@ -594,7 +594,7 @@ void ScUndoAutoOutline::Redo() ScRange aRange( aBlockStart.Col(), aBlockStart.Row(), nTab, aBlockEnd.Col(), aBlockEnd.Row(), nTab ); ScOutlineDocFunc aFunc( *pDocShell ); - aFunc.AutoOutline( aRange, false, false ); + aFunc.AutoOutline( aRange, false ); // Select in View // If it was called with a multi selection, diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index d033f9073611..b74de1228399 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -7864,7 +7864,7 @@ void SAL_CALL ScTableSheetObj::group( const table::CellRangeAddress& rGroupRange ScRange aGroupRange; ScUnoConversion::FillScRange( aGroupRange, rGroupRange ); ScOutlineDocFunc aFunc(*pDocSh); - aFunc.MakeOutline( aGroupRange, bColumns, sal_True, sal_True ); + aFunc.MakeOutline( aGroupRange, bColumns, true, true ); } } @@ -7880,7 +7880,7 @@ void SAL_CALL ScTableSheetObj::ungroup( const table::CellRangeAddress& rGroupRan ScRange aGroupRange; ScUnoConversion::FillScRange( aGroupRange, rGroupRange ); ScOutlineDocFunc aFunc(*pDocSh); - aFunc.RemoveOutline( aGroupRange, bColumns, sal_True, sal_True ); + aFunc.RemoveOutline( aGroupRange, bColumns, true, true ); } } @@ -7894,7 +7894,7 @@ void SAL_CALL ScTableSheetObj::autoOutline( const table::CellRangeAddress& rCell ScRange aFormulaRange; ScUnoConversion::FillScRange( aFormulaRange, rCellRange ); ScOutlineDocFunc aFunc(*pDocSh); - aFunc.AutoOutline( aFormulaRange, sal_True, sal_True ); + aFunc.AutoOutline( aFormulaRange, true ); } } @@ -7907,7 +7907,7 @@ void SAL_CALL ScTableSheetObj::clearOutline() { SCTAB nTab = GetTab_Impl(); ScOutlineDocFunc aFunc(*pDocSh); - aFunc.RemoveAllOutlines( nTab, sal_True, sal_True ); + aFunc.RemoveAllOutlines( nTab, true ); } } @@ -7921,7 +7921,7 @@ void SAL_CALL ScTableSheetObj::hideDetail( const table::CellRangeAddress& rCellR ScRange aMarkRange; ScUnoConversion::FillScRange( aMarkRange, rCellRange ); ScOutlineDocFunc aFunc(*pDocSh); - aFunc.HideMarkedOutlines( aMarkRange, sal_True, sal_True ); + aFunc.HideMarkedOutlines( aMarkRange, true ); } } @@ -7935,7 +7935,7 @@ void SAL_CALL ScTableSheetObj::showDetail( const table::CellRangeAddress& rCellR ScRange aMarkRange; ScUnoConversion::FillScRange( aMarkRange, rCellRange ); ScOutlineDocFunc aFunc(*pDocSh); - aFunc.ShowMarkedOutlines( aMarkRange, sal_True ); + aFunc.ShowMarkedOutlines( aMarkRange, true ); } } @@ -7949,7 +7949,7 @@ void SAL_CALL ScTableSheetObj::showLevel( sal_Int16 nLevel, table::TableOrientat sal_Bool bColumns = ( nOrientation == table::TableOrientation_COLUMNS ); SCTAB nTab = GetTab_Impl(); ScOutlineDocFunc aFunc(*pDocSh); - aFunc.SelectLevel( nTab, bColumns, nLevel, sal_True, sal_True, sal_True ); + aFunc.SelectLevel( nTab, bColumns, nLevel, true, true ); } } diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx index 50cfc2e4d32a..b92341152351 100644 --- a/sc/source/ui/view/dbfunc3.cxx +++ b/sc/source/ui/view/dbfunc3.cxx @@ -190,7 +190,7 @@ void ScDBFunc::RemoveAllOutlines( bool bRecord ) ScDocShell* pDocSh = GetViewData()->GetDocShell(); ScOutlineDocFunc aFunc(*pDocSh); - bool bOk = aFunc.RemoveAllOutlines( nTab, bRecord, false ); + bool bOk = aFunc.RemoveAllOutlines( nTab, bRecord ); if (bOk) UpdateScrollBars(); @@ -211,7 +211,7 @@ void ScDBFunc::AutoOutline( bool bRecord ) ScDocShell* pDocSh = GetViewData()->GetDocShell(); ScOutlineDocFunc aFunc(*pDocSh); - aFunc.AutoOutline( aRange, bRecord, false ); + aFunc.AutoOutline( aRange, bRecord ); } // Outline-Ebene auswaehlen @@ -222,7 +222,7 @@ void ScDBFunc::SelectLevel( bool bColumns, sal_uInt16 nLevel, bool bRecord, bool ScDocShell* pDocSh = GetViewData()->GetDocShell(); ScOutlineDocFunc aFunc(*pDocSh); - sal_Bool bOk = aFunc.SelectLevel( nTab, bColumns, nLevel, bRecord, bPaint, false ); + bool bOk = aFunc.SelectLevel( nTab, bColumns, nLevel, bRecord, bPaint ); if (bOk) UpdateScrollBars(); @@ -236,7 +236,7 @@ void ScDBFunc::ShowOutline( bool bColumns, sal_uInt16 nLevel, sal_uInt16 nEntry, ScDocShell* pDocSh = GetViewData()->GetDocShell(); ScOutlineDocFunc aFunc(*pDocSh); - sal_Bool bOk = aFunc.ShowOutline( nTab, bColumns, nLevel, nEntry, bRecord, bPaint, false ); + bool bOk = aFunc.ShowOutline( nTab, bColumns, nLevel, nEntry, bRecord, bPaint ); if ( bOk && bPaint ) UpdateScrollBars(); @@ -250,7 +250,7 @@ void ScDBFunc::HideOutline( bool bColumns, sal_uInt16 nLevel, sal_uInt16 nEntry, ScDocShell* pDocSh = GetViewData()->GetDocShell(); ScOutlineDocFunc aFunc(*pDocSh); - sal_Bool bOk = aFunc.HideOutline( nTab, bColumns, nLevel, nEntry, bRecord, bPaint, false ); + bool bOk = aFunc.HideOutline( nTab, bColumns, nLevel, nEntry, bRecord, bPaint ); if ( bOk && bPaint ) UpdateScrollBars(); @@ -356,7 +356,7 @@ void ScDBFunc::HideMarkedOutlines( bool bRecord ) { ScDocShell* pDocSh = GetViewData()->GetDocShell(); ScOutlineDocFunc aFunc(*pDocSh); - sal_Bool bDone = aFunc.HideMarkedOutlines( aRange, bRecord, false ); + bool bDone = aFunc.HideMarkedOutlines( aRange, bRecord ); if (bDone) UpdateScrollBars(); } |