removetooltypes01: #i112600# remove tooltypes from svx

1 files changed, 99 insertions, 99 deletions

diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index 56873298382f..7d3d6d05912c 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -83,7 +83,7 @@ Bitmap& SvxRectCtl::GetRectBitmap( void )
 }
 
 SvxRectCtl::SvxRectCtl( Window* pParent, const ResId& rResId, RECT_POINT eRpt,
-                        USHORT nBorder, USHORT nCircle, CTL_STYLE eStyle ) :
+                        sal_uInt16 nBorder, sal_uInt16 nCircle, CTL_STYLE eStyle ) :
 
     Control( pParent, rResId ),
 
@@ -156,7 +156,7 @@ void SvxRectCtl::Resize_Impl()
         break;
     }
     Reset();
-    InitSettings( TRUE, TRUE );
+    InitSettings( sal_True, sal_True );
 }
 // -----------------------------------------------------------------------
 
@@ -189,18 +189,18 @@ void SvxRectCtl::InitRectBitmap( void )
     aColorAry2[6] = rStyles.GetDialogColor();
 
 #ifdef DBG_UTIL
-    static BOOL     bModify = FALSE;
-    BOOL&           rModify = bModify;
+    static sal_Bool     bModify = sal_False;
+    sal_Bool&           rModify = bModify;
     if( rModify )
     {
         static int      n = 0;
-        static UINT8    r = 0xFF;
-        static UINT8    g = 0x00;
-        static UINT8    b = 0xFF;
+        static sal_uInt8    r = 0xFF;
+        static sal_uInt8    g = 0x00;
+        static sal_uInt8    b = 0xFF;
         int&            rn = n;
-        UINT8&          rr = r;
-        UINT8&          rg = g;
-        UINT8&          rb = b;
+        sal_uInt8&          rr = r;
+        sal_uInt8&          rg = g;
+        sal_uInt8&          rb = b;
         aColorAry2[ rn ] = Color( rr, rg, rb );
     }
 #endif
@@ -210,7 +210,7 @@ void SvxRectCtl::InitRectBitmap( void )
 
 // -----------------------------------------------------------------------
 
