Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

1 files changed, 135 insertions, 136 deletions

diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx
index a670f067c8d8..0e59c0a35f92 100644
--- a/sc/source/ui/undo/undoblk.cxx
+++ b/sc/source/ui/undo/undoblk.cxx
@@ -106,7 +106,7 @@ TYPEINIT1(ScUndoBorder,             ScBlockUndo);
 ScUndoInsertCells::ScUndoInsertCells( ScDocShell* pNewDocShell,
                                 const ScRange& rRange, SCTAB nNewCount, SCTAB* pNewTabs, SCTAB* pNewScenarios,
                                 InsCellCmd eNewCmd, ScDocument* pUndoDocument, ScRefUndoData* pRefData,
-                                BOOL bNewPartOfPaste ) :
+                                sal_Bool bNewPartOfPaste ) :
     ScMoveUndo( pNewDocShell, pUndoDocument, pRefData, SC_UNDO_REFLAST ),
     aEffRange( rRange ),
     nCount( nNewCount ),
@@ -143,7 +143,7 @@ String ScUndoInsertCells::GetComment() const
     return ScGlobal::GetRscString( pPasteUndo ? STR_UNDO_PASTE : STR_UNDO_INSERTCELLS );
 }
 
-BOOL ScUndoInsertCells::Merge( SfxUndoAction* pNextAction )
+sal_Bool ScUndoInsertCells::Merge( SfxUndoAction* pNextAction )
 {
     //  If a paste undo action has already been added, append (detective) action there.
     if ( pPasteUndo )
@@ -160,7 +160,7 @@ BOOL ScUndoInsertCells::Merge( SfxUndoAction* pNextAction )
 
             pPasteUndo = pWrappedAction;
             pWrapper->ForgetWrappedUndo();      // pWrapper is deleted by UndoManager
-            return TRUE;
+            return sal_True;
         }
     }
 
@@ -180,7 +180,7 @@ void ScUndoInsertCells::SetChangeTrack()
         nEndChangeAction = 0;
 }
 
-void ScUndoInsertCells::DoChange( const BOOL bUndo )
+void ScUndoInsertCells::DoChange( const sal_Bool bUndo )
 {
     ScDocument* pDoc = pDocShell->GetDocument();
     SCTAB i;
@@ -238,13 +238,13 @@ void ScUndoInsertCells::DoChange( const BOOL bUndo )
         {
             SCCOL nEndCol = aWorkRange.aEnd.Col();
             SCROW nEndRow = aWorkRange.aEnd.Row();
-            pDoc->ExtendMerge( aWorkRange.aStart.Col(), aWorkRange.aStart.Row(), nEndCol, nEndRow, pTabs[i], TRUE );
+            pDoc->ExtendMerge( aWorkRange.aStart.Col(), aWorkRange.aStart.Row(), nEndCol, nEndRow, pTabs[i], sal_True );
         }
     }
 
 //? Undo fuer herausgeschobene Attribute ?
 
-    USHORT nPaint = PAINT_GRID;
+    sal_uInt16 nPaint = PAINT_GRID;
     ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
     switch (eCmd)
     {
@@ -301,7 +301,7 @@ void ScUndoInsertCells::Undo()
 
     WaitObject aWait( pDocShell->GetActiveDialogParent() );     // wichtig wegen TrackFormulas bei UpdateReference
     BeginUndo();
-    DoChange( TRUE );
+    DoChange( sal_True );
     EndUndo();
 }
 
@@ -309,7 +309,7 @@ void ScUndoInsertCells::Redo()
 {
     WaitObject aWait( pDocShell->GetActiveDialogParent() );     // wichtig wegen TrackFormulas bei UpdateReference
     BeginRedo();
-    DoChange( FALSE );
+    DoChange( false );
     EndRedo();
 
     if ( pPasteUndo )
@@ -328,11 +328,11 @@ void ScUndoInsertCells::Repeat(SfxRepeatTarget& rTarget)
             pPasteUndo->Repeat( rTarget );
         }
         else
-            ((ScTabViewTarget&)rTarget).GetViewShell()->InsertCells( eCmd, TRUE );
+            ((ScTabViewTarget&)rTarget).GetViewShell()->InsertCells( eCmd, sal_True );
     }
 }
 
-BOOL ScUndoInsertCells::CanRepeat(SfxRepeatTarget& rTarget) const
+sal_Bool ScUndoInsertCells::CanRepeat(SfxRepeatTarget& rTarget) const
 {
     return (rTarget.ISA(ScTabViewTarget));
 }
@@ -391,7 +391,7 @@ void ScUndoDeleteCells::SetChangeTrack()
         nStartChangeAction = nEndChangeAction = 0;
 }
 
-void ScUndoDeleteCells::DoChange( const BOOL bUndo )
+void ScUndoDeleteCells::DoChange( const sal_Bool bUndo )
 {
     ScDocument* pDoc = pDocShell->GetDocument();
     SCTAB i;
@@ -442,7 +442,7 @@ void ScUndoDeleteCells::DoChange( const BOOL bUndo )
     for( i=0; i<nCount && bUndo; i++ )
     {
         pRefUndoDoc->CopyToDocument( aEffRange.aStart.Col(), aEffRange.aStart.Row(), pTabs[i], aEffRange.aEnd.Col(), aEffRange.aEnd.Row(), pTabs[i]+pScenarios[i],
-            IDF_ALL | IDF_NOCAPTIONS, FALSE, pDoc );
+            IDF_ALL | IDF_NOCAPTIONS, false, pDoc );
     }
 
     ScRange aWorkRange( aEffRange );
@@ -474,12 +474,12 @@ void ScUndoDeleteCells::DoChange( const BOOL bUndo )
 
             SCCOL nEndCol = aWorkRange.aEnd.Col();
             SCROW nEndRow = aWorkRange.aEnd.Row();
-            pDoc->ExtendMerge( aWorkRange.aStart.Col(), aWorkRange.aStart.Row(), nEndCol, nEndRow, pTabs[i], TRUE );
+            pDoc->ExtendMerge( aWorkRange.aStart.Col(), aWorkRange.aStart.Row(), nEndCol, nEndRow, pTabs[i], sal_True );
         }
     }
 
     // Zeichnen
-    USHORT nPaint = PAINT_GRID;
+    sal_uInt16 nPaint = PAINT_GRID;
     switch (eCmd)
     {
         case DEL_DELROWS:
@@ -533,7 +533,7 @@ void ScUndoDeleteCells::Undo()
 {
     WaitObject aWait( pDocShell->GetActiveDialogParent() );     // wichtig wegen TrackFormulas bei UpdateReference
     BeginUndo();
-    DoChange( TRUE );
+    DoChange( sal_True );
     EndUndo();
     SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) );
 
