removetooltypes01: #i112600# remove tooltypes from sc

5 files changed, 115 insertions, 115 deletions

diff --git a/sc/source/ui/optdlg/opredlin.cxx b/sc/source/ui/optdlg/opredlin.cxx
index 1a45ab715dee..a906849494e1 100644
--- a/sc/source/ui/optdlg/opredlin.cxx
+++ b/sc/source/ui/optdlg/opredlin.cxx
@@ -101,12 +101,12 @@ SfxTabPage* __EXPORT ScRedlineOptionsTabPage::Create( Window* pParent, const Sfx
     Beschreibung:
  -----------------------------------------------------------------------*/
 
-BOOL __EXPORT ScRedlineOptionsTabPage::FillItemSet( SfxItemSet& /* rSet */ )
+sal_Bool __EXPORT ScRedlineOptionsTabPage::FillItemSet( SfxItemSet& /* rSet */ )
 {
     ScAppOptions aAppOptions=SC_MOD()->GetAppOptions();
 
-    ULONG nNew=0;
-    USHORT nPos=0;
+    sal_uLong nNew=0;
+    sal_uInt16 nPos=0;
 
     nPos = aContentColorLB.GetSelectEntryPos();
     if (nPos != LISTBOX_ENTRY_NOTFOUND)
@@ -165,7 +165,7 @@ BOOL __EXPORT ScRedlineOptionsTabPage::FillItemSet( SfxItemSet& /* rSet */ )
     if (pDocSh)
         pDocSh->PostPaintGridAll();
 
-    return FALSE;
+    return sal_False;
 }
 
 /*-----------------------------------------------------------------------
@@ -181,12 +181,12 @@ void __EXPORT ScRedlineOptionsTabPage::Reset( const SfxItemSet& /* rSet */ )
     aInsertColorLB.InsertEntry(aAuthorStr);
     aRemoveColorLB.InsertEntry(aAuthorStr);
 
-    aContentColorLB.SetUpdateMode( FALSE);
-    aMoveColorLB.SetUpdateMode( FALSE);
-    aInsertColorLB.SetUpdateMode( FALSE);
-    aRemoveColorLB.SetUpdateMode( FALSE);
+    aContentColorLB.SetUpdateMode( sal_False);
+    aMoveColorLB.SetUpdateMode( sal_False);
+    aInsertColorLB.SetUpdateMode( sal_False);
+    aRemoveColorLB.SetUpdateMode( sal_False);
 
-    for( USHORT i = 0; i < pColorTbl->Count(); ++i )
+    for( sal_uInt16 i = 0; i < pColorTbl->Count(); ++i )
     {
         XColorEntry* pEntry = pColorTbl->GetColor( i );
         Color aColor = pEntry->GetColor();
@@ -197,15 +197,15 @@ void __EXPORT ScRedlineOptionsTabPage::Reset( const SfxItemSet& /* rSet */ )
         aInsertColorLB.InsertEntry( aColor, sName );
         aRemoveColorLB.InsertEntry( aColor, sName );
     }
-    aContentColorLB.SetUpdateMode( TRUE );
-    aMoveColorLB.SetUpdateMode( TRUE );
-    aInsertColorLB.SetUpdateMode( TRUE );
-    aRemoveColorLB.SetUpdateMode( TRUE );
+    aContentColorLB.SetUpdateMode( sal_True );
+    aMoveColorLB.SetUpdateMode( sal_True );
+    aInsertColorLB.SetUpdateMode( sal_True );
+    aRemoveColorLB.SetUpdateMode( sal_True );
 
 
     ScAppOptions aAppOptions=SC_MOD()->GetAppOptions();
 
-    ULONG nColor = aAppOptions.GetTrackContentColor();
+    sal_uLong nColor = aAppOptions.GetTrackContentColor();
     if (nColor == COL_TRANSPARENT)
         aContentColorLB.SelectEntryPos(0);
     else
@@ -252,7 +252,7 @@ IMPL_LINK( ScRedlineOptionsTabPage, ColorHdl, ColorListBox *, EMPTYARG )
     }
 
     SvxFont& rFont = pPrev->GetFont();
-    USHORT nPos = pLB->GetSelectEntryPos();
+    sal_uInt16 nPos = pLB->GetSelectEntryPos();
     if (nPos == LISTBOX_ENTRY_NOTFOUND)
         nPos = 0;
 
diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx
index 5b5920e904fc..a0ab61319e50 100644
--- a/sc/source/ui/optdlg/tpcalc.cxx
+++ b/sc/source/ui/optdlg/tpcalc.cxx
@@ -55,7 +55,7 @@
 
 // STATIC DATA -----------------------------------------------------------
 
