removetooltypes01: #i112600# remove tooltypes from sc

1 files changed, 43 insertions, 43 deletions

diff --git a/sc/source/ui/view/viewutil.cxx b/sc/source/ui/view/viewutil.cxx
index a6b4e320d3ab..1c2691d8a33f 100644
--- a/sc/source/ui/view/viewutil.cxx
+++ b/sc/source/ui/view/viewutil.cxx
@@ -69,7 +69,7 @@
 
 //  static
 void ScViewUtil::PutItemScript( SfxItemSet& rShellSet, const SfxItemSet& rCoreSet,
-                                USHORT nWhichId, USHORT nScript )
+                                sal_uInt16 nWhichId, sal_uInt16 nScript )
 {
     //  take the effective item from rCoreSet according to nScript
     //  and put in rShellSet under the (base) nWhichId
@@ -87,12 +87,12 @@ void ScViewUtil::PutItemScript( SfxItemSet& rShellSet, const SfxItemSet& rCoreSe
 }
 
 //  static
-USHORT ScViewUtil::GetEffLanguage( ScDocument* pDoc, const ScAddress& rPos )
+sal_uInt16 ScViewUtil::GetEffLanguage( ScDocument* pDoc, const ScAddress& rPos )
 {
     //  used for thesaurus
 
-    BYTE nScript = pDoc->GetScriptType( rPos.Col(), rPos.Row(), rPos.Tab() );
-    USHORT nWhich = ( nScript == SCRIPTTYPE_ASIAN ) ? ATTR_CJK_FONT_LANGUAGE :
+    sal_uInt8 nScript = pDoc->GetScriptType( rPos.Col(), rPos.Row(), rPos.Tab() );
+    sal_uInt16 nWhich = ( nScript == SCRIPTTYPE_ASIAN ) ? ATTR_CJK_FONT_LANGUAGE :
                     ( ( nScript == SCRIPTTYPE_COMPLEX ) ? ATTR_CTL_FONT_LANGUAGE : ATTR_FONT_LANGUAGE );
     const SfxPoolItem* pItem = pDoc->GetAttr( rPos.Col(), rPos.Row(), rPos.Tab(), nWhich);
     SvxLanguageItem* pLangIt = PTR_CAST( SvxLanguageItem, pItem );
@@ -117,7 +117,7 @@ USHORT ScViewUtil::GetEffLanguage( ScDocument* pDoc, const ScAddress& rPos )
 }
 
 //  static
-sal_Int32 ScViewUtil::GetTransliterationType( USHORT nSlotID )
+sal_Int32 ScViewUtil::GetTransliterationType( sal_uInt16 nSlotID )
 {
     sal_Int32 nType = 0;
     switch ( nSlotID )
@@ -154,7 +154,7 @@ sal_Int32 ScViewUtil::GetTransliterationType( USHORT nSlotID )
 }
 
 //  static
-BOOL ScViewUtil::IsActionShown( const ScChangeAction& rAction,
+sal_Bool ScViewUtil::IsActionShown( const ScChangeAction& rAction,
                                 const ScChangeViewSettings& rSettings,
                                 ScDocument& rDocument )
 {
@@ -162,10 +162,10 @@ BOOL ScViewUtil::IsActionShown( const ScChangeAction& rAction,
     // die Reihenfolge von ShowRejected/ShowAccepted ist deswegen wichtig
 
     if ( !rSettings.IsShowRejected() && rAction.IsRejecting() )
-        return FALSE;
+        return sal_False;
 
     if ( !rSettings.IsShowAccepted() && rAction.IsAccepted() && !rAction.IsRejecting() )
-        return FALSE;
+        return sal_False;
 
     if ( rSettings.HasAuthor() )
     {
@@ -174,10 +174,10 @@ BOOL ScViewUtil::IsActionShown( const ScChangeAction& rAction,
             //  GetUser() am ChangeTrack ist der aktuelle Benutzer
             ScChangeTrack* pTrack = rDocument.GetChangeTrack();
             if ( !pTrack || rAction.GetUser() == pTrack->GetUser() )
-                return FALSE;
+                return sal_False;
         }
         else if ( rAction.GetUser() != rSettings.GetTheAuthorToShow() )
-            return FALSE;
+            return sal_False;
     }
 
     if ( rSettings.HasComment() )
@@ -188,12 +188,12 @@ BOOL ScViewUtil::IsActionShown( const ScChangeAction& rAction,
         aComStr+=')';
 
         if(!rSettings.IsValidComment(&aComStr))
-            return FALSE;
+            return sal_False;
     }
 
     if ( rSettings.HasRange() )
         if ( !rSettings.GetTheRangeList().Intersects( rAction.GetBigRange().MakeRange() ) )
-            return FALSE;
+            return sal_False;
 
     if ( rSettings.HasDate() && rSettings.GetTheDateMode() != SCDM_NO_DATEMODE )
     {
@@ -204,23 +204,23 @@ BOOL ScViewUtil::IsActionShown( const ScChangeAction& rAction,
         {   // korrespondiert mit ScHighlightChgDlg::OKBtnHdl
             case SCDM_DATE_BEFORE:
                 if ( aDateTime > rFirst )
-                    return FALSE;
+                    return sal_False;
                 break;
 
             case SCDM_DATE_SINCE:
                 if ( aDateTime < rFirst )
-                    return FALSE;
+                    return sal_False;
                 break;
 
             case SCDM_DATE_EQUAL:
             case SCDM_DATE_BETWEEN:
                 if ( aDateTime < rFirst || aDateTime > rLast )
-                    return FALSE;
+                    return sal_False;
                 break;
 
             case SCDM_DATE_NOTEQUAL:
                 if ( aDateTime >= rFirst && aDateTime <= rLast )
-                    return FALSE;
+                    return sal_False;
                 break;
 
             case SCDM_DATE_SAVE:
@@ -228,7 +228,7 @@ BOOL ScViewUtil::IsActionShown( const ScChangeAction& rAction,
                 ScChangeTrack* pTrack = rDocument.GetChangeTrack();
                 if ( !pTrack || pTrack->GetLastSavedActionNumber() >=
                         rAction.GetActionNumber() )
-                    return FALSE;
+                    return sal_False;
                 }
                 break;
 
@@ -241,17 +241,17 @@ BOOL ScViewUtil::IsActionShown( const ScChangeAction& rAction,
 
     if ( rSettings.HasActionRange() )
     {
-        ULONG nAction = rAction.GetActionNumber();
-        ULONG nFirstAction;
-        ULONG nLastAction;
+        sal_uLong nAction = rAction.GetActionNumber();
+        sal_uLong nFirstAction;
+        sal_uLong nLastAction;
         rSettings.GetTheActionRange( nFirstAction, nLastAction );
         if ( nAction < nFirstAction || nAction > nLastAction )
         {
-            return FALSE;
+            return sal_False;
         }
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 // static
@@ -324,7 +324,7 @@ bool ScViewUtil::HasFiltered( const ScRange& rRange, ScDocument* pDoc )
 }
 
 // static
-void ScViewUtil::HideDisabledSlot( SfxItemSet& rSet, SfxBindings& rBindings, USHORT nSlotId )
+void ScViewUtil::HideDisabledSlot( SfxItemSet& rSet, SfxBindings& rBindings, sal_uInt16 nSlotId )
 {
     SvtCJKOptions aCJKOptions;
     SvtCTLOptions aCTLOptions;
@@ -363,28 +363,28 @@ void ScViewUtil::HideDisabledSlot( SfxItemSet& rSet, SfxBindings& rBindings, USH
 
 //==================================================================
 
-BOOL ScViewUtil::ExecuteCharMap( const SvxFontItem& rOldFont,
+sal_Bool ScViewUtil::ExecuteCharMap( const SvxFontItem& rOldFont,
                                  SfxViewFrame& rFrame,
                                  SvxFontItem&       rNewFont,
                                  String&            rString )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
     if(pFact)
     {
         SfxAllItemSet aSet( rFrame.GetObjectShell()->GetPool() );
-        aSet.Put( SfxBoolItem( FN_PARAM_1, FALSE ) );
+        aSet.Put( SfxBoolItem( FN_PARAM_1, sal_False ) );
         aSet.Put( SvxFontItem( rOldFont.GetFamily(), rOldFont.GetFamilyName(), rOldFont.GetStyleName(), rOldFont.GetPitch(), rOldFont.GetCharSet(), aSet.GetPool()->GetWhich( SID_ATTR_CHAR_FONT ) ) );
         SfxAbstractDialog* pDlg = pFact->CreateSfxDialog( &rFrame.GetWindow(), aSet, rFrame.GetFrame().GetFrameInterface(), RID_SVXDLG_CHARMAP );
         if ( pDlg->Execute() == RET_OK )
         {
-            SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pItem, SfxStringItem, SID_CHARMAP, FALSE );
-            SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pFontItem, SvxFontItem, SID_ATTR_CHAR_FONT, FALSE );
+            SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pItem, SfxStringItem, SID_CHARMAP, sal_False );
+            SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pFontItem, SvxFontItem, SID_ATTR_CHAR_FONT, sal_False );
             if ( pItem )
                 rString  = pItem->GetValue();
             if ( pFontItem )
                 rNewFont = SvxFontItem( pFontItem->GetFamily(), pFontItem->GetFamilyName(), pFontItem->GetStyleName(), pFontItem->GetPitch(), pFontItem->GetCharSet(), rNewFont.Which() );
-            bRet = TRUE;
+            bRet = sal_True;
         }
         delete pDlg;
     }
@@ -435,7 +435,7 @@ void ScUpdateRect::SetNew( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2 )
     nNewEndY = nY2;
 }
 
-BOOL ScUpdateRect::GetDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 )
+sal_Bool ScUpdateRect::GetDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 )
 {
     if ( nNewStartX == nOldStartX && nNewEndX == nOldEndX &&
          nNewStartY == nOldStartY && nNewEndY == nOldEndY )
@@ -444,7 +444,7 @@ BOOL ScUpdateRect::GetDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 )
         rY1 = nNewStartY;
         rX2 = nNewStartX;
         rY2 = nNewStartY;
-        return FALSE;
+        return sal_False;
     }
 
     rX1 = Min(nNewStartX,nOldStartX);
@@ -479,13 +479,13 @@ BOOL ScUpdateRect::GetDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 )
         }
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 #ifdef OLD_SELECTION_PAINT
-BOOL ScUpdateRect::GetXorDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2, BOOL& rCont )
+sal_Bool ScUpdateRect::GetXorDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2, sal_Bool& rCont )
 {
-    rCont = FALSE;
+    rCont = sal_False;
 
     if (nNewStartX == nOldStartX && nNewEndX == nOldEndX &&
         nNewStartY == nOldStartY && nNewEndY == nOldEndY)
@@ -494,7 +494,7 @@ BOOL ScUpdateRect::GetXorDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2, B
         rY1 = nNewStartY;
         rX2 = nNewStartX;
         rY2 = nNewStartY;
-        return FALSE;
+        return sal_False;
     }
 
     rX1 = Min(nNewStartX,nOldStartX);