@@ -552,7 +552,7 @@ void ScUndoDeleteCells::Redo()
 {
     WaitObject aWait( pDocShell->GetActiveDialogParent() );     // wichtig wegen TrackFormulas bei UpdateReference
     BeginRedo();
-    DoChange( FALSE);
+    DoChange( false);
     EndRedo();
     SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) );
 
@@ -564,10 +564,10 @@ void ScUndoDeleteCells::Redo()
 void ScUndoDeleteCells::Repeat(SfxRepeatTarget& rTarget)
 {
     if (rTarget.ISA(ScTabViewTarget))
-        ((ScTabViewTarget&)rTarget).GetViewShell()->DeleteCells( eCmd, TRUE );
+        ((ScTabViewTarget&)rTarget).GetViewShell()->DeleteCells( eCmd, sal_True );
 }
 
-BOOL ScUndoDeleteCells::CanRepeat(SfxRepeatTarget& rTarget) const
+sal_Bool ScUndoDeleteCells::CanRepeat(SfxRepeatTarget& rTarget) const
 {
     return (rTarget.ISA(ScTabViewTarget));
 }
@@ -579,7 +579,7 @@ BOOL ScUndoDeleteCells::CanRepeat(SfxRepeatTarget& rTarget) const
 //
 
 ScUndoDeleteMulti::ScUndoDeleteMulti( ScDocShell* pNewDocShell,
-                                        BOOL bNewRows, BOOL bNeedsRefresh, SCTAB nNewTab,
+                                        sal_Bool bNewRows, sal_Bool bNeedsRefresh, SCTAB nNewTab,
                                         const SCCOLROW* pRng, SCCOLROW nRngCnt,
                                         ScDocument* pUndoDocument, ScRefUndoData* pRefData ) :
     ScMoveUndo( pNewDocShell, pUndoDocument, pRefData, SC_UNDO_REFLAST ),
@@ -607,7 +607,7 @@ void ScUndoDeleteMulti::DoChange() const
 {
     SCCOL nStartCol;
     SCROW nStartRow;
-    USHORT nPaint;
+    sal_uInt16 nPaint;
     if (bRows)
     {
         nStartCol = 0;
@@ -627,7 +627,7 @@ void ScUndoDeleteMulti::DoChange() const
         SCCOL nEndCol = MAXCOL;
         SCROW nEndRow = MAXROW;
         pDoc->RemoveFlagsTab( nStartCol, nStartRow, nEndCol, nEndRow, nTab, SC_MF_HOR | SC_MF_VER );
-        pDoc->ExtendMerge( nStartCol, nStartRow, nEndCol, nEndRow, nTab, TRUE );
+        pDoc->ExtendMerge( nStartCol, nStartRow, nEndCol, nEndRow, nTab, sal_True );
     }
 
     pDocShell->PostPaint( nStartCol, nStartRow, nTab, MAXCOL, MAXROW, nTab, nPaint );
@@ -666,7 +666,7 @@ void ScUndoDeleteMulti::SetChangeTrack()
                 aRange.aStart.SetCol( static_cast<SCCOL>(nStart) );
                 aRange.aEnd.SetCol( static_cast<SCCOL>(nEnd) );
             }
-            ULONG nDummyStart;
+            sal_uLong nDummyStart;
             pChangeTrack->AppendDeleteRange( aRange, pRefUndoDoc,
                 nDummyStart, nEndChangeAction );
         }
@@ -702,10 +702,10 @@ void ScUndoDeleteMulti::Undo()
         SCCOLROW nStart = *(pOneRange++);
         SCCOLROW nEnd = *(pOneRange++);
         if (bRows)
-            pRefUndoDoc->CopyToDocument( 0,nStart,nTab, MAXCOL,nEnd,nTab, IDF_ALL,FALSE,pDoc );
+            pRefUndoDoc->CopyToDocument( 0,nStart,nTab, MAXCOL,nEnd,nTab, IDF_ALL,false,pDoc );
         else
             pRefUndoDoc->CopyToDocument( static_cast<SCCOL>(nStart),0,nTab,
-                    static_cast<SCCOL>(nEnd),MAXROW,nTab, IDF_ALL,FALSE,pDoc );
+                    static_cast<SCCOL>(nEnd),MAXROW,nTab, IDF_ALL,false,pDoc );
     }
 
     ScChangeTrack* pChangeTrack = pDoc->GetChangeTrack();
@@ -757,10 +757,10 @@ void ScUndoDeleteMulti::Repeat(SfxRepeatTarget& rTarget)
 {
     //  DeleteCells, falls einfache Selektion
     if (rTarget.ISA(ScTabViewTarget))
-        ((ScTabViewTarget&)rTarget).GetViewShell()->DeleteCells( DEL_DELROWS, TRUE );
+        ((ScTabViewTarget&)rTarget).GetViewShell()->DeleteCells( DEL_DELROWS, sal_True );
 }
 
-BOOL ScUndoDeleteMulti::CanRepeat(SfxRepeatTarget& rTarget) const
+sal_Bool ScUndoDeleteMulti::CanRepeat(SfxRepeatTarget& rTarget) const
 {
     return (rTarget.ISA(ScTabViewTarget));
 }
@@ -802,13 +802,13 @@ void ScUndoCut::SetChangeTrack()
         nStartChangeAction = nEndChangeAction = 0;
 }
 