-static USHORT pCalcOptRanges[] =
+static sal_uInt16 pCalcOptRanges[] =
 {
     SID_SCDOCOPTIONS,
     SID_SCDOCOPTIONS,
@@ -125,7 +125,7 @@ void ScTpCalcOptions::Init()
 
 //-----------------------------------------------------------------------
 
-USHORT* __EXPORT ScTpCalcOptions::GetRanges()
+sal_uInt16* __EXPORT ScTpCalcOptions::GetRanges()
 {
     return pCalcOptRanges;
 }
@@ -141,7 +141,7 @@ SfxTabPage* __EXPORT ScTpCalcOptions::Create( Window* pParent, const SfxItemSet&
 
 void __EXPORT ScTpCalcOptions::Reset( const SfxItemSet& /* rCoreAttrs */ )
 {
-    USHORT  d,m,y;
+    sal_uInt16  d,m,y;
 
     *pLocalOptions  = *pOldOptions;
 
@@ -190,10 +190,10 @@ void __EXPORT ScTpCalcOptions::Reset( const SfxItemSet& /* rCoreAttrs */ )
 
 //-----------------------------------------------------------------------
 
-BOOL __EXPORT ScTpCalcOptions::FillItemSet( SfxItemSet& rCoreAttrs )
+sal_Bool __EXPORT ScTpCalcOptions::FillItemSet( SfxItemSet& rCoreAttrs )
 {
     // alle weiteren Optionen werden in den Handlern aktualisiert
-    pLocalOptions->SetIterCount( (USHORT)aEdSteps.GetValue() );
+    pLocalOptions->SetIterCount( (sal_uInt16)aEdSteps.GetValue() );
     pLocalOptions->SetIgnoreCase( !aBtnCase.IsChecked() );
     pLocalOptions->SetCalcAsShown( aBtnCalc.IsChecked() );
     pLocalOptions->SetMatchWholeCell( aBtnMatch.IsChecked() );
@@ -209,10 +209,10 @@ BOOL __EXPORT ScTpCalcOptions::FillItemSet( SfxItemSet& rCoreAttrs )
     if ( *pLocalOptions != *pOldOptions )
     {
         rCoreAttrs.Put( ScTpCalcItem( nWhichCalc, *pLocalOptions ) );
-        return TRUE;
+        return sal_True;
     }
     else
-        return FALSE;
+        return sal_False;
 }
 
 //------------------------------------------------------------------------
@@ -285,13 +285,13 @@ IMPL_LINK( ScTpCalcOptions, CheckClickHdl, CheckBox*, pBtn )
     {
         if ( pBtn->IsChecked() )
         {
-            pLocalOptions->SetIter( TRUE );
+            pLocalOptions->SetIter( sal_True );
             aFtSteps.Enable();  aEdSteps.Enable();
             aFtEps  .Enable();  aEdEps  .Enable();
         }
         else
         {
-            pLocalOptions->SetIter( FALSE );
+            pLocalOptions->SetIter( sal_False );
             aFtSteps.Disable(); aEdSteps.Disable();
             aFtEps  .Disable(); aEdEps  .Disable();
         }
diff --git a/sc/source/ui/optdlg/tpprint.cxx b/sc/source/ui/optdlg/tpprint.cxx
index d14b79bd739a..636f9f8a931d 100644
--- a/sc/source/ui/optdlg/tpprint.cxx
+++ b/sc/source/ui/optdlg/tpprint.cxx
@@ -41,7 +41,7 @@
 
 // -----------------------------------------------------------------------
 
-static USHORT pPrintOptRanges[] =
+static sal_uInt16 pPrintOptRanges[] =
 {
     SID_SCPRINTOPTIONS,
     SID_SCPRINTOPTIONS,
@@ -67,7 +67,7 @@ ScTpPrintOptions::~ScTpPrintOptions()
 {
 }
 
-USHORT* ScTpPrintOptions::GetRanges()
+sal_uInt16* ScTpPrintOptions::GetRanges()
 {
     return pPrintOptRanges;
 }
@@ -92,7 +92,7 @@ void ScTpPrintOptions::Reset( const SfxItemSet& rCoreSet )
     ScPrintOptions aOptions;
 
     const SfxPoolItem* pItem;
-    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SCPRINTOPTIONS, FALSE , &pItem))
+    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SCPRINTOPTIONS, sal_False , &pItem))
         aOptions = ((const ScTpPrintItem*)pItem)->GetPrintOptions();
     else
     {
@@ -100,9 +100,9 @@ void ScTpPrintOptions::Reset( const SfxItemSet& rCoreSet )
         aOptions = SC_MOD()->GetPrintOptions();
     }
 
-    if ( SFX_ITEM_SET == rCoreSet.GetItemState( SID_PRINT_SELECTEDSHEET, FALSE , &pItem ) )
+    if ( SFX_ITEM_SET == rCoreSet.GetItemState( SID_PRINT_SELECTEDSHEET, sal_False , &pItem ) )
     {
-        BOOL bChecked = ( (const SfxBoolItem*)pItem )->GetValue();
+        sal_Bool bChecked = ( (const SfxBoolItem*)pItem )->GetValue();
         aSelectedSheetsCB.Check( bChecked );
     }
     else
@@ -117,7 +117,7 @@ void ScTpPrintOptions::Reset( const SfxItemSet& rCoreSet )
 
 // -----------------------------------------------------------------------
 
-BOOL ScTpPrintOptions::FillItemSet( SfxItemSet& rCoreAttrs )
+sal_Bool ScTpPrintOptions::FillItemSet( SfxItemSet& rCoreAttrs )
 {
     rCoreAttrs.ClearItem( SID_PRINT_SELECTEDSHEET );
 
@@ -134,11 +134,11 @@ BOOL ScTpPrintOptions::FillItemSet( SfxItemSet& rCoreAttrs )
         {
             rCoreAttrs.Put( SfxBoolItem( SID_PRINT_SELECTEDSHEET, aSelectedSheetsCB.IsChecked() ) );
         }
-        return TRUE;
+        return sal_True;
     }
     else
     {
-        return FALSE;
+        return sal_False;
     }
 }
 
diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx
index eb7c8a6635eb..535e60e72f28 100644
--- a/sc/source/ui/optdlg/tpusrlst.cxx
+++ b/sc/source/ui/optdlg/tpusrlst.cxx
@@ -63,7 +63,7 @@
 #define CR  (sal_Unicode)13
 #define LF  (sal_Unicode)10
 
-static USHORT pUserListsRanges[] =
+static sal_uInt16 pUserListsRanges[] =
 {
     SID_SCUSERLISTS,
     SID_SCUSERLISTS,
@@ -107,9 +107,9 @@ ScTpUserLists::ScTpUserLists( Window*               pParent,
         pDoc            ( NULL ),
         pViewData       ( NULL ),
         pRangeUtil      ( new ScRangeUtil ),
-        bModifyMode     ( FALSE ),
-        bCancelMode     ( FALSE ),
-        bCopyDone       ( FALSE ),
+        bModifyMode     ( sal_False ),
+        bCancelMode     ( sal_False ),
+        bCopyDone       ( sal_False ),
         nCancelPos      ( 0 )
 {
     SetExchangeSupport();
@@ -177,7 +177,7 @@ void ScTpUserLists::Init()
 
 // -----------------------------------------------------------------------
 
-USHORT* __EXPORT ScTpUserLists::GetRanges()
+sal_uInt16* __EXPORT ScTpUserLists::GetRanges()
 {
     return pUserListsRanges;
 }
@@ -242,7 +242,7 @@ void __EXPORT ScTpUserLists::Reset( const SfxItemSet& rCoreAttrs )
 
 // -----------------------------------------------------------------------
 
-BOOL __EXPORT ScTpUserLists::FillItemSet( SfxItemSet& rCoreAttrs )
+sal_Bool __EXPORT ScTpUserLists::FillItemSet( SfxItemSet& rCoreAttrs )
 {
     // Modifikationen noch nicht uebernommen?
     // -> Click auf Add-Button simulieren
@@ -254,18 +254,18 @@ BOOL __EXPORT ScTpUserLists::FillItemSet( SfxItemSet& rCoreAttrs )
                                            GetItemSet().Get( nWhichUserLists );
 
     ScUserList* pCoreList       = rUserListItem.GetUserList();
-    BOOL        bDataModified   = FALSE;
+    sal_Bool        bDataModified   = sal_False;
 
     if ( (pUserLists == NULL) && (pCoreList == NULL) )
     {
-        bDataModified = FALSE;
+        bDataModified = sal_False;
     }
     else if ( pUserLists != NULL )
     {
         if ( pCoreList != NULL )
             bDataModified = (*pUserLists != *pCoreList);
         else
-            bDataModified = TRUE;
+            bDataModified = sal_True;
     }
 
     if ( bDataModified )
@@ -293,7 +293,7 @@ int __EXPORT ScTpUserLists::DeactivatePage( SfxItemSet* pSetP )
 
 // -----------------------------------------------------------------------
 
-USHORT ScTpUserLists::UpdateUserListBox()
+sal_uInt16 ScTpUserLists::UpdateUserListBox()
 {
     aLbLists.Clear();
 
@@ -301,12 +301,12 @@ USHORT ScTpUserLists::UpdateUserListBox()
 
     //----------------------------------------------------------
 
-    USHORT  nCount = pUserLists->GetCount();
+    sal_uInt16  nCount = pUserLists->GetCount();
     String  aEntry;
 
     if ( nCount > 0 )
     {
-        for ( USHORT i=0; i<nCount; i++ )
+        for ( sal_uInt16 i=0; i<nCount; i++ )
         {
             aEntry = (*pUserLists)[i]->GetString();
             DBG_ASSERT( aEntry.Len() > 0, "Empty UserList-entry :-/" );
@@ -319,7 +319,7 @@ USHORT ScTpUserLists::UpdateUserListBox()
 
 // -----------------------------------------------------------------------
 
-void ScTpUserLists::UpdateEntries( USHORT nList )
+void ScTpUserLists::UpdateEntries( sal_uInt16 nList )
 {
     if ( !pUserLists ) return;
 
@@ -328,10 +328,10 @@ void ScTpUserLists::UpdateEntries( USHORT nList )
     if ( nList < pUserLists->GetCount() )
     {
         ScUserListData* pList     = (*pUserLists)[nList];
-        USHORT          nSubCount = pList->GetSubCount();
+        sal_uInt16          nSubCount = pList->GetSubCount();
         String          aEntryListStr;
 
-        for ( USHORT i=0; i<nSubCount; i++ )
+        for ( sal_uInt16 i=0; i<nSubCount; i++ )
         {
             if ( i!=0 )
                 aEntryListStr += CR;
@@ -438,8 +438,8 @@ void ScTpUserLists::CopyListFromArea( const ScRefAddress& rStartPos,
     SCROW   nStartRow       = rStartPos.Row();
     SCCOL   nEndCol         = rEndPos.Col();
     SCROW   nEndRow         = rEndPos.Row();
-    USHORT  nCellDir        = SCRET_COLS;
-    BOOL    bValueIgnored   = FALSE;
+    sal_uInt16  nCellDir        = SCRET_COLS;
+    sal_Bool    bValueIgnored   = sal_False;
 
     if ( (nStartCol != nEndCol) && (nStartRow != nEndRow) )
     {
@@ -479,7 +479,7 @@ void ScTpUserLists::CopyListFromArea( const ScRefAddress& rStartPos,
                         }
                     }
                     else
-                        bValueIgnored = TRUE;
+                        bValueIgnored = sal_True;
                 }
                 if ( aStrList.Len() > 0 )
                     AddNewList( aStrList );
@@ -503,7 +503,7 @@ void ScTpUserLists::CopyListFromArea( const ScRefAddress& rStartPos,
                         }
                     }
                     else
-                        bValueIgnored = TRUE;
+                        bValueIgnored = sal_True;
                 }
                 if ( aStrList.Len() > 0 )
                     AddNewList( aStrList );
@@ -519,13 +519,13 @@ void ScTpUserLists::CopyListFromArea( const ScRefAddress& rStartPos,
 
     //----------------------------------------------------------
 
-    bCopyDone = TRUE;
+    bCopyDone = sal_True;
 
 }
 
 // -----------------------------------------------------------------------
 
-void ScTpUserLists::ModifyList( USHORT          nSelList,
+void ScTpUserLists::ModifyList( sal_uInt16          nSelList,
                                 const String&   rEntriesStr )
 {
     if ( !pUserLists ) return;
@@ -541,7 +541,7 @@ void ScTpUserLists::ModifyList( USHORT          nSelList,
 
 // -----------------------------------------------------------------------
 
-void ScTpUserLists::RemoveList( USHORT nList )
+void ScTpUserLists::RemoveList( sal_uInt16 nList )
 {
     if ( pUserLists ) pUserLists->AtFree( nList );
 }
@@ -554,7 +554,7 @@ IMPL_LINK( ScTpUserLists, LbSelectHdl, ListBox*, pLb )
 {
     if ( pLb == &aLbLists )
     {
-        USHORT nSelPos = aLbLists.GetSelectEntryPos();
+        sal_uInt16 nSelPos = aLbLists.GetSelectEntryPos();
         if ( nSelPos != LISTBOX_ENTRY_NOTFOUND )
         {
             if ( !aFtEntries.IsEnabled() )  aFtEntries.Enable();
@@ -597,7 +597,7 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn )
                 aEdCopyFrom.Disable();
             }
             aBtnNew.SetText( aStrCancel );
-            bCancelMode = TRUE;
+            bCancelMode = sal_True;
         }
         else // if ( bCancelMode )
         {
@@ -624,8 +624,8 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn )
                 aEdCopyFrom.Enable();
             }
             aBtnNew.SetText( aStrNew );
-            bCancelMode = FALSE;
-            bModifyMode = FALSE;
+            bCancelMode = sal_False;
+            bModifyMode = sal_False;
         }
     }
     else if ( pBtn == &aBtnAdd )
@@ -657,11 +657,11 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn )
             aBtnAdd.Disable();
             aBtnRemove.Enable();
             aBtnNew.SetText( aStrNew );
-            bCancelMode = FALSE;
+            bCancelMode = sal_False;
         }
         else // if ( bModifyMode )
         {
-            USHORT nSelList = aLbLists.GetSelectEntryPos();
+            sal_uInt16 nSelList = aLbLists.GetSelectEntryPos();
 
             DBG_ASSERT( nSelList != LISTBOX_ENTRY_NOTFOUND, "Modify without List :-/" );
 
@@ -677,8 +677,8 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn )
                 LbSelectHdl( &aLbLists );
             }
 
-            aBtnNew.SetText( aStrNew ); bCancelMode = FALSE;
-            aBtnAdd.SetText( aStrAdd ); bModifyMode = FALSE;
+            aBtnNew.SetText( aStrNew ); bCancelMode = sal_False;
+            aBtnAdd.SetText( aStrAdd ); bModifyMode = sal_False;
             aBtnAdd.Disable();
             aBtnRemove.Enable();
             aFtLists.Enable();
@@ -696,7 +696,7 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn )
     {
         if ( aLbLists.GetEntryCount() > 0 )
         {
-            USHORT nRemovePos   = aLbLists.GetSelectEntryPos();
+            sal_uInt16 nRemovePos   = aLbLists.GetSelectEntryPos();
             String aMsg         ( aStrQueryRemove.GetToken( 0, '#' ) );
 
             aMsg += aLbLists.GetEntry( nRemovePos );
@@ -748,7 +748,7 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn )
         ScRefAddress theStartPos;
         ScRefAddress theEndPos;
         String      theAreaStr( aEdCopyFrom.GetText() );
-        BOOL        bAreaOk = FALSE;
+        sal_Bool        bAreaOk = sal_False;
 
         if ( theAreaStr.Len() > 0 )
         {
@@ -815,8 +815,8 @@ IMPL_LINK( ScTpUserLists, EdEntriesModHdl, MultiLineEdit*, pEd )
     {
         if ( !bCancelMode && !bModifyMode )
         {
-            aBtnNew.SetText( aStrCancel );  bCancelMode = TRUE;
-            aBtnAdd.SetText( aStrModify );  bModifyMode = TRUE;
+            aBtnNew.SetText( aStrCancel );  bCancelMode = sal_True;
+            aBtnAdd.SetText( aStrModify );  bModifyMode = sal_True;
             aBtnAdd.Enable();
             aBtnRemove.Disable();
             aFtLists.Disable();
diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx
index 5c2e8dd52c9f..a8bad6b3ded0 100644
--- a/sc/source/ui/optdlg/tpview.cxx
+++ b/sc/source/ui/optdlg/tpview.cxx
@@ -152,9 +152,9 @@ SfxTabPage* ScTpContentOptions::Create( Window*     pParent,
 /*-----------------11.01.97 10.52-------------------
 
 --------------------------------------------------*/
-BOOL    ScTpContentOptions::FillItemSet( SfxItemSet& rCoreSet )
+sal_Bool    ScTpContentOptions::FillItemSet( SfxItemSet& rCoreSet )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     if( aFormulaCB  .GetSavedValue() != aFormulaCB  .IsChecked() ||
         aNilCB      .GetSavedValue() != aNilCB      .IsChecked() ||
         aAnnotCB    .GetSavedValue() != aAnnotCB    .IsChecked() ||
@@ -179,17 +179,17 @@ BOOL    ScTpContentOptions::FillItemSet( SfxItemSet& rCoreSet )
         pLocalOptions->SetGridColor( aColorLB.GetSelectEntryColor(),
                                      aColorLB.GetSelectEntry() );
         rCoreSet.Put(ScTpViewItem(SID_SCVIEWOPTIONS, *pLocalOptions));
-        bRet = TRUE;
+        bRet = sal_True;
     }
     if(aRangeFindCB.GetSavedValue() != aRangeFindCB.IsChecked())
     {
         rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_RANGEFINDER, aRangeFindCB.IsChecked()));
-        bRet = TRUE;
+        bRet = sal_True;
     }
     if(aSyncZoomCB.GetSavedValue() != aSyncZoomCB.IsChecked())
     {
         rCoreSet.Put(SfxBoolItem(SID_SC_OPT_SYNCZOOM, aSyncZoomCB.IsChecked()));
-        bRet = TRUE;
+        bRet = sal_True;
     }
 
 
@@ -202,7 +202,7 @@ BOOL    ScTpContentOptions::FillItemSet( SfxItemSet& rCoreSet )
 void    ScTpContentOptions::Reset( const SfxItemSet& rCoreSet )
 {
     const SfxPoolItem* pItem;
-    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SCVIEWOPTIONS, FALSE , &pItem))
+    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SCVIEWOPTIONS, sal_False , &pItem))
         pLocalOptions  = new ScViewOptions(
                             ((const ScTpViewItem*)pItem)->GetViewOptions() );
     else
@@ -214,9 +214,9 @@ void    ScTpContentOptions::Reset( const SfxItemSet& rCoreSet )
     aAnchorCB   .Check(pLocalOptions->GetOption(VOPT_ANCHOR));
     aClipMarkCB .Check(pLocalOptions->GetOption(VOPT_CLIPMARKS));
 
-    aObjGrfLB   .SelectEntryPos( (USHORT)pLocalOptions->GetObjMode(VOBJ_TYPE_OLE) );
-    aDiagramLB  .SelectEntryPos( (USHORT)pLocalOptions->GetObjMode(VOBJ_TYPE_CHART) );
-    aDrawLB     .SelectEntryPos( (USHORT)pLocalOptions->GetObjMode(VOBJ_TYPE_DRAW) );
+    aObjGrfLB   .SelectEntryPos( (sal_uInt16)pLocalOptions->GetObjMode(VOBJ_TYPE_OLE) );
+    aDiagramLB  .SelectEntryPos( (sal_uInt16)pLocalOptions->GetObjMode(VOBJ_TYPE_CHART) );
+    aDrawLB     .SelectEntryPos( (sal_uInt16)pLocalOptions->GetObjMode(VOBJ_TYPE_DRAW) );
 
     aRowColHeaderCB.Check( pLocalOptions->GetOption(VOPT_HEADER) );
     aHScrollCB .Check( pLocalOptions->GetOption(VOPT_HSCROLL) );
@@ -231,9 +231,9 @@ void    ScTpContentOptions::Reset( const SfxItemSet& rCoreSet )
     aHandleCB.Check( !pLocalOptions->GetOption(VOPT_SOLIDHANDLES) );    // inverted
     aBigHandleCB.Check( pLocalOptions->GetOption(VOPT_BIGHANDLES) );
 
-    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_RANGEFINDER, FALSE, &pItem))
+    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_RANGEFINDER, sal_False, &pItem))
         aRangeFindCB.Check(((const SfxBoolItem*)pItem)->GetValue());
