accfixes: merged to m100

1 files changed, 225 insertions, 225 deletions

diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx
index 62193eadf735..8875ce66354c 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -74,21 +74,21 @@ void ValueSet::ImplInit()
     mnUserVisLines      = 0;
     mnSpacing           = 0;
     mnFrameStyle        = 0;
-    mbFormat            = TRUE;
-    mbHighlight         = FALSE ;
-    mbSelection         = FALSE;
-    mbNoSelection       = TRUE;
-    mbDrawSelection     = TRUE;
-    mbBlackSel          = FALSE;
-    mbDoubleSel         = FALSE;
-    mbScroll            = FALSE;
-    mbDropPos           = FALSE;
-    mbFullMode          = TRUE;
+    mbFormat            = sal_True;
+    mbHighlight         = sal_False ;
+    mbSelection         = sal_False;
+    mbNoSelection       = sal_True;
+    mbDrawSelection     = sal_True;
+    mbBlackSel          = sal_False;
+    mbDoubleSel         = sal_False;
+    mbScroll            = sal_False;
+    mbDropPos           = sal_False;
+    mbFullMode          = sal_True;
 
     // #106446#, #106601# force mirroring of virtual device
     maVirDev.EnableRTL( GetParent()->IsRTLEnabled() );
 
-    ImplInitSettings( TRUE, TRUE, TRUE );
+    ImplInitSettings( sal_True, sal_True, sal_True );
 }
 
 // -----------------------------------------------------------------------