-void ScUndoCut::DoChange( const BOOL bUndo )
+void ScUndoCut::DoChange( const sal_Bool bUndo )
 {
     ScDocument* pDoc = pDocShell->GetDocument();
-    USHORT nExtFlags = 0;
+    sal_uInt16 nExtFlags = 0;
 
     // do not undo/redo objects and note captions, they are handled via drawing undo
-    USHORT nUndoFlags = (IDF_ALL & ~IDF_OBJECTS) | IDF_NOCAPTIONS;
+    sal_uInt16 nUndoFlags = (IDF_ALL & ~IDF_OBJECTS) | IDF_NOCAPTIONS;
 
     if (bUndo)  // nur bei Undo
     {
@@ -817,7 +817,7 @@ void ScUndoCut::DoChange( const BOOL bUndo )
         ScRange aCopyRange = aExtendedRange;
         aCopyRange.aStart.SetTab(0);
         aCopyRange.aEnd.SetTab(nTabCount-1);
-        pUndoDoc->CopyToDocument( aCopyRange, nUndoFlags, FALSE, pDoc );
+        pUndoDoc->CopyToDocument( aCopyRange, nUndoFlags, false, pDoc );
         ScChangeTrack* pChangeTrack = pDoc->GetChangeTrack();
         if ( pChangeTrack )
             pChangeTrack->Undo( nStartChangeAction, nEndChangeAction );
@@ -845,7 +845,7 @@ void ScUndoCut::DoChange( const BOOL bUndo )
 void ScUndoCut::Undo()
 {
     BeginUndo();
-    DoChange( TRUE );
+    DoChange( sal_True );
     EndUndo();
 }
 
@@ -853,19 +853,19 @@ void ScUndoCut::Redo()
 {
     BeginRedo();
     ScDocument* pDoc = pDocShell->GetDocument();
-    EnableDrawAdjust( pDoc, FALSE );                //! include in ScBlockUndo?
-    DoChange( FALSE );
-    EnableDrawAdjust( pDoc, TRUE );                 //! include in ScBlockUndo?
+    EnableDrawAdjust( pDoc, false );                //! include in ScBlockUndo?
+    DoChange( false );
+    EnableDrawAdjust( pDoc, sal_True );                 //! include in ScBlockUndo?
     EndRedo();
 }
 
 void ScUndoCut::Repeat(SfxRepeatTarget& rTarget)
 {
     if (rTarget.ISA(ScTabViewTarget))
-        ((ScTabViewTarget&)rTarget).GetViewShell()->CutToClip( NULL, TRUE );
+        ((ScTabViewTarget&)rTarget).GetViewShell()->CutToClip( NULL, sal_True );
 }
 
-BOOL ScUndoCut::CanRepeat(SfxRepeatTarget& rTarget) const
+sal_Bool ScUndoCut::CanRepeat(SfxRepeatTarget& rTarget) const
 {
     return (rTarget.ISA(ScTabViewTarget));
 }
@@ -881,10 +881,10 @@ ScUndoPaste::ScUndoPaste( ScDocShell* pNewDocShell,
                 SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
                 const ScMarkData& rMark,
                 ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc,
-                USHORT nNewFlags,
+                sal_uInt16 nNewFlags,
                 ScRefUndoData* pRefData,
                 void* /* pFill1 */, void* /* pFill2 */, void* /* pFill3 */,
-                BOOL bRedoIsFilled, const ScUndoPasteOptions* pOptions ) :
+                sal_Bool bRedoIsFilled, const ScUndoPasteOptions* pOptions ) :
     ScBlockUndo( pNewDocShell, ScRange( nStartX, nStartY, nStartZ, nEndX, nEndY, nEndZ ), SC_UNDO_SIMPLE ),
     aMarkData( rMark ),
     pUndoDoc( pNewUndoDoc ),
@@ -933,20 +933,20 @@ void ScUndoPaste::SetChangeTrack()
         nStartChangeAction = nEndChangeAction = 0;
 }
 
-void ScUndoPaste::DoChange( const BOOL bUndo )
+void ScUndoPaste::DoChange( const sal_Bool bUndo )
 {
     ScDocument* pDoc = pDocShell->GetDocument();
 
     //  RefUndoData for redo is created before first undo
     //  (with DeleteUnchanged after the DoUndo call)
-    BOOL bCreateRedoData = ( bUndo && pRefUndoData && !pRefRedoData );
+    sal_Bool bCreateRedoData = ( bUndo && pRefUndoData && !pRefRedoData );
     if ( bCreateRedoData )
         pRefRedoData = new ScRefUndoData( pDoc );
 
     ScRefUndoData* pWorkRefData = bUndo ? pRefUndoData : pRefRedoData;
 
         //  fuer Undo immer alle oder keine Inhalte sichern
-    USHORT nUndoFlags = IDF_NONE;
+    sal_uInt16 nUndoFlags = IDF_NONE;
     if (nFlags & IDF_CONTENTS)
         nUndoFlags |= IDF_CONTENTS;
     if (nFlags & IDF_ATTRIB)
@@ -955,7 +955,7 @@ void ScUndoPaste::DoChange( const BOOL bUndo )
     // do not undo/redo objects and note captions, they are handled via drawing undo
     (nUndoFlags &= ~IDF_OBJECTS) |= IDF_NOCAPTIONS;
 
-    BOOL bPaintAll = FALSE;
+    sal_Bool bPaintAll = false;
 
     ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
 
@@ -967,8 +967,8 @@ void ScUndoPaste::DoChange( const BOOL bUndo )
     {
         if (!pRedoDoc)
         {
-            BOOL bColInfo = ( aBlockRange.aStart.Row()==0 && aBlockRange.aEnd.Row()==MAXROW );
-            BOOL bRowInfo = ( aBlockRange.aStart.Col()==0 && aBlockRange.aEnd.Col()==MAXCOL );
+            sal_Bool bColInfo = ( aBlockRange.aStart.Row()==0 && aBlockRange.aEnd.Row()==MAXROW );
+            sal_Bool bRowInfo = ( aBlockRange.aStart.Col()==0 && aBlockRange.aEnd.Col()==MAXCOL );
 
             pRedoDoc = new ScDocument( SCDOCMODE_UNDO );
             pRedoDoc->InitUndoSelected( pDoc, aMarkData, bColInfo, bRowInfo );
@@ -978,11 +978,11 @@ void ScUndoPaste::DoChange( const BOOL bUndo )
         ScRange aCopyRange = aBlockRange;
         aCopyRange.aStart.SetTab(0);
         aCopyRange.aEnd.SetTab(nTabCount-1);
-        pDoc->CopyToDocument( aCopyRange, nUndoFlags, FALSE, pRedoDoc );
-        bRedoFilled = TRUE;
+        pDoc->CopyToDocument( aCopyRange, nUndoFlags, false, pRedoDoc );
+        bRedoFilled = sal_True;
     }
 
-    USHORT nExtFlags = 0;
+    sal_uInt16 nExtFlags = 0;
     pDocShell->UpdatePaintExt( nExtFlags, aBlockRange );
 
     aMarkData.MarkToMulti();
@@ -997,21 +997,21 @@ void ScUndoPaste::DoChange( const BOOL bUndo )
     {
         aTabSelectRange.aStart.SetTab( nFirstSelected );
         aTabSelectRange.aEnd.SetTab( nFirstSelected );
-        pRedoDoc->UndoToDocument( aTabSelectRange, nUndoFlags, FALSE, pDoc );
+        pRedoDoc->UndoToDocument( aTabSelectRange, nUndoFlags, false, pDoc );
         for (nTab=0; nTab<nTabCount; nTab++)
             if (nTab != nFirstSelected && aMarkData.GetTableSelect(nTab))
             {
                 aTabSelectRange.aStart.SetTab( nTab );
                 aTabSelectRange.aEnd.SetTab( nTab );
-                pRedoDoc->CopyToDocument( aTabSelectRange, nUndoFlags, FALSE, pDoc );
+                pRedoDoc->CopyToDocument( aTabSelectRange, nUndoFlags, false, pDoc );
             }
     }
 
     if (pWorkRefData)
     {
-        pWorkRefData->DoUndo( pDoc, TRUE );     // TRUE = bSetChartRangeLists for SetChartListenerCollection
+        pWorkRefData->DoUndo( pDoc, sal_True );     // sal_True = bSetChartRangeLists for SetChartListenerCollection
         if ( pDoc->RefreshAutoFilter( 0,0, MAXCOL,MAXROW, aBlockRange.aStart.Tab() ) )
-            bPaintAll = TRUE;
+            bPaintAll = sal_True;
     }
 
     if ( bCreateRedoData && pRefRedoData )
@@ -1021,13 +1021,13 @@ void ScUndoPaste::DoChange( const BOOL bUndo )
     {
         aTabSelectRange.aStart.SetTab( nFirstSelected );
         aTabSelectRange.aEnd.SetTab( nFirstSelected );
-        pUndoDoc->UndoToDocument( aTabSelectRange, nUndoFlags, FALSE, pDoc );
+        pUndoDoc->UndoToDocument( aTabSelectRange, nUndoFlags, false, pDoc );
         for (nTab=0; nTab<nTabCount; nTab++)
             if (nTab != nFirstSelected && aMarkData.GetTableSelect(nTab))
             {
                 aTabSelectRange.aStart.SetTab( nTab );
                 aTabSelectRange.aEnd.SetTab( nTab );
-                pUndoDoc->UndoToDocument( aTabSelectRange, nUndoFlags, FALSE, pDoc );
+                pUndoDoc->UndoToDocument( aTabSelectRange, nUndoFlags, false, pDoc );
             }
     }
 
@@ -1041,8 +1041,8 @@ void ScUndoPaste::DoChange( const BOOL bUndo )
         SetChangeTrack();
 
     ScRange aDrawRange( aBlockRange );
-    pDoc->ExtendMerge( aDrawRange, TRUE );      // only needed for single sheet (text/rtf etc.)
-    USHORT nPaint = PAINT_GRID;
+    pDoc->ExtendMerge( aDrawRange, sal_True );      // only needed for single sheet (text/rtf etc.)
+    sal_uInt16 nPaint = PAINT_GRID;
     if (bPaintAll)
     {
         aDrawRange.aStart.SetCol(0);
@@ -1051,7 +1051,7 @@ void ScUndoPaste::DoChange( const BOOL bUndo )
         aDrawRange.aEnd.SetRow(MAXROW);
         nPaint |= PAINT_TOP | PAINT_LEFT;
 /*A*/   if (pViewShell)
-            pViewShell->AdjustBlockHeight(FALSE);
+            pViewShell->AdjustBlockHeight(false);
     }
     else
     {
@@ -1065,7 +1065,7 @@ void ScUndoPaste::DoChange( const BOOL bUndo )
             nPaint |= PAINT_LEFT;
             aDrawRange.aEnd.SetRow(MAXROW);
         }
-/*A*/   if ((pViewShell) && pViewShell->AdjustBlockHeight(FALSE))
+/*A*/   if ((pViewShell) && pViewShell->AdjustBlockHeight(false))
         {
             aDrawRange.aStart.SetCol(0);
             aDrawRange.aStart.SetRow(0);
@@ -1089,7 +1089,7 @@ void ScUndoPaste::DoChange( const BOOL bUndo )
 void ScUndoPaste::Undo()
 {
     BeginUndo();
-    DoChange( TRUE );
+    DoChange( sal_True );
     ShowTable( aBlockRange );
     EndUndo();
     SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) );
@@ -1099,9 +1099,9 @@ void ScUndoPaste::Redo()
 {
     BeginRedo();
     ScDocument* pDoc = pDocShell->GetDocument();
-    EnableDrawAdjust( pDoc, FALSE );                //! include in ScBlockUndo?
-    DoChange( FALSE );
-    EnableDrawAdjust( pDoc, TRUE );                 //! include in ScBlockUndo?
+    EnableDrawAdjust( pDoc, false );                //! include in ScBlockUndo?
+    DoChange( false );
+    EnableDrawAdjust( pDoc, sal_True );                 //! include in ScBlockUndo?
     EndRedo();
     SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) );
 }