-void SvxRectCtl::InitSettings( BOOL bForeground, BOOL bBackground )
+void SvxRectCtl::InitSettings( sal_Bool bForeground, sal_Bool bBackground )
 {
     const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
 
@@ -282,7 +282,7 @@ void SvxRectCtl::KeyInput( const KeyEvent& rKeyEvt )
     if(!IsCompletelyDisabled())
     {
         RECT_POINT eNewRP = eRP;
-        BOOL bUseMM = (eCS != CS_SHADOW) && (eCS != CS_ANGLE);
+        sal_Bool bUseMM = (eCS != CS_SHADOW) && (eCS != CS_ANGLE);
 
         switch( rKeyEvt.GetKeyCode().GetCode() )
         {
@@ -367,9 +367,9 @@ void SvxRectCtl::KeyInput( const KeyEvent& rKeyEvt )
 void SvxRectCtl::StateChanged( StateChangedType nType )
 {
     if ( nType == STATE_CHANGE_CONTROLFOREGROUND )
-        InitSettings( TRUE, FALSE );
+        InitSettings( sal_True, sal_False );
     else if ( nType == STATE_CHANGE_CONTROLBACKGROUND )
-        InitSettings( FALSE, TRUE );
+        InitSettings( sal_False, sal_True );
 
     Window::StateChanged( nType );
 }
@@ -379,7 +379,7 @@ void SvxRectCtl::StateChanged( StateChangedType nType )
 void SvxRectCtl::DataChanged( const DataChangedEvent& rDCEvt )
 {
     if ( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) )
-        InitSettings( TRUE, TRUE );
+        InitSettings( sal_True, sal_True );
     else
         Window::DataChanged( rDCEvt );
 }
@@ -464,8 +464,8 @@ void SvxRectCtl::Paint( const Rectangle& )
     Point aBtnPnt2( 11,0 );
     Point aBtnPnt3( 22,0 );
 
-    BOOL bNoHorz = (m_nState & CS_NOHORZ) != 0;
-    BOOL bNoVert = (m_nState & CS_NOVERT) != 0;
+    sal_Bool bNoHorz = (m_nState & CS_NOHORZ) != 0;
+    sal_Bool bNoVert = (m_nState & CS_NOVERT) != 0;
 
     Bitmap&         rBitmap = GetRectBitmap();
 
@@ -698,7 +698,7 @@ void SvxRectCtl::SetState( CTL_STATE nState )
         ( (SvxTabPage*) GetParent() )->PointChanged( this, eRP );
 }
 
-UINT8 SvxRectCtl::GetNumOfChilds( void ) const
+sal_uInt8 SvxRectCtl::GetNumOfChilds( void ) const
 {
     return ( eCS == CS_ANGLE )? 8 : 9;
 }
@@ -801,12 +801,12 @@ SvxAngleCtl::SvxAngleCtl( Window* pParent, const ResId& rResId, Size _aSize ) :
 
 void SvxAngleCtl::Initialize()
 {
-    bPositive = TRUE;
+    bPositive = sal_True;
 
     // aFont.SetName( "Helvetica" );
     aFont.SetSize( aFontSize );
     aFont.SetWeight( WEIGHT_NORMAL );
-    aFont.SetTransparent( FALSE );
+    aFont.SetTransparent( sal_False );
 
     SetFont( aFont );
 }
@@ -873,10 +873,10 @@ void SvxAngleCtl::Paint( const Rectangle& )
 |*
 \************************************************************************/
 
-SvxPixelCtl::SvxPixelCtl( Window* pParent, const ResId& rResId, USHORT nNumber ) :
+SvxPixelCtl::SvxPixelCtl( Window* pParent, const ResId& rResId, sal_uInt16 nNumber ) :
                         Control     ( pParent, rResId ),
                         nLines      ( nNumber ),
-                        bPaintable  ( TRUE )
+                        bPaintable  ( sal_True )
 {
     // SetMapMode( MAP_100TH_MM );
     aRectSize = GetOutputSize();
@@ -886,8 +886,8 @@ SvxPixelCtl::SvxPixelCtl( Window* pParent, const ResId& rResId, USHORT nNumber )
     SetLineColor( Application::GetSettings().GetStyleSettings().GetShadowColor() );
 
     nSquares = nLines * nLines;
-    pPixel = new USHORT[ nSquares ];
-    rtl_zeroMemory(pPixel, nSquares * sizeof(USHORT));
+    pPixel = new sal_uInt16[ nSquares ];
+    rtl_zeroMemory(pPixel, nSquares * sizeof(sal_uInt16));
 }
 
 /*************************************************************************
@@ -907,7 +907,7 @@ SvxPixelCtl::~SvxPixelCtl( )
 |*
 \************************************************************************/
 
-void SvxPixelCtl::ChangePixel( USHORT nPixel )
+void SvxPixelCtl::ChangePixel( sal_uInt16 nPixel )
 {
     if( *( pPixel + nPixel) == 0 )
         *( pPixel + nPixel) = 1; // koennte erweitert werden auf mehrere Farben
@@ -925,10 +925,10 @@ void SvxPixelCtl::MouseButtonDown( const MouseEvent& rMEvt )
 {
     Point aPt = PixelToLogic( rMEvt.GetPosPixel() );
     Point aPtTl, aPtBr;
-    USHORT  nX, nY;
+    sal_uInt16  nX, nY;
 
-    nX = (USHORT) ( aPt.X() * nLines / aRectSize.Width() );
-    nY = (USHORT) ( aPt.Y() * nLines / aRectSize.Height() );
+    nX = (sal_uInt16) ( aPt.X() * nLines / aRectSize.Width() );
+    nY = (sal_uInt16) ( aPt.Y() * nLines / aRectSize.Height() );
 
     ChangePixel( nX + nY * nLines );
 
@@ -951,7 +951,7 @@ void SvxPixelCtl::MouseButtonDown( const MouseEvent& rMEvt )
 
 void SvxPixelCtl::Paint( const Rectangle& )
 {
-    USHORT  i, j, nTmp;
+    sal_uInt16  i, j, nTmp;
     Point   aPtTl, aPtBr;
 
     if( bPaintable )
@@ -961,16 +961,16 @@ void SvxPixelCtl::Paint( const Rectangle& )
         for( i = 1; i < nLines; i++)
         {
             // horizontal
-            nTmp = (USHORT) ( aRectSize.Height() * i / nLines );
+            nTmp = (sal_uInt16) ( aRectSize.Height() * i / nLines );
             DrawLine( Point( 0, nTmp ), Point( aRectSize.Width(), nTmp ) );
             // vertikal
-            nTmp = (USHORT) ( aRectSize.Width() * i / nLines );
+            nTmp = (sal_uInt16) ( aRectSize.Width() * i / nLines );
             DrawLine( Point( nTmp, 0 ), Point( nTmp, aRectSize.Height() ) );
         }
 
         // Rechtecke (Quadrate) zeichnen
         Control::SetLineColor();
-        USHORT nLastPixel = *pPixel ? 0 : 1;
+        sal_uInt16 nLastPixel = *pPixel ? 0 : 1;
 
         for( i = 0; i < nLines; i++)
         {
@@ -1014,9 +1014,9 @@ void SvxPixelCtl::SetXBitmap( const XOBitmap& rXBmp )
         aPixelColor = rXBmp.GetPixelColor();
         aBackgroundColor = rXBmp.GetBackgroundColor();
 
-        USHORT* pArray = rXBmp.GetPixelArray();
+        sal_uInt16* pArray = rXBmp.GetPixelArray();
 
-        for( USHORT i = 0; i < nSquares; i++ )
+        for( sal_uInt16 i = 0; i < nSquares; i++ )
             *( pPixel + i ) = *( pArray + i );
     }
 }
@@ -1027,7 +1027,7 @@ void SvxPixelCtl::SetXBitmap( const XOBitmap& rXBmp )
 |*
 \************************************************************************/
 
-USHORT SvxPixelCtl::GetBitmapPixel( const USHORT nPixel )
+sal_uInt16 SvxPixelCtl::GetBitmapPixel( const sal_uInt16 nPixel )
 {
     return( *( pPixel + nPixel ) );
 }
@@ -1041,7 +1041,7 @@ USHORT SvxPixelCtl::GetBitmapPixel( const USHORT nPixel )
 void SvxPixelCtl::Reset()
 {
     // clear pixel area
-    rtl_zeroMemory(pPixel, nSquares * sizeof(USHORT));
+    rtl_zeroMemory(pPixel, nSquares * sizeof(sal_uInt16));
     Invalidate();
 }
 
@@ -1090,14 +1090,14 @@ void ColorLB::Fill( const XColorTable* pColorTab )
 {
     long nCount = pColorTab->Count();
     XColorEntry* pEntry;
-    SetUpdateMode( FALSE );
+    SetUpdateMode( sal_False );
 
     for( long i = 0; i < nCount; i++ )
     {
         pEntry = pColorTab->GetColor( i );
         InsertEntry( pEntry->GetColor(), pEntry->GetName() );
     }
-    SetUpdateMode( TRUE );
+    SetUpdateMode( sal_True );
 }
 
 /************************************************************************/
@@ -1109,7 +1109,7 @@ void ColorLB::Append( XColorEntry* pEntry, Bitmap* )
 
 /************************************************************************/
 
-void ColorLB::Modify( XColorEntry* pEntry, USHORT nPos, Bitmap*  )
+void ColorLB::Modify( XColorEntry* pEntry, sal_uInt16 nPos, Bitmap*  )
 {
     RemoveEntry( nPos );
     InsertEntry( pEntry->GetColor(), pEntry->GetName(), nPos );
@@ -1125,14 +1125,14 @@ void FillAttrLB::Fill( const XColorTable* pColorTab )
 {
     long nCount = pColorTab->Count();
     XColorEntry* pEntry;
-    SetUpdateMode( FALSE );
+    SetUpdateMode( sal_False );
 
     for( long i = 0; i < nCount; i++ )
     {
         pEntry = pColorTab->GetColor( i );
         InsertEntry( pEntry->GetColor(), pEntry->GetName() );
     }
-    SetUpdateMode( TRUE );
+    SetUpdateMode( sal_True );
 }
 
 /*************************************************************************
@@ -1141,7 +1141,7 @@ void FillAttrLB::Fill( const XColorTable* pColorTab )
 |*
 \************************************************************************/
 
-HatchingLB::HatchingLB( Window* pParent, ResId Id, BOOL bUserDraw /*= TRUE*/ )
+HatchingLB::HatchingLB( Window* pParent, ResId Id, sal_Bool bUserDraw /*= sal_True*/ )
 : ListBox( pParent, Id ),
   mpList ( NULL ),
   mbUserDraw( bUserDraw )
@@ -1149,7 +1149,7 @@ HatchingLB::HatchingLB( Window* pParent, ResId Id, BOOL bUserDraw /*= TRUE*/ )
     EnableUserDraw( mbUserDraw );
 }
 
-HatchingLB::HatchingLB( Window* pParent, WinBits aWB, BOOL bUserDraw /*= TRUE*/ )
+HatchingLB::HatchingLB( Window* pParent, WinBits aWB, sal_Bool bUserDraw /*= sal_True*/ )
 : ListBox( pParent, aWB ),
   mpList ( NULL ),
   mbUserDraw( bUserDraw )
@@ -1163,7 +1163,7 @@ void HatchingLB::Fill( const XHatchList* pList )
     XHatchEntry* pEntry;
     long nCount = pList->Count();
 
-    SetUpdateMode( FALSE );
+    SetUpdateMode( sal_False );
 
     if( mbUserDraw )
     {
@@ -1183,7 +1183,7 @@ void HatchingLB::Fill( const XHatchList* pList )
         }
     }
 
-    SetUpdateMode( TRUE );
+    SetUpdateMode( sal_True );
 }
 
 void HatchingLB::UserDraw( const UserDrawEvent& rUDEvt )
@@ -1199,7 +1199,7 @@ void HatchingLB::UserDraw( const UserDrawEvent& rUDEvt )
         {
             OutputDevice* pDevice = rUDEvt.GetDevice();
 
-            ULONG nOldDrawMode = pDevice->GetDrawMode();
+            sal_uIntPtr nOldDrawMode = pDevice->GetDrawMode();
             pDevice->SetDrawMode( GetSettings().GetStyleSettings().GetHighContrastMode() ? OUTPUT_DRAWMODE_CONTRAST : OUTPUT_DRAWMODE_COLOR );
 
             XHatch& rXHatch = mpList->GetHatch( rUDEvt.GetItemId() )->GetHatch();
@@ -1236,7 +1236,7 @@ void HatchingLB::Append( XHatchEntry* pEntry, Bitmap* pBmp )
 
 /************************************************************************/
 
-void HatchingLB::Modify( XHatchEntry* pEntry, USHORT nPos, Bitmap* pBmp )
+void HatchingLB::Modify( XHatchEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp )
 {
     RemoveEntry( nPos );
 
@@ -1249,11 +1249,11 @@ void HatchingLB::Modify( XHatchEntry* pEntry, USHORT nPos, Bitmap* pBmp )
 /************************************************************************/
 
 void HatchingLB::SelectEntryByList( const XHatchList* pList, const String& rStr,
-                                    const XHatch& rHatch, USHORT nDist )
+                                    const XHatch& rHatch, sal_uInt16 nDist )
 {
     long nCount = pList->Count();
     XHatchEntry* pEntry;
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
     String aStr;
 
     long i;
@@ -1264,10 +1264,10 @@ void HatchingLB::SelectEntryByList( const XHatchList* pList, const String& rStr,
         aStr = pEntry->GetName();
 
         if( rStr == aStr && rHatch == pEntry->GetHatch() )
-            bFound = TRUE;
+            bFound = sal_True;
     }
     if( bFound )
-        SelectEntryPos( (USHORT) ( i - 1 + nDist ) );
+        SelectEntryPos( (sal_uInt16) ( i - 1 + nDist ) );
 }
 
 /*************************************************************************
@@ -1280,7 +1280,7 @@ void FillAttrLB::Fill( const XHatchList* pList )
 {
     long nCount = pList->Count();
     XHatchEntry* pEntry;
-    ListBox::SetUpdateMode( FALSE );
+    ListBox::SetUpdateMode( sal_False );
 
     for( long i = 0; i < nCount; i++ )
     {
@@ -1291,7 +1291,7 @@ void FillAttrLB::Fill( const XHatchList* pList )
         else
             InsertEntry( pEntry->GetName() );
     }
-    ListBox::SetUpdateMode( TRUE );
+    ListBox::SetUpdateMode( sal_True );
 }
 
 /*************************************************************************
@@ -1300,7 +1300,7 @@ void FillAttrLB::Fill( const XHatchList* pList )
 |*
 \************************************************************************/
 
-GradientLB::GradientLB( Window* pParent, ResId Id, BOOL bUserDraw /*= TRUE*/ )
+GradientLB::GradientLB( Window* pParent, ResId Id, sal_Bool bUserDraw /*= sal_True*/ )
 : ListBox( pParent, Id ),
   mpList(NULL),
   mbUserDraw( bUserDraw )
@@ -1308,7 +1308,7 @@ GradientLB::GradientLB( Window* pParent, ResId Id, BOOL bUserDraw /*= TRUE*/ )
     EnableUserDraw( mbUserDraw);
 }
 
-GradientLB::GradientLB( Window* pParent, WinBits aWB, BOOL bUserDraw /*= TRUE*/ )
+GradientLB::GradientLB( Window* pParent, WinBits aWB, sal_Bool bUserDraw /*= sal_True*/ )
 : ListBox( pParent, aWB ),
   mpList(NULL),
   mbUserDraw( bUserDraw )
@@ -1322,7 +1322,7 @@ void GradientLB::Fill( const XGradientList* pList )
     XGradientEntry* pEntry;
     long nCount = pList->Count();
 
-    SetUpdateMode( FALSE );
+    SetUpdateMode( sal_False );
 
     if( mbUserDraw )
     {
@@ -1342,7 +1342,7 @@ void GradientLB::Fill( const XGradientList* pList )
         }
     }
 
