removetooltypes01: #i112600# remove tooltypes from sc

1 files changed, 82 insertions, 82 deletions

diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx
index 013511ab0acb..fb5c30c5826e 100644
--- a/sc/source/ui/docshell/docsh5.cxx
+++ b/sc/source/ui/docshell/docsh5.cxx
@@ -77,13 +77,13 @@ void VBA_InsertModule( ScDocument& rDoc, SCTAB nTab, String& sModuleName, String
 //  ehemalige viewfunc/dbfunc Methoden
 //
 
-void ScDocShell::ErrorMessage( USHORT nGlobStrId )
+void ScDocShell::ErrorMessage( sal_uInt16 nGlobStrId )
 {
     //! StopMarking an der (aktiven) View?
 
     Window* pParent = GetActiveDialogParent();
     ScWaitCursorOff aWaitOff( pParent );
-    BOOL bFocus = pParent && pParent->HasFocus();
+    sal_Bool bFocus = pParent && pParent->HasFocus();
 
     if(nGlobStrId==STR_PROTECTIONERR)
     {
@@ -99,7 +99,7 @@ void ScDocShell::ErrorMessage( USHORT nGlobStrId )
         pParent->GrabFocus();
 }
 
-BOOL ScDocShell::IsEditable() const
+sal_Bool ScDocShell::IsEditable() const
 {
     // import into read-only document is possible - must be extended if other filters use api
     // #i108547# MSOOXML filter uses "IsChangeReadOnlyEnabled" property
@@ -126,12 +126,12 @@ ScDBData* lcl_GetDBNearCursor( ScDBCollection* pColl, SCCOL nCol, SCROW nRow, SC
 
     ScDBData* pNoNameData = NULL;
     ScDBData* pNearData = NULL;
-    USHORT nCount = pColl->GetCount();
+    sal_uInt16 nCount = pColl->GetCount();
     String aNoName = ScGlobal::GetRscString( STR_DB_NONAME );
     SCTAB nAreaTab;
     SCCOL nStartCol, nEndCol;
     SCROW nStartRow, nEndRow;
-    for (USHORT i = 0; i < nCount; i++)
+    for (sal_uInt16 i = 0; i < nCount; i++)
     {
         ScDBData* pDB = (*pColl)[i];
         pDB->GetArea( nAreaTab, nStartCol, nStartRow, nEndCol, nEndRow );
@@ -175,11 +175,11 @@ ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGe
     if (!pData)
         pData = lcl_GetDBNearCursor( aDocument.GetDBCollection(), nCol, nRow, nTab );
 
-    BOOL bSelected = ( eSel == SC_DBSEL_FORCE_MARK ||
+    sal_Bool bSelected = ( eSel == SC_DBSEL_FORCE_MARK ||
             (rMarked.aStart != rMarked.aEnd && eSel != SC_DBSEL_ROW_DOWN) );
     bool bOnlyDown = (!bSelected && eSel == SC_DBSEL_ROW_DOWN && rMarked.aStart.Row() == rMarked.aEnd.Row());
 
-    BOOL bUseThis = FALSE;
+    sal_Bool bUseThis = sal_False;
     if (pData)
     {
         //      Bereich nehmen, wenn nichts anderes markiert
@@ -190,11 +190,11 @@ ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGe
         SCCOL nOldCol2;
         SCROW nOldRow2;
         pData->GetArea( nDummy, nOldCol1,nOldRow1, nOldCol2,nOldRow2 );
-        BOOL bIsNoName = ( pData->GetName() == ScGlobal::GetRscString( STR_DB_NONAME ) );
+        sal_Bool bIsNoName = ( pData->GetName() == ScGlobal::GetRscString( STR_DB_NONAME ) );
 
         if (!bSelected)
         {
-            bUseThis = TRUE;
+            bUseThis = sal_True;
             if ( bIsNoName && eMode == SC_DB_MAKE )
             {
                 // If nothing marked or only one row marked, adapt
@@ -211,9 +211,9 @@ ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGe
                     nEndCol = nStartCol;
                     nEndRow = nStartRow;
                 }
-                aDocument.GetDataArea( nTab, nStartCol, nStartRow, nEndCol, nEndRow, FALSE, bOnlyDown );
+                aDocument.GetDataArea( nTab, nStartCol, nStartRow, nEndCol, nEndRow, sal_False, bOnlyDown );
                 if ( nOldCol1 != nStartCol || nOldCol2 != nEndCol || nOldRow1 != nStartRow )
-                    bUseThis = FALSE;               // passt gar nicht
+                    bUseThis = sal_False;               // passt gar nicht
                 else if ( nOldRow2 != nEndRow )
                 {
                     //  Bereich auf neue End-Zeile erweitern
@@ -225,15 +225,15 @@ ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGe
         {
             if ( nOldCol1 == nStartCol && nOldRow1 == nStartRow &&
                  nOldCol2 == nEndCol && nOldRow2 == nEndRow )               // genau markiert?
-                bUseThis = TRUE;
+                bUseThis = sal_True;
             else
-                bUseThis = FALSE;           // immer Markierung nehmen (Bug 11964)
+                bUseThis = sal_False;           // immer Markierung nehmen (Bug 11964)
         }
 
         //      fuer Import nie "unbenannt" nehmen
 
         if ( bUseThis && eMode == SC_DB_IMPORT && bIsNoName )
-            bUseThis = FALSE;
+            bUseThis = sal_False;
     }
 
     if ( bUseThis )
@@ -247,13 +247,13 @@ ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGe
         nStartCol = nEndCol = nCol;
         nStartRow = nEndRow = nRow;
         nStartTab = nEndTab = nTab;
-//      bMark = FALSE;                          // nichts zu markieren
+//      bMark = sal_False;                          // nichts zu markieren
     }
     else
     {
         if ( bSelected )
         {
-//          bMark = FALSE;
+//          bMark = sal_False;
         }
         else
         {                                       // zusammenhaengender Bereich
@@ -269,13 +269,13 @@ ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGe
                 nEndCol = nStartCol;
                 nEndRow = nStartRow;
             }
-            aDocument.GetDataArea( nTab, nStartCol, nStartRow, nEndCol, nEndRow, FALSE, bOnlyDown );
+            aDocument.GetDataArea( nTab, nStartCol, nStartRow, nEndCol, nEndRow, sal_False, bOnlyDown );
         }
 
-        BOOL bHasHeader = aDocument.HasColHeader( nStartCol,nStartRow, nEndCol,nEndRow, nTab );
+        sal_Bool bHasHeader = aDocument.HasColHeader( nStartCol,nStartRow, nEndCol,nEndRow, nTab );
 
         ScDBData* pNoNameData;
-        USHORT nNoNameIndex;
+        sal_uInt16 nNoNameIndex;
         ScDBCollection* pColl = aDocument.GetDBCollection();
         if ( eMode != SC_DB_IMPORT &&
                 pColl->SearchName( ScGlobal::GetRscString( STR_DB_NONAME ), nNoNameIndex ) )
@@ -302,9 +302,9 @@ ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGe
             pNoNameData->SetSubTotalParam( ScSubTotalParam() );
 
             pNoNameData->SetArea( nTab, nStartCol,nStartRow, nEndCol,nEndRow );     // neu setzen
-            pNoNameData->SetByRow( TRUE );
+            pNoNameData->SetByRow( sal_True );
             pNoNameData->SetHeader( bHasHeader );
-            pNoNameData->SetAutoFilter( FALSE );
+            pNoNameData->SetAutoFilter( sal_False );
         }
         else
         {
@@ -313,12 +313,12 @@ ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGe
             String aNewName;
             if (eMode==SC_DB_IMPORT)
             {
-                aDocument.CompileDBFormula( TRUE );         // CreateFormulaString
+                aDocument.CompileDBFormula( sal_True );         // CreateFormulaString
                 pUndoColl = new ScDBCollection( *pColl );   // Undo fuer Import1-Bereich
 
                 String aImport = ScGlobal::GetRscString( STR_DBNAME_IMPORT );
                 long nCount = 0;
-                USHORT nDummy;
+                sal_uInt16 nDummy;
                 do
                 {
                     ++nCount;
@@ -331,12 +331,12 @@ ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGe
                 aNewName = ScGlobal::GetRscString( STR_DB_NONAME );
             pNoNameData = new ScDBData( aNewName, nTab,
                                 nStartCol,nStartRow, nEndCol,nEndRow,
-                                TRUE, bHasHeader );
+                                sal_True, bHasHeader );
             pColl->Insert( pNoNameData );
 
             if ( pUndoColl )
             {
-                aDocument.CompileDBFormula( FALSE );        // CompileFormulaString
+                aDocument.CompileDBFormula( sal_False );        // CompileFormulaString
 
                 ScDBCollection* pRedoColl = new ScDBCollection( *pColl );
                 GetUndoManager()->AddUndoAction( new ScUndoDBData( this, pUndoColl, pRedoColl ) );
@@ -352,7 +352,7 @@ ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGe
     }
 
 //  if (bMark)
-//      MarkRange( ScRange( nStartCol, nStartRow, nTab, nEndCol, nEndRow, nTab ), FALSE );
+//      MarkRange( ScRange( nStartCol, nStartRow, nTab, nEndCol, nEndRow, nTab ), sal_False );
 
     return pData;
 }
@@ -369,7 +369,7 @@ void ScDocShell::CancelAutoDBRange()
     // called when dialog is cancelled
     if ( pOldAutoDBRange )
     {
-        USHORT nNoNameIndex;
+        sal_uInt16 nNoNameIndex;
         ScDBCollection* pColl = aDocument.GetDBCollection();
         if ( pColl->SearchName( ScGlobal::GetRscString( STR_DB_NONAME ), nNoNameIndex ) )
         {
@@ -403,12 +403,12 @@ void ScDocShell::CancelAutoDBRange()
         //  Hoehen anpassen
         //! mit docfunc zusammenfassen
 
-BOOL ScDocShell::AdjustRowHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab )
+sal_Bool ScDocShell::AdjustRowHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab )
 {
     ScSizeDeviceProvider aProv(this);
     Fraction aZoom(1,1);
-    BOOL bChange = aDocument.SetOptimalHeight( nStartRow,nEndRow, nTab, 0, aProv.GetDevice(),
-                                                aProv.GetPPTX(),aProv.GetPPTY(), aZoom,aZoom, FALSE );
+    sal_Bool bChange = aDocument.SetOptimalHeight( nStartRow,nEndRow, nTab, 0, aProv.GetDevice(),
+                                                aProv.GetPPTX(),aProv.GetPPTY(), aZoom,aZoom, sal_False );
     if (bChange)
         PostPaint( 0,nStartRow,nTab, MAXCOL,MAXROW,nTab, PAINT_GRID|PAINT_LEFT );
 
@@ -426,8 +426,8 @@ void ScDocShell::UpdateAllRowHeights( const ScMarkData* pTabMark )
 
 void ScDocShell::UpdatePendingRowHeights( SCTAB nUpdateTab, bool bBefore )
 {
-    BOOL bIsUndoEnabled = aDocument.IsUndoEnabled();
-    aDocument.EnableUndo( FALSE );
+    sal_Bool bIsUndoEnabled = aDocument.IsUndoEnabled();
+    aDocument.EnableUndo( sal_False );
     aDocument.LockStreamValid( true );      // ignore draw page size (but not formula results)
     if ( bBefore )          // check all sheets up to nUpdateTab
     {
@@ -439,7 +439,7 @@ void ScDocShell::UpdatePendingRowHeights( SCTAB nUpdateTab, bool bBefore )
         SCTAB nTab;
         for (nTab=0; nTab<=nUpdateTab; ++nTab)
             if ( aDocument.IsPendingRowHeights( nTab ) )
-                aUpdateSheets.SelectTable( nTab, TRUE );
+                aUpdateSheets.SelectTable( nTab, sal_True );
 
         if (aUpdateSheets.GetSelectCount())
             UpdateAllRowHeights(&aUpdateSheets);        // update with a single progress bar
@@ -448,7 +448,7 @@ void ScDocShell::UpdatePendingRowHeights( SCTAB nUpdateTab, bool bBefore )
             if ( aUpdateSheets.GetTableSelect( nTab ) )
             {
                 aDocument.UpdatePageBreaks( nTab );
-                aDocument.SetPendingRowHeights( nTab, FALSE );
+                aDocument.SetPendingRowHeights( nTab, sal_False );
             }
     }
     else                    // only nUpdateTab
@@ -457,7 +457,7 @@ void ScDocShell::UpdatePendingRowHeights( SCTAB nUpdateTab, bool bBefore )
         {
             AdjustRowHeight( 0, MAXROW, nUpdateTab );
             aDocument.UpdatePageBreaks( nUpdateTab );
-            aDocument.SetPendingRowHeights( nUpdateTab, FALSE );
+            aDocument.SetPendingRowHeights( nUpdateTab, sal_False );
         }
     }
     aDocument.LockStreamValid( false );
@@ -474,8 +474,8 @@ void ScDocShell::RefreshPivotTables( const ScRange& rSource )
         //  DataPilotUpdate doesn't modify the collection order like PivotUpdate did,
         //  so a simple loop can be used.
 
-        USHORT nCount = pColl->GetCount();
-        for ( USHORT i=0; i<nCount; i++ )
+        sal_uInt16 nCount = pColl->GetCount();
+        for ( sal_uInt16 i=0; i<nCount; i++ )
         {
             ScDPObject* pOld = (*pColl)[i];
             if ( pOld )
@@ -485,7 +485,7 @@ void ScDocShell::RefreshPivotTables( const ScRange& rSource )
                 {
                     ScDPObject* pNew = new ScDPObject( *pOld );
                     ScDBDocFunc aFunc( *this );
-                    aFunc.DataPilotUpdate( pOld, pNew, TRUE, FALSE );
+                    aFunc.DataPilotUpdate( pOld, pNew, sal_True, sal_False );
                     delete pNew;    // DataPilotUpdate copies settings from "new" object
                 }
             }
@@ -496,14 +496,14 @@ void ScDocShell::RefreshPivotTables( const ScRange& rSource )
 String lcl_GetAreaName( ScDocument* pDoc, ScArea* pArea )
 {
     String aName;
-    BOOL bOk = FALSE;
+    sal_Bool bOk = sal_False;
     ScDBData* pData = pDoc->GetDBAtArea( pArea->nTab, pArea->nColStart, pArea->nRowStart,
                                                         pArea->nColEnd, pArea->nRowEnd );
     if (pData)
     {
         pData->GetName( aName );
         if ( aName != ScGlobal::GetRscString( STR_DB_NONAME ) )
-            bOk = TRUE;
+            bOk = sal_True;
     }
 
     if (!bOk)
@@ -512,14 +512,14 @@ String lcl_GetAreaName( ScDocument* pDoc, ScArea* pArea )
     return aName;
 }
 
-void ScDocShell::DoConsolidate( const ScConsolidateParam& rParam, BOOL bRecord )
+void ScDocShell::DoConsolidate( const ScConsolidateParam& rParam, sal_Bool bRecord )
 {
     ScConsData aData;
 
-    USHORT nPos;
+    sal_uInt16 nPos;
     SCCOL nColSize = 0;
     SCROW nRowSize = 0;
-    BOOL bErr = FALSE;
+    sal_Bool bErr = sal_False;
     for (nPos=0; nPos<rParam.nDataAreaCount; nPos++)
     {
         ScArea* pArea = rParam.ppDataAreas[nPos];
@@ -529,7 +529,7 @@ void ScDocShell::DoConsolidate( const ScConsolidateParam& rParam, BOOL bRecord )
                                         // Test, ob Quelldaten verschoben wuerden
         if (rParam.bReferenceData)
             if (pArea->nTab == rParam.nTab && pArea->nRowEnd >= rParam.nRow)
-                bErr = TRUE;
+                bErr = sal_True;
     }
 
     if (bErr)
@@ -546,7 +546,7 @@ void ScDocShell::DoConsolidate( const ScConsolidateParam& rParam, BOOL bRecord )
     ScDocShellModificator aModificator( *this );
 
     ScRange aOldDest;
-    ScDBData* pDestData = aDocument.GetDBAtCursor( rParam.nCol, rParam.nRow, rParam.nTab, TRUE );
+    ScDBData* pDestData = aDocument.GetDBAtCursor( rParam.nCol, rParam.nRow, rParam.nTab, sal_True );
     if (pDestData)
         pDestData->GetArea(aOldDest);
 
@@ -589,28 +589,28 @@ void ScDocShell::DoConsolidate( const ScConsolidateParam& rParam, BOOL bRecord )
             ScOutlineTable* pUndoTab = pTable ? new ScOutlineTable( *pTable ) : NULL;
 
             ScDocument* pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
-            pUndoDoc->InitUndo( &aDocument, 0, nTabCount-1, FALSE, TRUE );
+            pUndoDoc->InitUndo( &aDocument, 0, nTabCount-1, sal_False, sal_True );
 
             // Zeilenstatus
             aDocument.CopyToDocument( 0,0,nDestTab, MAXCOL,MAXROW,nDestTab,
-                                    IDF_NONE, FALSE, pUndoDoc );
+                                    IDF_NONE, sal_False, pUndoDoc );
 
             // alle Formeln
             aDocument.CopyToDocument( 0,0,0, MAXCOL,MAXROW,nTabCount-1,
-                                        IDF_FORMULA, FALSE, pUndoDoc );
+                                        IDF_FORMULA, sal_False, pUndoDoc );
 
             // komplette Ausgangszeilen
             aDocument.CopyToDocument( 0,aDestArea.nRowStart,nDestTab,
                                     MAXCOL,aDestArea.nRowEnd,nDestTab,
-                                    IDF_ALL, FALSE, pUndoDoc );
+                                    IDF_ALL, sal_False, pUndoDoc );
 
             // alten Ausgabebereich
             if (pDestData)
-                aDocument.CopyToDocument( aOldDest, IDF_ALL, FALSE, pUndoDoc );
+                aDocument.CopyToDocument( aOldDest, IDF_ALL, sal_False, pUndoDoc );
 
             GetUndoManager()->AddUndoAction(
                     new ScUndoConsolidate( this, aDestArea, rParam, pUndoDoc,
-                                            TRUE, nInsertCount, pUndoTab, pUndoData ) );
+                                            sal_True, nInsertCount, pUndoTab, pUndoData ) );
         }
         else
         {
@@ -619,15 +619,15 @@ void ScDocShell::DoConsolidate( const ScConsolidateParam& rParam, BOOL bRecord )
 
             aDocument.CopyToDocument( aDestArea.nColStart, aDestArea.nRowStart, aDestArea.nTab,
                                     aDestArea.nColEnd, aDestArea.nRowEnd, aDestArea.nTab,
-                                    IDF_ALL, FALSE, pUndoDoc );
+                                    IDF_ALL, sal_False, pUndoDoc );
 
             // alten Ausgabebereich
             if (pDestData)
-                aDocument.CopyToDocument( aOldDest, IDF_ALL, FALSE, pUndoDoc );
+                aDocument.CopyToDocument( aOldDest, IDF_ALL, sal_False, pUndoDoc );
 
             GetUndoManager()->AddUndoAction(
                     new ScUndoConsolidate( this, aDestArea, rParam, pUndoDoc,
-                                            FALSE, 0, NULL, pUndoData ) );
+                                            sal_False, 0, NULL, pUndoData ) );
         }
     }
 