@@ -1119,12 +1119,12 @@ void ScUndoPaste::Repeat(SfxRepeatTarget& rTarget)
             pViewSh->PasteFromClip( nFlags, pOwnClip->GetDocument(),
                                     aPasteOptions.nFunction, aPasteOptions.bSkipEmpty, aPasteOptions.bTranspose,
                                     aPasteOptions.bAsLink, aPasteOptions.eMoveMode, IDF_NONE,
-                                    TRUE );     // allow warning dialog
+                                    sal_True );     // allow warning dialog
         }
     }
 }
 
-BOOL ScUndoPaste::CanRepeat(SfxRepeatTarget& rTarget) const
+sal_Bool ScUndoPaste::CanRepeat(SfxRepeatTarget& rTarget) const
 {
     return (rTarget.ISA(ScTabViewTarget));
 }
@@ -1136,8 +1136,8 @@ BOOL ScUndoPaste::CanRepeat(SfxRepeatTarget& rTarget) const
 //
 
 ScUndoDragDrop::ScUndoDragDrop( ScDocShell* pNewDocShell,
-                    const ScRange& rRange, ScAddress aNewDestPos, BOOL bNewCut,
-                    ScDocument* pUndoDocument, ScRefUndoData* pRefData, BOOL bScenario ) :
+                    const ScRange& rRange, ScAddress aNewDestPos, sal_Bool bNewCut,
+                    ScDocument* pUndoDocument, ScRefUndoData* pRefData, sal_Bool bScenario ) :
     ScMoveUndo( pNewDocShell, pUndoDocument, pRefData, SC_UNDO_REFFIRST ),
     aSrcRange( rRange ),
     bCut( bNewCut ),