-    SetUpdateMode( TRUE );
+    SetUpdateMode( sal_True );
 }
 
 void GradientLB::UserDraw( const UserDrawEvent& rUDEvt )
@@ -1360,7 +1360,7 @@ void GradientLB::UserDraw( const UserDrawEvent& rUDEvt )
 
             XGradient& rXGrad = mpList->GetGradient( rUDEvt.GetItemId() )->GetGradient();
             Gradient aGradient( (GradientStyle) rXGrad.GetGradientStyle(), rXGrad.GetStartColor(), rXGrad.GetEndColor() );
-            aGradient.SetAngle( (USHORT)rXGrad.GetAngle() );
+            aGradient.SetAngle( (sal_uInt16)rXGrad.GetAngle() );
             aGradient.SetBorder( rXGrad.GetBorder() );
             aGradient.SetOfsX( rXGrad.GetXOffset() );
             aGradient.SetOfsY( rXGrad.GetYOffset() );
@@ -1374,14 +1374,14 @@ void GradientLB::UserDraw( const UserDrawEvent& rUDEvt )
             {
                 long nWidth = pDevice->GetOutputSize().Width();
 
-                pWin->EnableRTL( FALSE );
+                pWin->EnableRTL( sal_False );
 
                 Rectangle aMirrorRect( Point( nWidth - aRect.Left() - aRect.GetWidth(), aRect.Top() ),
                                        aRect.GetSize() );
 
                 pDevice->DrawGradient( aMirrorRect, aGradient );
 
-                pWin->EnableRTL( TRUE );
+                pWin->EnableRTL( sal_True );
             }
             else
                 pDevice->DrawGradient( aRect, aGradient );
