diff options
Diffstat (limited to 'sc/source/ui/undo/undobase.cxx')
-rw-r--r-- | sc/source/ui/undo/undobase.cxx | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/sc/source/ui/undo/undobase.cxx b/sc/source/ui/undo/undobase.cxx index fffb76ebd061..71183046f4fa 100644 --- a/sc/source/ui/undo/undobase.cxx +++ b/sc/source/ui/undo/undobase.cxx @@ -66,14 +66,14 @@ __EXPORT ScSimpleUndo::~ScSimpleUndo() delete pDetectiveUndo; } -BOOL __EXPORT ScSimpleUndo::Merge( SfxUndoAction *pNextAction ) +sal_Bool __EXPORT ScSimpleUndo::Merge( SfxUndoAction *pNextAction ) { // Zu jeder Undo-Action kann eine SdrUndoGroup fuer das Aktualisieren // der Detektiv-Pfeile gehoeren. // DetectiveRefresh kommt immer hinterher, die SdrUndoGroup ist in // eine ScUndoDraw Action verpackt. // Nur beim automatischen Aktualisieren wird AddUndoAction mit - // bTryMerg=TRUE gerufen. + // bTryMerg=sal_True gerufen. if ( !pDetectiveUndo && pNextAction->ISA(ScUndoDraw) ) { @@ -83,15 +83,15 @@ BOOL __EXPORT ScSimpleUndo::Merge( SfxUndoAction *pNextAction ) ScUndoDraw* pCalcUndo = (ScUndoDraw*)pNextAction; pDetectiveUndo = pCalcUndo->GetDrawUndo(); pCalcUndo->ForgetDrawUndo(); - return TRUE; + return sal_True; } - return FALSE; + return sal_False; } void ScSimpleUndo::BeginUndo() { - pDocShell->SetInUndo( TRUE ); + pDocShell->SetInUndo( sal_True ); ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); if (pViewShell) @@ -114,12 +114,12 @@ void ScSimpleUndo::EndUndo() pViewShell->ShowAllCursors(); } - pDocShell->SetInUndo( FALSE ); + pDocShell->SetInUndo( sal_False ); } void ScSimpleUndo::BeginRedo() { - pDocShell->SetInUndo( TRUE ); //! eigenes Flag fuer Redo? + pDocShell->SetInUndo( sal_True ); //! eigenes Flag fuer Redo? ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); if (pViewShell) @@ -141,7 +141,7 @@ void ScSimpleUndo::EndRedo() pViewShell->ShowAllCursors(); } - pDocShell->SetInUndo( FALSE ); + pDocShell->SetInUndo( sal_False ); } void ScSimpleUndo::ShowTable( SCTAB nTab ) // static @@ -184,7 +184,7 @@ __EXPORT ScBlockUndo::~ScBlockUndo() void ScBlockUndo::BeginUndo() { ScSimpleUndo::BeginUndo(); - EnableDrawAdjust( pDocShell->GetDocument(), FALSE ); + EnableDrawAdjust( pDocShell->GetDocument(), sal_False ); } void ScBlockUndo::EndUndo() @@ -192,7 +192,7 @@ void ScBlockUndo::EndUndo() if (eMode == SC_UNDO_AUTOHEIGHT) AdjustHeight(); - EnableDrawAdjust( pDocShell->GetDocument(), TRUE ); + EnableDrawAdjust( pDocShell->GetDocument(), sal_True ); DoSdrUndoAction( pDrawUndo, pDocShell->GetDocument() ); ShowBlock(); @@ -215,7 +215,7 @@ void ScBlockUndo::EndRedo() ScSimpleUndo::EndRedo(); } -BOOL ScBlockUndo::AdjustHeight() +sal_Bool ScBlockUndo::AdjustHeight() { ScDocument* pDoc = pDocShell->GetDocument(); @@ -239,9 +239,9 @@ BOOL ScBlockUndo::AdjustHeight() nPPTY = ScGlobal::nScreenPPTY; } - BOOL bRet = pDoc->SetOptimalHeight( aBlockRange.aStart.Row(), aBlockRange.aEnd.Row(), + sal_Bool bRet = pDoc->SetOptimalHeight( aBlockRange.aStart.Row(), aBlockRange.aEnd.Row(), /*!*/ aBlockRange.aStart.Tab(), 0, &aVirtDev, - nPPTX, nPPTY, aZoomX, aZoomY, FALSE ); + nPPTX, nPPTY, aZoomX, aZoomY, sal_False ); if (bRet) pDocShell->PostPaint( 0, aBlockRange.aStart.Row(), aBlockRange.aStart.Tab(), @@ -258,7 +258,7 @@ void ScBlockUndo::ShowBlock() { ShowTable( aBlockRange ); // bei mehreren Tabs im Range ist jede davon gut pViewShell->MoveCursorAbs( aBlockRange.aStart.Col(), aBlockRange.aStart.Row(), - SC_FOLLOW_JUMP, FALSE, FALSE ); + SC_FOLLOW_JUMP, sal_False, sal_False ); SCTAB nTab = pViewShell->GetViewData()->GetTabNo(); ScRange aRange = aBlockRange; aRange.aStart.SetTab( nTab ); @@ -296,7 +296,7 @@ void ScMoveUndo::UndoRef() { ScDocument* pDoc = pDocShell->GetDocument(); ScRange aRange(0,0,0, MAXCOL,MAXROW,pRefUndoDoc->GetTableCount()-1); - pRefUndoDoc->CopyToDocument( aRange, IDF_FORMULA, FALSE, pDoc, NULL, FALSE ); + pRefUndoDoc->CopyToDocument( aRange, IDF_FORMULA, sal_False, pDoc, NULL, sal_False ); if (pRefUndoData) pRefUndoData->DoUndo( pDoc, (eMode == SC_UNDO_REFFIRST) ); // #65055# HACK: ScDragDropUndo ist der einzige mit REFFIRST. @@ -308,7 +308,7 @@ void ScMoveUndo::BeginUndo() { ScSimpleUndo::BeginUndo(); - EnableDrawAdjust( pDocShell->GetDocument(), FALSE ); + EnableDrawAdjust( pDocShell->GetDocument(), sal_False ); if (pRefUndoDoc && eMode == SC_UNDO_REFFIRST) UndoRef(); @@ -322,7 +322,7 @@ void ScMoveUndo::EndUndo() if (pRefUndoDoc && eMode == SC_UNDO_REFLAST) UndoRef(); - EnableDrawAdjust( pDocShell->GetDocument(), TRUE ); + EnableDrawAdjust( pDocShell->GetDocument(), sal_True ); ScSimpleUndo::EndUndo(); } @@ -375,7 +375,7 @@ void ScDBFuncUndo::EndUndo() if ( pAutoDBRange ) { - USHORT nNoNameIndex; + sal_uInt16 nNoNameIndex; ScDocument* pDoc = pDocShell->GetDocument(); ScDBCollection* pColl = pDoc->GetDBCollection(); if ( pColl->SearchName( ScGlobal::GetRscString( STR_DB_NONAME ), nNoNameIndex ) ) @@ -410,7 +410,7 @@ void ScDBFuncUndo::BeginRedo() { // move the database range to this function's position again (see ScDocShell::GetDBData) - USHORT nNoNameIndex; + sal_uInt16 nNoNameIndex; ScDocument* pDoc = pDocShell->GetDocument(); ScDBCollection* pColl = pDoc->GetDBCollection(); if ( pColl->SearchName( ScGlobal::GetRscString( STR_DB_NONAME ), nNoNameIndex ) ) @@ -433,8 +433,8 @@ void ScDBFuncUndo::BeginRedo() aOriginalRange.aStart.Col(), aOriginalRange.aStart.Row(), aOriginalRange.aEnd.Col(), aOriginalRange.aEnd.Row() ); - pNoNameData->SetByRow( TRUE ); - pNoNameData->SetAutoFilter( FALSE ); + pNoNameData->SetByRow( sal_True ); + pNoNameData->SetAutoFilter( sal_False ); // header is always set with the operation in redo } } @@ -480,7 +480,7 @@ String ScUndoWrapper::GetRepeatComment(SfxRepeatTarget& rTarget) const return String(); } -USHORT ScUndoWrapper::GetId() const +sal_uInt16 ScUndoWrapper::GetId() const { if (pWrappedUndo) return pWrappedUndo->GetId(); @@ -488,26 +488,26 @@ USHORT ScUndoWrapper::GetId() const return 0; } -BOOL ScUndoWrapper::IsLinked() +sal_Bool ScUndoWrapper::IsLinked() { if (pWrappedUndo) return pWrappedUndo->IsLinked(); else - return FALSE; + return sal_False; } -void ScUndoWrapper::SetLinked( BOOL bIsLinked ) +void ScUndoWrapper::SetLinked( sal_Bool bIsLinked ) { if (pWrappedUndo) pWrappedUndo->SetLinked(bIsLinked); } -BOOL ScUndoWrapper::Merge( SfxUndoAction* pNextAction ) +sal_Bool ScUndoWrapper::Merge( SfxUndoAction* pNextAction ) { if (pWrappedUndo) return pWrappedUndo->Merge(pNextAction); else - return FALSE; + return sal_False; } void ScUndoWrapper::Undo() @@ -528,12 +528,12 @@ void ScUndoWrapper::Repeat(SfxRepeatTarget& rTarget) pWrappedUndo->Repeat(rTarget); } -BOOL ScUndoWrapper::CanRepeat(SfxRepeatTarget& rTarget) const +sal_Bool ScUndoWrapper::CanRepeat(SfxRepeatTarget& rTarget) const { if (pWrappedUndo) return pWrappedUndo->CanRepeat(rTarget); else - return FALSE; + return sal_False; } |