@@ -1148,7 +1148,7 @@ ScUndoDragDrop::ScUndoDragDrop( ScDocShell* pNewDocShell,
     aDestEnd.IncCol(aSrcRange.aEnd.Col() - aSrcRange.aStart.Col());
     aDestEnd.IncTab(aSrcRange.aEnd.Tab() - aSrcRange.aStart.Tab());
 
-    BOOL bIncludeFiltered = bCut;
+    sal_Bool bIncludeFiltered = bCut;
     if ( !bIncludeFiltered )
     {
         // find number of non-filtered rows
@@ -1196,9 +1196,9 @@ void ScUndoDragDrop::SetChangeTrack()
         nStartChangeAction = nEndChangeAction = 0;
 }
 
-void ScUndoDragDrop::PaintArea( ScRange aRange, USHORT nExtFlags ) const
+void ScUndoDragDrop::PaintArea( ScRange aRange, sal_uInt16 nExtFlags ) const
 {
-    USHORT nPaint = PAINT_GRID;
+    sal_uInt16 nPaint = PAINT_GRID;
     ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
     ScDocument* pDoc = pDocShell->GetDocument();
 
@@ -1211,7 +1211,7 @@ void ScUndoDragDrop::PaintArea( ScRange aRange, USHORT nExtFlags ) const
                                      aRange.aStart.Tab(), 0, &aVirtDev,
                                      pViewData->GetPPTX(),  pViewData->GetPPTY(),
                                      pViewData->GetZoomX(), pViewData->GetZoomY(),
-                                     FALSE ) )
+                                     false ) )
         {
             aRange.aStart.SetCol(0);
             aRange.aEnd.SetCol(MAXCOL);
@@ -1258,16 +1258,16 @@ void ScUndoDragDrop::DoUndo( ScRange aRange ) const
     ScRange aPaintRange = aRange;
     pDoc->ExtendMerge( aPaintRange );           // before deleting
 
-    USHORT nExtFlags = 0;
+    sal_uInt16 nExtFlags = 0;
     pDocShell->UpdatePaintExt( nExtFlags, aPaintRange );
 
     // do not undo objects and note captions, they are handled via drawing undo
-    USHORT nUndoFlags = (IDF_ALL & ~IDF_OBJECTS) | IDF_NOCAPTIONS;
+    sal_uInt16 nUndoFlags = (IDF_ALL & ~IDF_OBJECTS) | IDF_NOCAPTIONS;
 
     pDoc->DeleteAreaTab( aRange, nUndoFlags );
-    pRefUndoDoc->CopyToDocument( aRange, nUndoFlags, FALSE, pDoc );
+    pRefUndoDoc->CopyToDocument( aRange, nUndoFlags, false, pDoc );
     if ( pDoc->HasAttrib( aRange, HASATTR_MERGED ) )
-        pDoc->ExtendMerge( aRange, TRUE );
+        pDoc->ExtendMerge( aRange, sal_True );
 
     aPaintRange.aEnd.SetCol( Max( aPaintRange.aEnd.Col(), aRange.aEnd.Col() ) );
     aPaintRange.aEnd.SetRow( Max( aPaintRange.aEnd.Row(), aRange.aEnd.Row() ) );
@@ -1293,10 +1293,10 @@ void ScUndoDragDrop::Redo()
     ScDocument* pDoc = pDocShell->GetDocument();
     ScDocument* pClipDoc = new ScDocument( SCDOCMODE_CLIP );
 
-    EnableDrawAdjust( pDoc, FALSE );                //! include in ScBlockUndo?
+    EnableDrawAdjust( pDoc, false );                //! include in ScBlockUndo?
 
     // do not undo/redo objects and note captions, they are handled via drawing undo
-    USHORT nRedoFlags = (IDF_ALL & ~IDF_OBJECTS) | IDF_NOCAPTIONS;
+    sal_uInt16 nRedoFlags = (IDF_ALL & ~IDF_OBJECTS) | IDF_NOCAPTIONS;
 
     /*  TODO: Redoing note captions is quite tricky due to the fact that a
         helper clip document is used. While (re-)pasting the contents to the
@@ -1314,7 +1314,7 @@ void ScUndoDragDrop::Redo()
     SCTAB nTab;
     ScMarkData aSourceMark;
     for (nTab=aSrcRange.aStart.Tab(); nTab<=aSrcRange.aEnd.Tab(); nTab++)
-        aSourceMark.SelectTable( nTab, TRUE );
+        aSourceMark.SelectTable( nTab, sal_True );
 
     // do not clone objects and note captions into clipdoc (see above)
     ScClipParam aClipParam(aSrcRange, bCut);
@@ -1324,7 +1324,7 @@ void ScUndoDragDrop::Redo()
     {
         ScRange aSrcPaintRange = aSrcRange;
         pDoc->ExtendMerge( aSrcPaintRange );            // before deleting
-        USHORT nExtFlags = 0;
+        sal_uInt16 nExtFlags = 0;
         pDocShell->UpdatePaintExt( nExtFlags, aSrcPaintRange );
         pDoc->DeleteAreaTab( aSrcRange, nRedoFlags );
         PaintArea( aSrcPaintRange, nExtFlags );
@@ -1332,11 +1332,11 @@ void ScUndoDragDrop::Redo()
 
     ScMarkData aDestMark;
     for (nTab=aDestRange.aStart.Tab(); nTab<=aDestRange.aEnd.Tab(); nTab++)
-        aDestMark.SelectTable( nTab, TRUE );
+        aDestMark.SelectTable( nTab, sal_True );
 
-    BOOL bIncludeFiltered = bCut;
+    sal_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 );
+    pDoc->CopyFromClip( aDestRange, aDestMark, IDF_ALL & ~IDF_OBJECTS, NULL, pClipDoc, sal_True, false, bIncludeFiltered );
 
     if (bCut)
         for (nTab=aSrcRange.aStart.Tab(); nTab<=aSrcRange.aEnd.Tab(); nTab++)
@@ -1345,14 +1345,14 @@ void ScUndoDragDrop::Redo()
 
     // skipped rows and merged cells don't mix
     if ( !bIncludeFiltered && pClipDoc->HasClipFilteredRows() )
-        pDocShell->GetDocFunc().UnmergeCells( aDestRange, FALSE, TRUE );
+        pDocShell->GetDocFunc().UnmergeCells( aDestRange, false, sal_True );
 
     for (nTab=aDestRange.aStart.Tab(); nTab<=aDestRange.aEnd.Tab(); nTab++)
     {
         SCCOL nEndCol = aDestRange.aEnd.Col();
         SCROW nEndRow = aDestRange.aEnd.Row();
         pDoc->ExtendMerge( aDestRange.aStart.Col(), aDestRange.aStart.Row(),
-                            nEndCol, nEndRow, nTab, TRUE );
+                            nEndCol, nEndRow, nTab, sal_True );
         PaintArea( ScRange( aDestRange.aStart.Col(), aDestRange.aStart.Row(), nTab,
                             nEndCol, nEndRow, nTab ), 0 );
     }
@@ -1363,7 +1363,7 @@ void ScUndoDragDrop::Redo()
     ShowTable( aDestRange.aStart.Tab() );
 
     RedoSdrUndoAction( pDrawUndo );             //! include in ScBlockUndo?
-    EnableDrawAdjust( pDoc, TRUE );             //! include in ScBlockUndo?
+    EnableDrawAdjust( pDoc, sal_True );             //! include in ScBlockUndo?
 
     EndRedo();
     SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) );
@@ -1373,9 +1373,9 @@ void ScUndoDragDrop::Repeat(SfxRepeatTarget& /* rTarget */)
 {
 }
 
-BOOL ScUndoDragDrop::CanRepeat(SfxRepeatTarget& /* rTarget */) const
+sal_Bool ScUndoDragDrop::CanRepeat(SfxRepeatTarget& /* rTarget */) const
 {
-    return FALSE;           // geht nicht
+    return false;           // geht nicht
 }
 
 
