diff options
author | Noel Grandin <noel@peralex.com> | 2014-02-19 10:19:12 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-02-19 13:05:10 +0200 |
commit | 11189797891d2b7508c37bcea83bce1b2302b92f (patch) | |
tree | befb24a158cc0709f2d36b02640f4372894a60a5 /sc | |
parent | 45441c0a7ff182ba429ca10d7cfa563fc49db1f7 (diff) |
sal_Bool->bool
Change-Id: I7e37926fc1e69da2b192a60df3b54807243c646f
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/ui/docshell/docsh5.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/docshell/olinefun.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/inc/undodat.hxx | 68 | ||||
-rw-r--r-- | sc/source/ui/undo/undodat.cxx | 50 |
4 files changed, 63 insertions, 63 deletions
diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx index d8d222e81c01..388c5bfb4a8d 100644 --- a/sc/source/ui/docshell/docsh5.cxx +++ b/sc/source/ui/docshell/docsh5.cxx @@ -567,7 +567,7 @@ void ScDocShell::DoConsolidate( const ScConsolidateParam& rParam, bool bRecord ) GetUndoManager()->AddUndoAction( new ScUndoConsolidate( this, aDestArea, rParam, pUndoDoc, - sal_True, nInsertCount, pUndoTab, pUndoData ) ); + true, nInsertCount, pUndoTab, pUndoData ) ); } else { diff --git a/sc/source/ui/docshell/olinefun.cxx b/sc/source/ui/docshell/olinefun.cxx index 389b398bb878..187637d7ffd5 100644 --- a/sc/source/ui/docshell/olinefun.cxx +++ b/sc/source/ui/docshell/olinefun.cxx @@ -115,7 +115,7 @@ bool ScOutlineDocFunc::MakeOutline( const ScRange& rRange, bool bColumns, bool b rDocShell.GetUndoManager()->AddUndoAction( new ScUndoMakeOutline( &rDocShell, nStartCol,nStartRow,nTab,nEndCol,nEndRow,nTab, - pUndoTab, bColumns, sal_True ) ); + pUndoTab, bColumns, true ) ); } if (pDoc->IsStreamValid(nTab)) @@ -465,7 +465,7 @@ bool ScOutlineDocFunc::ShowMarkedOutlines( const ScRange& rRange, bool bRecord ) rDocShell.GetUndoManager()->AddUndoAction( new ScUndoOutlineBlock( &rDocShell, nStartCol, nStartRow, nTab, nEndCol, nEndRow, nTab, - pUndoDoc, pUndoTab, sal_True ) ); + pUndoDoc, pUndoTab, true ) ); } // Spalten @@ -658,7 +658,7 @@ bool ScOutlineDocFunc::ShowOutline( SCTAB nTab, bool bColumns, sal_uInt16 nLevel rDocShell.GetUndoManager()->AddUndoAction( new ScUndoDoOutline( &rDocShell, nStart, nEnd, nTab, pUndoDoc, //! start und end berechnen - bColumns, nLevel, nEntry, sal_True ) ); + bColumns, nLevel, nEntry, true ) ); } pEntry->SetHidden(false); diff --git a/sc/source/ui/inc/undodat.hxx b/sc/source/ui/inc/undodat.hxx index 23eb82d4bda8..feb658d1187e 100644 --- a/sc/source/ui/inc/undodat.hxx +++ b/sc/source/ui/inc/undodat.hxx @@ -48,8 +48,8 @@ public: TYPEINFO(); ScUndoDoOutline( ScDocShell* pNewDocShell, SCCOLROW nNewStart, SCCOLROW nNewEnd, SCTAB nNewTab, - ScDocument* pNewUndoDoc, sal_Bool bNewColumns, - sal_uInt16 nNewLevel, sal_uInt16 nNewEntry, sal_Bool bNewShow ); + ScDocument* pNewUndoDoc, bool bNewColumns, + sal_uInt16 nNewLevel, sal_uInt16 nNewEntry, bool bNewShow ); virtual ~ScUndoDoOutline(); virtual void Undo(); @@ -64,10 +64,10 @@ private: SCCOLROW nEnd; SCTAB nTab; ScDocument* pUndoDoc; - sal_Bool bColumns; - sal_uInt16 nLevel; - sal_uInt16 nEntry; - sal_Bool bShow; + bool bColumns; + sal_uInt16 nLevel; + sal_uInt16 nEntry; + bool bShow; }; @@ -79,7 +79,7 @@ public: SCCOL nStartX, SCROW nStartY, SCTAB nStartZ, SCCOL nEndX, SCROW nEndY, SCTAB nEndZ, ScOutlineTable* pNewUndoTab, - sal_Bool bNewColumns, sal_Bool bNewMake ); + bool bNewColumns, bool bNewMake ); virtual ~ScUndoMakeOutline(); virtual void Undo(); @@ -93,8 +93,8 @@ private: ScAddress aBlockStart; ScAddress aBlockEnd; ScOutlineTable* pUndoTable; - sal_Bool bColumns; - sal_Bool bMake; + bool bColumns; + bool bMake; }; @@ -105,7 +105,7 @@ public: ScUndoOutlineLevel( ScDocShell* pNewDocShell, SCCOLROW nNewStart, SCCOLROW nNewEnd, SCTAB nNewTab, ScDocument* pNewUndoDoc, ScOutlineTable* pNewUndoTab, - sal_Bool bNewColumns, sal_uInt16 nNewLevel ); + bool bNewColumns, sal_uInt16 nNewLevel ); virtual ~ScUndoOutlineLevel(); virtual void Undo(); @@ -121,8 +121,8 @@ private: SCTAB nTab; ScDocument* pUndoDoc; ScOutlineTable* pUndoTable; - sal_Bool bColumns; - sal_uInt16 nLevel; + bool bColumns; + sal_uInt16 nLevel; }; @@ -134,7 +134,7 @@ public: SCCOL nStartX, SCROW nStartY, SCTAB nStartZ, SCCOL nEndX, SCROW nEndY, SCTAB nEndZ, ScDocument* pNewUndoDoc, ScOutlineTable* pNewUndoTab, - sal_Bool bNewShow ); + bool bNewShow ); virtual ~ScUndoOutlineBlock(); virtual void Undo(); @@ -149,7 +149,7 @@ private: ScAddress aBlockEnd; ScDocument* pUndoDoc; ScOutlineTable* pUndoTable; - sal_Bool bShow; + bool bShow; }; @@ -255,7 +255,7 @@ private: ScSortParam aSortParam; ScDocument* pUndoDoc; ScDBCollection* pUndoDB; // due to source and target range - sal_Bool bDestArea; + bool bDestArea; ScRange aDestRange; }; @@ -267,7 +267,7 @@ public: ScUndoQuery( ScDocShell* pNewDocShell, SCTAB nNewTab, const ScQueryParam& rParam, ScDocument* pNewUndoDoc, ScDBCollection* pNewUndoDB, const ScRange* pOld, - sal_Bool bSize, const ScRange* pAdvSrc ); + bool bSize, const ScRange* pAdvSrc ); virtual ~ScUndoQuery(); virtual void Undo(); @@ -285,9 +285,9 @@ private: ScDBCollection* pUndoDB; // due to source and target range ScRange aOldDest; ScRange aAdvSource; - sal_Bool bIsAdvanced; - sal_Bool bDestArea; - sal_Bool bDoSize; + bool bIsAdvanced; + bool bDestArea; + bool bDoSize; }; @@ -363,7 +363,7 @@ private: ScDBData* pUndoDBData; ScDBData* pRedoDBData; SCCOL nFormulaCols; - sal_Bool bRedoFilled; + bool bRedoFilled; }; @@ -397,7 +397,7 @@ private: ScDBCollection* pUndoDB; ScRange aOldQuery; ScRange aNewQuery; - sal_Bool bQuerySize; + bool bQuerySize; }; @@ -408,7 +408,7 @@ public: ScUndoDataPilot( ScDocShell* pNewDocShell, ScDocument* pOldDoc, ScDocument* pNewDoc, const ScDPObject* pOldObj, const ScDPObject* pNewObj, - sal_Bool bMove ); + bool bMove ); virtual ~ScUndoDataPilot(); virtual void Undo(); @@ -423,7 +423,7 @@ private: ScDocument* pNewUndoDoc; ScDPObject* pOldDPObject; ScDPObject* pNewDPObject; - sal_Bool bAllowMove; + bool bAllowMove; }; @@ -433,7 +433,7 @@ public: TYPEINFO(); ScUndoConsolidate( ScDocShell* pNewDocShell, const ScArea& rArea, const ScConsolidateParam& rPar, - ScDocument* pNewUndoDoc, sal_Bool bReference, + ScDocument* pNewUndoDoc, bool bReference, SCROW nInsCount, ScOutlineTable* pTab, ScDBData* pData ); virtual ~ScUndoConsolidate(); @@ -449,7 +449,7 @@ private: ScArea aDestArea; ScDocument* pUndoDoc; ScConsolidateParam aParam; - sal_Bool bInsRef; + bool bInsRef; SCSIZE nInsertCount; ScOutlineTable* pUndoTab; ScDBData* pUndoData; @@ -500,7 +500,7 @@ public: ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc, sal_uInt16 nNewFlags, ScRefUndoData* pRefData, void* pFill1, void* pFill2, void* pFill3, - sal_Bool bRedoIsFilled = true + bool bRedoIsFilled = true ); virtual ~ScUndoDataForm(); @@ -515,14 +515,14 @@ private: boost::scoped_ptr<ScMarkData> mpMarkData; ScDocument* pUndoDoc; ScDocument* pRedoDoc; - sal_uInt16 nFlags; - ScRefUndoData* pRefUndoData; - ScRefUndoData* pRefRedoData; - sal_uLong nStartChangeAction; - sal_uLong nEndChangeAction; - sal_Bool bRedoFilled; - - void DoChange( const sal_Bool bUndo ); + sal_uInt16 nFlags; + ScRefUndoData* pRefUndoData; + ScRefUndoData* pRefRedoData; + sal_uLong nStartChangeAction; + sal_uLong nEndChangeAction; + bool bRedoFilled; + + void DoChange( const bool bUndo ); void SetChangeTrack(); }; diff --git a/sc/source/ui/undo/undodat.cxx b/sc/source/ui/undo/undodat.cxx index 7a1cbb9b4707..96040f7f081e 100644 --- a/sc/source/ui/undo/undodat.cxx +++ b/sc/source/ui/undo/undodat.cxx @@ -68,8 +68,8 @@ TYPEINIT1(ScUndoDataForm, SfxUndoAction); ScUndoDoOutline::ScUndoDoOutline( ScDocShell* pNewDocShell, SCCOLROW nNewStart, SCCOLROW nNewEnd, SCTAB nNewTab, - ScDocument* pNewUndoDoc, sal_Bool bNewColumns, - sal_uInt16 nNewLevel, sal_uInt16 nNewEntry, sal_Bool bNewShow ) : + ScDocument* pNewUndoDoc, bool bNewColumns, + sal_uInt16 nNewLevel, sal_uInt16 nNewEntry, bool bNewShow ) : ScSimpleUndo( pNewDocShell ), nStart( nNewStart ), nEnd( nNewEnd ), @@ -161,7 +161,7 @@ bool ScUndoDoOutline::CanRepeat(SfxRepeatTarget& /* rTarget */) const ScUndoMakeOutline::ScUndoMakeOutline( ScDocShell* pNewDocShell, SCCOL nStartX, SCROW nStartY, SCTAB nStartZ, SCCOL nEndX, SCROW nEndY, SCTAB nEndZ, - ScOutlineTable* pNewUndoTab, sal_Bool bNewColumns, sal_Bool bNewMake ) : + ScOutlineTable* pNewUndoTab, bool bNewColumns, bool bNewMake ) : ScSimpleUndo( pNewDocShell ), aBlockStart( nStartX, nStartY, nStartZ ), aBlockEnd( nEndX, nEndY, nEndZ ), @@ -243,7 +243,7 @@ bool ScUndoMakeOutline::CanRepeat(SfxRepeatTarget& rTarget) const ScUndoOutlineLevel::ScUndoOutlineLevel( ScDocShell* pNewDocShell, SCCOLROW nNewStart, SCCOLROW nNewEnd, SCTAB nNewTab, ScDocument* pNewUndoDoc, ScOutlineTable* pNewUndoTab, - sal_Bool bNewColumns, sal_uInt16 nNewLevel ) : + bool bNewColumns, sal_uInt16 nNewLevel ) : ScSimpleUndo( pNewDocShell ), nStart( nNewStart ), nEnd( nNewEnd ), @@ -330,7 +330,7 @@ bool ScUndoOutlineLevel::CanRepeat(SfxRepeatTarget& rTarget) const ScUndoOutlineBlock::ScUndoOutlineBlock( ScDocShell* pNewDocShell, SCCOL nStartX, SCROW nStartY, SCTAB nStartZ, SCCOL nEndX, SCROW nEndY, SCTAB nEndZ, - ScDocument* pNewUndoDoc, ScOutlineTable* pNewUndoTab, sal_Bool bNewShow ) : + ScDocument* pNewUndoDoc, ScOutlineTable* pNewUndoTab, bool bNewShow ) : ScSimpleUndo( pNewDocShell ), aBlockStart( nStartX, nStartY, nStartZ ), aBlockEnd( nEndX, nEndY, nEndZ ), @@ -754,7 +754,7 @@ ScUndoSort::ScUndoSort( ScDocShell* pNewDocShell, { if ( pDest ) { - bDestArea = sal_True; + bDestArea = true; aDestRange = *pDest; } } @@ -858,7 +858,7 @@ bool ScUndoSort::CanRepeat(SfxRepeatTarget& /* rTarget */) const ScUndoQuery::ScUndoQuery( ScDocShell* pNewDocShell, SCTAB nNewTab, const ScQueryParam& rParam, ScDocument* pNewUndoDoc, ScDBCollection* pNewUndoDB, - const ScRange* pOld, sal_Bool bSize, const ScRange* pAdvSrc ) : + const ScRange* pOld, bool bSize, const ScRange* pAdvSrc ) : ScDBFuncUndo( pNewDocShell, ScRange( rParam.nCol1, rParam.nRow1, nNewTab, rParam.nCol2, rParam.nRow2, nNewTab ) ), pDrawUndo( NULL ), @@ -872,12 +872,12 @@ ScUndoQuery::ScUndoQuery( ScDocShell* pNewDocShell, SCTAB nNewTab, const ScQuery { if ( pOld ) { - bDestArea = sal_True; + bDestArea = true; aOldDest = *pOld; } if ( pAdvSrc ) { - bIsAdvanced = sal_True; + bIsAdvanced = true; aAdvSource = *pAdvSrc; } @@ -903,7 +903,7 @@ void ScUndoQuery::Undo() ScDocument* pDoc = pDocShell->GetDocument(); ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); - sal_Bool bCopy = !aQueryParam.bInplace; + bool bCopy = !aQueryParam.bInplace; SCCOL nDestEndCol = 0; SCROW nDestEndRow = 0; if (bCopy) @@ -1131,7 +1131,7 @@ void ScUndoDBData::Undo() ScDocument* pDoc = pDocShell->GetDocument(); - sal_Bool bOldAutoCalc = pDoc->GetAutoCalc(); + bool bOldAutoCalc = pDoc->GetAutoCalc(); pDoc->SetAutoCalc( false ); // Avoid unnecessary calculations pDoc->CompileDBFormula( true ); // CreateFormulaString pDoc->SetDBCollection( new ScDBCollection(*pUndoColl), true ); @@ -1149,7 +1149,7 @@ void ScUndoDBData::Redo() ScDocument* pDoc = pDocShell->GetDocument(); - sal_Bool bOldAutoCalc = pDoc->GetAutoCalc(); + bool bOldAutoCalc = pDoc->GetAutoCalc(); pDoc->SetAutoCalc( false ); // Avoid unnecessary calculations pDoc->CompileDBFormula( true ); // CreateFormulaString pDoc->SetDBCollection( new ScDBCollection(*pRedoColl), true ); @@ -1229,7 +1229,7 @@ void ScUndoImportData::Undo() // imported data is deleted later anyway, // so now delete each column after copying to save memory (#41216#) - sal_Bool bOldAutoCalc = pDoc->GetAutoCalc(); + bool bOldAutoCalc = pDoc->GetAutoCalc(); pDoc->SetAutoCalc( false ); // outside of the loop for (SCCOL nCopyCol = nCol1; nCopyCol <= nCol2; nCopyCol++) { @@ -1238,10 +1238,10 @@ void ScUndoImportData::Undo() pDoc->DeleteAreaTab( nCopyCol,nRow1, nCopyCol,nRow2, nTab, IDF_CONTENTS & ~IDF_NOTE ); } pDoc->SetAutoCalc( bOldAutoCalc ); - bRedoFilled = sal_True; + bRedoFilled = true; } } - sal_Bool bMoveCells = pUndoDBData && pRedoDBData && + bool bMoveCells = pUndoDBData && pRedoDBData && pRedoDBData->IsDoSize(); // the same in old and new if (bMoveCells) { @@ -1308,7 +1308,7 @@ void ScUndoImportData::Redo() pCurrentData = ScUndoUtil::GetOldDBData( pUndoDBData, pDoc, nTab, nCol1, nRow1, nCol2, nRow2 ); } - sal_Bool bMoveCells = pUndoDBData && pRedoDBData && + bool bMoveCells = pUndoDBData && pRedoDBData && pRedoDBData->IsDoSize(); // // the same in old and new if (bMoveCells) { @@ -1404,7 +1404,7 @@ ScUndoRepeatDB::ScUndoRepeatDB( ScDocShell* pNewDocShell, SCTAB nNewTab, { aOldQuery = *pOldQ; aNewQuery = *pNewQ; - bQuerySize = sal_True;; + bQuerySize = true; } } @@ -1548,7 +1548,7 @@ bool ScUndoRepeatDB::CanRepeat(SfxRepeatTarget& rTarget) const ScUndoDataPilot::ScUndoDataPilot( ScDocShell* pNewDocShell, ScDocument* pOldDoc, ScDocument* pNewDoc, - const ScDPObject* pOldObj, const ScDPObject* pNewObj, sal_Bool bMove ) : + const ScDPObject* pOldObj, const ScDPObject* pNewObj, bool bMove ) : ScSimpleUndo( pNewDocShell ), pOldUndoDoc( pOldDoc ), pNewUndoDoc( pNewDoc ), @@ -1707,7 +1707,7 @@ bool ScUndoDataPilot::CanRepeat(SfxRepeatTarget& /* rTarget */) const ScUndoConsolidate::ScUndoConsolidate( ScDocShell* pNewDocShell, const ScArea& rArea, const ScConsolidateParam& rPar, ScDocument* pNewUndoDoc, - sal_Bool bReference, SCROW nInsCount, ScOutlineTable* pTab, + bool bReference, SCROW nInsCount, ScOutlineTable* pTab, ScDBData* pData ) : ScSimpleUndo( pNewDocShell ), aDestArea( rArea ), @@ -1926,7 +1926,7 @@ ScUndoDataForm::ScUndoDataForm( ScDocShell* pNewDocShell, sal_uInt16 nNewFlags, ScRefUndoData* pRefData, void* /*pFill1*/, void* /*pFill2*/, void* /*pFill3*/, - sal_Bool bRedoIsFilled ) : + bool bRedoIsFilled ) : ScBlockUndo( pNewDocShell, ScRange( nStartX, nStartY, nStartZ, nEndX, nEndY, nEndZ ), SC_UNDO_SIMPLE ), mpMarkData(new ScMarkData(rMark)), pUndoDoc( pNewUndoDoc ), @@ -2001,13 +2001,13 @@ bool ScUndoDataForm::CanRepeat(SfxRepeatTarget& rTarget) const return (rTarget.ISA(ScTabViewTarget)); } -void ScUndoDataForm::DoChange( const sal_Bool bUndo ) +void ScUndoDataForm::DoChange( const bool bUndo ) { ScDocument* pDoc = pDocShell->GetDocument(); // RefUndoData for redo is created before first undo // (with DeleteUnchanged after the DoUndo call) - sal_Bool bCreateRedoData = ( bUndo && pRefUndoData && !pRefRedoData ); + bool bCreateRedoData = ( bUndo && pRefUndoData && !pRefRedoData ); if ( bCreateRedoData ) pRefRedoData = new ScRefUndoData( pDoc ); @@ -2020,7 +2020,7 @@ void ScUndoDataForm::DoChange( const sal_Bool bUndo ) if (nFlags & IDF_ATTRIB) nUndoFlags |= IDF_ATTRIB; - sal_Bool bPaintAll = false; + bool bPaintAll = false; ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); @@ -2029,8 +2029,8 @@ void ScUndoDataForm::DoChange( const sal_Bool bUndo ) { if (!pRedoDoc) { - sal_Bool bColInfo = ( aBlockRange.aStart.Row()==0 && aBlockRange.aEnd.Row()==MAXROW ); - sal_Bool bRowInfo = ( aBlockRange.aStart.Col()==0 && aBlockRange.aEnd.Col()==MAXCOL ); + bool bColInfo = ( aBlockRange.aStart.Row()==0 && aBlockRange.aEnd.Row()==MAXROW ); + bool bRowInfo = ( aBlockRange.aStart.Col()==0 && aBlockRange.aEnd.Col()==MAXCOL ); pRedoDoc = new ScDocument( SCDOCMODE_UNDO ); pRedoDoc->InitUndoSelected( pDoc, *mpMarkData, bColInfo, bRowInfo ); |