@@ -1408,7 +1408,7 @@ void GradientLB::Append( XGradientEntry* pEntry, Bitmap* pBmp )
 
 /************************************************************************/
 
-void GradientLB::Modify( XGradientEntry* pEntry, USHORT nPos, Bitmap* pBmp )
+void GradientLB::Modify( XGradientEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp )
 {
     RemoveEntry( nPos );
 
@@ -1421,11 +1421,11 @@ void GradientLB::Modify( XGradientEntry* pEntry, USHORT nPos, Bitmap* pBmp )
 /************************************************************************/
 
 void GradientLB::SelectEntryByList( const XGradientList* pList, const String& rStr,
-                                const XGradient& rGradient, USHORT nDist )
+                                const XGradient& rGradient, sal_uInt16 nDist )
 {
     long nCount = pList->Count();
     XGradientEntry* pEntry;
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
     String aStr;
 
     long i;
@@ -1436,10 +1436,10 @@ void GradientLB::SelectEntryByList( const XGradientList* pList, const String& rS
         aStr = pEntry->GetName();
 
         if( rStr == aStr && rGradient == pEntry->GetGradient() )
-            bFound = TRUE;
+            bFound = sal_True;
     }
     if( bFound )
-        SelectEntryPos( (USHORT) ( i - 1 + nDist ) );
+        SelectEntryPos( (sal_uInt16) ( i - 1 + nDist ) );
 }
 
 /*************************************************************************
@@ -1452,7 +1452,7 @@ void FillAttrLB::Fill( const XGradientList* pList )
 {
     long nCount = pList->Count();
     XGradientEntry* pEntry;
-    ListBox::SetUpdateMode( FALSE );
+    ListBox::SetUpdateMode( sal_False );
 
     for( long i = 0; i < nCount; i++ )
     {
@@ -1463,7 +1463,7 @@ void FillAttrLB::Fill( const XGradientList* pList )
         else
             InsertEntry( pEntry->GetName() );
     }
-    ListBox::SetUpdateMode( TRUE );
+    ListBox::SetUpdateMode( sal_True );
 }
 
 /*************************************************************************
@@ -1472,7 +1472,7 @@ void FillAttrLB::Fill( const XGradientList* pList )
 |*
 \************************************************************************/
 
-BitmapLB::BitmapLB( Window* pParent, ResId Id, BOOL bUserDraw /*= TRUE*/ )
+BitmapLB::BitmapLB( Window* pParent, ResId Id, sal_Bool bUserDraw /*= sal_True*/ )
 : ListBox( pParent, Id ),
   mpList( NULL ),
   mbUserDraw( bUserDraw )
@@ -1511,7 +1511,7 @@ void BitmapLB::Fill( const XBitmapList* pList )
     XBitmapEntry* pEntry;
     long nCount = pList->Count();
 
-    SetUpdateMode( FALSE );
+    SetUpdateMode( sal_False );
 
     if( mbUserDraw )
     {
@@ -1531,7 +1531,7 @@ void BitmapLB::Fill( const XBitmapList* pList )
         }
     }
 
-    SetUpdateMode( TRUE );
+    SetUpdateMode( sal_True );
 }
 
 void BitmapLB::UserDraw( const UserDrawEvent& rUDEvt )
@@ -1596,7 +1596,7 @@ void BitmapLB::Append( XBitmapEntry* pEntry, Bitmap* pBmp )
 
 /************************************************************************/
 
-void BitmapLB::Modify( XBitmapEntry* pEntry, USHORT nPos, Bitmap* pBmp )
+void BitmapLB::Modify( XBitmapEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp )
 {
     RemoveEntry( nPos );
 
@@ -1618,7 +1618,7 @@ void BitmapLB::SelectEntryByList( const XBitmapList* pList, const String& rStr,
 {
     long nCount = pList->Count();
     XBitmapEntry* pEntry;
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
 
     long i;
     for( i = 0; i < nCount && !bFound; i++ )
@@ -1630,11 +1630,11 @@ void BitmapLB::SelectEntryByList( const XBitmapList* pList, const String& rStr,
 
         if( rStr == aStr )
         {
-            bFound = TRUE;
+            bFound = sal_True;
         }
     }
     if( bFound )
-        SelectEntryPos( (USHORT) ( i - 1 ) );
+        SelectEntryPos( (sal_uInt16) ( i - 1 ) );
 }
 
 /*************************************************************************
@@ -1685,7 +1685,7 @@ void FillAttrLB::Fill( const XBitmapList* pList )
 {
     long nCount = pList->Count();
     XBitmapEntry* pEntry;
-    ListBox::SetUpdateMode( FALSE );
+    ListBox::SetUpdateMode( sal_False );
 
     for( long i = 0; i < nCount; i++ )
     {
@@ -1696,7 +1696,7 @@ void FillAttrLB::Fill( const XBitmapList* pList )
 
         ListBox::InsertEntry( pEntry->GetName(), aVD.GetBitmap( Point( 0, 2 ), Size( 32, 12 ) ) );
     }
-    ListBox::SetUpdateMode( TRUE );
+    ListBox::SetUpdateMode( sal_True );
 }
 
 /************************************************************************/
@@ -1706,7 +1706,7 @@ void FillAttrLB::SelectEntryByList( const XBitmapList* pList, const String& rStr
 {
     long nCount = pList->Count();
     XBitmapEntry* pEntry;
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
 
     long i;
     for( i = 0; i < nCount && !bFound; i++ )
@@ -1718,14 +1718,14 @@ void FillAttrLB::SelectEntryByList( const XBitmapList* pList, const String& rStr
 
         if( rStr == aStr )
         {
-            bFound = TRUE;
+            bFound = sal_True;
         }
         /*
         if( rStr == aStr && rBmp == aBmp )
-            bFound = TRUE; */
+            bFound = sal_True; */
     }
     if( bFound )
-        SelectEntryPos( (USHORT) ( i - 1 ) );
+        SelectEntryPos( (sal_uInt16) ( i - 1 ) );
 }
 
 /*************************************************************************
@@ -1736,13 +1736,13 @@ void FillAttrLB::SelectEntryByList( const XBitmapList* pList, const String& rStr
 
 void FillTypeLB::Fill()
 {
-    SetUpdateMode( FALSE );
+    SetUpdateMode( sal_False );
     InsertEntry( String( SVX_RES( RID_SVXSTR_INVISIBLE ) ) );
     InsertEntry( String( SVX_RES( RID_SVXSTR_COLOR ) ) );
     InsertEntry( String( SVX_RES( RID_SVXSTR_GRADIENT ) ) );
     InsertEntry( String( SVX_RES( RID_SVXSTR_HATCH ) ) );
     InsertEntry( String( SVX_RES( RID_SVXSTR_BITMAP ) ) );
-    SetUpdateMode( TRUE );
+    SetUpdateMode( sal_True );
 }
 
 /*************************************************************************
@@ -1755,7 +1755,7 @@ void LineLB::Fill( const XDashList* pList )
 {
     long nCount = pList->Count();
     XDashEntry* pEntry;
-    SetUpdateMode( FALSE );
+    SetUpdateMode( sal_False );
 
     for( long i = 0; i < nCount; i++ )
     {
@@ -1769,7 +1769,7 @@ void LineLB::Fill( const XDashList* pList )
         else
             InsertEntry( pEntry->GetName() );
     }
-    SetUpdateMode( TRUE );
+    SetUpdateMode( sal_True );
 }
 
 void LineLB::FillStyles()
@@ -1808,7 +1808,7 @@ void LineLB::Append( XDashEntry* pEntry, Bitmap* pBmp )
 
 /************************************************************************/
 
-void LineLB::Modify( XDashEntry* pEntry, USHORT nPos, Bitmap* pBmp )
+void LineLB::Modify( XDashEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp )
 {
     RemoveEntry( nPos );
 
@@ -1821,11 +1821,11 @@ void LineLB::Modify( XDashEntry* pEntry, USHORT nPos, Bitmap* pBmp )
 /************************************************************************/
 
 void LineLB::SelectEntryByList( const XDashList* pList, const String& rStr,
-                                const XDash& rDash, USHORT nDist )
+                                const XDash& rDash, sal_uInt16 nDist )
 {
     long nCount = pList->Count();
     XDashEntry* pEntry;
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
     String aStr;
     XDash aDash;
 
@@ -1838,10 +1838,10 @@ void LineLB::SelectEntryByList( const XDashList* pList, const String& rStr,
         aDash = pEntry->GetDash();
 
         if( rStr == aStr && rDash == aDash )
-            bFound = TRUE;
+            bFound = sal_True;
     }
     if( bFound )
-        SelectEntryPos( (USHORT) ( i - 1 + nDist ) );
+        SelectEntryPos( (sal_uInt16) ( i - 1 + nDist ) );
 }
 
 /*************************************************************************
@@ -1850,12 +1850,12 @@ void LineLB::SelectEntryByList( const XDashList* pList, const String& rStr,
 |*
 \************************************************************************/
 
-void LineEndLB::Fill( const XLineEndList* pList, BOOL bStart )
+void LineEndLB::Fill( const XLineEndList* pList, sal_Bool bStart )
 {
     long nCount = pList->Count();
     XLineEndEntry* pEntry;
     VirtualDevice aVD;
-    SetUpdateMode( FALSE );
+    SetUpdateMode( sal_False );
 
     for( long i = 0; i < nCount; i++ )
     {
@@ -1864,7 +1864,7 @@ void LineEndLB::Fill( const XLineEndList* pList, BOOL bStart )
         if( pBitmap )
         {
             Size aBmpSize( pBitmap->GetSizePixel() );
-            aVD.SetOutputSizePixel( aBmpSize, FALSE );
+            aVD.SetOutputSizePixel( aBmpSize, sal_False );
             aVD.DrawBitmap( Point(), *pBitmap );
             InsertEntry( pEntry->GetName(),
                 aVD.GetBitmap( bStart ? Point() : Point( aBmpSize.Width() / 2, 0 ),
@@ -1875,20 +1875,20 @@ void LineEndLB::Fill( const XLineEndList* pList, BOOL bStart )
         else
             InsertEntry( pEntry->GetName() );
     }
-    SetUpdateMode( TRUE );
+    SetUpdateMode( sal_True );
 }
 
 /************************************************************************/
 
 void LineEndLB::Append( XLineEndEntry* pEntry, Bitmap* pBmp,
-                        BOOL bStart )
+                        sal_Bool bStart )
 {
     if( pBmp )
     {
         VirtualDevice aVD;
         Size aBmpSize( pBmp->GetSizePixel() );
 
-        aVD.SetOutputSizePixel( aBmpSize, FALSE );
+        aVD.SetOutputSizePixel( aBmpSize, sal_False );
         aVD.DrawBitmap( Point(), *pBmp );
         InsertEntry( pEntry->GetName(),
             aVD.GetBitmap( bStart ? Point() : Point( aBmpSize.Width() / 2, 0 ),
@@ -1900,8 +1900,8 @@ void LineEndLB::Append( XLineEndEntry* pEntry, Bitmap* pBmp,
 
 /************************************************************************/
 
-void LineEndLB::Modify( XLineEndEntry* pEntry, USHORT nPos, Bitmap* pBmp,
-                        BOOL bStart )
+void LineEndLB::Modify( XLineEndEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp,
+                        sal_Bool bStart )
 {
     RemoveEntry( nPos );
 
@@ -1910,7 +1910,7 @@ void LineEndLB::Modify( XLineEndEntry* pEntry, USHORT nPos, Bitmap* pBmp,
         VirtualDevice aVD;
         Size aBmpSize( pBmp->GetSizePixel() );
 
-        aVD.SetOutputSizePixel( aBmpSize, FALSE );
+        aVD.SetOutputSizePixel( aBmpSize, sal_False );
         aVD.DrawBitmap( Point(), *pBmp );
         InsertEntry( pEntry->GetName(),
             aVD.GetBitmap( bStart ? Point() : Point( aBmpSize.Width() / 2, 0 ),
@@ -2055,7 +2055,7 @@ SvxXLinePreview::SvxXLinePreview( Window* pParent, const ResId& rResId )
     mbWithSymbol( sal_False )
 {
     const Size aOutputSize(GetOutputSize());
-    InitSettings( TRUE, TRUE );
+    InitSettings( sal_True, sal_True );
 
     const sal_Int32 nDistance(500L);
     const sal_Int32 nAvailableLength(aOutputSize.Width() - (4 * nDistance));