@@ -1409,7 +1409,7 @@ void ScUndoListNames::DoChange( ScDocument* pSrcDoc ) const
     ScDocument* pDoc = pDocShell->GetDocument();
 
     pDoc->DeleteAreaTab( aBlockRange, IDF_ALL );
-    pSrcDoc->CopyToDocument( aBlockRange, IDF_ALL, FALSE, pDoc );
+    pSrcDoc->CopyToDocument( aBlockRange, IDF_ALL, false, pDoc );
     pDocShell->PostPaint( aBlockRange, PAINT_GRID );
     pDocShell->PostDataChanged();
     ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
@@ -1437,7 +1437,7 @@ void ScUndoListNames::Repeat(SfxRepeatTarget& rTarget)
         ((ScTabViewTarget&)rTarget).GetViewShell()->InsertNameList();
 }
 
-BOOL ScUndoListNames::CanRepeat(SfxRepeatTarget& rTarget) const
+sal_Bool ScUndoListNames::CanRepeat(SfxRepeatTarget& rTarget) const
 {
     return (rTarget.ISA(ScTabViewTarget));
 }
@@ -1490,10 +1490,10 @@ void ScUndoUseScenario::Undo()
 
     ScDocument* pDoc = pDocShell->GetDocument();
     pDoc->DeleteSelection( IDF_ALL, aMarkData );
-    pUndoDoc->CopyToDocument( aRange, IDF_ALL, TRUE, pDoc, &aMarkData );
+    pUndoDoc->CopyToDocument( aRange, IDF_ALL, sal_True, pDoc, &aMarkData );
 
     //  Szenario-Tabellen
-    BOOL bFrame = FALSE;
+    sal_Bool bFrame = false;
     SCTAB nTab = aRange.aStart.Tab();
     SCTAB nEndTab = nTab;
     while ( pUndoDoc->HasTable(nEndTab+1) && pUndoDoc->IsScenario(nEndTab+1) )
@@ -1503,19 +1503,19 @@ void ScUndoUseScenario::Undo()
         //  Flags immer
         String aComment;
         Color  aColor;
-        USHORT nScenFlags;
+        sal_uInt16 nScenFlags;
         pUndoDoc->GetScenarioData( i, aComment, aColor, nScenFlags );
         pDoc->SetScenarioData( i, aComment, aColor, nScenFlags );
-        BOOL bActive = pUndoDoc->IsActiveScenario( i );
+        sal_Bool bActive = pUndoDoc->IsActiveScenario( i );
         pDoc->SetActiveScenario( i, bActive );
         //  Bei Zurueckkopier-Szenarios auch Inhalte
         if ( nScenFlags & SC_SCENARIO_TWOWAY )
         {
             pDoc->DeleteAreaTab( 0,0, MAXCOL,MAXROW, i, IDF_ALL );
-            pUndoDoc->CopyToDocument( 0,0,i, MAXCOL,MAXROW,i, IDF_ALL,FALSE, pDoc );
+            pUndoDoc->CopyToDocument( 0,0,i, MAXCOL,MAXROW,i, IDF_ALL,false, pDoc );
         }
         if ( nScenFlags & SC_SCENARIO_SHOWFRAME )
-            bFrame = TRUE;
+            bFrame = sal_True;
     }
 
     //  Wenn sichtbare Rahmen, dann alles painten
@@ -1545,7 +1545,7 @@ void ScUndoUseScenario::Redo()
         pViewShell->InitOwnBlockMode();
     }
 
-    pDocShell->UseScenario( nTab, aName, FALSE );
+    pDocShell->UseScenario( nTab, aName, false );
 
     EndRedo();
 }
@@ -1559,14 +1559,14 @@ void ScUndoUseScenario::Repeat(SfxRepeatTarget& rTarget)
     }
 }
 
-BOOL ScUndoUseScenario::CanRepeat(SfxRepeatTarget& rTarget) const
+sal_Bool ScUndoUseScenario::CanRepeat(SfxRepeatTarget& rTarget) const
 {
     if (rTarget.ISA(ScTabViewTarget))
     {
         ScViewData* pViewData = ((ScTabViewTarget&)rTarget).GetViewShell()->GetViewData();
         return !pViewData->GetDocument()->IsScenario( pViewData->GetTabNo() );
     }
-    return FALSE;
+    return false;
 }
 
 
@@ -1600,19 +1600,17 @@ String ScUndoSelectionStyle::GetComment() const
     return ScGlobal::GetRscString( STR_UNDO_APPLYCELLSTYLE );
 }
 
-void ScUndoSelectionStyle::DoChange( const BOOL bUndo )
+void ScUndoSelectionStyle::DoChange( const sal_Bool bUndo )
 {
     ScDocument* pDoc = pDocShell->GetDocument();
-    ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
 
-    if (pViewShell)
-        pViewShell->SetMarkData( aMarkData );
+    SetViewMarkData( aMarkData );
 
     ScRange aWorkRange( aRange );
     if ( pDoc->HasAttrib( aWorkRange, HASATTR_MERGED ) )        // zusammengefasste Zellen?
-        pDoc->ExtendMerge( aWorkRange, TRUE );
+        pDoc->ExtendMerge( aWorkRange, sal_True );
 
-    USHORT nExtFlags = 0;
+    sal_uInt16 nExtFlags = 0;
     pDocShell->UpdatePaintExt( nExtFlags, aWorkRange );
 
     if (bUndo)      // bei Undo alte Daten wieder reinschubsen
@@ -1621,7 +1619,7 @@ void ScUndoSelectionStyle::DoChange( const BOOL bUndo )
         ScRange aCopyRange = aWorkRange;
         aCopyRange.aStart.SetTab(0);
         aCopyRange.aEnd.SetTab(nTabCount-1);
-        pUndoDoc->CopyToDocument( aCopyRange, IDF_ATTRIB, TRUE, pDoc, &aMarkData );
+        pUndoDoc->CopyToDocument( aCopyRange, IDF_ATTRIB, sal_True, pDoc, &aMarkData );
     }
     else            // bei Redo Style wieder zuweisen
     {
@@ -1638,6 +1636,7 @@ void ScUndoSelectionStyle::DoChange( const BOOL bUndo )
 
     pDocShell->UpdatePaintExt( nExtFlags, aWorkRange );
 
+    ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
     if ( !( (pViewShell) && pViewShell->AdjustBlockHeight() ) )
 /*A*/   pDocShell->PostPaint( aWorkRange, PAINT_GRID | PAINT_EXTRAS, nExtFlags );
 
@@ -1647,14 +1646,14 @@ void ScUndoSelectionStyle::DoChange( const BOOL bUndo )
 void ScUndoSelectionStyle::Undo()
 {
     BeginUndo();
-    DoChange( TRUE );
+    DoChange( sal_True );
     EndUndo();
 }
 
 void ScUndoSelectionStyle::Redo()
 {
     BeginRedo();
-    DoChange( FALSE );
+    DoChange( false );
     EndRedo();
 }
 
@@ -1673,16 +1672,16 @@ void ScUndoSelectionStyle::Repeat(SfxRepeatTarget& rTarget)
         }
 
         ScTabViewShell& rViewShell = *((ScTabViewTarget&)rTarget).GetViewShell();