@@ -645,7 +645,7 @@ void ScDocShell::DoConsolidate( const ScConsolidateParam& rParam, BOOL bRecord )
     SCROW nPaintStartRow = rParam.nRow;
     SCCOL nPaintEndCol = nPaintStartCol + nColSize - 1;
     SCROW nPaintEndRow = nPaintStartRow + nRowSize - 1;
-    USHORT nPaintFlags = PAINT_GRID;
+    sal_uInt16 nPaintFlags = PAINT_GRID;
     if (rParam.bByCol)
         ++nPaintEndRow;
     if (rParam.bByRow)
@@ -669,7 +669,7 @@ void ScDocShell::DoConsolidate( const ScConsolidateParam& rParam, BOOL bRecord )
     aModificator.SetDocumentModified();
 }
 
-void ScDocShell::UseScenario( SCTAB nTab, const String& rName, BOOL bRecord )
+void ScDocShell::UseScenario( SCTAB nTab, const String& rName, sal_Bool bRecord )
 {
     if (!aDocument.IsScenario(nTab))
     {
@@ -707,22 +707,22 @@ void ScDocShell::UseScenario( SCTAB nTab, const String& rName, BOOL bRecord )
                     pUndoDoc->InitUndo( &aDocument, nTab,nEndTab );             // auch alle Szenarien
                     //  angezeigte Tabelle:
                     aDocument.CopyToDocument( nStartCol,nStartRow,nTab,
-                                    nEndCol,nEndRow,nTab, IDF_ALL,TRUE, pUndoDoc, &aScenMark );
+                                    nEndCol,nEndRow,nTab, IDF_ALL,sal_True, pUndoDoc, &aScenMark );
                     //  Szenarien
                     for (SCTAB i=nTab+1; i<=nEndTab; i++)
                     {
-                        pUndoDoc->SetScenario( i, TRUE );
+                        pUndoDoc->SetScenario( i, sal_True );
                         String aComment;
                         Color  aColor;
-                        USHORT nScenFlags;
+                        sal_uInt16 nScenFlags;
                         aDocument.GetScenarioData( i, aComment, aColor, nScenFlags );
                         pUndoDoc->SetScenarioData( i, aComment, aColor, nScenFlags );
-                        BOOL bActive = aDocument.IsActiveScenario( i );
+                        sal_Bool bActive = aDocument.IsActiveScenario( i );
                         pUndoDoc->SetActiveScenario( i, bActive );
                         //  Bei Zurueckkopier-Szenarios auch Inhalte
                         if ( nScenFlags & SC_SCENARIO_TWOWAY )
                             aDocument.CopyToDocument( 0,0,i, MAXCOL,MAXROW,i,
-                                                        IDF_ALL,FALSE, pUndoDoc );
+                                                        IDF_ALL,sal_False, pUndoDoc );
                     }
 
                     GetUndoManager()->AddUndoAction(
@@ -761,14 +761,14 @@ void ScDocShell::UseScenario( SCTAB nTab, const String& rName, BOOL bRecord )
 }
 
 void ScDocShell::ModifyScenario( SCTAB nTab, const String& rName, const String& rComment,
-                                    const Color& rColor, USHORT nFlags )
+                                    const Color& rColor, sal_uInt16 nFlags )
 {
     //  Undo
     String aOldName;
     aDocument.GetName( nTab, aOldName );
     String aOldComment;
     Color aOldColor;
-    USHORT nOldFlags;
+    sal_uInt16 nOldFlags;
     aDocument.GetScenarioData( nTab, aOldComment, aOldColor, nOldFlags );
     GetUndoManager()->AddUndoAction(
         new ScUndoScenarioFlags( this, nTab,
@@ -791,8 +791,8 @@ void ScDocShell::ModifyScenario( SCTAB nTab, const String& rName, const String&
 }
 
 SCTAB ScDocShell::MakeScenario( SCTAB nTab, const String& rName, const String& rComment,
-                                    const Color& rColor, USHORT nFlags,
-                                    ScMarkData& rMark, BOOL bRecord )
+                                    const Color& rColor, sal_uInt16 nFlags,
+                                    ScMarkData& rMark, sal_Bool bRecord )
 {
     rMark.MarkToMulti();
     if (rMark.IsMultiMarked())
@@ -801,7 +801,7 @@ SCTAB ScDocShell::MakeScenario( SCTAB nTab, const String& rName, const String& r
         while (aDocument.IsScenario(nNewTab))
             ++nNewTab;
 
-        BOOL bCopyAll = ( (nFlags & SC_SCENARIO_COPYALL) != 0 );
+        sal_Bool bCopyAll = ( (nFlags & SC_SCENARIO_COPYALL) != 0 );
         const ScMarkData* pCopyMark = NULL;
         if (!bCopyAll)
             pCopyMark = &rMark;
@@ -820,8 +820,8 @@ SCTAB ScDocShell::MakeScenario( SCTAB nTab, const String& rName, const String& r
                                                 rName, rComment, rColor, nFlags, rMark ));
             }
 
-            aDocument.RenameTab( nNewTab, rName, FALSE );           // ohne Formel-Update
-            aDocument.SetScenario( nNewTab, TRUE );
+            aDocument.RenameTab( nNewTab, rName, sal_False );           // ohne Formel-Update
+            aDocument.SetScenario( nNewTab, sal_True );
             aDocument.SetScenarioData( nNewTab, rComment, rColor, nFlags );
 
             ScMarkData aDestMark = rMark;
@@ -830,19 +830,19 @@ SCTAB ScDocShell::MakeScenario( SCTAB nTab, const String& rName, const String& r
             //!     auf Filter / Buttons / Merging testen !
 
             ScPatternAttr aProtPattern( aDocument.GetPool() );
-            aProtPattern.GetItemSet().Put( ScProtectionAttr( TRUE ) );
+            aProtPattern.GetItemSet().Put( ScProtectionAttr( sal_True ) );
             aDocument.ApplyPatternAreaTab( 0,0, MAXCOL,MAXROW, nNewTab, aProtPattern );
 
             ScPatternAttr aPattern( aDocument.GetPool() );
             aPattern.GetItemSet().Put( ScMergeFlagAttr( SC_MF_SCENARIO ) );
-            aPattern.GetItemSet().Put( ScProtectionAttr( TRUE ) );
+            aPattern.GetItemSet().Put( ScProtectionAttr( sal_True ) );
             aDocument.ApplySelectionPattern( aPattern, aDestMark );
 
             if (!bCopyAll)
-                aDocument.SetVisible( nNewTab, FALSE );
+                aDocument.SetVisible( nNewTab, sal_False );
 
             //  dies ist dann das aktive Szenario
-            aDocument.CopyScenario( nNewTab, nTab, TRUE );  // TRUE - nicht aus Szenario kopieren
+            aDocument.CopyScenario( nNewTab, nTab, sal_True );  // sal_True - nicht aus Szenario kopieren
 
             if (nFlags & SC_SCENARIO_SHOWFRAME)
                 PostPaint( 0,0,nTab, MAXCOL,MAXROW,nTab, PAINT_GRID );  // Rahmen painten
@@ -857,7 +857,7 @@ SCTAB ScDocShell::MakeScenario( SCTAB nTab, const String& rName, const String& r
     return nTab;
 }
 
-BOOL ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, BOOL bCopy, BOOL bRecord )
+sal_Bool ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, sal_Bool bCopy, sal_Bool bRecord )
 {
     ScDocShellModificator aModificator( *this );
 
@@ -876,7 +876,7 @@ BOOL ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, BOOL bCopy, BOOL bRec
         if (!aDocument.CopyTab( nSrcTab, nDestTab ))
         {
             //! EndDrawUndo?
-            return FALSE;
+            return sal_False;
         }
         else
         {
@@ -897,7 +897,7 @@ BOOL ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, BOOL bCopy, BOOL bRec
                         new ScUndoCopyTab( this, aSrcList, aDestList ) );
             }
 
-            BOOL bVbaEnabled = aDocument.IsInVBAMode();
+            sal_Bool bVbaEnabled = aDocument.IsInVBAMode();
                         if ( bVbaEnabled )
                         {
                 StarBASIC* pStarBASIC = GetBasic();
@@ -933,7 +933,7 @@ BOOL ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, BOOL bCopy, BOOL bRec
     else
     {
         if ( aDocument.GetChangeTrack() )
-            return FALSE;
+            return sal_False;
 
         if ( nSrcTab<nDestTab && nDestTab!=SC_TAB_APPEND )
             nDestTab--;
@@ -941,11 +941,11 @@ BOOL ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, BOOL bCopy, BOOL bRec
         if ( nSrcTab == nDestTab )
         {
             //! allow only for api calls?
-            return TRUE;    // nothing to do, but valid
+            return sal_True;    // nothing to do, but valid
         }
 
         if (!aDocument.MoveTab( nSrcTab, nDestTab ))
-            return FALSE;
+            return sal_False;
         else if (bRecord)
         {
             SvShorts aSrcList;
@@ -964,7 +964,7 @@ BOOL ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, BOOL bCopy, BOOL bRec
     aModificator.SetDocumentModified();
     SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) );
 
-    return TRUE;
+    return sal_True;
 }
 
 
@@ -972,7 +972,7 @@ IMPL_LINK( ScDocShell, RefreshDBDataHdl, ScRefreshTimer*, pRefreshTimer )
 {
     ScDBDocFunc aFunc(*this);
 
-    BOOL bContinue = TRUE;
+    sal_Bool bContinue = sal_True;
     ScDBData* pDBData = static_cast<ScDBData*>(pRefreshTimer);
     ScImportParam aImportParam;
     pDBData->GetImportParam( aImportParam );
@@ -981,11 +981,11 @@ IMPL_LINK( ScDocShell, RefreshDBDataHdl, ScRefreshTimer*, pRefreshTimer )
         ScRange aRange;
         pDBData->GetArea( aRange );
         ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> xResultSet;
-        bContinue = aFunc.DoImport( aRange.aStart.Tab(), aImportParam, xResultSet, NULL, TRUE, FALSE ); //! Api-Flag as parameter
+        bContinue = aFunc.DoImport( aRange.aStart.Tab(), aImportParam, xResultSet, NULL, sal_True, sal_False ); //! Api-Flag as parameter
         // internal operations (sort, query, subtotal) only if no error
         if (bContinue)
         {
-            aFunc.RepeatDB( pDBData->GetName(), TRUE, TRUE );
+            aFunc.RepeatDB( pDBData->GetName(), sal_True, sal_True );
             RefreshPivotTables(aRange);
         }
     }