-    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_OPT_SYNCZOOM, FALSE, &pItem))
+    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_OPT_SYNCZOOM, sal_False, &pItem))
         aSyncZoomCB.Check(((const SfxBoolItem*)pItem)->GetValue());
 
     aRangeFindCB.SaveValue();
@@ -267,7 +267,7 @@ void    ScTpContentOptions::Reset( const SfxItemSet& rCoreSet )
 void ScTpContentOptions::ActivatePage( const SfxItemSet& rSet)
 {
     const SfxPoolItem* pItem;
-    if(SFX_ITEM_SET == rSet.GetItemState(SID_SCVIEWOPTIONS, FALSE , &pItem))
+    if(SFX_ITEM_SET == rSet.GetItemState(SID_SCVIEWOPTIONS, sal_False , &pItem))
         *pLocalOptions = ((const ScTpViewItem*)pItem)->GetViewOptions();
 }
 /*-----------------11.01.97 12.45-------------------
@@ -286,7 +286,7 @@ int ScTpContentOptions::DeactivatePage( SfxItemSet* pSetP )
 
 IMPL_LINK( ScTpContentOptions, SelLbObjHdl, ListBox*, pLb )
 {
-    USHORT      nSelPos = pLb->GetSelectEntryPos();
+    sal_uInt16      nSelPos = pLb->GetSelectEntryPos();
     ScVObjMode  eMode   = ScVObjMode(nSelPos);
     ScVObjType  eType   = VOBJ_TYPE_OLE;
 
@@ -307,7 +307,7 @@ IMPL_LINK( ScTpContentOptions, SelLbObjHdl, ListBox*, pLb )
 IMPL_LINK( ScTpContentOptions, CBHdl, CheckBox*, pBtn )
 {
     ScViewOption eOption = VOPT_FORMULAS;
-    BOOL         bChecked = pBtn->IsChecked();
+    sal_Bool         bChecked = pBtn->IsChecked();
 
     if (      &aFormulaCB   == pBtn )   eOption = VOPT_FORMULAS;
     else if ( &aNilCB       == pBtn )   eOption = VOPT_NULLVALS;
@@ -340,7 +340,7 @@ IMPL_LINK( ScTpContentOptions, CBHdl, CheckBox*, pBtn )
 
 void ScTpContentOptions::InitGridOpt()
 {
-    BOOL bGrid = pLocalOptions->GetOption( VOPT_GRID );
+    sal_Bool bGrid = pLocalOptions->GetOption( VOPT_GRID );
 
     aGridCB.Check( bGrid );
 
@@ -372,7 +372,7 @@ void ScTpContentOptions::InitGridOpt()
 
         //------------------------------------------------------
 
-        aColorLB.SetUpdateMode( FALSE );
+        aColorLB.SetUpdateMode( sal_False );
 
         //  Eintraege aus der Colortable
 
@@ -390,7 +390,7 @@ void ScTpContentOptions::InitGridOpt()
                 aColorLB.GetEntryPos( aStdCol ) )
             aColorLB.InsertEntry( aStdCol, ScGlobal::GetRscString( STR_GRIDCOLOR ) );
 
-        aColorLB.SetUpdateMode( TRUE );
+        aColorLB.SetUpdateMode( sal_True );
 
         Invalidate();
     }
@@ -399,7 +399,7 @@ void ScTpContentOptions::InitGridOpt()
 
     String  aName;
     Color   aCol    = pLocalOptions->GetGridColor( &aName );
-    USHORT  nSelPos = aColorLB.GetEntryPos( aCol );
+    sal_uInt16  nSelPos = aColorLB.GetEntryPos( aCol );
 
     if ( LISTBOX_ENTRY_NOTFOUND != nSelPos )
         aColorLB.SelectEntryPos( nSelPos );
@@ -412,7 +412,7 @@ void ScTpContentOptions::InitGridOpt()
 
 IMPL_LINK( ScTpContentOptions, GridHdl, CheckBox*, pBox )
 {
-    BOOL bChecked = pBox->IsChecked();
+    sal_Bool bChecked = pBox->IsChecked();
     aColorFT.Enable(bChecked);
     aColorLB.Enable(bChecked);
     pLocalOptions->SetOption( VOPT_GRID, bChecked );
@@ -458,7 +458,7 @@ ScTpLayoutOptions::ScTpLayoutOptions(   Window* pParent,
     aAlignCB.SetClickHdl(LINK(this, ScTpLayoutOptions, AlignHdl));
 
 
-    for ( USHORT i = 0; i < aUnitArr.Count(); ++i )
+    for ( sal_uInt16 i = 0; i < aUnitArr.Count(); ++i )
     {
         String sMetric = aUnitArr.GetStringByPos( i );
         FieldUnit eFUnit = (FieldUnit)aUnitArr.GetValue( i );
@@ -472,7 +472,7 @@ ScTpLayoutOptions::ScTpLayoutOptions(   Window* pParent,
             case FUNIT_INCH:
             {
                 // nur diese Metriken benutzen
-                USHORT nPos = aUnitLB.InsertEntry( sMetric );
+                sal_uInt16 nPos = aUnitLB.InsertEntry( sMetric );
                 aUnitLB.SetEntryData( nPos, (void*)(long)eFUnit );
             }
             break;
@@ -509,23 +509,23 @@ SfxTabPage* ScTpLayoutOptions::Create( Window*          pParent,
 
 --------------------------------------------------*/
 