-        rViewShell.SetStyleSheetToMarked( pStyleSheet, TRUE );
+        rViewShell.SetStyleSheetToMarked( pStyleSheet, sal_True );
     }
 }
 
-BOOL ScUndoSelectionStyle::CanRepeat(SfxRepeatTarget& rTarget) const
+sal_Bool ScUndoSelectionStyle::CanRepeat(SfxRepeatTarget& rTarget) const
 {
     return (rTarget.ISA(ScTabViewTarget));
 }
 
-USHORT ScUndoSelectionStyle::GetId() const
+sal_uInt16 ScUndoSelectionStyle::GetId() const
 {
     return STR_UNDO_APPLYCELLSTYLE;
 }
@@ -1730,7 +1729,7 @@ void ScUndoEnterMatrix::Undo()
     ScDocument* pDoc = pDocShell->GetDocument();
 
     pDoc->DeleteAreaTab( aBlockRange, IDF_ALL & ~IDF_NOTE );
-    pUndoDoc->CopyToDocument( aBlockRange, IDF_ALL & ~IDF_NOTE, FALSE, pDoc );
+    pUndoDoc->CopyToDocument( aBlockRange, IDF_ALL & ~IDF_NOTE, false, pDoc );
     pDocShell->PostPaint( aBlockRange, PAINT_GRID );
     pDocShell->PostDataChanged();
     ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
@@ -1773,7 +1772,7 @@ void ScUndoEnterMatrix::Repeat(SfxRepeatTarget& rTarget)
     }
 }
 
-BOOL ScUndoEnterMatrix::CanRepeat(SfxRepeatTarget& rTarget) const
+sal_Bool ScUndoEnterMatrix::CanRepeat(SfxRepeatTarget& rTarget) const
 {
     return (rTarget.ISA(ScTabViewTarget));
 }
@@ -1793,7 +1792,7 @@ ScRange lcl_GetMultiMarkRange( const ScMarkData& rMark )
 }
 
 ScUndoIndent::ScUndoIndent( ScDocShell* pNewDocShell, const ScMarkData& rMark,
-                            ScDocument* pNewUndoDoc, BOOL bIncrement ) :
+                            ScDocument* pNewUndoDoc, sal_Bool bIncrement ) :
     ScBlockUndo( pNewDocShell, lcl_GetMultiMarkRange(rMark), SC_UNDO_AUTOHEIGHT ),
     aMarkData( rMark ),
     pUndoDoc( pNewUndoDoc ),
@@ -1808,7 +1807,7 @@ ScUndoIndent::~ScUndoIndent()
 
 String ScUndoIndent::GetComment() const
 {
-    USHORT nId = bIsIncrement ? STR_UNDO_INC_INDENT : STR_UNDO_DEC_INDENT;
+    sal_uInt16 nId = bIsIncrement ? STR_UNDO_INC_INDENT : STR_UNDO_DEC_INDENT;
     return ScGlobal::GetRscString( nId );
 }
 
@@ -1821,7 +1820,7 @@ void ScUndoIndent::Undo()
     ScRange aCopyRange = aBlockRange;
     aCopyRange.aStart.SetTab(0);
     aCopyRange.aEnd.SetTab(nTabCount-1);
-    pUndoDoc->CopyToDocument( aCopyRange, IDF_ATTRIB, TRUE, pDoc, &aMarkData );
+    pUndoDoc->CopyToDocument( aCopyRange, IDF_ATTRIB, sal_True, pDoc, &aMarkData );
     pDocShell->PostPaint( aBlockRange, PAINT_GRID, SC_PF_LINES | SC_PF_TESTMERGE );
 
     EndUndo();
@@ -1844,7 +1843,7 @@ void ScUndoIndent::Repeat(SfxRepeatTarget& rTarget)
         ((ScTabViewTarget&)rTarget).GetViewShell()->ChangeIndent( bIsIncrement );
 }
 
-BOOL ScUndoIndent::CanRepeat(SfxRepeatTarget& rTarget) const
+sal_Bool ScUndoIndent::CanRepeat(SfxRepeatTarget& rTarget) const
 {
     return (rTarget.ISA(ScTabViewTarget));
 }
@@ -1882,7 +1881,7 @@ void ScUndoTransliterate::Undo()
     ScRange aCopyRange = aBlockRange;
     aCopyRange.aStart.SetTab(0);
     aCopyRange.aEnd.SetTab(nTabCount-1);
-    pUndoDoc->CopyToDocument( aCopyRange, IDF_CONTENTS, TRUE, pDoc, &aMarkData );
+    pUndoDoc->CopyToDocument( aCopyRange, IDF_CONTENTS, sal_True, pDoc, &aMarkData );
     pDocShell->PostPaint( aBlockRange, PAINT_GRID, SC_PF_LINES | SC_PF_TESTMERGE );
 
     EndUndo();
@@ -1905,7 +1904,7 @@ void ScUndoTransliterate::Repeat(SfxRepeatTarget& rTarget)
         ((ScTabViewTarget&)rTarget).GetViewShell()->TransliterateText( nTransliterationType );
 }
 
-BOOL ScUndoTransliterate::CanRepeat(SfxRepeatTarget& rTarget) const
+sal_Bool ScUndoTransliterate::CanRepeat(SfxRepeatTarget& rTarget) const
 {
     return (rTarget.ISA(ScTabViewTarget));
 }
@@ -1916,7 +1915,7 @@ BOOL ScUndoTransliterate::CanRepeat(SfxRepeatTarget& rTarget) const
 //
 
 ScUndoClearItems::ScUndoClearItems( ScDocShell* pNewDocShell, const ScMarkData& rMark,
-                            ScDocument* pNewUndoDoc, const USHORT* pW ) :
+                            ScDocument* pNewUndoDoc, const sal_uInt16* pW ) :
     ScBlockUndo( pNewDocShell, lcl_GetMultiMarkRange(rMark), SC_UNDO_AUTOHEIGHT ),
     aMarkData( rMark ),
     pUndoDoc( pNewUndoDoc ),