@@ -120,7 +120,7 @@ ValueSet::ValueSet( Window* pParent, const ResId& rResId, bool bDisableTransient
 ValueSet::~ValueSet()
 {
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent>
-          xComponent (GetAccessible(FALSE), ::com::sun::star::uno::UNO_QUERY);
+          xComponent (GetAccessible(sal_False), ::com::sun::star::uno::UNO_QUERY);
     if (xComponent.is())
         xComponent->dispose ();
 
@@ -156,8 +156,8 @@ void ValueSet::ImplDeleteItems()
 
 // -----------------------------------------------------------------------
 
-void ValueSet::ImplInitSettings( BOOL bFont,
-                                 BOOL bForeground, BOOL bBackground )
+void ValueSet::ImplInitSettings( sal_Bool bFont,
+                                 sal_Bool bForeground, sal_Bool bBackground )
 {
     const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
 
@@ -315,7 +315,7 @@ void ValueSet::ImplFormatItem( ValueSetItem* pItem )
                 aPos.X() += (aRectSize.Width()-aImageSize.Width())/2;
                 aPos.Y() += (aRectSize.Height()-aImageSize.Height())/2;
 
-                USHORT  nImageStyle  = 0;
+                sal_uInt16  nImageStyle  = 0;
                 if( !IsEnabled() )
                     nImageStyle  |= IMAGE_DRAW_DISABLE;
 
@@ -345,7 +345,7 @@ void ValueSet::ImplFormatItem( ValueSetItem* pItem )
 void ValueSet::Format()
 {
     Size        aWinSize = GetOutputSizePixel();
-    ULONG       nItemCount = mpImpl->mpItemList->Count();
+    sal_uLong       nItemCount = mpImpl->mpItemList->Count();
     WinBits     nStyle = GetStyle();
     long        nTxtHeight = GetTextHeight();
     long        nOff;
@@ -425,7 +425,7 @@ void ValueSet::Format()
     {
         if ( mnUserItemWidth )
         {
-            mnCols = (USHORT)((aWinSize.Width()-nScrBarWidth+nSpace) / (mnUserItemWidth+nSpace));
+            mnCols = (sal_uInt16)((aWinSize.Width()-nScrBarWidth+nSpace) / (mnUserItemWidth+nSpace));
             if ( !mnCols )
                 mnCols = 1;
         }
@@ -436,7 +436,7 @@ void ValueSet::Format()
         mnCols = mnUserCols;
 
     // Zeilenanzahl berechnen
-    mbScroll = FALSE;
+    mbScroll = sal_False;
     mnLines = (long)mpImpl->mpItemList->Count() / mnCols;
     if ( mpImpl->mpItemList->Count() % mnCols )
         mnLines++;
@@ -455,13 +455,13 @@ void ValueSet::Format()
     else
         mnVisLines = mnLines;
     if ( mnLines > mnVisLines )
-        mbScroll = TRUE;
+        mbScroll = sal_True;
     if ( mnLines <= mnVisLines )
         mnFirstLine = 0;
     else
     {
-        if ( mnFirstLine > (USHORT)(mnLines-mnVisLines) )
-            mnFirstLine = (USHORT)(mnLines-mnVisLines);
+        if ( mnFirstLine > (sal_uInt16)(mnLines-mnVisLines) )
+            mnFirstLine = (sal_uInt16)(mnLines-mnVisLines);
     }
 
     // Itemgroessen berechnen
@@ -492,7 +492,7 @@ void ValueSet::Format()
     // Init VirDev
     maVirDev.SetSettings( GetSettings() );
     maVirDev.SetBackground( GetBackground() );
-    maVirDev.SetOutputSizePixel( aWinSize, TRUE );
+    maVirDev.SetOutputSizePixel( aWinSize, sal_True );
 
     // Bei zu kleinen Items machen wir nichts
     long nMinHeight = 2;
@@ -509,7 +509,7 @@ void ValueSet::Format()
             }
         }
 
-        for ( ULONG i = 0; i < nItemCount; i++ )
+        for ( sal_uLong i = 0; i < nItemCount; i++ )
         {
             ValueSetItem* pItem = mpImpl->mpItemList->GetObject( i );
             pItem->maRect.SetEmpty();
@@ -535,17 +535,17 @@ void ValueSet::Format()
               (aHighColor.GetBlue() > 0x80)) ||
              ((aHighColor.GetRed() == 0x80) && (aHighColor.GetGreen() == 0x80) &&
               (aHighColor.GetBlue() == 0x80)) )
-            mbBlackSel = TRUE;
+            mbBlackSel = sal_True;
         else
-            mbBlackSel = FALSE;
+            mbBlackSel = sal_False;
 
         // Wenn die Items groesser sind, dann die Selektion doppelt so breit
         // zeichnen
         if ( (nStyle & WB_DOUBLEBORDER) &&
              ((nItemWidth >= 25) && (nItemHeight >= 20)) )
-            mbDoubleSel = TRUE;
+            mbDoubleSel = sal_True;
         else
-            mbDoubleSel = FALSE;
+            mbDoubleSel = sal_False;
 
         // Calculate offsets
         long nStartX;
@@ -587,8 +587,8 @@ void ValueSet::Format()
         }
 
         // draw items
-        ULONG nFirstItem = mnFirstLine * mnCols;
-        ULONG nLastItem = nFirstItem + (mnVisLines * mnCols);
+        sal_uLong nFirstItem = mnFirstLine * mnCols;
+        sal_uLong nLastItem = nFirstItem + (mnVisLines * mnCols);
 
         if ( !mbFullMode )
         {
@@ -598,13 +598,13 @@ void ValueSet::Format()
             if ( y+(mnVisLines*(nItemHeight+nSpace)) < aWinSize.Height() )
                 nLastItem += mnCols;
         }
-        for ( ULONG i = 0; i < nItemCount; i++ )
+        for ( sal_uLong i = 0; i < nItemCount; i++ )
         {
             ValueSetItem*   pItem = mpImpl->mpItemList->GetObject( i );
 
             if ( (i >= nFirstItem) && (i < nLastItem) )
             {
-                const BOOL bWasEmpty = pItem->maRect.IsEmpty();
+                const sal_Bool bWasEmpty = pItem->maRect.IsEmpty();
 
                 pItem->maRect.Left()    = x;
                 pItem->maRect.Top()     = y;
@@ -667,7 +667,7 @@ void ValueSet::Format()
     }
 
     // Jetzt haben wir formatiert und warten auf das naechste
-    mbFormat = FALSE;
+    mbFormat = sal_False;
 
     // ScrollBar loeschen
     if ( pDelScrBar )
@@ -709,13 +709,13 @@ void ValueSet::ImplDrawSelect()
     if ( !IsReallyVisible() )
         return;
 
-    BOOL bFocus = HasFocus();
-    BOOL bDrawSel;
+    sal_Bool bFocus = HasFocus();
+    sal_Bool bDrawSel;
 
     if ( (mbNoSelection && !mbHighlight) || (!mbDrawSelection && mbHighlight) )
-        bDrawSel = FALSE;
+        bDrawSel = sal_False;
     else
-        bDrawSel = TRUE;
+        bDrawSel = sal_True;
 
     if ( !bFocus &&
          ((mbNoSelection && !mbHighlight) || (!mbDrawSelection && mbHighlight)) )
@@ -725,7 +725,7 @@ void ValueSet::ImplDrawSelect()
         return;
     }
 
-    USHORT nItemId = mnSelItemId;
+    sal_uInt16 nItemId = mnSelItemId;
 
     for( int stage = 0; stage < 2; stage++ )
     {
@@ -898,12 +898,12 @@ void ValueSet::ImplDrawSelect()
 
 // -----------------------------------------------------------------------
 
-void ValueSet::ImplHideSelect( USHORT nItemId )
+void ValueSet::ImplHideSelect( sal_uInt16 nItemId )
 {
     Rectangle aRect;
 
-    USHORT nItemPos = GetItemPos( nItemId );
-    if ( nItemPos != sal::static_int_cast<USHORT>(LIST_ENTRY_NOTFOUND) )
+    sal_uInt16 nItemPos = GetItemPos( nItemId );
+    if ( nItemPos != sal::static_int_cast<sal_uInt16>(LIST_ENTRY_NOTFOUND) )
         aRect = mpImpl->mpItemList->GetObject( nItemPos )->maRect;
     else
     {
@@ -922,42 +922,42 @@ void ValueSet::ImplHideSelect( USHORT nItemId )
 
 // -----------------------------------------------------------------------
 
-void ValueSet::ImplHighlightItem( USHORT nItemId, BOOL bIsSelection )
+void ValueSet::ImplHighlightItem( sal_uInt16 nItemId, sal_Bool bIsSelection )
 {
     if ( mnHighItemId != nItemId )
     {
         // Alten merken, um vorherige Selektion zu entfernen
-        USHORT nOldItem = mnHighItemId;
+        sal_uInt16 nOldItem = mnHighItemId;
         mnHighItemId = nItemId;
 
         // Wenn keiner selektiert ist, dann Selektion nicht malen
         if ( !bIsSelection && mbNoSelection )
-            mbDrawSelection = FALSE;
+            mbDrawSelection = sal_False;
 
         // Neu ausgeben und alte Selection wegnehmen
         ImplHideSelect( nOldItem );
         ImplDrawSelect();
-        mbDrawSelection = TRUE;
+        mbDrawSelection = sal_True;
     }
 }
 
 // -----------------------------------------------------------------------
 
-void ValueSet::ImplDrawDropPos( BOOL bShow )
+void ValueSet::ImplDrawDropPos( sal_Bool bShow )
 {
     if ( (mnDropPos != VALUESET_ITEM_NOTFOUND) && mpImpl->mpItemList->Count() )
     {
-        USHORT  nItemPos = mnDropPos;
-        USHORT  nItemId1;
-        USHORT  nItemId2 = 0;
-        BOOL    bRight;
+        sal_uInt16  nItemPos = mnDropPos;
+        sal_uInt16  nItemId1;
+        sal_uInt16  nItemId2 = 0;
+        sal_Bool    bRight;
         if ( nItemPos >= mpImpl->mpItemList->Count() )
         {
-            nItemPos = (USHORT)(mpImpl->mpItemList->Count()-1);
-            bRight = TRUE;
+            nItemPos = (sal_uInt16)(mpImpl->mpItemList->Count()-1);
+            bRight = sal_True;
         }
         else
-            bRight = FALSE;
+            bRight = sal_False;
 
         nItemId1 = GetItemId( nItemPos );
         if ( (nItemId1 != mnSelItemId) && (nItemId1 != mnHighItemId) )
@@ -996,7 +996,7 @@ void ValueSet::ImplDrawDropPos( BOOL bShow )
                     Point aPos = aRect1.RightCenter();
                     nX = aPos.X()-2;
                     nY = aPos.Y();
-                    for ( USHORT i = 0; i < 4; i++ )
+                    for ( sal_uInt16 i = 0; i < 4; i++ )
                         DrawLine( Point( nX-i, nY-i ), Point( nX-i, nY+i ) );
                 }
                 if ( !aRect2.IsEmpty() )
@@ -1004,7 +1004,7 @@ void ValueSet::ImplDrawDropPos( BOOL bShow )
                     Point aPos = aRect2.LeftCenter();
                     nX = aPos.X()+2;
                     nY = aPos.Y();
-                    for ( USHORT i = 0; i < 4; i++ )
+                    for ( sal_uInt16 i = 0; i < 4; i++ )
                         DrawLine( Point( nX+i, nY-i ), Point( nX+i, nY+i ) );
                 }
             }
@@ -1089,7 +1089,7 @@ void ValueSet::ImplDraw()
 
 // -----------------------------------------------------------------------
 
-BOOL ValueSet::ImplScroll( const Point& rPos )
+sal_Bool ValueSet::ImplScroll( const Point& rPos )
 {
     Size aOutSize = GetOutputSizePixel();
     long nScrBarWidth;
@@ -1100,10 +1100,10 @@ BOOL ValueSet::ImplScroll( const Point& rPos )
         nScrBarWidth = 0;
 
     if ( !mbScroll || (rPos.X() < 0) || (rPos.X() > aOutSize.Width()-nScrBarWidth) )
-        return FALSE;
+        return sal_False;
 
     long             nScrollOffset;
-    USHORT           nOldLine = mnFirstLine;
+    sal_uInt16           nOldLine = mnFirstLine;
     const Rectangle& rTopRect = mpImpl->mpItemList->GetObject( mnFirstLine*mnCols )->maRect;
     if ( rTopRect.GetHeight() <= 16 )
         nScrollOffset = VALUESET_SCROLL_OFFSET/2;
@@ -1116,7 +1116,7 @@ BOOL ValueSet::ImplScroll( const Point& rPos )
             mnFirstLine--;
     }
     if ( (mnFirstLine == nOldLine) &&
-         (mnFirstLine < (USHORT)(mnLines-mnVisLines)) && (rPos.Y() < aOutSize.Height()) )
+         (mnFirstLine < (sal_uInt16)(mnLines-mnVisLines)) && (rPos.Y() < aOutSize.Height()) )
     {
         long nBottomPos = mpImpl->mpItemList->GetObject( (mnFirstLine+mnVisLines-1)*mnCols )->maRect.Bottom();
         if ( (rPos.Y() >= nBottomPos-nScrollOffset) && (rPos.Y() <= nBottomPos) )
@@ -1125,17 +1125,17 @@ BOOL ValueSet::ImplScroll( const Point& rPos )
 
     if ( mnFirstLine != nOldLine )
     {
-        mbFormat = TRUE;
+        mbFormat = sal_True;
         ImplDraw();
-        return TRUE;
+        return sal_True;
     }
     else
-        return FALSE;
+        return sal_False;
 }
 
 // -----------------------------------------------------------------------
 
-USHORT ValueSet::ImplGetItem( const Point& rPos, BOOL bMove ) const
+sal_uInt16 ValueSet::ImplGetItem( const Point& rPos, sal_Bool bMove ) const
 {
     if ( mpNoneItem )
     {
@@ -1146,14 +1146,14 @@ USHORT ValueSet::ImplGetItem( const Point& rPos, BOOL bMove ) const
     Point     aDefPos;
     Rectangle aWinRect( aDefPos, maVirDev.GetOutputSizePixel() );
 
-    ULONG nItemCount = mpImpl->mpItemList->Count();
-    for ( ULONG i = 0; i < nItemCount; i++ )
+    sal_uLong nItemCount = mpImpl->mpItemList->Count();
+    for ( sal_uLong i = 0; i < nItemCount; i++ )
     {
         ValueSetItem* pItem = mpImpl->mpItemList->GetObject( i );
         if ( pItem->maRect.IsInside( rPos ) )
         {
             if ( aWinRect.IsInside( rPos ) )
-                return (USHORT)i;
+                return (sal_uInt16)i;
             else
                 return VALUESET_ITEM_NOTFOUND;
         }
@@ -1173,7 +1173,7 @@ USHORT ValueSet::ImplGetItem( const Point& rPos, BOOL bMove ) const
 
 // -----------------------------------------------------------------------
 
-ValueSetItem* ValueSet::ImplGetItem( USHORT nPos )
+ValueSetItem* ValueSet::ImplGetItem( sal_uInt16 nPos )
 {
     if ( nPos == VALUESET_ITEM_NONEITEM )
         return mpNoneItem;
@@ -1185,8 +1185,8 @@ ValueSetItem* ValueSet::ImplGetItem( USHORT nPos )
 
 ValueSetItem* ValueSet::ImplGetFirstItem()
 {
-    USHORT nItemCount = (USHORT)mpImpl->mpItemList->Count();
-    USHORT i = 0;
+    sal_uInt16 nItemCount = (sal_uInt16)mpImpl->mpItemList->Count();
+    sal_uInt16 i = 0;
 
     while ( i < nItemCount )
     {
@@ -1201,9 +1201,9 @@ ValueSetItem* ValueSet::ImplGetFirstItem()
 
 // -----------------------------------------------------------------------
 
-USHORT ValueSet::ImplGetVisibleItemCount() const
+sal_uInt16 ValueSet::ImplGetVisibleItemCount() const
 {
-    USHORT nRet = 0;
+    sal_uInt16 nRet = 0;
 
     for( sal_Int32 n = 0, nItemCount = mpImpl->mpItemList->Count(); n < nItemCount; n++  )
     {
@@ -1218,10 +1218,10 @@ USHORT ValueSet::ImplGetVisibleItemCount() const
 
 // -----------------------------------------------------------------------
 
-ValueSetItem* ValueSet::ImplGetVisibleItem( USHORT nVisiblePos )
+ValueSetItem* ValueSet::ImplGetVisibleItem( sal_uInt16 nVisiblePos )
 {
     ValueSetItem*   pRet = NULL;
-    USHORT          nFoundPos = 0;
+    sal_uInt16          nFoundPos = 0;
 
     for( sal_Int32 n = 0, nItemCount = mpImpl->mpItemList->Count(); ( n < nItemCount ) && !pRet; n++  )
     {
@@ -1238,7 +1238,7 @@ ValueSetItem* ValueSet::ImplGetVisibleItem( USHORT nVisiblePos )
 
 void ValueSet::ImplFireAccessibleEvent( short nEventId, const ::com::sun::star::uno::Any& rOldValue, const ::com::sun::star::uno::Any& rNewValue )
 {
-    ValueSetAcc* pAcc = ValueSetAcc::getImplementation( GetAccessible( FALSE ) );
+    ValueSetAcc* pAcc = ValueSetAcc::getImplementation( GetAccessible( sal_False ) );
 
     if( pAcc )
         pAcc->FireAccessibleEvent( nEventId, rOldValue, rNewValue );
@@ -1246,9 +1246,9 @@ void ValueSet::ImplFireAccessibleEvent( short nEventId, const ::com::sun::star::
 
 // -----------------------------------------------------------------------
 
-BOOL ValueSet::ImplHasAccessibleListeners()
+sal_Bool ValueSet::ImplHasAccessibleListeners()
 {
-    ValueSetAcc* pAcc = ValueSetAcc::getImplementation( GetAccessible( FALSE ) );
+    ValueSetAcc* pAcc = ValueSetAcc::getImplementation( GetAccessible( sal_False ) );
     return( pAcc && pAcc->HasAccessibleListeners() );
 }
 
@@ -1256,11 +1256,11 @@ BOOL ValueSet::ImplHasAccessibleListeners()
 
 IMPL_LINK( ValueSet,ImplScrollHdl, ScrollBar*, pScrollBar )
 {
-    USHORT nNewFirstLine = (USHORT)pScrollBar->GetThumbPos();
+    sal_uInt16 nNewFirstLine = (sal_uInt16)pScrollBar->GetThumbPos();
     if ( nNewFirstLine != mnFirstLine )
     {
         mnFirstLine = nNewFirstLine;
-        mbFormat = TRUE;
+        mbFormat = sal_True;
         ImplDraw();
     }
     return 0;
@@ -1270,13 +1270,13 @@ IMPL_LINK( ValueSet,ImplScrollHdl, ScrollBar*, pScrollBar )
 
 IMPL_LINK( ValueSet,ImplTimerHdl, Timer*, EMPTYARG )
 {
-    ImplTracking( GetPointerPosPixel(), TRUE );
+    ImplTracking( GetPointerPosPixel(), sal_True );
     return 0;
 }
 
 // -----------------------------------------------------------------------
 
-void ValueSet::ImplTracking( const Point& rPos, BOOL bRepeat )
+void ValueSet::ImplTracking( const Point& rPos, sal_Bool bRepeat )
 {
     if ( bRepeat || mbSelection )
     {
@@ -1295,22 +1295,22 @@ void ValueSet::ImplTracking( const Point& rPos, BOOL bRepeat )
     if ( pItem && (pItem->meType != VALUESETITEM_SPACE) )
     {
         if( GetStyle() & WB_MENUSTYLEVALUESET )
-            mbHighlight = TRUE;
+            mbHighlight = sal_True;
 
         ImplHighlightItem( pItem->mnId );
     }
     else
     {
         if( GetStyle() & WB_MENUSTYLEVALUESET )
-            mbHighlight = TRUE;
+            mbHighlight = sal_True;
 
-        ImplHighlightItem( mnSelItemId, FALSE );
+        ImplHighlightItem( mnSelItemId, sal_False );
     }
 }
 
 // -----------------------------------------------------------------------
 
-void ValueSet::ImplEndTracking( const Point& rPos, BOOL bCancel )
+void ValueSet::ImplEndTracking( const Point& rPos, sal_Bool bCancel )
 {
     ValueSetItem* pItem;
 
@@ -1325,15 +1325,15 @@ void ValueSet::ImplEndTracking( const Point& rPos, BOOL bCancel )
         SelectItem( pItem->mnId );
         if ( !mbSelection && !(GetStyle() & WB_NOPOINTERFOCUS) )
             GrabFocus();
-        mbHighlight = FALSE;
-        mbSelection = FALSE;
+        mbHighlight = sal_False;
+        mbSelection = sal_False;
         Select();
     }
     else
     {
-        ImplHighlightItem( mnSelItemId, FALSE );
-        mbHighlight = FALSE;
-        mbSelection = FALSE;
+        ImplHighlightItem( mnSelItemId, sal_False );
+        mbHighlight = sal_False;
+        mbSelection = sal_False;
     }
 }
 
@@ -1346,7 +1346,7 @@ void ValueSet::MouseButtonDown( const MouseEvent& rMEvt )
         ValueSetItem* pItem = ImplGetItem( ImplGetItem( rMEvt.GetPosPixel() ) );
         if ( mbSelection )
         {
-            mbHighlight = TRUE;
+            mbHighlight = sal_True;
             if ( pItem && (pItem->meType != VALUESETITEM_SPACE) )
             {
                 mnOldItemId  = mnSelItemId;
@@ -1363,7 +1363,7 @@ void ValueSet::MouseButtonDown( const MouseEvent& rMEvt )
                 if ( (pItem->mnBits & VIB_NODOUBLECLICK) || (rMEvt.GetClicks() == 1) )
                 {
                     mnOldItemId  = mnSelItemId;
-                    mbHighlight  = TRUE;
+                    mbHighlight  = sal_True;
                     mnHighItemId = mnSelItemId;
                     ImplHighlightItem( pItem->mnId );
                     StartTracking( STARTTRACK_SCROLLREPEAT );
@@ -1385,7 +1385,7 @@ void ValueSet::MouseButtonUp( const MouseEvent& rMEvt )
 {
     // Wegen SelectionMode
     if ( rMEvt.IsLeft() && mbSelection )
-        ImplEndTracking( rMEvt.GetPosPixel(), FALSE );
+        ImplEndTracking( rMEvt.GetPosPixel(), sal_False );
     else
         Control::MouseButtonUp( rMEvt );
 }
@@ -1396,7 +1396,7 @@ void ValueSet::MouseMove( const MouseEvent& rMEvt )
 {
     // Wegen SelectionMode
     if ( mbSelection || (GetStyle() & WB_MENUSTYLEVALUESET) )
-        ImplTracking( rMEvt.GetPosPixel(), FALSE );
+        ImplTracking( rMEvt.GetPosPixel(), sal_False );
     Control::MouseMove( rMEvt );
 }
 
@@ -1416,10 +1416,10 @@ void ValueSet::Tracking( const TrackingEvent& rTEvt )
 
 void ValueSet::KeyInput( const KeyEvent& rKEvt )
 {
-    USHORT nLastItem = (USHORT)mpImpl->mpItemList->Count();
-    USHORT nItemPos = VALUESET_ITEM_NOTFOUND;
-    USHORT nCurPos = VALUESET_ITEM_NONEITEM;
-    USHORT nCalcPos;
+    sal_uInt16 nLastItem = (sal_uInt16)mpImpl->mpItemList->Count();
+    sal_uInt16 nItemPos = VALUESET_ITEM_NOTFOUND;
+    sal_uInt16 nCurPos = VALUESET_ITEM_NONEITEM;
+    sal_uInt16 nCalcPos;
 
     if ( !nLastItem || !ImplGetFirstItem() )
     {
@@ -1434,7 +1434,7 @@ void ValueSet::KeyInput( const KeyEvent& rKEvt )
     nCalcPos = nCurPos;
 
     //switch off selection mode if key travelling is used
-    BOOL bDefault = FALSE;
+    sal_Bool bDefault = sal_False;
     switch ( rKEvt.GetKeyCode().GetCode() )
     {
         case KEY_HOME:
@@ -1522,7 +1522,7 @@ void ValueSet::KeyInput( const KeyEvent& rKEvt )
                         }
                     }
                     else if ( nCalcPos >= ( nLineCount * mnCols ) )
-                        nItemPos = sal::static_int_cast< USHORT >(
+                        nItemPos = sal::static_int_cast< sal_uInt16 >(
                             nCalcPos - ( nLineCount * mnCols ));
                     else
                     {
@@ -1564,7 +1564,7 @@ void ValueSet::KeyInput( const KeyEvent& rKEvt )
                     if ( nCalcPos == VALUESET_ITEM_NONEITEM )
                         nItemPos = mnCurCol;
                     else if ( nCalcPos + ( nLineCount * mnCols ) <= nLastItem )
-                        nItemPos = sal::static_int_cast< USHORT >(
+                        nItemPos = sal::static_int_cast< sal_uInt16 >(
                             nCalcPos + ( nLineCount * mnCols ));
                     else
                     {
@@ -1607,14 +1607,14 @@ void ValueSet::KeyInput( const KeyEvent& rKEvt )
             //no break;
         default:
             Control::KeyInput( rKEvt );
-            bDefault = TRUE;
+            bDefault = sal_True;
             break;
     }
     if(!bDefault)
         EndSelection();
     if ( nItemPos != VALUESET_ITEM_NOTFOUND )
     {
-        USHORT nItemId;
+        sal_uInt16 nItemId;
         if ( nItemPos != VALUESET_ITEM_NONEITEM )
             nItemId = GetItemId( nItemPos );
         else
@@ -1671,7 +1671,7 @@ void ValueSet::GetFocus()
     Control::GetFocus();
 
     // Tell the accessible object that we got the focus.
-    ValueSetAcc* pAcc = ValueSetAcc::getImplementation( GetAccessible( FALSE ) );
+    ValueSetAcc* pAcc = ValueSetAcc::getImplementation( GetAccessible( sal_False ) );
     if( pAcc )
         pAcc->GetFocus();
 }
@@ -1688,7 +1688,7 @@ void ValueSet::LoseFocus()
     Control::LoseFocus();
 
     // Tell the accessible object that we lost the focus.
-    ValueSetAcc* pAcc = ValueSetAcc::getImplementation( GetAccessible( FALSE ) );
+    ValueSetAcc* pAcc = ValueSetAcc::getImplementation( GetAccessible( sal_False ) );
     if( pAcc )
         pAcc->LoseFocus();
 }
@@ -1697,7 +1697,7 @@ void ValueSet::LoseFocus()
 
 void ValueSet::Resize()
 {
-    mbFormat = TRUE;
+    mbFormat = sal_True;
     if ( IsReallyVisible() && IsUpdateMode() )
         Invalidate();
     Control::Resize();
@@ -1710,7 +1710,7 @@ void ValueSet::RequestHelp( const HelpEvent& rHEvt )
     if ( (rHEvt.GetMode() & (HELPMODE_QUICK | HELPMODE_BALLOON)) == HELPMODE_QUICK )
     {
         Point aPos = ScreenToOutputPixel( rHEvt.GetMousePosPixel() );
-        USHORT nItemPos = ImplGetItem( aPos );
+        sal_uInt16 nItemPos = ImplGetItem( aPos );
         if ( nItemPos != VALUESET_ITEM_NOTFOUND )
         {
             ValueSetItem* pItem = ImplGetItem( nItemPos );
@@ -1756,23 +1756,23 @@ void ValueSet::StateChanged( StateChangedType nType )
     else if ( (nType == STATE_CHANGE_ZOOM) ||
               (nType == STATE_CHANGE_CONTROLFONT) )
     {
-        ImplInitSettings( TRUE, FALSE, FALSE );
+        ImplInitSettings( sal_True, sal_False, sal_False );
         Invalidate();
     }
     else if ( nType == STATE_CHANGE_CONTROLFOREGROUND )
     {
-        ImplInitSettings( FALSE, TRUE, FALSE );
+        ImplInitSettings( sal_False, sal_True, sal_False );
         Invalidate();
     }
     else if ( nType == STATE_CHANGE_CONTROLBACKGROUND )
     {
-        ImplInitSettings( FALSE, FALSE, TRUE );
+        ImplInitSettings( sal_False, sal_False, sal_True );
         Invalidate();
     }
     else if ( (nType == STATE_CHANGE_STYLE) || (nType == STATE_CHANGE_ENABLE) )
     {
-        mbFormat = TRUE;
-        ImplInitSettings( FALSE, FALSE, TRUE );
+        mbFormat = sal_True;
+        ImplInitSettings( sal_False, sal_False, sal_True );
         Invalidate();
     }
 }
@@ -1789,8 +1789,8 @@ void ValueSet::DataChanged( const DataChangedEvent& rDCEvt )
          ((rDCEvt.GetType() == DATACHANGED_SETTINGS) &&
           (rDCEvt.GetFlags() & SETTINGS_STYLE)) )
     {
-        mbFormat = TRUE;
-        ImplInitSettings( TRUE, TRUE, TRUE );
+        mbFormat = sal_True;
+        ImplInitSettings( sal_True, sal_True, sal_True );
         Invalidate();
     }
 }
@@ -1817,7 +1817,7 @@ void ValueSet::UserDraw( const UserDrawEvent& )
 
 // -----------------------------------------------------------------------
 
-void ValueSet::InsertItem( USHORT nItemId, const Image& rImage, USHORT nPos )
+void ValueSet::InsertItem( sal_uInt16 nItemId, const Image& rImage, sal_uInt16 nPos )
 {
     DBG_ASSERT( nItemId, "ValueSet::InsertItem(): ItemId == 0" );
     DBG_ASSERT( GetItemPos( nItemId ) == VALUESET_ITEM_NOTFOUND,
@@ -1827,16 +1827,16 @@ void ValueSet::InsertItem( USHORT nItemId, const Image& rImage, USHORT nPos )
     pItem->mnId     = nItemId;
     pItem->meType   = VALUESETITEM_IMAGE;
     pItem->maImage  = rImage;
-    mpImpl->mpItemList->Insert( pItem, (ULONG)nPos );
+    mpImpl->mpItemList->Insert( pItem, (sal_uLong)nPos );
 
-    mbFormat = TRUE;
+    mbFormat = sal_True;
     if ( IsReallyVisible() && IsUpdateMode() )
         Invalidate();
 }
 
 // -----------------------------------------------------------------------
 
-void ValueSet::InsertItem( USHORT nItemId, const Color& rColor, USHORT nPos )
+void ValueSet::InsertItem( sal_uInt16 nItemId, const Color& rColor, sal_uInt16 nPos )
 {
     DBG_ASSERT( nItemId, "ValueSet::InsertItem(): ItemId == 0" );
     DBG_ASSERT( GetItemPos( nItemId ) == VALUESET_ITEM_NOTFOUND,
@@ -1846,17 +1846,17 @@ void ValueSet::InsertItem( USHORT nItemId, const Color& rColor, USHORT nPos )
     pItem->mnId     = nItemId;
     pItem->meType   = VALUESETITEM_COLOR;
     pItem->maColor  = rColor;
-    mpImpl->mpItemList->Insert( pItem, (ULONG)nPos );
+    mpImpl->mpItemList->Insert( pItem, (sal_uLong)nPos );
 
-    mbFormat = TRUE;
+    mbFormat = sal_True;
     if ( IsReallyVisible() && IsUpdateMode() )
         Invalidate();
 }
 
 // -----------------------------------------------------------------------
 
-void ValueSet::InsertItem( USHORT nItemId, const Image& rImage,
-                           const XubString& rText, USHORT nPos )
+void ValueSet::InsertItem( sal_uInt16 nItemId, const Image& rImage,
+                           const XubString& rText, sal_uInt16 nPos )
 {
     DBG_ASSERT( nItemId, "ValueSet::InsertItem(): ItemId == 0" );
     DBG_ASSERT( GetItemPos( nItemId ) == VALUESET_ITEM_NOTFOUND,
@@ -1867,17 +1867,17 @@ void ValueSet::InsertItem( USHORT nItemId, const Image& rImage,
     pItem->meType   = VALUESETITEM_IMAGE;
     pItem->maImage  = rImage;
     pItem->maText   = rText;
-    mpImpl->mpItemList->Insert( pItem, (ULONG)nPos );
+    mpImpl->mpItemList->Insert( pItem, (sal_uLong)nPos );
 
-    mbFormat = TRUE;
+    mbFormat = sal_True;
     if ( IsReallyVisible() && IsUpdateMode() )
         Invalidate();
 }
 
 // -----------------------------------------------------------------------
 
-void ValueSet::InsertItem( USHORT nItemId, const Color& rColor,
-                           const XubString& rText, USHORT nPos )
+void ValueSet::InsertItem( sal_uInt16 nItemId, const Color& rColor,
+                           const XubString& rText, sal_uInt16 nPos )
 {
     DBG_ASSERT( nItemId, "ValueSet::InsertItem(): ItemId == 0" );
     DBG_ASSERT( GetItemPos( nItemId ) == VALUESET_ITEM_NOTFOUND,
@@ -1888,16 +1888,16 @@ void ValueSet::InsertItem( USHORT nItemId, const Color& rColor,
     pItem->meType   = VALUESETITEM_COLOR;
     pItem->maColor  = rColor;
     pItem->maText   = rText;
-    mpImpl->mpItemList->Insert( pItem, (ULONG)nPos );
+    mpImpl->mpItemList->Insert( pItem, (sal_uLong)nPos );
 
-    mbFormat = TRUE;
+    mbFormat = sal_True;
     if ( IsReallyVisible() && IsUpdateMode() )
         Invalidate();
 }
 
 // -----------------------------------------------------------------------
 
-void ValueSet::InsertItem( USHORT nItemId, USHORT nPos )
+void ValueSet::InsertItem( sal_uInt16 nItemId, sal_uInt16 nPos )
 {
     DBG_ASSERT( nItemId, "ValueSet::InsertItem(): ItemId == 0" );
     DBG_ASSERT( GetItemPos( nItemId ) == VALUESET_ITEM_NOTFOUND,
@@ -1906,16 +1906,16 @@ void ValueSet::InsertItem( USHORT nItemId, USHORT nPos )
     ValueSetItem* pItem = new ValueSetItem( *this );
     pItem->mnId     = nItemId;
     pItem->meType   = VALUESETITEM_USERDRAW;
-    mpImpl->mpItemList->Insert( pItem, (ULONG)nPos );
+    mpImpl->mpItemList->Insert( pItem, (sal_uLong)nPos );
 
-    mbFormat = TRUE;
+    mbFormat = sal_True;
     if ( IsReallyVisible() && IsUpdateMode() )
         Invalidate();
 }
 
 // -----------------------------------------------------------------------
 
-void ValueSet::InsertSpace( USHORT nItemId, USHORT nPos )
+void ValueSet::InsertSpace( sal_uInt16 nItemId, sal_uInt16 nPos )
 {
     DBG_ASSERT( nItemId, "ValueSet::InsertSpace(): ItemId == 0" );
     DBG_ASSERT( GetItemPos( nItemId ) == VALUESET_ITEM_NOTFOUND,
@@ -1924,18 +1924,18 @@ void ValueSet::InsertSpace( USHORT nItemId, USHORT nPos )
     ValueSetItem* pItem = new ValueSetItem( *this );
     pItem->mnId     = nItemId;
     pItem->meType   = VALUESETITEM_SPACE;
-    mpImpl->mpItemList->Insert( pItem, (ULONG)nPos );
+    mpImpl->mpItemList->Insert( pItem, (sal_uLong)nPos );
 
-    mbFormat = TRUE;
+    mbFormat = sal_True;
     if ( IsReallyVisible() && IsUpdateMode() )
         Invalidate();
 }
 
 // -----------------------------------------------------------------------
 
-void ValueSet::RemoveItem( USHORT nItemId )
+void ValueSet::RemoveItem( sal_uInt16 nItemId )
 {
-    USHORT nPos = GetItemPos( nItemId );
+    sal_uInt16 nPos = GetItemPos( nItemId );
 
     if ( nPos == VALUESET_ITEM_NOTFOUND )
         return;
@@ -1949,10 +1949,10 @@ void ValueSet::RemoveItem( USHORT nItemId )
         mnOldItemId     = 0;
         mnHighItemId    = 0;
         mnSelItemId     = 0;
-        mbNoSelection   = TRUE;
+        mbNoSelection   = sal_True;
     }
 
-    mbFormat = TRUE;
+    mbFormat = sal_True;
     if ( IsReallyVisible() && IsUpdateMode() )
         Invalidate();
 }
@@ -1988,9 +1988,9 @@ void ValueSet::CopyItems( const ValueSet& rValueSet )
     mnOldItemId     = 0;
     mnHighItemId    = 0;
     mnSelItemId     = 0;
-    mbNoSelection   = TRUE;
+    mbNoSelection   = sal_True;
 
-    mbFormat = TRUE;
+    mbFormat = sal_True;
     if ( IsReallyVisible() && IsUpdateMode() )
         Invalidate();
 }
@@ -2007,29 +2007,29 @@ void ValueSet::Clear()
     mnOldItemId     = 0;
     mnHighItemId    = 0;
     mnSelItemId     = 0;
-    mbNoSelection   = TRUE;
+    mbNoSelection   = sal_True;
 
-    mbFormat = TRUE;
+    mbFormat = sal_True;
     if ( IsReallyVisible() && IsUpdateMode() )
         Invalidate();
 }
 
 // -----------------------------------------------------------------------
 
-USHORT ValueSet::GetItemCount() const
+sal_uInt16 ValueSet::GetItemCount() const
 {
-    return (USHORT)mpImpl->mpItemList->Count();
+    return (sal_uInt16)mpImpl->mpItemList->Count();
 }
 
 // -----------------------------------------------------------------------
 
-USHORT ValueSet::GetItemPos( USHORT nItemId ) const
+sal_uInt16 ValueSet::GetItemPos( sal_uInt16 nItemId ) const
 {
     ValueSetItem* pItem = mpImpl->mpItemList->First();
     while ( pItem )
     {
         if ( pItem->mnId == nItemId )
-            return (USHORT)mpImpl->mpItemList->GetCurPos();
+            return (sal_uInt16)mpImpl->mpItemList->GetCurPos();
         pItem = mpImpl->mpItemList->Next();
     }
 
@@ -2038,7 +2038,7 @@ USHORT ValueSet::GetItemPos( USHORT nItemId ) const
 
 // -----------------------------------------------------------------------
 
-USHORT ValueSet::GetItemId( USHORT nPos ) const
+sal_uInt16 ValueSet::GetItemId( sal_uInt16 nPos ) const
 {
     ValueSetItem* pItem = mpImpl->mpItemList->GetObject( nPos );
 
@@ -2050,9 +2050,9 @@ USHORT ValueSet::GetItemId( USHORT nPos ) const
 
 // -----------------------------------------------------------------------
 
-USHORT ValueSet::GetItemId( const Point& rPos ) const
+sal_uInt16 ValueSet::GetItemId( const Point& rPos ) const
 {
-    USHORT nItemPos = ImplGetItem( rPos );
+    sal_uInt16 nItemPos = ImplGetItem( rPos );
     if ( nItemPos != VALUESET_ITEM_NOTFOUND )
         return GetItemId( nItemPos );
 
@@ -2061,9 +2061,9 @@ USHORT ValueSet::GetItemId( const Point& rPos ) const
 
 // -----------------------------------------------------------------------
 
-Rectangle ValueSet::GetItemRect( USHORT nItemId ) const
+Rectangle ValueSet::GetItemRect( sal_uInt16 nItemId ) const
 {
-    USHORT nPos = GetItemPos( nItemId );
+    sal_uInt16 nPos = GetItemPos( nItemId );
 
     if ( nPos != VALUESET_ITEM_NOTFOUND )
         return mpImpl->mpItemList->GetObject( nPos )->maRect;
@@ -2073,19 +2073,19 @@ Rectangle ValueSet::GetItemRect( USHORT nItemId ) const
 
 // -----------------------------------------------------------------------
 
-void ValueSet::EnableFullItemMode( BOOL bFullMode )
+void ValueSet::EnableFullItemMode( sal_Bool bFullMode )
 {
     mbFullMode = bFullMode;
 }
 
 // -----------------------------------------------------------------------
 
-void ValueSet::SetColCount( USHORT nNewCols )
+void ValueSet::SetColCount( sal_uInt16 nNewCols )
 {
     if ( mnUserCols != nNewCols )
     {
         mnUserCols = nNewCols;
-        mbFormat = TRUE;
+        mbFormat = sal_True;
         if ( IsReallyVisible() && IsUpdateMode() )
             Invalidate();
     }
@@ -2093,12 +2093,12 @@ void ValueSet::SetColCount( USHORT nNewCols )
 
 // -----------------------------------------------------------------------
 
-void ValueSet::SetLineCount( USHORT nNewLines )
+void ValueSet::SetLineCount( sal_uInt16 nNewLines )
 {
     if ( mnUserVisLines != nNewLines )
     {
         mnUserVisLines = nNewLines;
-        mbFormat = TRUE;
+        mbFormat = sal_True;
         if ( IsReallyVisible() && IsUpdateMode() )
             Invalidate();
     }
@@ -2111,7 +2111,7 @@ void ValueSet::SetItemWidth( long nNewItemWidth )
     if ( mnUserItemWidth != nNewItemWidth )
     {
         mnUserItemWidth = nNewItemWidth;
-        mbFormat = TRUE;
+        mbFormat = sal_True;
         if ( IsReallyVisible() && IsUpdateMode() )
             Invalidate();
     }
@@ -2124,7 +2124,7 @@ void ValueSet::SetItemHeight( long nNewItemHeight )
     if ( mnUserItemHeight != nNewItemHeight )
     {
         mnUserItemHeight = nNewItemHeight;
-        mbFormat = TRUE;
+        mbFormat = sal_True;
         if ( IsReallyVisible() && IsUpdateMode() )
             Invalidate();
     }
@@ -2132,12 +2132,12 @@ void ValueSet::SetItemHeight( long nNewItemHeight )
 
 // -----------------------------------------------------------------------
 
-void ValueSet::SetFirstLine( USHORT nNewLine )
+void ValueSet::SetFirstLine( sal_uInt16 nNewLine )
 {
     if ( mnFirstLine != nNewLine )
     {
         mnFirstLine = nNewLine;
-        mbFormat = TRUE;
+        mbFormat = sal_True;
         if ( IsReallyVisible() && IsUpdateMode() )
             Invalidate();
     }
@@ -2145,9 +2145,9 @@ void ValueSet::SetFirstLine( USHORT nNewLine )
 
 // -----------------------------------------------------------------------
 
-void ValueSet::SelectItem( USHORT nItemId )
+void ValueSet::SelectItem( sal_uInt16 nItemId )
 {
-    USHORT nItemPos = 0;
+    sal_uInt16 nItemPos = 0;
 
     if ( nItemId )
     {
@@ -2160,31 +2160,31 @@ void ValueSet::SelectItem( USHORT nItemId )
 
     if ( (mnSelItemId != nItemId) || mbNoSelection )
     {
-        USHORT nOldItem = mnSelItemId ? mnSelItemId : 1;
+        sal_uInt16 nOldItem = mnSelItemId ? mnSelItemId : 1;
         mnSelItemId = nItemId;
-        mbNoSelection = FALSE;
+        mbNoSelection = sal_False;
 
-        BOOL bNewOut;
-        BOOL bNewLine;
+        sal_Bool bNewOut;
+        sal_Bool bNewLine;
         if ( !mbFormat && IsReallyVisible() && IsUpdateMode() )
-            bNewOut = TRUE;
+            bNewOut = sal_True;
         else
-            bNewOut = FALSE;
-        bNewLine = FALSE;
+            bNewOut = sal_False;
+        bNewLine = sal_False;
 
         // Gegebenenfalls in den sichtbaren Bereich scrollen
         if ( mbScroll && nItemId )
         {
-            USHORT nNewLine = (USHORT)(nItemPos / mnCols);
+            sal_uInt16 nNewLine = (sal_uInt16)(nItemPos / mnCols);
             if ( nNewLine < mnFirstLine )
             {
                 mnFirstLine = nNewLine;
-                bNewLine = TRUE;
+                bNewLine = sal_True;
             }
-            else if ( nNewLine > (USHORT)(mnFirstLine+mnVisLines-1) )
+            else if ( nNewLine > (sal_uInt16)(mnFirstLine+mnVisLines-1) )
             {
-                mnFirstLine = (USHORT)(nNewLine-mnVisLines+1);
-                bNewLine = TRUE;
+                mnFirstLine = (sal_uInt16)(nNewLine-mnVisLines+1);
+                bNewLine = sal_True;
             }
         }
 
@@ -2194,7 +2194,7 @@ void ValueSet::SelectItem( USHORT nItemId )
             {
                 // Falls sich der sichtbare Bereich geaendert hat,
                 // alles neu ausgeben
-                mbFormat = TRUE;
+                mbFormat = sal_True;
                 ImplDraw();
             }
             else
@@ -2210,7 +2210,7 @@ void ValueSet::SelectItem( USHORT nItemId )
             // focus event (deselect)
             if( nOldItem )
             {
-                const USHORT nPos = GetItemPos( nItemId );
+                const sal_uInt16 nPos = GetItemPos( nItemId );
 
                 if( nPos != VALUESET_ITEM_NOTFOUND )
                 {
@@ -2236,7 +2236,7 @@ void ValueSet::SelectItem( USHORT nItemId )
             }
 
             // focus event (select)
-            const USHORT nPos = GetItemPos( mnSelItemId );
+            const sal_uInt16 nPos = GetItemPos( mnSelItemId );
 
             ValueSetItem* pItem;
             if( nPos != VALUESET_ITEM_NOTFOUND )
@@ -2276,9 +2276,9 @@ void ValueSet::SelectItem( USHORT nItemId )
 
 void ValueSet::SetNoSelection()
 {
-    mbNoSelection   = TRUE;
-    mbHighlight     = FALSE;
-    mbSelection     = FALSE;
+    mbNoSelection   = sal_True;
+    mbHighlight     = sal_False;
+    mbSelection     = sal_False;
 
     if ( IsReallyVisible() && IsUpdateMode() )
         ImplDraw();
@@ -2286,9 +2286,9 @@ void ValueSet::SetNoSelection()
 
 // -----------------------------------------------------------------------
 
-void ValueSet::SetItemBits( USHORT nItemId, USHORT nItemBits )
+void ValueSet::SetItemBits( sal_uInt16 nItemId, sal_uInt16 nItemBits )
 {
-    USHORT nPos = GetItemPos( nItemId );
+    sal_uInt16 nPos = GetItemPos( nItemId );
 
     if ( nPos != VALUESET_ITEM_NOTFOUND )
         mpImpl->mpItemList->GetObject( nPos )->mnBits = nItemBits;
@@ -2296,9 +2296,9 @@ void ValueSet::SetItemBits( USHORT nItemId, USHORT nItemBits )
 
 // -----------------------------------------------------------------------
 
-USHORT ValueSet::GetItemBits( USHORT nItemId ) const
+sal_uInt16 ValueSet::GetItemBits( sal_uInt16 nItemId ) const
 {
-    USHORT nPos = GetItemPos( nItemId );
+    sal_uInt16 nPos = GetItemPos( nItemId );
 
     if ( nPos != VALUESET_ITEM_NOTFOUND )
         return mpImpl->mpItemList->GetObject( nPos )->mnBits;
@@ -2308,9 +2308,9 @@ USHORT ValueSet::GetItemBits( USHORT nItemId ) const
 
 // -----------------------------------------------------------------------
 
-void ValueSet::SetItemImage( USHORT nItemId, const Image& rImage )
+void ValueSet::SetItemImage( sal_uInt16 nItemId, const Image& rImage )
 {
-    USHORT nPos = GetItemPos( nItemId );
+    sal_uInt16 nPos = GetItemPos( nItemId );
 
     if ( nPos == VALUESET_ITEM_NOTFOUND )
         return;
@@ -2325,14 +2325,14 @@ void ValueSet::SetItemImage( USHORT nItemId, const Image& rImage )
         Invalidate( pItem->maRect );
     }
     else
-        mbFormat = TRUE;
+        mbFormat = sal_True;
 }
 
 // -----------------------------------------------------------------------
 
-Image ValueSet::GetItemImage( USHORT nItemId ) const
+Image ValueSet::GetItemImage( sal_uInt16 nItemId ) const
 {
-    USHORT nPos = GetItemPos( nItemId );
+    sal_uInt16 nPos = GetItemPos( nItemId );
 
     if ( nPos != VALUESET_ITEM_NOTFOUND )
         return mpImpl->mpItemList->GetObject( nPos )->maImage;
@@ -2342,9 +2342,9 @@ Image ValueSet::GetItemImage( USHORT nItemId ) const
 
 // -----------------------------------------------------------------------
 
-void ValueSet::SetItemColor( USHORT nItemId, const Color& rColor )
+void ValueSet::SetItemColor( sal_uInt16 nItemId, const Color& rColor )
 {
-    USHORT nPos = GetItemPos( nItemId );
+    sal_uInt16 nPos = GetItemPos( nItemId );
 
     if ( nPos == VALUESET_ITEM_NOTFOUND )
         return;
@@ -2359,14 +2359,14 @@ void ValueSet::SetItemColor( USHORT nItemId, const Color& rColor )
         Invalidate( pItem->maRect );
     }
     else
-        mbFormat = TRUE;
+        mbFormat = sal_True;
 }
 
 // -----------------------------------------------------------------------
 
-Color ValueSet::GetItemColor( USHORT nItemId ) const
+Color ValueSet::GetItemColor( sal_uInt16 nItemId ) const
 {
-    USHORT nPos = GetItemPos( nItemId );
+    sal_uInt16 nPos = GetItemPos( nItemId );
 
     if ( nPos != VALUESET_ITEM_NOTFOUND )
         return mpImpl->mpItemList->GetObject( nPos )->maColor;
@@ -2376,9 +2376,9 @@ Color ValueSet::GetItemColor( USHORT nItemId ) const
 
 // -----------------------------------------------------------------------
 
-void ValueSet::SetItemData( USHORT nItemId, void* pData )
+void ValueSet::SetItemData( sal_uInt16 nItemId, void* pData )
 {
-    USHORT nPos = GetItemPos( nItemId );
+    sal_uInt16 nPos = GetItemPos( nItemId );
 
     if ( nPos == VALUESET_ITEM_NOTFOUND )
         return;
@@ -2394,15 +2394,15 @@ void ValueSet::SetItemData( USHORT nItemId, void* pData )
             Invalidate( pItem->maRect );
         }
         else
-            mbFormat = TRUE;
+            mbFormat = sal_True;
     }
 }
 
 // -----------------------------------------------------------------------
 
-void* ValueSet::GetItemData( USHORT nItemId ) const
+void* ValueSet::GetItemData( sal_uInt16 nItemId ) const
 {
-    USHORT nPos = GetItemPos( nItemId );
+    sal_uInt16 nPos = GetItemPos( nItemId );
 
     if ( nPos != VALUESET_ITEM_NOTFOUND )
         return mpImpl->mpItemList->GetObject( nPos )->mpData;
@@ -2412,9 +2412,9 @@ void* ValueSet::GetItemData( USHORT nItemId ) const
 
 // -----------------------------------------------------------------------
 
-void ValueSet::SetItemText( USHORT nItemId, const XubString& rText )
+void ValueSet::SetItemText( sal_uInt16 nItemId, const XubString& rText )
 {
-    USHORT nPos = GetItemPos( nItemId );
+    sal_uInt16 nPos = GetItemPos( nItemId );
 
     if ( nPos == VALUESET_ITEM_NOTFOUND )
         return;
@@ -2433,7 +2433,7 @@ void ValueSet::SetItemText( USHORT nItemId, const XubString& rText )
 
     if ( !mbFormat && IsReallyVisible() && IsUpdateMode() )
     {
-        USHORT nTempId = mnSelItemId;
+        sal_uInt16 nTempId = mnSelItemId;
 
         if ( mbHighlight )
             nTempId = mnHighItemId;
@@ -2455,9 +2455,9 @@ void ValueSet::SetItemText( USHORT nItemId, const XubString& rText )
 
 // -----------------------------------------------------------------------
 
-XubString ValueSet::GetItemText( USHORT nItemId ) const
+XubString ValueSet::GetItemText( sal_uInt16 nItemId ) const
 {
-    USHORT nPos = GetItemPos( nItemId );
+    sal_uInt16 nPos = GetItemPos( nItemId );
 
     if ( nPos != VALUESET_ITEM_NOTFOUND )
         return mpImpl->mpItemList->GetObject( nPos )->maText;
@@ -2470,20 +2470,20 @@ XubString ValueSet::GetItemText( USHORT nItemId ) const
 void ValueSet::SetColor( const Color& rColor )
 {
     maColor     = rColor;
-    mbFormat    = TRUE;
+    mbFormat    = sal_True;
     if ( IsReallyVisible() && IsUpdateMode() )
         ImplDraw();
 }
 
 // -----------------------------------------------------------------------
 
-void ValueSet::SetExtraSpacing( USHORT nNewSpacing )
+void ValueSet::SetExtraSpacing( sal_uInt16 nNewSpacing )
 {
     if ( GetStyle() & WB_ITEMBORDER )
     {
         mnSpacing = nNewSpacing;
 
-        mbFormat = TRUE;
+        mbFormat = sal_True;
         if ( IsReallyVisible() && IsUpdateMode() )
             Invalidate();
     }
@@ -2494,8 +2494,8 @@ void ValueSet::SetExtraSpacing( USHORT nNewSpacing )
 void ValueSet::StartSelection()
 {
     mnOldItemId     = mnSelItemId;
-    mbHighlight     = TRUE;
-    mbSelection     = TRUE;
+    mbHighlight     = sal_True;
+    mbSelection     = sal_True;
     mnHighItemId    = mnSelItemId;
 }
 
@@ -2509,17 +2509,17 @@ void ValueSet::EndSelection()
             EndTracking( ENDTRACK_CANCEL );
 
         ImplHighlightItem( mnSelItemId );
-        mbHighlight = FALSE;
+        mbHighlight = sal_False;
     }
-    mbSelection = FALSE;
+    mbSelection = sal_False;
 }
 
 // -----------------------------------------------------------------------
 
-BOOL ValueSet::StartDrag( const CommandEvent& rCEvt, Region& rRegion )
+sal_Bool ValueSet::StartDrag( const CommandEvent& rCEvt, Region& rRegion )
 {
     if ( rCEvt.GetCommand() != COMMAND_STARTDRAG )
-        return FALSE;
+        return sal_False;
 
     // Gegebenenfalls eine vorhandene Aktion abbrechen
     EndSelection();
@@ -2528,7 +2528,7 @@ BOOL ValueSet::StartDrag( const CommandEvent& rCEvt, Region& rRegion )
     // der Fall ist, setzen wir ihn als aktuellen Eintrag. Falls Drag and
     // Drop auch mal ueber Tastatur ausgeloest werden kann, testen wir
     // dies nur bei einer Mausaktion.
-    USHORT nSelId;
+    sal_uInt16 nSelId;
     if ( rCEvt.IsMouseEvent() )
         nSelId = GetItemId( rCEvt.GetMousePosPixel() );
     else
@@ -2536,7 +2536,7 @@ BOOL ValueSet::StartDrag( const CommandEvent& rCEvt, Region& rRegion )
 
     // Falls kein Eintrag angeklickt wurde, starten wir kein Dragging
     if ( !nSelId )
-        return FALSE;
+        return sal_False;
 
     // Testen, ob Seite selektiertiert ist. Falls nicht, als aktuelle
     // Seite setzen und Select rufen.
@@ -2552,13 +2552,13 @@ BOOL ValueSet::StartDrag( const CommandEvent& rCEvt, Region& rRegion )
     // Region zuweisen
     rRegion = aRegion;
 
-    return TRUE;
+    return sal_True;
 }
 
 // -----------------------------------------------------------------------
 
-Size ValueSet::CalcWindowSizePixel( const Size& rItemSize, USHORT nDesireCols,
-                                    USHORT nDesireLines )
+Size ValueSet::CalcWindowSizePixel( const Size& rItemSize, sal_uInt16 nDesireCols,
+                                    sal_uInt16 nDesireLines )
 {
     long nCalcCols = (long)nDesireCols;
     long nCalcLines = (long)nDesireLines;
@@ -2640,7 +2640,7 @@ Size ValueSet::CalcWindowSizePixel( const Size& rItemSize, USHORT nDesireCols,
 
 // -----------------------------------------------------------------------
 
-Size ValueSet::CalcItemSizePixel( const Size& rItemSize, BOOL bOut ) const
+Size ValueSet::CalcItemSizePixel( const Size& rItemSize, sal_Bool bOut ) const
 {
     Size aSize = rItemSize;
 
@@ -2684,15 +2684,15 @@ long ValueSet::GetScrollWidth() const
 
 // -----------------------------------------------------------------------
 
-USHORT ValueSet::ShowDropPos( const Point& rPos )
+sal_uInt16 ValueSet::ShowDropPos( const Point& rPos )
 {
-    mbDropPos = TRUE;
+    mbDropPos = sal_True;
 
     // Gegebenenfalls scrollen
     ImplScroll( rPos );
 
     // DropPosition ermitteln
-    USHORT nPos = ImplGetItem( rPos, TRUE );
+    sal_uInt16 nPos = ImplGetItem( rPos, sal_True );
     if ( nPos == VALUESET_ITEM_NONEITEM )
         nPos = 0;
     else if ( nPos == VALUESET_ITEM_NOTFOUND )
@@ -2702,7 +2702,7 @@ USHORT ValueSet::ShowDropPos( const Point& rPos )
             aOutSize.Height() = mnTextOffset;
         if ( (rPos.X() >= 0) && (rPos.X() < aOutSize.Width()) &&
              (rPos.Y() >= 0) && (rPos.Y() < aOutSize.Height()) )
-            nPos = (USHORT)mpImpl->mpItemList->Count();
+            nPos = (sal_uInt16)mpImpl->mpItemList->Count();
     }
     else
     {
@@ -2714,9 +2714,9 @@ USHORT ValueSet::ShowDropPos( const Point& rPos )
 
     if ( nPos != mnDropPos )
     {
-        ImplDrawDropPos( FALSE );
+        ImplDrawDropPos( sal_False );
         mnDropPos = nPos;
-        ImplDrawDropPos( TRUE );
+        ImplDrawDropPos( sal_True );
     }
 
     return mnDropPos;
@@ -2728,8 +2728,8 @@ void ValueSet::HideDropPos()
 {
     if ( mbDropPos )
     {
-        ImplDrawDropPos( FALSE );
-        mbDropPos = FALSE;
+        ImplDrawDropPos( sal_False );
+        mbDropPos = sal_False;
     }
 }