-BOOL    ScTpLayoutOptions::FillItemSet( SfxItemSet& rCoreSet )
+sal_Bool    ScTpLayoutOptions::FillItemSet( SfxItemSet& rCoreSet )
 {
-    BOOL bRet = TRUE;
-    const USHORT nMPos = aUnitLB.GetSelectEntryPos();
+    sal_Bool bRet = sal_True;
+    const sal_uInt16 nMPos = aUnitLB.GetSelectEntryPos();
     if ( nMPos != aUnitLB.GetSavedValue() )
     {
-        USHORT nFieldUnit = (USHORT)(long)aUnitLB.GetEntryData( nMPos );
+        sal_uInt16 nFieldUnit = (sal_uInt16)(long)aUnitLB.GetEntryData( nMPos );
         rCoreSet.Put( SfxUInt16Item( SID_ATTR_METRIC,
-                                     (UINT16)nFieldUnit ) );
-        bRet = TRUE;
+                                     (sal_uInt16)nFieldUnit ) );
+        bRet = sal_True;
     }
 
     if(aTabMF.GetText() != aTabMF.GetSavedValue())
     {
         rCoreSet.Put(SfxUInt16Item(SID_ATTR_DEFTABSTOP,
-                    sal::static_int_cast<UINT16>( aTabMF.Denormalize(aTabMF.GetValue(FUNIT_TWIP)) )));
-        bRet = TRUE;
+                    sal::static_int_cast<sal_uInt16>( aTabMF.Denormalize(aTabMF.GetValue(FUNIT_TWIP)) )));
+        bRet = sal_True;
     }
 
     ScLkUpdMode nSet=LM_ALWAYS;
@@ -547,55 +547,55 @@ BOOL    ScTpLayoutOptions::FillItemSet( SfxItemSet& rCoreSet )
         ScAppOptions aAppOptions=SC_MOD()->GetAppOptions();
         aAppOptions.SetLinkMode(nSet );
         SC_MOD()->SetAppOptions(aAppOptions);
-        bRet = TRUE;
+        bRet = sal_True;
     }
     if(aAlignCB.GetSavedValue() != aAlignCB.IsChecked())
     {
         rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_SELECTION, aAlignCB.IsChecked()));
-        bRet = TRUE;
+        bRet = sal_True;
     }
 
     if(aAlignLB.GetSavedValue() != aAlignLB.GetSelectEntryPos())
     {
         rCoreSet.Put(SfxUInt16Item(SID_SC_INPUT_SELECTIONPOS, aAlignLB.GetSelectEntryPos()));
-        bRet = TRUE;
+        bRet = sal_True;
     }
 
     if(aEditModeCB.GetSavedValue() != aEditModeCB.IsChecked())
     {
         rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_EDITMODE, aEditModeCB.IsChecked()));
-        bRet = TRUE;
+        bRet = sal_True;
     }
 
     if(aFormatCB.GetSavedValue() != aFormatCB.IsChecked())
     {
         rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_FMT_EXPAND, aFormatCB.IsChecked()));
-        bRet = TRUE;
+        bRet = sal_True;
     }
 
 
     if(aExpRefCB.GetSavedValue() != aExpRefCB.IsChecked())
     {
         rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_REF_EXPAND, aExpRefCB.IsChecked()));
-        bRet = TRUE;
+        bRet = sal_True;
     }
 
     if(aMarkHdrCB.GetSavedValue() != aMarkHdrCB.IsChecked())
     {
         rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_MARK_HEADER, aMarkHdrCB.IsChecked()));
-        bRet = TRUE;
+        bRet = sal_True;
     }
 
     if(aTextFmtCB.GetSavedValue() != aTextFmtCB.IsChecked())
     {
         rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_TEXTWYSIWYG, aTextFmtCB.IsChecked()));
-        bRet = TRUE;
+        bRet = sal_True;
     }
 
     if( aReplWarnCB.GetSavedValue() != aReplWarnCB.IsChecked() )
     {
         rCoreSet.Put( SfxBoolItem( SID_SC_INPUT_REPLCELLSWARN, aReplWarnCB.IsChecked() ) );
-        bRet = TRUE;
+        bRet = sal_True;
     }
 
     return bRet;
@@ -612,7 +612,7 @@ void    ScTpLayoutOptions::Reset( const SfxItemSet& rCoreSet )
         const SfxUInt16Item& rItem = (SfxUInt16Item&)rCoreSet.Get( SID_ATTR_METRIC );
         FieldUnit eFieldUnit = (FieldUnit)rItem.GetValue();
 
-        for ( USHORT i = 0; i < aUnitLB.GetEntryCount(); ++i )
+        for ( sal_uInt16 i = 0; i < aUnitLB.GetEntryCount(); ++i )
         {
             if ( (FieldUnit)(long)aUnitLB.GetEntryData( i ) == eFieldUnit )
             {
@@ -625,7 +625,7 @@ void    ScTpLayoutOptions::Reset( const SfxItemSet& rCoreSet )
     aUnitLB.SaveValue();
 
     const SfxPoolItem* pItem;
-    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_ATTR_DEFTABSTOP, FALSE, &pItem))
+    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_ATTR_DEFTABSTOP, sal_False, &pItem))
         aTabMF.SetValue(aTabMF.Normalize(((SfxUInt16Item*)pItem)->GetValue()), FUNIT_TWIP);
     aTabMF.SaveValue();
 
@@ -655,29 +655,29 @@ void    ScTpLayoutOptions::Reset( const SfxItemSet& rCoreSet )
             // added to avoid warnings
         }
     }
-    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_SELECTION, FALSE, &pItem))
+    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_SELECTION, sal_False, &pItem))
         aAlignCB.Check(((const SfxBoolItem*)pItem)->GetValue());
 
-    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_SELECTIONPOS, FALSE, &pItem))
+    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_SELECTIONPOS, sal_False, &pItem))
         aAlignLB.SelectEntryPos(((const SfxUInt16Item*)pItem)->GetValue());
 
-    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_EDITMODE, FALSE, &pItem))
+    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_EDITMODE, sal_False, &pItem))
         aEditModeCB.Check(((const SfxBoolItem*)pItem)->GetValue());
 
-    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_FMT_EXPAND, FALSE, &pItem))
+    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_FMT_EXPAND, sal_False, &pItem))
         aFormatCB.Check(((const SfxBoolItem*)pItem)->GetValue());
 
 
-    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_REF_EXPAND, FALSE, &pItem))
+    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_REF_EXPAND, sal_False, &pItem))
         aExpRefCB.Check(((const SfxBoolItem*)pItem)->GetValue());
 
-    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_MARK_HEADER, FALSE, &pItem))
+    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_MARK_HEADER, sal_False, &pItem))
         aMarkHdrCB.Check(((const SfxBoolItem*)pItem)->GetValue());
 
-    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_TEXTWYSIWYG, FALSE, &pItem))
+    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_TEXTWYSIWYG, sal_False, &pItem))
         aTextFmtCB.Check(((const SfxBoolItem*)pItem)->GetValue());
 
-    if( SFX_ITEM_SET == rCoreSet.GetItemState( SID_SC_INPUT_REPLCELLSWARN, FALSE, &pItem ) )
+    if( SFX_ITEM_SET == rCoreSet.GetItemState( SID_SC_INPUT_REPLCELLSWARN, sal_False, &pItem ) )
         aReplWarnCB.Check( ( (const SfxBoolItem*)pItem)->GetValue() );
 
     aAlignCB    .SaveValue();
@@ -721,7 +721,7 @@ int ScTpLayoutOptions::DeactivatePage( SfxItemSet* pSetP )
 
 IMPL_LINK(ScTpLayoutOptions, MetricHdl, ListBox*, EMPTYARG)
 {
-    const USHORT nMPos = aUnitLB.GetSelectEntryPos();
+    const sal_uInt16 nMPos = aUnitLB.GetSelectEntryPos();
     if(nMPos != USHRT_MAX)
     {
         FieldUnit eFieldUnit = (FieldUnit)(long)aUnitLB.GetEntryData( nMPos );