@@ -1924,11 +1923,11 @@ ScUndoClearItems::ScUndoClearItems( ScDocShell* pNewDocShell, const ScMarkData&
 {
     DBG_ASSERT( pW, "ScUndoClearItems: Which-Pointer ist 0" );
 
-    USHORT nCount = 0;
+    sal_uInt16 nCount = 0;
     while ( pW[nCount] )
         ++nCount;
-    pWhich = new USHORT[nCount+1];
-    for (USHORT i=0; i<=nCount; i++)
+    pWhich = new sal_uInt16[nCount+1];
+    for (sal_uInt16 i=0; i<=nCount; i++)
         pWhich[i] = pW[i];
 }
 
@@ -1948,7 +1947,7 @@ void ScUndoClearItems::Undo()
     BeginUndo();
 
     ScDocument* pDoc = pDocShell->GetDocument();
-    pUndoDoc->CopyToDocument( aBlockRange, IDF_ATTRIB, TRUE, pDoc, &aMarkData );
+    pUndoDoc->CopyToDocument( aBlockRange, IDF_ATTRIB, sal_True, pDoc, &aMarkData );
     pDocShell->PostPaint( aBlockRange, PAINT_GRID, SC_PF_LINES | SC_PF_TESTMERGE );
 
     EndUndo();
@@ -1971,11 +1970,11 @@ void ScUndoClearItems::Repeat(SfxRepeatTarget& rTarget)
     {
         ScViewData* pViewData = ((ScTabViewTarget&)rTarget).GetViewShell()->GetViewData();
         ScDocFunc aFunc(*pViewData->GetDocShell());
-        aFunc.ClearItems( pViewData->GetMarkData(), pWhich, FALSE );
+        aFunc.ClearItems( pViewData->GetMarkData(), pWhich, false );
     }
 }
 
-BOOL ScUndoClearItems::CanRepeat(SfxRepeatTarget& rTarget) const
+sal_Bool ScUndoClearItems::CanRepeat(SfxRepeatTarget& rTarget) const
 {
     return (rTarget.ISA(ScTabViewTarget));
 }
@@ -2010,9 +2009,9 @@ void ScUndoRemoveBreaks::Undo()
     ScDocument* pDoc = pDocShell->GetDocument();
     ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
 
-    pUndoDoc->CopyToDocument( 0,0,nTab, MAXCOL,MAXROW,nTab, IDF_NONE, FALSE, pDoc );
+    pUndoDoc->CopyToDocument( 0,0,nTab, MAXCOL,MAXROW,nTab, IDF_NONE, false, pDoc );
     if (pViewShell)
-        pViewShell->UpdatePageBreakData( TRUE );
+        pViewShell->UpdatePageBreakData( sal_True );
     pDocShell->PostPaint( 0,0,nTab, MAXCOL,MAXROW,nTab, PAINT_GRID );
 
     EndUndo();
@@ -2028,7 +2027,7 @@ void ScUndoRemoveBreaks::Redo()
     pDoc->RemoveManualBreaks(nTab);
     pDoc->UpdatePageBreaks(nTab);
     if (pViewShell)
-        pViewShell->UpdatePageBreakData( TRUE );
+        pViewShell->UpdatePageBreakData( sal_True );
     pDocShell->PostPaint( 0,0,nTab, MAXCOL,MAXROW,nTab, PAINT_GRID );
 
     EndRedo();
@@ -2043,7 +2042,7 @@ void ScUndoRemoveBreaks::Repeat(SfxRepeatTarget& rTarget)
     }
 }
 
-BOOL ScUndoRemoveBreaks::CanRepeat(SfxRepeatTarget& rTarget) const
+sal_Bool ScUndoRemoveBreaks::CanRepeat(SfxRepeatTarget& rTarget) const
 {
     return (rTarget.ISA(ScTabViewTarget));
 }
@@ -2087,7 +2086,7 @@ void ScUndoRemoveMerge::Undo()
         // There is no need to extend merge area because it's already been extended.
         ScRange aRange = maOption.getSingleRange(*itr);
         pDoc->DeleteAreaTab(aRange, IDF_ATTRIB);
-        pUndoDoc->CopyToDocument(aRange, IDF_ATTRIB, FALSE, pDoc);
+        pUndoDoc->CopyToDocument(aRange, IDF_ATTRIB, false, pDoc);
 
         bool bDidPaint = false;
         if ( pViewShell )
@@ -2132,11 +2131,11 @@ void ScUndoRemoveMerge::Redo()
                               maOption.mnEndCol, maOption.mnEndRow, nTab,
                               SC_MF_HOR | SC_MF_VER );
 
-        pDoc->ExtendMerge(aRange, TRUE, FALSE);
+        pDoc->ExtendMerge(aRange, true, false);
 
         //  Paint
 
-        BOOL bDidPaint = FALSE;
+        sal_Bool bDidPaint = false;
         if ( pViewShell )
         {
             pViewShell->SetTabNo(nTab);
@@ -2155,7 +2154,7 @@ void ScUndoRemoveMerge::Repeat(SfxRepeatTarget& rTarget)
         ((ScTabViewTarget&)rTarget).GetViewShell()->RemoveMerge();
 }
 
-BOOL ScUndoRemoveMerge::CanRepeat(SfxRepeatTarget& rTarget) const
+sal_Bool ScUndoRemoveMerge::CanRepeat(SfxRepeatTarget& rTarget) const
 {
     return (rTarget.ISA(ScTabViewTarget));
 }
@@ -2222,8 +2221,8 @@ void ScUndoBorder::Undo()
 
     ScDocument* pDoc = pDocShell->GetDocument();
     ScMarkData aMarkData;
-    aMarkData.MarkFromRangeList( *pRanges, FALSE );
-    pUndoDoc->CopyToDocument( aBlockRange, IDF_ATTRIB, TRUE, pDoc, &aMarkData );
+    aMarkData.MarkFromRangeList( *pRanges, false );
+    pUndoDoc->CopyToDocument( aBlockRange, IDF_ATTRIB, sal_True, pDoc, &aMarkData );
     pDocShell->PostPaint( aBlockRange, PAINT_GRID, SC_PF_LINES | SC_PF_TESTMERGE );
 
     EndUndo();
@@ -2242,7 +2241,7 @@ void ScUndoBorder::Redo()
 
         ScMarkData aMark;
         aMark.SetMarkArea( aRange );
-        aMark.SelectTable( nTab, TRUE );
+        aMark.SelectTable( nTab, sal_True );
 
         pDoc->ApplySelectionFrame( aMark, pOuter, pInner );
     }
@@ -2257,9 +2256,9 @@ void ScUndoBorder::Repeat(SfxRepeatTarget& /* rTarget */)
     //! spaeter (wenn die Funktion aus cellsuno nach docfunc gewandert ist)
 }
 
-BOOL ScUndoBorder::CanRepeat(SfxRepeatTarget& /* rTarget */) const
+sal_Bool ScUndoBorder::CanRepeat(SfxRepeatTarget& /* rTarget */) const
 {
-    return FALSE;   // s.o.
+    return false;   // s.o.
 }