@@ -518,7 +518,7 @@ BOOL ScUpdateRect::GetXorDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2, B
         {
             rY1 = Min( nNewStartY, nOldStartY );
             rY2 = Max( nNewStartY, nOldStartY ) - 1;
-            rCont = TRUE;
+            rCont = sal_True;
             nContY1 = Min( nNewEndY, nOldEndY ) + 1;
             nContY2 = Max( nNewEndY, nOldEndY );
             nContX1 = rX1;
@@ -541,7 +541,7 @@ BOOL ScUpdateRect::GetXorDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2, B
         {
             rX1 = Min( nNewStartX, nOldStartX );
             rX2 = Max( nNewStartX, nOldStartX ) - 1;
-            rCont = TRUE;
+            rCont = sal_True;
             nContX1 = Min( nNewEndX, nOldEndX ) + 1;
             nContX2 = Max( nNewEndX, nOldEndX );
             nContY1 = rY1;
@@ -557,7 +557,7 @@ BOOL ScUpdateRect::GetXorDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2, B
         rX2 = nOldEndX;
         rY1 = Min( nNewStartY, nOldStartY );                // oben
         rY2 = Max( nNewStartY, nOldStartY ) - 1;
-        rCont = TRUE;
+        rCont = sal_True;
         nContY1 = rY2+1;
         nContY2 = nOldEndY;
         nContX1 = Min( nNewStartX, nOldStartX );            // links
@@ -572,7 +572,7 @@ BOOL ScUpdateRect::GetXorDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2, B
         rX1 = nOldStartX;
         rY1 = Min( nNewStartY, nOldStartY );                // oben
         rY2 = Max( nNewStartY, nOldStartY ) - 1;
-        rCont = TRUE;
+        rCont = sal_True;
         nContY1 = rY2+1;
         nContY2 = nOldEndY;
         nContX1 = Min( nNewEndX, nOldEndX ) + 1;            // rechts
@@ -587,7 +587,7 @@ BOOL ScUpdateRect::GetXorDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2, B
         rX2 = nOldEndX;
         rY1 = Min( nNewEndY, nOldEndY ) + 1;                // unten
         rY2 = Max( nNewEndY, nOldEndY );
-        rCont = TRUE;
+        rCont = sal_True;
         nContY1 = nOldStartY;
         nContY2 = rY1-1;
         nContX1 = Min( nNewStartX, nOldStartX );            // links
@@ -602,7 +602,7 @@ BOOL ScUpdateRect::GetXorDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2, B
         rX1 = nOldStartX;
         rY1 = Min( nNewEndY, nOldEndY ) + 1;                // unten
         rY2 = Max( nNewEndY, nOldEndY );
-        rCont = TRUE;
+        rCont = sal_True;
         nContY1 = nOldStartY;
         nContY2 = rY1-1;
         nContX1 = Min( nNewEndX, nOldEndX ) + 1;            // rechts
@@ -614,14 +614,14 @@ BOOL ScUpdateRect::GetXorDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2, B
         rY1 = nOldStartY;
         rX2 = nOldEndX;
         rY2 = nOldEndY;
-        rCont = TRUE;
+        rCont = sal_True;
         nContX1 = nNewStartX;
         nContY1 = nNewStartY;
         nContX2 = nNewEndX;
         nContY2 = nNewEndY;
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 void ScUpdateRect::GetContDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 )