Skip to content

C
core
Kaydet (Commit) 37b48385 authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

sal_Bool->bool 

Change-Id: I9921d8a5d883e519f0345aedc7bc36c3e553105b
üst 47f3b228
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 38 deletions
sc/source/ui/inc/undoblk.hxx
Dosyayı görüntüle @ 37b48385
This diff is collapsed.
sc/source/ui/undo/undoblk.cxx
Dosyayı görüntüle @ 37b48385
......@@ -79,7 +79,7 @@ TYPEINIT1(ScUndoBorder, ScBlockUndo);
ScUndoInsertCells::ScUndoInsertCells( ScDocShell* pNewDocShell,
const ScRange& rRange, SCTAB nNewCount, SCTAB* pNewTabs, SCTAB* pNewScenarios,
InsCellCmd eNewCmd, ScDocument* pUndoDocument, ScRefUndoData* pRefData,
sal_Bool bNewPartOfPaste ) :
bool bNewPartOfPaste ) :
ScMoveUndo( pNewDocShell, pUndoDocument, pRefData, SC_UNDO_REFLAST ),
aEffRange( rRange ),
nCount( nNewCount ),
......@@ -153,7 +153,7 @@ void ScUndoInsertCells::SetChangeTrack()
nEndChangeAction = 0;
}
void ScUndoInsertCells::DoChange( const sal_Bool bUndo )
void ScUndoInsertCells::DoChange( const bool bUndo )
{
ScDocument* pDoc = pDocShell->GetDocument();
SCTAB i;
......@@ -274,7 +274,7 @@ void ScUndoInsertCells::Undo()
WaitObject aWait( pDocShell->GetActiveDialogParent() ); // important due to TrackFormulas in UpdateReference
BeginUndo();
DoChange( sal_True );
DoChange( true );
EndUndo();
ScDocument* pDoc = pDocShell->GetDocument();
......@@ -365,7 +365,7 @@ void ScUndoDeleteCells::SetChangeTrack()
nStartChangeAction = nEndChangeAction = 0;
}
void ScUndoDeleteCells::DoChange( const sal_Bool bUndo )
void ScUndoDeleteCells::DoChange( const bool bUndo )
{
ScDocument* pDoc = pDocShell->GetDocument();
SCTAB i;
......@@ -506,7 +506,7 @@ void ScUndoDeleteCells::Undo()
{
WaitObject aWait( pDocShell->GetActiveDialogParent() ); // important because of TrackFormulas in UpdateReference
BeginUndo();
DoChange( sal_True );
DoChange( true );
EndUndo();
SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) );
......@@ -764,7 +764,7 @@ void ScUndoCut::SetChangeTrack()
nStartChangeAction = nEndChangeAction = 0;
}
void ScUndoCut::DoChange( const sal_Bool bUndo )
void ScUndoCut::DoChange( const bool bUndo )
{
ScDocument* pDoc = pDocShell->GetDocument();
sal_uInt16 nExtFlags = 0;
......@@ -809,7 +809,7 @@ void ScUndoCut::DoChange( const sal_Bool bUndo )
void ScUndoCut::Undo()
{
BeginUndo();
DoChange( sal_True );
DoChange( true );
EndUndo();
}
......@@ -1107,8 +1107,8 @@ bool ScUndoPaste::CanRepeat(SfxRepeatTarget& rTarget) const
}
ScUndoDragDrop::ScUndoDragDrop( ScDocShell* pNewDocShell,
const ScRange& rRange, ScAddress aNewDestPos, sal_Bool bNewCut,
ScDocument* pUndoDocument, ScRefUndoData* pRefData, sal_Bool bScenario ) :
const ScRange& rRange, ScAddress aNewDestPos, bool bNewCut,
ScDocument* pUndoDocument, ScRefUndoData* pRefData, bool bScenario ) :
ScMoveUndo( pNewDocShell, pUndoDocument, pRefData, SC_UNDO_REFFIRST ),
aSrcRange( rRange ),
bCut( bNewCut ),
......@@ -1119,7 +1119,7 @@ ScUndoDragDrop::ScUndoDragDrop( ScDocShell* pNewDocShell,
aDestEnd.IncCol(aSrcRange.aEnd.Col() - aSrcRange.aStart.Col());
aDestEnd.IncTab(aSrcRange.aEnd.Tab() - aSrcRange.aStart.Tab());
sal_Bool bIncludeFiltered = bCut;
bool bIncludeFiltered = bCut;
if ( !bIncludeFiltered )
{
// find number of non-filtered rows
......@@ -1304,7 +1304,7 @@ void ScUndoDragDrop::Redo()
for (nTab=aDestRange.aStart.Tab(); nTab<=aDestRange.aEnd.Tab(); nTab++)
aDestMark.SelectTable( nTab, true );
sal_Bool bIncludeFiltered = bCut;
bool bIncludeFiltered = bCut;
// TODO: restore old note captions instead of cloning new captions...
pDoc->CopyFromClip( aDestRange, aDestMark, IDF_ALL & ~IDF_OBJECTS, NULL, pClipDoc, true, false, bIncludeFiltered );
......@@ -1451,7 +1451,7 @@ void ScUndoUseScenario::Undo()
pUndoDoc->CopyToDocument( aRange, IDF_ALL, true, pDoc, &aMarkData );
// scenario table
sal_Bool bFrame = false;
bool bFrame = false;
SCTAB nTab = aRange.aStart.Tab();
SCTAB nEndTab = nTab;
while ( pUndoDoc->HasTable(nEndTab+1) && pUndoDoc->IsScenario(nEndTab+1) )
......@@ -1464,7 +1464,7 @@ void ScUndoUseScenario::Undo()
sal_uInt16 nScenFlags;
pUndoDoc->GetScenarioData( i, aComment, aColor, nScenFlags );
pDoc->SetScenarioData( i, aComment, aColor, nScenFlags );
sal_Bool bActive = pUndoDoc->IsActiveScenario( i );
bool bActive = pUndoDoc->IsActiveScenario( i );
pDoc->SetActiveScenario( i, bActive );
// For copy-back scenario also consider content
if ( nScenFlags & SC_SCENARIO_TWOWAY )
......@@ -1473,7 +1473,7 @@ void ScUndoUseScenario::Undo()
pUndoDoc->CopyToDocument( 0,0,i, MAXCOL,MAXROW,i, IDF_ALL,false, pDoc );
}
if ( nScenFlags & SC_SCENARIO_SHOWFRAME )
bFrame = sal_True;
bFrame = true;
}
// if visible borders, then paint all
......@@ -1551,7 +1551,7 @@ OUString ScUndoSelectionStyle::GetComment() const
return ScGlobal::GetRscString( STR_UNDO_APPLYCELLSTYLE );
}
void ScUndoSelectionStyle::DoChange( const sal_Bool bUndo )
void ScUndoSelectionStyle::DoChange( const bool bUndo )
{
ScDocument* pDoc = pDocShell->GetDocument();
......@@ -1597,7 +1597,7 @@ void ScUndoSelectionStyle::DoChange( const sal_Bool bUndo )
void ScUndoSelectionStyle::Undo()
{
BeginUndo();
DoChange( sal_True );
DoChange( true );
EndUndo();
}
......@@ -1732,7 +1732,7 @@ static ScRange lcl_GetMultiMarkRange( const ScMarkData& rMark )
}
ScUndoIndent::ScUndoIndent( ScDocShell* pNewDocShell, const ScMarkData& rMark,
ScDocument* pNewUndoDoc, sal_Bool bIncrement ) :
ScDocument* pNewUndoDoc, bool bIncrement ) :
ScBlockUndo( pNewDocShell, lcl_GetMultiMarkRange(rMark), SC_UNDO_AUTOHEIGHT ),
aMarkData( rMark ),
pUndoDoc( pNewUndoDoc ),
......@@ -2056,7 +2056,7 @@ void ScUndoRemoveMerge::Redo()
// Paint
sal_Bool bDidPaint = false;
bool bDidPaint = false;
if ( pViewShell )
{
pViewShell->SetTabNo(nTab);
......
sc/source/ui/undo/undoblk2.cxx
Dosyayı görüntüle @ 37b48385
......@@ -38,7 +38,7 @@ ScUndoWidthOrHeight::ScUndoWidthOrHeight( ScDocShell* pNewDocShell,
SCCOLROW nNewStart, SCTAB nNewStartTab, SCCOLROW nNewEnd, SCTAB nNewEndTab,
ScDocument* pNewUndoDoc, SCCOLROW nNewCnt, SCCOLROW* pNewRanges,
ScOutlineTable* pNewUndoTab,
ScSizeMode eNewMode, sal_uInt16 nNewSizeTwips, sal_Bool bNewWidth ) :
ScSizeMode eNewMode, sal_uInt16 nNewSizeTwips, bool bNewWidth ) :
ScSimpleUndo( pNewDocShell ),
aMarkData( rMark ),
nStart( nNewStart ),
......
sc/source/ui/undo/undoblk3.cxx
Dosyayı görüntüle @ 37b48385
......@@ -76,8 +76,8 @@ TYPEINIT1(ScUndoUpdateAreaLink, SfxUndoAction);
ScUndoDeleteContents::ScUndoDeleteContents(
ScDocShell* pNewDocShell,
const ScMarkData& rMark, const ScRange& rRange,
ScDocument* pNewUndoDoc, sal_Bool bNewMulti,
sal_uInt16 nNewFlags, sal_Bool bObjects )
ScDocument* pNewUndoDoc, bool bNewMulti,
sal_uInt16 nNewFlags, bool bObjects )
: ScSimpleUndo( pNewDocShell ),
aRange ( rRange ),
aMarkData ( rMark ),
......@@ -116,7 +116,7 @@ void ScUndoDeleteContents::SetChangeTrack()
nStartChangeAction = nEndChangeAction = 0;
}
void ScUndoDeleteContents::DoChange( const sal_Bool bUndo )
void ScUndoDeleteContents::DoChange( const bool bUndo )
{
ScDocument* pDoc = pDocShell->GetDocument();
......@@ -181,7 +181,7 @@ void ScUndoDeleteContents::DoChange( const sal_Bool bUndo )
void ScUndoDeleteContents::Undo()
{
BeginUndo();
DoChange( sal_True );
DoChange( true );
EndUndo();
BroadcastChanges(aRange);
......@@ -213,8 +213,8 @@ ScUndoFillTable::ScUndoFillTable( ScDocShell* pNewDocShell,
const ScMarkData& rMark,
SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
ScDocument* pNewUndoDoc, sal_Bool bNewMulti, SCTAB nSrc,
sal_uInt16 nFlg, sal_uInt16 nFunc, sal_Bool bSkip, sal_Bool bLink )
ScDocument* pNewUndoDoc, bool bNewMulti, SCTAB nSrc,
sal_uInt16 nFlg, sal_uInt16 nFunc, bool bSkip, bool bLink )
: ScSimpleUndo( pNewDocShell ),
aRange ( nStartX, nStartY, nStartZ, nEndX, nEndY, nEndZ ),
aMarkData ( rMark ),
......@@ -266,7 +266,7 @@ void ScUndoFillTable::SetChangeTrack()
nStartChangeAction = nEndChangeAction = 0;
}
void ScUndoFillTable::DoChange( const sal_Bool bUndo )
void ScUndoFillTable::DoChange( const bool bUndo )
{
ScDocument* pDoc = pDocShell->GetDocument();
......@@ -320,7 +320,7 @@ void ScUndoFillTable::DoChange( const sal_Bool bUndo )
void ScUndoFillTable::Undo()
{
BeginUndo();
DoChange( sal_True );
DoChange( true );
EndUndo();
}
......@@ -346,7 +346,7 @@ ScUndoSelectionAttr::ScUndoSelectionAttr( ScDocShell* pNewDocShell,
const ScMarkData& rMark,
SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
ScDocument* pNewUndoDoc, sal_Bool bNewMulti,
ScDocument* pNewUndoDoc, bool bNewMulti,
const ScPatternAttr* pNewApply,
const SvxBoxItem* pNewOuter, const SvxBoxInfoItem* pNewInner )
: ScSimpleUndo( pNewDocShell ),
......@@ -385,7 +385,7 @@ ScEditDataArray* ScUndoSelectionAttr::GetDataArray()
return mpDataArray.get();
}
void ScUndoSelectionAttr::DoChange( const sal_Bool bUndo )
void ScUndoSelectionAttr::DoChange( const bool bUndo )
{
ScDocument* pDoc = pDocShell->GetDocument();
......@@ -454,7 +454,7 @@ void ScUndoSelectionAttr::ChangeEditData( const bool bUndo )
void ScUndoSelectionAttr::Undo()
{
BeginUndo();
DoChange( sal_True );
DoChange( true );
EndUndo();
}
......@@ -757,7 +757,7 @@ bool ScUndoMerge::CanRepeat(SfxRepeatTarget& rTarget) const
ScUndoAutoFormat::ScUndoAutoFormat( ScDocShell* pNewDocShell,
const ScRange& rRange, ScDocument* pNewUndoDoc,
const ScMarkData& rMark, sal_Bool bNewSize, sal_uInt16 nNewFormatNo )
const ScMarkData& rMark, bool bNewSize, sal_uInt16 nNewFormatNo )
: ScBlockUndo( pNewDocShell, rRange, bNewSize ? SC_UNDO_MANUALHEIGHT : SC_UNDO_AUTOHEIGHT ),
pUndoDoc ( pNewUndoDoc ),
aMarkData ( rMark ),
......@@ -1224,7 +1224,7 @@ void ScUndoConversion::DoChange( ScDocument* pRefDoc, const ScAddress& rCursorPo
SCTAB nTabCount = pDoc->GetTableCount();
// Undo/Redo-doc has only selected tables
sal_Bool bMulti = aMarkData.IsMultiMarked();
bool bMulti = aMarkData.IsMultiMarked();
pRefDoc->CopyToDocument( 0, 0, 0,
MAXCOL, MAXROW, nTabCount-1,
IDF_CONTENTS, bMulti, pDoc, &aMarkData );
......@@ -1267,7 +1267,7 @@ bool ScUndoConversion::CanRepeat(SfxRepeatTarget& rTarget) const
ScUndoRefConversion::ScUndoRefConversion( ScDocShell* pNewDocShell,
const ScRange& aMarkRange, const ScMarkData& rMark,
ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc, sal_Bool bNewMulti, sal_uInt16 nNewFlag) :
ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc, bool bNewMulti, sal_uInt16 nNewFlag) :
ScSimpleUndo( pNewDocShell ),
aMarkData ( rMark ),
pUndoDoc ( pNewUndoDoc ),
......@@ -1374,11 +1374,11 @@ void ScUndoRefreshLink::Undo()
{
BeginUndo();
sal_Bool bMakeRedo = !pRedoDoc;
bool bMakeRedo = !pRedoDoc;
if (bMakeRedo)
pRedoDoc = new ScDocument( SCDOCMODE_UNDO );
sal_Bool bFirst = sal_True;
bool bFirst = true;
ScDocument* pDoc = pDocShell->GetDocument();
SCTAB nCount = pDoc->GetTableCount();
for (SCTAB nTab=0; nTab<nCount; nTab++)
......@@ -1607,7 +1607,7 @@ ScUndoUpdateAreaLink::ScUndoUpdateAreaLink( ScDocShell* pShell,
const OUString& rOldA, const ScRange& rOldR, sal_uLong nOldRD,
const OUString& rNewD, const OUString& rNewF, const OUString& rNewO,
const OUString& rNewA, const ScRange& rNewR, sal_uLong nNewRD,
ScDocument* pUndo, ScDocument* pRedo, sal_Bool bDoInsert )
ScDocument* pUndo, ScDocument* pRedo, bool bDoInsert )
: ScSimpleUndo( pShell ),
aOldDoc ( rOldD ),
aOldFlt ( rOldF ),
......@@ -1639,7 +1639,7 @@ OUString ScUndoUpdateAreaLink::GetComment() const
return ScGlobal::GetRscString( STR_UNDO_UPDATELINK ); //! own text ??
}
void ScUndoUpdateAreaLink::DoChange( const sal_Bool bUndo ) const
void ScUndoUpdateAreaLink::DoChange( const bool bUndo ) const
{
ScDocument* pDoc = pDocShell->GetDocument();
......@@ -1710,7 +1710,7 @@ void ScUndoUpdateAreaLink::Undo()
pLink->SetRefreshDelay( nOldRefresh );
}
DoChange(sal_True);
DoChange(true);
}
void ScUndoUpdateAreaLink::Redo()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment