removetooltypes01: #i112600# remove tooltypes from sc

1 files changed, 161 insertions, 161 deletions

diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx
index dbdeae1ae0b1..af201cd6295d 100644
--- a/sc/source/ui/view/dbfunc3.cxx
+++ b/sc/source/ui/view/dbfunc3.cxx
@@ -112,14 +112,14 @@ using ::std::hash_set;
 
 //  Outline-Gruppierung erzeugen
 
-void ScDBFunc::MakeOutline( BOOL bColumns, BOOL bRecord )
+void ScDBFunc::MakeOutline( sal_Bool bColumns, sal_Bool bRecord )
 {
     ScRange aRange;
     if (GetViewData()->GetSimpleArea(aRange) == SC_MARK_SIMPLE)
     {
         ScDocShell* pDocSh = GetViewData()->GetDocShell();
         ScOutlineDocFunc aFunc(*pDocSh);
-        aFunc.MakeOutline( aRange, bColumns, bRecord, FALSE );
+        aFunc.MakeOutline( aRange, bColumns, bRecord, sal_False );
     }
     else
         ErrorMessage(STR_NOMULTISELECT);
@@ -127,14 +127,14 @@ void ScDBFunc::MakeOutline( BOOL bColumns, BOOL bRecord )
 
 //  Outline-Gruppierung loeschen
 
-void ScDBFunc::RemoveOutline( BOOL bColumns, BOOL bRecord )
+void ScDBFunc::RemoveOutline( sal_Bool bColumns, sal_Bool bRecord )
 {
     ScRange aRange;
     if (GetViewData()->GetSimpleArea(aRange) == SC_MARK_SIMPLE)
     {
         ScDocShell* pDocSh = GetViewData()->GetDocShell();
         ScOutlineDocFunc aFunc(*pDocSh);
-        aFunc.RemoveOutline( aRange, bColumns, bRecord, FALSE );
+        aFunc.RemoveOutline( aRange, bColumns, bRecord, sal_False );
     }
     else
         ErrorMessage(STR_NOMULTISELECT);
@@ -142,10 +142,10 @@ void ScDBFunc::RemoveOutline( BOOL bColumns, BOOL bRecord )
 
 //  Menue-Status: Outlines loeschen
 
-void ScDBFunc::TestRemoveOutline( BOOL& rCol, BOOL& rRow )
+void ScDBFunc::TestRemoveOutline( sal_Bool& rCol, sal_Bool& rRow )
 {
-    BOOL bColFound = FALSE;
-    BOOL bRowFound = FALSE;
+    sal_Bool bColFound = sal_False;
+    sal_Bool bRowFound = sal_False;
 
     SCCOL nStartCol, nEndCol;
     SCROW nStartRow, nEndRow;
@@ -161,8 +161,8 @@ void ScDBFunc::TestRemoveOutline( BOOL& rCol, BOOL& rRow )
             ScOutlineEntry* pEntry;
             SCCOLROW nStart;
             SCCOLROW nEnd;
-            BOOL bColMarked = ( nStartRow == 0 && nEndRow == MAXROW );
-            BOOL bRowMarked = ( nStartCol == 0 && nEndCol == MAXCOL );
+            sal_Bool bColMarked = ( nStartRow == 0 && nEndRow == MAXROW );
+            sal_Bool bRowMarked = ( nStartCol == 0 && nEndCol == MAXCOL );
 
             //  Spalten
 
@@ -175,7 +175,7 @@ void ScDBFunc::TestRemoveOutline( BOOL& rCol, BOOL& rRow )
                     nStart = pEntry->GetStart();
                     nEnd   = pEntry->GetEnd();
                     if ( nStartCol<=static_cast<SCCOL>(nEnd) && nEndCol>=static_cast<SCCOL>(nStart) )
-                        bColFound = TRUE;
+                        bColFound = sal_True;
                 }
             }
 
@@ -190,7 +190,7 @@ void ScDBFunc::TestRemoveOutline( BOOL& rCol, BOOL& rRow )
                     nStart = pEntry->GetStart();
                     nEnd   = pEntry->GetEnd();
                     if ( nStartRow<=nEnd && nEndRow>=nStart )
-                        bRowFound = TRUE;
+                        bRowFound = sal_True;
                 }
             }
         }
@@ -200,14 +200,14 @@ void ScDBFunc::TestRemoveOutline( BOOL& rCol, BOOL& rRow )
     rRow = bRowFound;
 }
 
-void ScDBFunc::RemoveAllOutlines( BOOL bRecord )
+void ScDBFunc::RemoveAllOutlines( sal_Bool bRecord )
 {
     SCTAB nTab = GetViewData()->GetTabNo();
     ScDocShell* pDocSh = GetViewData()->GetDocShell();
     ScOutlineDocFunc aFunc(*pDocSh);
 
     HideCursor();
-    BOOL bOk = aFunc.RemoveAllOutlines( nTab, bRecord, FALSE );
+    sal_Bool bOk = aFunc.RemoveAllOutlines( nTab, bRecord, sal_False );
     ShowCursor();
 
     if (bOk)
@@ -216,7 +216,7 @@ void ScDBFunc::RemoveAllOutlines( BOOL bRecord )
 
 //  Auto-Outlines
 
-void ScDBFunc::AutoOutline( BOOL bRecord )
+void ScDBFunc::AutoOutline( sal_Bool bRecord )
 {
     SCTAB nTab = GetViewData()->GetTabNo();
     ScRange aRange( 0,0,nTab, MAXCOL,MAXROW,nTab );     // ganze Tabelle, wenn nichts markiert
@@ -229,19 +229,19 @@ void ScDBFunc::AutoOutline( BOOL bRecord )
 
     ScDocShell* pDocSh = GetViewData()->GetDocShell();
     ScOutlineDocFunc aFunc(*pDocSh);
-    aFunc.AutoOutline( aRange, bRecord, FALSE );
+    aFunc.AutoOutline( aRange, bRecord, sal_False );
 }
 
 //  Outline-Ebene auswaehlen
 
-void ScDBFunc::SelectLevel( BOOL bColumns, USHORT nLevel, BOOL bRecord, BOOL bPaint )
+void ScDBFunc::SelectLevel( sal_Bool bColumns, sal_uInt16 nLevel, sal_Bool bRecord, sal_Bool bPaint )
 {
     SCTAB nTab = GetViewData()->GetTabNo();
     ScDocShell* pDocSh = GetViewData()->GetDocShell();
     ScOutlineDocFunc aFunc(*pDocSh);
 
     HideCursor();
-    BOOL bOk = aFunc.SelectLevel( nTab, bColumns, nLevel, bRecord, bPaint, FALSE );
+    sal_Bool bOk = aFunc.SelectLevel( nTab, bColumns, nLevel, bRecord, bPaint, sal_False );
     ShowCursor();
 
     if (bOk)
@@ -250,14 +250,14 @@ void ScDBFunc::SelectLevel( BOOL bColumns, USHORT nLevel, BOOL bRecord, BOOL bPa
 
 //  einzelne Outline-Gruppe einblenden
 
-void ScDBFunc::ShowOutline( BOOL bColumns, USHORT nLevel, USHORT nEntry, BOOL bRecord, BOOL bPaint )
+void ScDBFunc::ShowOutline( sal_Bool bColumns, sal_uInt16 nLevel, sal_uInt16 nEntry, sal_Bool bRecord, sal_Bool bPaint )
 {
     SCTAB nTab = GetViewData()->GetTabNo();
     ScDocShell* pDocSh = GetViewData()->GetDocShell();
     ScOutlineDocFunc aFunc(*pDocSh);
 
     HideCursor();
-    BOOL bOk = aFunc.ShowOutline( nTab, bColumns, nLevel, nEntry, bRecord, bPaint, FALSE );
+    sal_Bool bOk = aFunc.ShowOutline( nTab, bColumns, nLevel, nEntry, bRecord, bPaint, sal_False );
     ShowCursor();
 
     if ( bOk && bPaint )
@@ -266,14 +266,14 @@ void ScDBFunc::ShowOutline( BOOL bColumns, USHORT nLevel, USHORT nEntry, BOOL bR
 
 //  einzelne Outline-Gruppe ausblenden
 
-void ScDBFunc::HideOutline( BOOL bColumns, USHORT nLevel, USHORT nEntry, BOOL bRecord, BOOL bPaint )
+void ScDBFunc::HideOutline( sal_Bool bColumns, sal_uInt16 nLevel, sal_uInt16 nEntry, sal_Bool bRecord, sal_Bool bPaint )
 {
     SCTAB nTab = GetViewData()->GetTabNo();
     ScDocShell* pDocSh = GetViewData()->GetDocShell();
     ScOutlineDocFunc aFunc(*pDocSh);
 
     HideCursor();
-    BOOL bOk = aFunc.HideOutline( nTab, bColumns, nLevel, nEntry, bRecord, bPaint, FALSE );
+    sal_Bool bOk = aFunc.HideOutline( nTab, bColumns, nLevel, nEntry, bRecord, bPaint, sal_False );
     ShowCursor();
 
     if ( bOk && bPaint )
@@ -282,9 +282,9 @@ void ScDBFunc::HideOutline( BOOL bColumns, USHORT nLevel, USHORT nEntry, BOOL bR
 
 //  Menue-Status: markierten Bereich ein-/ausblenden
 
-BOOL ScDBFunc::OutlinePossible(BOOL bHide)
+sal_Bool ScDBFunc::OutlinePossible(sal_Bool bHide)
 {
-    BOOL bEnable = FALSE;
+    sal_Bool bEnable = sal_False;
 
     SCCOL nStartCol;
     SCROW nStartRow;
@@ -317,13 +317,13 @@ BOOL ScDBFunc::OutlinePossible(BOOL bHide)
                 {
                     if ( nStartCol<=static_cast<SCCOL>(nEnd) && nEndCol>=static_cast<SCCOL>(nStart) )
                         if (!pEntry->IsHidden())
-                            bEnable = TRUE;
+                            bEnable = sal_True;
                 }
                 else
                 {
                     if ( nStart>=nStartCol && nEnd<=nEndCol )
                         if (pEntry->IsHidden())
-                            bEnable = TRUE;
+                            bEnable = sal_True;
                 }
             }
 
@@ -339,13 +339,13 @@ BOOL ScDBFunc::OutlinePossible(BOOL bHide)
                 {
                     if ( nStartRow<=nEnd && nEndRow>=nStart )
                         if (!pEntry->IsHidden())
-                            bEnable = TRUE;
+                            bEnable = sal_True;
                 }
                 else
                 {
                     if ( nStart>=nStartRow && nEnd<=nEndRow )
                         if (pEntry->IsHidden())
-                            bEnable = TRUE;
+                            bEnable = sal_True;
                 }
             }
         }
@@ -356,7 +356,7 @@ BOOL ScDBFunc::OutlinePossible(BOOL bHide)
 
 //  markierten Bereich einblenden
 
-void ScDBFunc::ShowMarkedOutlines( BOOL bRecord )
+void ScDBFunc::ShowMarkedOutlines( sal_Bool bRecord )
 {
     ScRange aRange;
     if (GetViewData()->GetSimpleArea(aRange) == SC_MARK_SIMPLE)
@@ -364,7 +364,7 @@ void ScDBFunc::ShowMarkedOutlines( BOOL bRecord )
         ScDocShell* pDocSh = GetViewData()->GetDocShell();
         ScOutlineDocFunc aFunc(*pDocSh);
         HideCursor();
-        BOOL bDone = aFunc.ShowMarkedOutlines( aRange, bRecord, FALSE );
+        sal_Bool bDone = aFunc.ShowMarkedOutlines( aRange, bRecord, sal_False );
         ShowCursor();
         if (bDone)
             UpdateScrollBars();
@@ -375,7 +375,7 @@ void ScDBFunc::ShowMarkedOutlines( BOOL bRecord )
 
 //  markierten Bereich ausblenden
 
-void ScDBFunc::HideMarkedOutlines( BOOL bRecord )
+void ScDBFunc::HideMarkedOutlines( sal_Bool bRecord )
 {
     ScRange aRange;
     if (GetViewData()->GetSimpleArea(aRange) == SC_MARK_SIMPLE)
@@ -383,7 +383,7 @@ void ScDBFunc::HideMarkedOutlines( BOOL bRecord )
         ScDocShell* pDocSh = GetViewData()->GetDocShell();
         ScOutlineDocFunc aFunc(*pDocSh);
         HideCursor();
-        BOOL bDone = aFunc.HideMarkedOutlines( aRange, bRecord, FALSE );
+        sal_Bool bDone = aFunc.HideMarkedOutlines( aRange, bRecord, sal_False );
         ShowCursor();
         if (bDone)
             UpdateScrollBars();
@@ -398,17 +398,17 @@ void ScDBFunc::HideMarkedOutlines( BOOL bRecord )
 //          Teilergebnisse
 //
 
-void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, BOOL bRecord,
+void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, sal_Bool bRecord,
                             const ScSortParam* pForceNewSort )
 {
-    BOOL bDo = !rParam.bRemoveOnly;                         // FALSE = nur loeschen
+    sal_Bool bDo = !rParam.bRemoveOnly;                         // sal_False = nur loeschen
 
     ScDocShell* pDocSh = GetViewData()->GetDocShell();
     ScDocument* pDoc = pDocSh->GetDocument();
     ScMarkData& rMark = GetViewData()->GetMarkData();
     SCTAB nTab = GetViewData()->GetTabNo();
     if (bRecord && !pDoc->IsUndoEnabled())
-        bRecord = FALSE;
+        bRecord = sal_False;
 
     ScDBData* pDBData = pDoc->GetDBAtArea( nTab, rParam.nCol1, rParam.nRow1,
                                                 rParam.nCol2, rParam.nRow2 );
@@ -433,12 +433,12 @@ void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, BOOL bRecord,
     }
 
     WaitObject aWait( GetViewData()->GetDialogParent() );
-    BOOL bOk = TRUE;
-    BOOL bDelete = FALSE;
+    sal_Bool bOk = sal_True;
+    sal_Bool bDelete = sal_False;
     if (rParam.bReplace)
         if (pDoc->TestRemoveSubTotals( nTab, rParam ))
         {
-            bDelete = TRUE;
+            bDelete = sal_True;
             bOk = ( MessBox( GetViewData()->GetDialogParent(), WinBits(WB_YES_NO | WB_DEF_YES),
                 // "StarCalc" "Daten loeschen?"
                 ScGlobal::GetRscString( STR_MSSG_DOSUBTOTALS_0 ),
@@ -459,7 +459,7 @@ void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, BOOL bRecord,
 
         if (bRecord)                                        // alte Daten sichern
         {
-            BOOL bOldFilter = bDo && rParam.bDoSort;
+            sal_Bool bOldFilter = bDo && rParam.bDoSort;
 
             nTabCount = pDoc->GetTableCount();
             pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
@@ -475,20 +475,20 @@ void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, BOOL bRecord,
                 pTable->GetColArray()->GetRange( nOutStartCol, nOutEndCol );
                 pTable->GetRowArray()->GetRange( nOutStartRow, nOutEndRow );
 
-                pUndoDoc->InitUndo( pDoc, nTab, nTab, TRUE, TRUE );
-                pDoc->CopyToDocument( static_cast<SCCOL>(nOutStartCol), 0, nTab, static_cast<SCCOL>(nOutEndCol), MAXROW, nTab, IDF_NONE, FALSE, pUndoDoc );
-                pDoc->CopyToDocument( 0, nOutStartRow, nTab, MAXCOL, nOutEndRow, nTab, IDF_NONE, FALSE, pUndoDoc );
+                pUndoDoc->InitUndo( pDoc, nTab, nTab, sal_True, sal_True );
+                pDoc->CopyToDocument( static_cast<SCCOL>(nOutStartCol), 0, nTab, static_cast<SCCOL>(nOutEndCol), MAXROW, nTab, IDF_NONE, sal_False, pUndoDoc );
+                pDoc->CopyToDocument( 0, nOutStartRow, nTab, MAXCOL, nOutEndRow, nTab, IDF_NONE, sal_False, pUndoDoc );
             }
             else
-                pUndoDoc->InitUndo( pDoc, nTab, nTab, FALSE, bOldFilter );
+                pUndoDoc->InitUndo( pDoc, nTab, nTab, sal_False, bOldFilter );
 
             //  Datenbereich sichern - incl. Filter-Ergebnis
             pDoc->CopyToDocument( 0,rParam.nRow1+1,nTab, MAXCOL,rParam.nRow2,nTab,
-                                    IDF_ALL, FALSE, pUndoDoc );
+                                    IDF_ALL, sal_False, pUndoDoc );
 
             //  alle Formeln wegen Referenzen
             pDoc->CopyToDocument( 0,0,0, MAXCOL,MAXROW,nTabCount-1,
-                                        IDF_FORMULA, FALSE, pUndoDoc );
+                                        IDF_FORMULA, sal_False, pUndoDoc );
 
             //  DB- und andere Bereiche
             ScRangeName* pDocRange = pDoc->GetRangeName();
@@ -506,7 +506,7 @@ void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, BOOL bRecord,
 
         if (rParam.bReplace)
             pDoc->RemoveSubTotals( nTab, aNewParam );
-        BOOL bSuccess = TRUE;
+        sal_Bool bSuccess = sal_True;
         if (bDo)
         {
             // Sortieren
@@ -520,7 +520,7 @@ void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, BOOL bRecord,
                 ScSortParam aOldSort;
                 pDBData->GetSortParam( aOldSort );
                 ScSortParam aSortParam( aNewParam, pForceNewSort ? *pForceNewSort : aOldSort );
-                Sort( aSortParam, FALSE, FALSE );
+                Sort( aSortParam, sal_False, sal_False );
             }
 
             bSuccess = pDoc->DoSubTotals( nTab, aNewParam );
@@ -569,11 +569,11 @@ void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, BOOL bRecord,
 //          Consolidate
 //
 
-void ScDBFunc::Consolidate( const ScConsolidateParam& rParam, BOOL bRecord )
+void ScDBFunc::Consolidate( const ScConsolidateParam& rParam, sal_Bool bRecord )
 {
     ScDocShell* pDocShell = GetViewData()->GetDocShell();
     pDocShell->DoConsolidate( rParam, bRecord );
-    SetTabNo( rParam.nTab, TRUE );
+    SetTabNo( rParam.nTab, sal_True );
 }
 
 //
@@ -587,8 +587,8 @@ String lcl_MakePivotTabName( const String& rPrefix, SCTAB nNumber )
     return aName;
 }
 
-bool ScDBFunc::MakePivotTable( const ScDPSaveData& rData, const ScRange& rDest, BOOL bNewTable,
-                                const ScDPObject& rSource, BOOL bApi )
+bool ScDBFunc::MakePivotTable( const ScDPSaveData& rData, const ScRange& rDest, sal_Bool bNewTable,
+                                const ScDPObject& rSource, sal_Bool bApi )
 {
     //  #70096# error message if no fields are set
     //  this must be removed when drag&drop of fields from a toolbox is available
@@ -601,7 +601,7 @@ bool ScDBFunc::MakePivotTable( const ScDPSaveData& rData, const ScRange& rDest,
 
     ScDocShell* pDocSh  = GetViewData()->GetDocShell();
     ScDocument* pDoc    = GetViewData()->GetDocument();
-    BOOL bUndo(pDoc->IsUndoEnabled());
+    sal_Bool bUndo(pDoc->IsUndoEnabled());
 
     ScRange aDestRange = rDest;
     if ( bNewTable )
@@ -622,7 +622,7 @@ bool ScDBFunc::MakePivotTable( const ScDPSaveData& rData, const ScRange& rDest,
         while ( !pDoc->InsertTab( nNewTab, lcl_MakePivotTabName( aName, i ) ) && i <= MAXTAB )
             i++;
 
-        BOOL bAppend = ( nNewTab+1 == pDoc->GetTableCount() );
+        sal_Bool bAppend = ( nNewTab+1 == pDoc->GetTableCount() );
         if (bUndo)
         {
             pDocSh->GetUndoManager()->AddUndoAction(
@@ -630,7 +630,7 @@ bool ScDBFunc::MakePivotTable( const ScDPSaveData& rData, const ScRange& rDest,
         }
 
         GetViewData()->InsertTab( nNewTab );
-        SetTabNo( nNewTab, TRUE );
+        SetTabNo( nNewTab, sal_True );
 
         aDestRange = ScRange( 0, 0, nNewTab );
     }
@@ -657,10 +657,10 @@ bool ScDBFunc::MakePivotTable( const ScDPSaveData& rData, const ScRange& rDest,
     else
         aObj.SetSaveData( rData );
 
-    BOOL bAllowMove = ( pDPObj != NULL );   // allow re-positioning when editing existing table
+    sal_Bool bAllowMove = ( pDPObj != NULL );   // allow re-positioning when editing existing table
 
     ScDBDocFunc aFunc( *pDocSh );
-    bool bSuccess = aFunc.DataPilotUpdate( pDPObj, &aObj, TRUE, FALSE, bAllowMove );
+    bool bSuccess = aFunc.DataPilotUpdate( pDPObj, &aObj, sal_True, sal_False, bAllowMove );
 
     CursorPosChanged();     // shells may be switched
 
@@ -683,13 +683,13 @@ void ScDBFunc::DeletePivotTable()
     if ( pDPObj )
     {
         ScDBDocFunc aFunc( *pDocSh );
-        aFunc.DataPilotUpdate( pDPObj, NULL, TRUE, FALSE );
+        aFunc.DataPilotUpdate( pDPObj, NULL, sal_True, sal_False );
         CursorPosChanged();     // shells may be switched
     }
     else
         ErrorMessage(STR_PIVOT_NOTFOUND);
 }
-ULONG RefreshDPObject( ScDPObject *pDPObj, ScDocument *pDoc, ScDocShell *pDocSh, BOOL bRecord, BOOL bApi )
+sal_uLong RefreshDPObject( ScDPObject *pDPObj, ScDocument *pDoc, ScDocShell *pDocSh, sal_Bool bRecord, sal_Bool bApi )
 {
     if( !pDPObj )
         return STR_PIVOT_NOTFOUND;
@@ -698,19 +698,19 @@ ULONG RefreshDPObject( ScDPObject *pDPObj, ScDocument *pDoc, ScDocShell *pDocSh,
         pDoc = pDocSh->GetDocument();
 
     if( !pDoc  )
-        return static_cast<ULONG>(-1);
+        return static_cast<sal_uLong>(-1);
 
     if( !pDocSh && ( pDocSh = PTR_CAST( ScDocShell, pDoc->GetDocumentShell() ) ) == NULL )
-        return static_cast<ULONG>(-1);
+        return static_cast<sal_uLong>(-1);
 
-    if( ULONG nErrId = pDPObj->RefreshCache() )
+    if( sal_uLong nErrId = pDPObj->RefreshCache() )
         return nErrId;
     else if ( nErrId == 0 )
     {
         //Refresh all dpobjects
         ScDPCollection* pDPCollection = pDoc->GetDPCollection();
-        USHORT nCount = pDPCollection->GetCount();
-        for (USHORT i=0; i<nCount; i++)
+        sal_uInt16 nCount = pDPCollection->GetCount();
+        for (sal_uInt16 i=0; i<nCount; i++)
         {
             if ( (*pDPCollection)[i]->GetCacheId() == pDPObj->GetCacheId()  )
             {
@@ -726,7 +726,7 @@ ULONG RefreshDPObject( ScDPObject *pDPObj, ScDocument *pDoc, ScDocShell *pDocSh,
     return 0U;
 }
 
-ULONG  ScDBFunc::RecalcPivotTable()
+sal_uLong  ScDBFunc::RecalcPivotTable()
 {
     ScDocShell* pDocSh  = GetViewData()->GetDocShell();
     ScDocument* pDoc    = GetViewData()->GetDocument();
@@ -741,9 +741,9 @@ ULONG  ScDBFunc::RecalcPivotTable()
         // Wang Xu Ming -- 2009-6-17
         // DataPilot Migration
         //ScDBDocFunc aFunc( *pDocSh );
-        //aFunc.DataPilotUpdate( pDPObj, pDPObj, TRUE, FALSE );
+        //aFunc.DataPilotUpdate( pDPObj, pDPObj, sal_True, sal_False );
         //CursorPosChanged();      // shells may be switched
-        ULONG nErrId = RefreshDPObject( pDPObj, pDoc, pDocSh, TRUE, FALSE );//pDPObj->RefreshCache();
+        sal_uLong nErrId = RefreshDPObject( pDPObj, pDoc, pDocSh, sal_True, sal_False );//pDPObj->RefreshCache();
         if ( nErrId == 0 )
         {
             // There is no undo for the refresh of the cache table, but the undo history for cell changes
@@ -751,7 +751,7 @@ ULONG  ScDBFunc::RecalcPivotTable()
             //GetViewData()->GetDocShell()->GetUndoManager()->Clear();
         }
         else if (nErrId <= USHRT_MAX)
-            ErrorMessage(static_cast<USHORT>(nErrId));
+            ErrorMessage(static_cast<sal_uInt16>(nErrId));
       return nErrId;
       // End Comments
     }
@@ -773,10 +773,10 @@ void ScDBFunc::GetSelectedMemberList( ScStrCollection& rEntries, long& rDimensio
 
     ScRangeListRef xRanges;
     GetViewData()->GetMultiArea( xRanges );         // incl. cursor if nothing is selected
-    ULONG nRangeCount = xRanges->Count();
-    BOOL bContinue = TRUE;
+    sal_uLong nRangeCount = xRanges->Count();
+    sal_Bool bContinue = sal_True;
 
-    for (ULONG nRangePos=0; nRangePos<nRangeCount && bContinue; nRangePos++)
+    for (sal_uLong nRangePos=0; nRangePos<nRangeCount && bContinue; nRangePos++)
     {
         ScRange aRange = *xRanges->GetObject(nRangePos);
         SCCOL nStartCol = aRange.aStart.Col();
@@ -791,7 +791,7 @@ void ScDBFunc::GetSelectedMemberList( ScStrCollection& rEntries, long& rDimensio
                 sheet::DataPilotTableHeaderData aData;
                 pDPObj->GetHeaderPositionData(ScAddress(nCol, nRow, nTab), aData);
                 if ( aData.Dimension < 0 )
-                    bContinue = FALSE;              // not part of any dimension
+                    bContinue = sal_False;              // not part of any dimension
                 else
                 {
                     if ( nStartDimension < 0 )      // first member?
@@ -804,7 +804,7 @@ void ScDBFunc::GetSelectedMemberList( ScStrCollection& rEntries, long& rDimensio
                          aData.Hierarchy != nStartHierarchy ||
                          aData.Level     != nStartLevel )
                     {
-                        bContinue = FALSE;          // cannot mix dimensions
+                        bContinue = sal_False;          // cannot mix dimensions
                     }
                 }
                 if ( bContinue )
@@ -826,11 +826,11 @@ void ScDBFunc::GetSelectedMemberList( ScStrCollection& rEntries, long& rDimensio
         rEntries.FreeAll();         // remove all if not valid
 }
 
-BOOL ScDBFunc::HasSelectionForDateGroup( ScDPNumGroupInfo& rOldInfo, sal_Int32& rParts )
+sal_Bool ScDBFunc::HasSelectionForDateGroup( ScDPNumGroupInfo& rOldInfo, sal_Int32& rParts )
 {
     // determine if the date group dialog has to be shown for the current selection
 
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
 
     SCCOL nCurX = GetViewData()->GetCurX();
     SCROW nCurY = GetViewData()->GetCurY();
@@ -846,12 +846,12 @@ BOOL ScDBFunc::HasSelectionForDateGroup( ScDPNumGroupInfo& rOldInfo, sal_Int32&
 
         if ( aEntries.GetCount() > 0 )
         {
-            BOOL bIsDataLayout;
+            sal_Bool bIsDataLayout;
             String aDimName = pDPObj->GetDimName( nSelectDimension, bIsDataLayout );
             String aBaseDimName( aDimName );
 
-            BOOL bInGroupDim = FALSE;
-            BOOL bFoundParts = FALSE;
+            sal_Bool bInGroupDim = sal_False;
+            sal_Bool bFoundParts = sal_False;
 
             ScDPDimensionSaveData* pDimData =
                 const_cast<ScDPDimensionSaveData*>( pDPObj->GetSaveData()->GetExistingDimensionData() );
@@ -869,7 +869,7 @@ BOOL ScDBFunc::HasSelectionForDateGroup( ScDPNumGroupInfo& rOldInfo, sal_Int32&
                         //  (parts are collected below)
 
                         rOldInfo = pNumGroupDim->GetDateInfo();
-                        bFound = TRUE;
+                        bFound = sal_True;
                     }
                     else if ( pNumGroupDim->GetInfo().DateValues )
                     {
@@ -878,10 +878,10 @@ BOOL ScDBFunc::HasSelectionForDateGroup( ScDPNumGroupInfo& rOldInfo, sal_Int32&
 
                         rOldInfo = pNumGroupDim->GetInfo();
                         rParts = com::sun::star::sheet::DataPilotFieldGroupBy::DAYS;               // not found in CollectDateParts
-                        bFoundParts = TRUE;
-                        bFound = TRUE;
+                        bFoundParts = sal_True;
+                        bFound = sal_True;
                     }
-                    bInGroupDim = TRUE;
+                    bInGroupDim = sal_True;
                 }
                 else if ( pGroupDim )
                 {
@@ -894,9 +894,9 @@ BOOL ScDBFunc::HasSelectionForDateGroup( ScDPNumGroupInfo& rOldInfo, sal_Int32&
 
                         rOldInfo = pGroupDim->GetDateInfo();
                         aBaseDimName = pGroupDim->GetSourceDimName();
-                        bFound = TRUE;
+                        bFound = sal_True;
                     }
-                    bInGroupDim = TRUE;
+                    bInGroupDim = sal_True;
                 }
             }
             if ( bFound && !bFoundParts )
@@ -918,12 +918,12 @@ BOOL ScDBFunc::HasSelectionForDateGroup( ScDPNumGroupInfo& rOldInfo, sal_Int32&
                     SCTAB nSelTab = aSelRange.aStart.Tab();
                     if ( pDoc->HasValueData( nSelCol, nSelRow, nSelTab ) )
                     {
-                        ULONG nIndex = static_cast<const SfxUInt32Item*>(pDoc->GetAttr(
+                        sal_uLong nIndex = static_cast<const SfxUInt32Item*>(pDoc->GetAttr(
                                         nSelCol, nSelRow, nSelTab, ATTR_VALUE_FORMAT))->GetValue();
                         short nType = pDoc->GetFormatTable()->GetType(nIndex);
                         if ( nType == NUMBERFORMAT_DATE || nType == NUMBERFORMAT_TIME || nType == NUMBERFORMAT_DATETIME )
                         {
-                            bFound = TRUE;
+                            bFound = sal_True;
                             // use currently selected value for automatic limits
                             if( rOldInfo.AutoStart )
                                 rOldInfo.Start = pDoc->GetValue( aSelRange.aStart );
@@ -939,11 +939,11 @@ BOOL ScDBFunc::HasSelectionForDateGroup( ScDPNumGroupInfo& rOldInfo, sal_Int32&
     return bFound;
 }
 
-BOOL ScDBFunc::HasSelectionForNumGroup( ScDPNumGroupInfo& rOldInfo )
+sal_Bool ScDBFunc::HasSelectionForNumGroup( ScDPNumGroupInfo& rOldInfo )
 {
     // determine if the numeric group dialog has to be shown for the current selection
 
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
 
     SCCOL nCurX = GetViewData()->GetCurX();
     SCROW nCurY = GetViewData()->GetCurY();
@@ -959,10 +959,10 @@ BOOL ScDBFunc::HasSelectionForNumGroup( ScDPNumGroupInfo& rOldInfo )
 
         if ( aEntries.GetCount() > 0 )
         {
-            BOOL bIsDataLayout;
+            sal_Bool bIsDataLayout;
             String aDimName = pDPObj->GetDimName( nSelectDimension, bIsDataLayout );
 
-            BOOL bInGroupDim = FALSE;
+            sal_Bool bInGroupDim = sal_False;
 
             ScDPDimensionSaveData* pDimData =
                 const_cast<ScDPDimensionSaveData*>( pDPObj->GetSaveData()->GetExistingDimensionData() );
@@ -975,10 +975,10 @@ BOOL ScDBFunc::HasSelectionForNumGroup( ScDPNumGroupInfo& rOldInfo )
                     //  -> edit settings of this dimension
 
                     rOldInfo = pNumGroupDim->GetInfo();
-                    bFound = TRUE;
+                    bFound = sal_True;
                 }
                 else if ( pDimData->GetNamedGroupDim( aDimName ) )
-                    bInGroupDim = TRUE;                                    // in a group dimension
+                    bInGroupDim = sal_True;                                    // in a group dimension
             }
             if ( !bFound && !bInGroupDim )
             {
@@ -992,7 +992,7 @@ BOOL ScDBFunc::HasSelectionForNumGroup( ScDPNumGroupInfo& rOldInfo )
                     if ( pDoc->HasValueData( aSelRange.aStart.Col(), aSelRange.aStart.Row(),
                                              aSelRange.aStart.Tab() ) )
                     {
-                        bFound = TRUE;
+                        bFound = sal_True;
                         // use currently selected value for automatic limits
                         if( rOldInfo.AutoStart )
                             rOldInfo.Start = pDoc->GetValue( aSelRange.aStart );
@@ -1019,7 +1019,7 @@ void ScDBFunc::DateGroupDataPilot( const ScDPNumGroupInfo& rInfo, sal_Int32 nPar
 
         if ( aEntries.GetCount() > 0 )
         {
-            BOOL bIsDataLayout;
+            sal_Bool bIsDataLayout;
             String aDimName = pDPObj->GetDimName( nSelectDimension, bIsDataLayout );
 
             ScDPSaveData aData( *pDPObj->GetSaveData() );
@@ -1073,7 +1073,7 @@ void ScDBFunc::DateGroupDataPilot( const ScDPNumGroupInfo& rInfo, sal_Int32 nPar
                 ScDPNumGroupInfo aEmpty;
                 bool bFirst = true;
                 sal_Int32 nMask = 1;
-                for (USHORT nBit=0; nBit<32; nBit++)
+                for (sal_uInt16 nBit=0; nBit<32; nBit++)
                 {
                     if ( nParts & nMask )
                     {
@@ -1128,7 +1128,7 @@ void ScDBFunc::DateGroupDataPilot( const ScDPNumGroupInfo& rInfo, sal_Int32 nPar
             ScDBDocFunc aFunc( *GetViewData()->GetDocShell() );
             ScDPObject* pNewObj = new ScDPObject( *pDPObj );
             pNewObj->SetSaveData( aData );
-            aFunc.DataPilotUpdate( pDPObj, pNewObj, TRUE, FALSE );
+            aFunc.DataPilotUpdate( pDPObj, pNewObj, sal_True, sal_False );
             delete pNewObj;
 
             // unmark cell selection
@@ -1149,7 +1149,7 @@ void ScDBFunc::NumGroupDataPilot( const ScDPNumGroupInfo& rInfo )
 
         if ( aEntries.GetCount() > 0 )
         {
-            BOOL bIsDataLayout;
+            sal_Bool bIsDataLayout;
             String aDimName = pDPObj->GetDimName( nSelectDimension, bIsDataLayout );
 
             ScDPSaveData aData( *pDPObj->GetSaveData() );
@@ -1172,7 +1172,7 @@ void ScDBFunc::NumGroupDataPilot( const ScDPNumGroupInfo& rInfo )
             ScDBDocFunc aFunc( *GetViewData()->GetDocShell() );
             ScDPObject* pNewObj = new ScDPObject( *pDPObj );
             pNewObj->SetSaveData( aData );
-            aFunc.DataPilotUpdate( pDPObj, pNewObj, TRUE, FALSE );
+            aFunc.DataPilotUpdate( pDPObj, pNewObj, sal_True, sal_False );
             delete pNewObj;
 
             // unmark cell selection
@@ -1193,7 +1193,7 @@ void ScDBFunc::GroupDataPilot()
 
         if ( aEntries.GetCount() > 0 )
         {
-            BOOL bIsDataLayout;
+            sal_Bool bIsDataLayout;
             String aDimName = pDPObj->GetDimName( nSelectDimension, bIsDataLayout );
 
             ScDPSaveData aData( *pDPObj->GetSaveData() );
@@ -1214,8 +1214,8 @@ void ScDBFunc::GroupDataPilot()
 
             // remove the selected items from their groups
             // (empty groups are removed, too)
-            USHORT nEntryCount = aEntries.GetCount();
-            USHORT nEntry;
+            sal_uInt16 nEntryCount = aEntries.GetCount();
+            sal_uInt16 nEntry;
             if ( pGroupDimension )
             {
                 for (nEntry=0; nEntry<nEntryCount; nEntry++)
@@ -1260,7 +1260,7 @@ void ScDBFunc::GroupDataPilot()
                         const ScDPSaveGroupItem* pBaseGroup = pBaseGroupDim->GetGroupByIndex( nGroup );
 
                         StrData aStrData( pBaseGroup->GetGroupName() );
-                        USHORT nCollIndex;
+                        sal_uInt16 nCollIndex;
                         if ( !aEntries.Search( &aStrData, nCollIndex ) )    //! ignore case?
                         {
                             // add an additional group for each item that is not in the selection
@@ -1316,7 +1316,7 @@ void ScDBFunc::GroupDataPilot()
             ScDBDocFunc aFunc( *GetViewData()->GetDocShell() );
             ScDPObject* pNewObj = new ScDPObject( *pDPObj );
             pNewObj->SetSaveData( aData );
-            aFunc.DataPilotUpdate( pDPObj, pNewObj, TRUE, FALSE );
+            aFunc.DataPilotUpdate( pDPObj, pNewObj, sal_True, sal_False );
             delete pNewObj;
 
             // unmark cell selection
@@ -1337,14 +1337,14 @@ void ScDBFunc::UngroupDataPilot()
 
         if ( aEntries.GetCount() > 0 )
         {
-            BOOL bIsDataLayout;
+            sal_Bool bIsDataLayout;
             String aDimName = pDPObj->GetDimName( nSelectDimension, bIsDataLayout );
 
             ScDPSaveData aData( *pDPObj->GetSaveData() );
             ScDPDimensionSaveData* pDimData = aData.GetDimensionData();     // created if not there
             //! test first if DimensionData exists?
 
-            BOOL bApply = FALSE;
+            sal_Bool bApply = sal_False;
 
             ScDPSaveGroupDimension* pGroupDim = pDimData->GetNamedGroupDimAcc( aDimName );
             const ScDPSaveNumGroupDimension* pNumGroupDim = pDimData->GetNumGroupDim( aDimName );
@@ -1360,8 +1360,8 @@ void ScDBFunc::UngroupDataPilot()
             }
             else if ( pGroupDim )
             {
-                USHORT nEntryCount = aEntries.GetCount();
-                for (USHORT nEntry=0; nEntry<nEntryCount; nEntry++)
+                sal_uInt16 nEntryCount = aEntries.GetCount();
+                for (sal_uInt16 nEntry=0; nEntry<nEntryCount; nEntry++)
                 {
                     String aEntryName = aEntries[nEntry]->GetString();
                     pGroupDim->RemoveGroup( aEntryName );
@@ -1383,14 +1383,14 @@ void ScDBFunc::UngroupDataPilot()
                     // also remove SaveData settings for the dimension that no longer exists
                     aData.RemoveDimensionByName( aDimName );
                 }
-                bApply = TRUE;
+                bApply = sal_True;
             }
             else if ( pNumGroupDim )
             {
                 // remove the numerical grouping
                 pDimData->RemoveNumGroupDimension( aDimName );
                 // SaveData settings can remain unchanged - the same dimension still exists
-                bApply = TRUE;
+                bApply = sal_True;
             }
 
             if ( bApply )
@@ -1399,7 +1399,7 @@ void ScDBFunc::UngroupDataPilot()
                 ScDBDocFunc aFunc( *GetViewData()->GetDocShell() );
                 ScDPObject* pNewObj = new ScDPObject( *pDPObj );
                 pNewObj->SetSaveData( aData );
-                aFunc.DataPilotUpdate( pDPObj, pNewObj, TRUE, FALSE );
+                aFunc.DataPilotUpdate( pDPObj, pNewObj, sal_True, sal_False );
                 delete pNewObj;
 
                 // unmark cell selection
@@ -1474,13 +1474,13 @@ void ScDBFunc::DataPilotInput( const ScAddress& rPos, const String& rString )
         return;
     }
 
-    USHORT nErrorId = 0;
+    sal_uInt16 nErrorId = 0;
 
     pDPObj->BuildAllDimensionMembers();
     ScDPSaveData aData( *pDPObj->GetSaveData() );
-    BOOL bChange = FALSE;
+    sal_Bool bChange = sal_False;
 
-    USHORT nOrient = DataPilotFieldOrientation_HIDDEN;
+    sal_uInt16 nOrient = DataPilotFieldOrientation_HIDDEN;
     long nField = pDPObj->GetHeaderDim( rPos, nOrient );
     if ( nField >= 0 )
     {
@@ -1502,7 +1502,7 @@ void ScDBFunc::DataPilotInput( const ScAddress& rPos, const String& rString )
                     ScDPSaveDimension* pSaveDim = aData.GetDimensionByName( aOldText );
                     pSaveDim->SetName( aNewName );
 
-                    bChange = TRUE;
+                    bChange = sal_True;
                 }
                 else
                     nErrorId = STR_INVALIDNAME;
@@ -1510,7 +1510,7 @@ void ScDBFunc::DataPilotInput( const ScAddress& rPos, const String& rString )
         }
         else if (nOrient == DataPilotFieldOrientation_COLUMN || nOrient == DataPilotFieldOrientation_ROW)
         {
-            BOOL bDataLayout = false;
+            sal_Bool bDataLayout = false;
             String aDimName = pDPObj->GetDimName(nField, bDataLayout);
             ScDPSaveDimension* pDim = bDataLayout ? aData.GetDataLayoutDimension() : aData.GetDimensionByName(aDimName);
             if (pDim)
@@ -1570,7 +1570,7 @@ void ScDBFunc::DataPilotInput( const ScAddress& rPos, const String& rString )
         {
             if ( aData.GetExistingDimensionData() && !(aPosData.Flags & MemberResultFlags::SUBTOTAL))
             {
-                BOOL bIsDataLayout;
+                sal_Bool bIsDataLayout;
                 String aDimName = pDPObj->GetDimName( aPosData.Dimension, bIsDataLayout );
 
                 ScDPDimensionSaveData* pDimData = aData.GetDimensionData();
@@ -1598,7 +1598,7 @@ void ScDBFunc::DataPilotInput( const ScAddress& rPos, const String& rString )
                         if ( pSaveMember )
                             pSaveMember->SetName( aNewName );
 
-                        bChange = TRUE;
+                        bChange = sal_True;
                     }
                     else
                         nErrorId = STR_INVALIDNAME;
@@ -1611,7 +1611,7 @@ void ScDBFunc::DataPilotInput( const ScAddress& rPos, const String& rString )
             }
             else if (aPosData.Dimension >= 0 && aPosData.MemberName.getLength() > 0)
             {
-                BOOL bDataLayout = false;
+                sal_Bool bDataLayout = false;
                 String aDimName = pDPObj->GetDimName(static_cast<long>(aPosData.Dimension), bDataLayout);
                 if (bDataLayout)
                 {
@@ -1718,7 +1718,7 @@ void ScDBFunc::DataPilotInput( const ScAddress& rPos, const String& rString )
         ScDBDocFunc aFunc( *GetViewData()->GetDocShell() );
         ScDPObject* pNewObj = new ScDPObject( *pDPObj );
         pNewObj->SetSaveData( aData );
-        aFunc.DataPilotUpdate( pDPObj, pNewObj, TRUE, FALSE );
+        aFunc.DataPilotUpdate( pDPObj, pNewObj, sal_True, sal_False );
         delete pNewObj;
     }
     else
@@ -1765,13 +1765,13 @@ bool ScDBFunc::DataPilotSort( const ScAddress& rPos, bool bAscending, sal_uInt16
     if ( pUserListId )
         pDPObj->BuildAllDimensionMembers();
 
-    USHORT nOrientation;
+    sal_uInt16 nOrientation;
     long nDimIndex = pDPObj->GetHeaderDim(rPos, nOrientation);
     if (nDimIndex < 0)
         // Invalid dimension index.  Bail out.
         return false;
 
-    BOOL bDataLayout;
+    sal_Bool bDataLayout;
     ScDPSaveData* pSaveData = pDPObj->GetSaveData();
     if (!pSaveData)
         return false;
@@ -1897,9 +1897,9 @@ bool ScDBFunc::DataPilotSort( const ScAddress& rPos, bool bAscending, sal_uInt16
     return aFunc.DataPilotUpdate(pDPObj, pNewObj.get(), true, false);
 }
 
-BOOL ScDBFunc::DataPilotMove( const ScRange& rSource, const ScAddress& rDest )
+sal_Bool ScDBFunc::DataPilotMove( const ScRange& rSource, const ScAddress& rDest )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     ScDocument* pDoc = GetViewData()->GetDocument();
     ScDPObject* pDPObj = pDoc->GetDPAtCursor( rSource.aStart.Col(), rSource.aStart.Row(), rSource.aStart.Tab() );
     if ( pDPObj && pDPObj == pDoc->GetDPAtCursor( rDest.Col(), rDest.Row(), rDest.Tab() ) )
@@ -1933,7 +1933,7 @@ BOOL ScDBFunc::DataPilotMove( const ScRange& rSource, const ScAddress& rDest )
 
         if ( bValid )
         {
-            BOOL bIsDataLayout;
+            sal_Bool bIsDataLayout;
             String aDimName = pDPObj->GetDimName( aDestData.Dimension, bIsDataLayout );
             if ( !bIsDataLayout )
             {
@@ -1980,12 +1980,12 @@ BOOL ScDBFunc::DataPilotMove( const ScRange& rSource, const ScAddress& rDest )
                 ScDBDocFunc aFunc( *GetViewData()->GetDocShell() );
                 ScDPObject* pNewObj = new ScDPObject( *pDPObj );
                 pNewObj->SetSaveData( aData );
-                aFunc.DataPilotUpdate( pDPObj, pNewObj, TRUE, FALSE );      //! bApi for drag&drop?
+                aFunc.DataPilotUpdate( pDPObj, pNewObj, sal_True, sal_False );      //! bApi for drag&drop?
                 delete pNewObj;
 
                 Unmark();       // entry was moved - no use in leaving the old cell selected
 
-                bRet = TRUE;
+                bRet = sal_True;
             }
         }
     }
@@ -1993,9 +1993,9 @@ BOOL ScDBFunc::DataPilotMove( const ScRange& rSource, const ScAddress& rDest )
     return bRet;
 }
 
-BOOL ScDBFunc::HasSelectionForDrillDown( USHORT& rOrientation )
+sal_Bool ScDBFunc::HasSelectionForDrillDown( sal_uInt16& rOrientation )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
 
     ScDPObject* pDPObj = GetViewData()->GetDocument()->GetDPAtCursor( GetViewData()->GetCurX(),
                                         GetViewData()->GetCurY(), GetViewData()->GetTabNo() );
@@ -2007,7 +2007,7 @@ BOOL ScDBFunc::HasSelectionForDrillDown( USHORT& rOrientation )
 
         if ( aEntries.GetCount() > 0 )
         {
-            BOOL bIsDataLayout;
+            sal_Bool bIsDataLayout;
             String aDimName = pDPObj->GetDimName( nSelectDimension, bIsDataLayout );
             if ( !bIsDataLayout )
             {
@@ -2015,12 +2015,12 @@ BOOL ScDBFunc::HasSelectionForDrillDown( USHORT& rOrientation )
                 ScDPSaveDimension* pDim = pSaveData->GetExistingDimensionByName( aDimName );
                 if ( pDim )
                 {
-                    USHORT nDimOrient = pDim->GetOrientation();
+                    sal_uInt16 nDimOrient = pDim->GetOrientation();
                     ScDPSaveDimension* pInner = pSaveData->GetInnermostDimension( nDimOrient );
                     if ( pDim == pInner )
                     {
                         rOrientation = nDimOrient;
-                        bRet = TRUE;
+                        bRet = sal_True;
                     }
                 }
             }
@@ -2030,7 +2030,7 @@ BOOL ScDBFunc::HasSelectionForDrillDown( USHORT& rOrientation )
     return bRet;
 }
 
-void ScDBFunc::SetDataPilotDetails( BOOL bShow, const String* pNewDimensionName )
+void ScDBFunc::SetDataPilotDetails( sal_Bool bShow, const String* pNewDimensionName )
 {
     ScDPObject* pDPObj = GetViewData()->GetDocument()->GetDPAtCursor( GetViewData()->GetCurX(),
                                         GetViewData()->GetCurY(), GetViewData()->GetTabNo() );
@@ -2042,7 +2042,7 @@ void ScDBFunc::SetDataPilotDetails( BOOL bShow, const String* pNewDimensionName
 
         if ( aEntries.GetCount() > 0 )
         {
-            BOOL bIsDataLayout;
+            sal_Bool bIsDataLayout;
             String aDimName = pDPObj->GetDimName( nSelectDimension, bIsDataLayout );
             if ( !bIsDataLayout )
             {
@@ -2062,7 +2062,7 @@ void ScDBFunc::SetDataPilotDetails( BOOL bShow, const String* pNewDimensionName
                         pDuplicated = aData.DuplicateDimension( *pNewDimensionName );
                     }
 
-                    USHORT nOrientation = pDim->GetOrientation();
+                    sal_uInt16 nOrientation = pDim->GetOrientation();
                     pNewDim->SetOrientation( nOrientation );
 
                     long nPosition = LONG_MAX;
@@ -2089,17 +2089,17 @@ void ScDBFunc::SetDataPilotDetails( BOOL bShow, const String* pNewDimensionName
                     ScStrCollection aVisibleEntries;
                     pDPObj->GetMemberResultNames( aVisibleEntries, nSelectDimension );
 
-                    USHORT nVisCount = aVisibleEntries.GetCount();
-                    for (USHORT nVisPos=0; nVisPos<nVisCount; nVisPos++)
+                    sal_uInt16 nVisCount = aVisibleEntries.GetCount();
+                    for (sal_uInt16 nVisPos=0; nVisPos<nVisCount; nVisPos++)
                     {
                         String aVisName = aVisibleEntries[nVisPos]->GetString();
                         ScDPSaveMember* pMember = pDim->GetMemberByName( aVisName );
-                        pMember->SetShowDetails( FALSE );
+                        pMember->SetShowDetails( sal_False );
                     }
                 }
 
-                USHORT nEntryCount = aEntries.GetCount();
-                for (USHORT nEntry=0; nEntry<nEntryCount; nEntry++)
+                sal_uInt16 nEntryCount = aEntries.GetCount();
+                for (sal_uInt16 nEntry=0; nEntry<nEntryCount; nEntry++)
                 {
                     String aEntryName = aEntries[nEntry]->GetString();
                     ScDPSaveMember* pMember = pDim->GetMemberByName( aEntryName );
@@ -2110,7 +2110,7 @@ void ScDBFunc::SetDataPilotDetails( BOOL bShow, const String* pNewDimensionName
                 ScDBDocFunc aFunc( *GetViewData()->GetDocShell() );
                 ScDPObject* pNewObj = new ScDPObject( *pDPObj );
                 pNewObj->SetSaveData( aData );
-                aFunc.DataPilotUpdate( pDPObj, pNewObj, TRUE, FALSE );
+                aFunc.DataPilotUpdate( pDPObj, pNewObj, sal_True, sal_False );
                 delete pNewObj;
 
                 // unmark cell selection
@@ -2178,7 +2178,7 @@ void ScDBFunc::ShowDataPilotSourceData( ScDPObject& rDPObj, const Sequence<sheet
             continue;
 
         ScPatternAttr aPattern( pInsDoc->GetPool() );
-        aPattern.GetItemSet().Put( SfxUInt32Item(ATTR_VALUE_FORMAT, static_cast<UINT32>(nNumFmt)) );
+        aPattern.GetItemSet().Put( SfxUInt32Item(ATTR_VALUE_FORMAT, static_cast<sal_uInt32>(nNumFmt)) );
         pInsDoc->ApplyPatternAreaTab(nCol, 1, nCol, nRowSize-1, nNewTab, aPattern);
     }
 
@@ -2203,7 +2203,7 @@ void ScDBFunc::ShowDataPilotSourceData( ScDPObject& rDPObj, const Sequence<sheet
 //          DB-Operationen (Sortieren, Filtern, Teilergebnisse) wiederholen
 //
 
-void ScDBFunc::RepeatDB( BOOL bRecord )
+void ScDBFunc::RepeatDB( sal_Bool bRecord )
 {
     SCCOL nCurX = GetViewData()->GetCurX();
     SCROW nCurY = GetViewData()->GetCurY();
@@ -2211,33 +2211,33 @@ void ScDBFunc::RepeatDB( BOOL bRecord )
     ScDocument* pDoc = GetViewData()->GetDocument();
     ScDBData* pDBData = GetDBData();
     if (bRecord && !pDoc->IsUndoEnabled())
-        bRecord = FALSE;
+        bRecord = sal_False;
 
     ScQueryParam aQueryParam;
     pDBData->GetQueryParam( aQueryParam );
-    BOOL bQuery = aQueryParam.GetEntry(0).bDoQuery;
+    sal_Bool bQuery = aQueryParam.GetEntry(0).bDoQuery;
 
     ScSortParam aSortParam;
     pDBData->GetSortParam( aSortParam );
-    BOOL bSort = aSortParam.bDoSort[0];
+    sal_Bool bSort = aSortParam.bDoSort[0];
 
     ScSubTotalParam aSubTotalParam;
     pDBData->GetSubTotalParam( aSubTotalParam );
-    BOOL bSubTotal = aSubTotalParam.bGroupActive[0] && !aSubTotalParam.bRemoveOnly;
+    sal_Bool bSubTotal = aSubTotalParam.bGroupActive[0] && !aSubTotalParam.bRemoveOnly;
 
     if ( bQuery || bSort || bSubTotal )
     {
-        BOOL bQuerySize = FALSE;
+        sal_Bool bQuerySize = sal_False;
         ScRange aOldQuery;
         ScRange aNewQuery;
         if (bQuery && !aQueryParam.bInplace)
         {
             ScDBData* pDest = pDoc->GetDBAtCursor( aQueryParam.nDestCol, aQueryParam.nDestRow,
-                                                    aQueryParam.nDestTab, TRUE );
+                                                    aQueryParam.nDestTab, sal_True );
             if (pDest && pDest->IsDoSize())
             {
                 pDest->GetArea( aOldQuery );
-                bQuerySize = TRUE;
+                bQuerySize = sal_True;
             }
         }
 
@@ -2271,18 +2271,18 @@ void ScDBFunc::RepeatDB( BOOL bRecord )
                 pTable->GetColArray()->GetRange( nOutStartCol, nOutEndCol );
                 pTable->GetRowArray()->GetRange( nOutStartRow, nOutEndRow );
 
-                pUndoDoc->InitUndo( pDoc, nTab, nTab, TRUE, TRUE );
-                pDoc->CopyToDocument( static_cast<SCCOL>(nOutStartCol), 0, nTab, static_cast<SCCOL>(nOutEndCol), MAXROW, nTab, IDF_NONE, FALSE, pUndoDoc );
-                pDoc->CopyToDocument( 0, nOutStartRow, nTab, MAXCOL, nOutEndRow, nTab, IDF_NONE, FALSE, pUndoDoc );
+                pUndoDoc->InitUndo( pDoc, nTab, nTab, sal_True, sal_True );
+                pDoc->CopyToDocument( static_cast<SCCOL>(nOutStartCol), 0, nTab, static_cast<SCCOL>(nOutEndCol), MAXROW, nTab, IDF_NONE, sal_False, pUndoDoc );
+                pDoc->CopyToDocument( 0, nOutStartRow, nTab, MAXCOL, nOutEndRow, nTab, IDF_NONE, sal_False, pUndoDoc );
             }
             else
-                pUndoDoc->InitUndo( pDoc, nTab, nTab, FALSE, TRUE );
+                pUndoDoc->InitUndo( pDoc, nTab, nTab, sal_False, sal_True );
 
             //  Datenbereich sichern - incl. Filter-Ergebnis
-            pDoc->CopyToDocument( 0,nStartRow,nTab, MAXCOL,nEndRow,nTab, IDF_ALL, FALSE, pUndoDoc );
+            pDoc->CopyToDocument( 0,nStartRow,nTab, MAXCOL,nEndRow,nTab, IDF_ALL, sal_False, pUndoDoc );
 
             //  alle Formeln wegen Referenzen
-            pDoc->CopyToDocument( 0,0,0, MAXCOL,MAXROW,nTabCount-1, IDF_FORMULA, FALSE, pUndoDoc );
+            pDoc->CopyToDocument( 0,0,0, MAXCOL,MAXROW,nTabCount-1, IDF_FORMULA, sal_False, pUndoDoc );
 
             //  DB- und andere Bereiche
             ScRangeName* pDocRange = pDoc->GetRangeName();
@@ -2297,14 +2297,14 @@ void ScDBFunc::RepeatDB( BOOL bRecord )
         {
             //  Sortieren ohne SubTotals
 
-            aSubTotalParam.bRemoveOnly = TRUE;      // wird unten wieder zurueckgesetzt
-            DoSubTotals( aSubTotalParam, FALSE );
+            aSubTotalParam.bRemoveOnly = sal_True;      // wird unten wieder zurueckgesetzt
+            DoSubTotals( aSubTotalParam, sal_False );
         }
 
         if (bSort)
         {
             pDBData->GetSortParam( aSortParam );            // Bereich kann sich geaendert haben
-            Sort( aSortParam, FALSE, FALSE);
+            Sort( aSortParam, sal_False, sal_False);
         }
         if (bQuery)
         {
@@ -2316,10 +2316,10 @@ void ScDBFunc::RepeatDB( BOOL bRecord )
                     aAdvSource.aStart.Col(), aAdvSource.aStart.Row(),
                     aAdvSource.aEnd.Col(), aAdvSource.aEnd.Row(),
                     aAdvSource.aStart.Tab(), aQueryParam );
-                Query( aQueryParam, &aAdvSource, FALSE );
+                Query( aQueryParam, &aAdvSource, sal_False );
             }
             else
-                Query( aQueryParam, NULL, FALSE );
+                Query( aQueryParam, NULL, sal_False );
 
             //  bei nicht-inplace kann die Tabelle umgestellt worden sein
             if ( !aQueryParam.bInplace && aQueryParam.nDestTab != nTab )
@@ -2328,8 +2328,8 @@ void ScDBFunc::RepeatDB( BOOL bRecord )
         if (bSubTotal)
         {
             pDBData->GetSubTotalParam( aSubTotalParam );    // Bereich kann sich geaendert haben
-            aSubTotalParam.bRemoveOnly = FALSE;
-            DoSubTotals( aSubTotalParam, FALSE );
+            aSubTotalParam.bRemoveOnly = sal_False;
+            DoSubTotals( aSubTotalParam, sal_False );
         }
 
         if (bRecord)
@@ -2344,7 +2344,7 @@ void ScDBFunc::RepeatDB( BOOL bRecord )
             if (bQuerySize)
             {
                 ScDBData* pDest = pDoc->GetDBAtCursor( aQueryParam.nDestCol, aQueryParam.nDestRow,
-                                                        aQueryParam.nDestTab, TRUE );
+                                                        aQueryParam.nDestTab, sal_True );
                 if (pDest)
                 {
                     pDest->GetArea( aNewQuery );