1 files changed, 39 insertions, 39 deletions

diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx
index d260f984c2b0..89e888de0318 100644
--- a/svtools/source/contnr/svlbitm.cxx
+++ b/svtools/source/contnr/svlbitm.cxx
@@ -44,20 +44,20 @@
 struct SvLBoxButtonData_Impl
 {
     SvLBoxEntry*    pEntry;
-    BOOL            bDefaultImages;
-    BOOL            bShowRadioButton;
+    sal_Bool            bDefaultImages;
+    sal_Bool            bShowRadioButton;
 
-    SvLBoxButtonData_Impl() : pEntry( NULL ), bDefaultImages( FALSE ), bShowRadioButton( FALSE ) {}
+    SvLBoxButtonData_Impl() : pEntry( NULL ), bDefaultImages( sal_False ), bShowRadioButton( sal_False ) {}
 };
 
 
 DBG_NAME(SvLBoxButtonData)
 
-void SvLBoxButtonData::InitData( BOOL bImagesFromDefault, bool _bRadioBtn, const Control* pCtrl )
+void SvLBoxButtonData::InitData( sal_Bool bImagesFromDefault, bool _bRadioBtn, const Control* pCtrl )
 {
     pImpl = new SvLBoxButtonData_Impl;
 
-    bDataOk = FALSE;
+    bDataOk = sal_False;
     eState = SV_BUTTON_UNCHECKED;
     pImpl->bDefaultImages = bImagesFromDefault;
     pImpl->bShowRadioButton = ( _bRadioBtn != false );
@@ -70,21 +70,21 @@ SvLBoxButtonData::SvLBoxButtonData( const Control* pControlForSettings )
 {
     DBG_CTOR(SvLBoxButtonData,0);
 
-    InitData( TRUE, false, pControlForSettings );
+    InitData( sal_True, false, pControlForSettings );
 }
 
 SvLBoxButtonData::SvLBoxButtonData( const Control* pControlForSettings, bool _bRadioBtn )
 {
     DBG_CTOR(SvLBoxButtonData,0);
 
-    InitData( TRUE, _bRadioBtn, pControlForSettings );
+    InitData( sal_True, _bRadioBtn, pControlForSettings );
 }
 
 SvLBoxButtonData::SvLBoxButtonData()
 {
     DBG_CTOR(SvLBoxButtonData,0);
 
-    InitData( FALSE, false );
+    InitData( sal_False, false );
 }
 
 SvLBoxButtonData::~SvLBoxButtonData()
@@ -103,11 +103,11 @@ void SvLBoxButtonData::CallLink()
     aLink.Call( this );
 }
 
-USHORT SvLBoxButtonData::GetIndex( USHORT nItemState )
+sal_uInt16 SvLBoxButtonData::GetIndex( sal_uInt16 nItemState )
 {
     DBG_CHKTHIS(SvLBoxButtonData,0);
     nItemState &= 0x000F;
-    USHORT nIdx;
+    sal_uInt16 nIdx;
     switch( nItemState )
     {
         case SV_ITEMSTATE_UNCHECKED:
@@ -134,18 +134,18 @@ void SvLBoxButtonData::SetWidthAndHeight()
     Size aSize = aBmps[0].GetSizePixel();
     nWidth = aSize.Width();
     nHeight = aSize.Height();
-    bDataOk = TRUE;
+    bDataOk = sal_True;
 }
 
 
-void SvLBoxButtonData::StoreButtonState( SvLBoxEntry* pActEntry, USHORT nItemFlags )
+void SvLBoxButtonData::StoreButtonState( SvLBoxEntry* pActEntry, sal_uInt16 nItemFlags )
 {
     DBG_CHKTHIS(SvLBoxButtonData,0);
     pImpl->pEntry = pActEntry;
     eState = ConvertToButtonState( nItemFlags );
 }
 
-SvButtonState SvLBoxButtonData::ConvertToButtonState( USHORT nItemFlags ) const
+SvButtonState SvLBoxButtonData::ConvertToButtonState( sal_uInt16 nItemFlags ) const
 {
     DBG_CHKTHIS(SvLBoxButtonData,0);
     nItemFlags &= (SV_ITEMSTATE_UNCHECKED |
@@ -196,12 +196,12 @@ void SvLBoxButtonData::SetDefaultImages( const Control* pCtrl )
     }
 }
 
-BOOL SvLBoxButtonData::HasDefaultImages( void ) const
+sal_Bool SvLBoxButtonData::HasDefaultImages( void ) const
 {
     return pImpl->bDefaultImages;
 }
 
-BOOL SvLBoxButtonData::IsRadio() {
+sal_Bool SvLBoxButtonData::IsRadio() {
     return pImpl->bShowRadioButton;
 }
 
@@ -211,7 +211,7 @@ BOOL SvLBoxButtonData::IsRadio() {
 
 DBG_NAME(SvLBoxString);
 
-SvLBoxString::SvLBoxString( SvLBoxEntry* pEntry,USHORT nFlags,const XubString& rStr) :
+SvLBoxString::SvLBoxString( SvLBoxEntry* pEntry,sal_uInt16 nFlags,const XubString& rStr) :
         SvLBoxItem( pEntry, nFlags )
 {
     DBG_CTOR(SvLBoxString,0);
@@ -228,19 +228,19 @@ SvLBoxString::~SvLBoxString()
     DBG_DTOR(SvLBoxString,0);
 }
 
-USHORT SvLBoxString::IsA()
+sal_uInt16 SvLBoxString::IsA()
 {
     DBG_CHKTHIS(SvLBoxString,0);
     return SV_ITEM_ID_LBOXSTRING;
 }
 
-void SvLBoxString::Paint( const Point& rPos, SvLBox& rDev, USHORT /* nFlags */,
+void SvLBoxString::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16 /* nFlags */,
     SvLBoxEntry* _pEntry)
 {
     DBG_CHKTHIS(SvLBoxString,0);
     if ( _pEntry )
     {
-        USHORT nStyle = rDev.IsEnabled() ? 0 : TEXT_DRAW_DISABLE;
+        sal_uInt16 nStyle = rDev.IsEnabled() ? 0 : TEXT_DRAW_DISABLE;
         if ( rDev.IsEntryMnemonicsEnabled() )
             nStyle |= TEXT_DRAW_MNEMONIC;
         rDev.DrawText( Rectangle(rPos,GetSize(&rDev,_pEntry)),aStr,nStyle);
@@ -283,7 +283,7 @@ void SvLBoxString::InitViewData( SvLBox* pView,SvLBoxEntry* pEntry,
 
 DBG_NAME(SvLBoxBmp);
 
-SvLBoxBmp::SvLBoxBmp( SvLBoxEntry* pEntry, USHORT nFlags, Image aBitmap ) :
+SvLBoxBmp::SvLBoxBmp( SvLBoxEntry* pEntry, sal_uInt16 nFlags, Image aBitmap ) :
     SvLBoxItem( pEntry, nFlags )
 {
     DBG_CTOR(SvLBoxBmp,0);
@@ -300,7 +300,7 @@ SvLBoxBmp::~SvLBoxBmp()
     DBG_DTOR(SvLBoxBmp,0);
 }
 
-USHORT SvLBoxBmp::IsA()
+sal_uInt16 SvLBoxBmp::IsA()
 {
     DBG_CHKTHIS(SvLBoxBmp,0);
     return SV_ITEM_ID_LBOXBMP;
@@ -321,11 +321,11 @@ void SvLBoxBmp::InitViewData( SvLBox* pView,SvLBoxEntry* pEntry,
     pViewData->aSize = aBmp.GetSizePixel();
 }
 
-void SvLBoxBmp::Paint( const Point& rPos, SvLBox& rDev, USHORT /* nFlags */,
+void SvLBoxBmp::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16 /* nFlags */,
                         SvLBoxEntry* )
 {
     DBG_CHKTHIS(SvLBoxBmp,0);
-    USHORT nStyle = rDev.IsEnabled() ? 0 : IMAGE_DRAW_DISABLE;
+    sal_uInt16 nStyle = rDev.IsEnabled() ? 0 : IMAGE_DRAW_DISABLE;
     rDev.DrawImage( rPos, aBmp ,nStyle);
 }
 
@@ -348,7 +348,7 @@ void SvLBoxBmp::Clone( SvLBoxItem* pSource )
 DBG_NAME(SvLBoxButton);
 
 SvLBoxButton::SvLBoxButton( SvLBoxEntry* pEntry, SvLBoxButtonKind eTheKind,
-                            USHORT nFlags, SvLBoxButtonData* pBData )
+                            sal_uInt16 nFlags, SvLBoxButtonData* pBData )
     : SvLBoxItem( pEntry, nFlags )
 {
     DBG_CTOR(SvLBoxButton,0);
@@ -372,13 +372,13 @@ SvLBoxButton::~SvLBoxButton()
     DBG_DTOR(SvLBoxButton,0);
 }
 
-USHORT SvLBoxButton::IsA()
+sal_uInt16 SvLBoxButton::IsA()
 {
     DBG_CHKTHIS(SvLBoxButton,0);
     return SV_ITEM_ID_LBOXBUTTON;
 }
 
-void SvLBoxButton::Check(SvLBox*, SvLBoxEntry*, BOOL bOn)
+void SvLBoxButton::Check(SvLBox*, SvLBoxEntry*, sal_Bool bOn)
 {
     DBG_CHKTHIS(SvLBoxButton,0);
     if ( bOn != IsStateChecked() )
@@ -390,7 +390,7 @@ void SvLBoxButton::Check(SvLBox*, SvLBoxEntry*, BOOL bOn)
     }
 }
 
-BOOL SvLBoxButton::ClickHdl( SvLBox*, SvLBoxEntry* pEntry )
+sal_Bool SvLBoxButton::ClickHdl( SvLBox*, SvLBoxEntry* pEntry )
 {
     DBG_CHKTHIS(SvLBoxButton,0);
     if ( CheckModification() )
@@ -402,22 +402,22 @@ BOOL SvLBoxButton::ClickHdl( SvLBox*, SvLBoxEntry* pEntry )
         pData->StoreButtonState( pEntry, nItemFlags );
         pData->CallLink();
     }
-    return FALSE;
+    return sal_False;
 }
 
-void SvLBoxButton::Paint( const Point& rPos, SvLBox& rDev, USHORT /* nFlags */,
+void SvLBoxButton::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16 /* nFlags */,
                             SvLBoxEntry* /*pEntry*/ )
 {
     DBG_CHKTHIS(SvLBoxButton,0);
-    USHORT nIndex = eKind == SvLBoxButtonKind_staticImage
+    sal_uInt16 nIndex = eKind == SvLBoxButtonKind_staticImage
         ? SV_BMP_STATICIMAGE : pData->GetIndex( nItemFlags );
-    USHORT nStyle = eKind != SvLBoxButtonKind_disabledCheckbox &&
+    sal_uInt16 nStyle = eKind != SvLBoxButtonKind_disabledCheckbox &&
         rDev.IsEnabled() ? 0 : IMAGE_DRAW_DISABLE;
 
 ///
 //Native drawing
 ///
-    BOOL bNativeOK = FALSE;
+    sal_Bool bNativeOK = sal_False;
     ControlType eCtrlType = (pData->IsRadio())? CTRL_RADIOBUTTON : CTRL_CHECKBOX;
     if ( nIndex != SV_BMP_STATICIMAGE && rDev.IsNativeControlSupported( eCtrlType, PART_ENTIRE_CONTROL) )
     {
@@ -520,14 +520,14 @@ struct SvLBoxContextBmp_Impl
     Image       m_aImage1_hc;
     Image       m_aImage2_hc;
 
-    USHORT      m_nB2IndicatorFlags;
+    sal_uInt16      m_nB2IndicatorFlags;
 };
 
 // ***************************************************************
 DBG_NAME(SvLBoxContextBmp)
 
-SvLBoxContextBmp::SvLBoxContextBmp( SvLBoxEntry* pEntry, USHORT nItemFlags,
-    Image aBmp1, Image aBmp2, USHORT nEntryFlags )
+SvLBoxContextBmp::SvLBoxContextBmp( SvLBoxEntry* pEntry, sal_uInt16 nItemFlags,
+    Image aBmp1, Image aBmp2, sal_uInt16 nEntryFlags )
     :SvLBoxItem( pEntry, nItemFlags )
     ,m_pImpl( new SvLBoxContextBmp_Impl )
 {
@@ -551,13 +551,13 @@ SvLBoxContextBmp::~SvLBoxContextBmp()
     DBG_DTOR(SvLBoxContextBmp,0);
 }
 
-USHORT SvLBoxContextBmp::IsA()
+sal_uInt16 SvLBoxContextBmp::IsA()
 {
     DBG_CHKTHIS(SvLBoxContextBmp,0);
     return SV_ITEM_ID_LBOXCONTEXTBMP;
 }
 
-BOOL SvLBoxContextBmp::SetModeImages( const Image& _rBitmap1, const Image& _rBitmap2, BmpColorMode _eMode )
+sal_Bool SvLBoxContextBmp::SetModeImages( const Image& _rBitmap1, const Image& _rBitmap2, BmpColorMode _eMode )
 {
     DBG_CHKTHIS(SvLBoxContextBmp,0);
 
@@ -612,7 +612,7 @@ void SvLBoxContextBmp::InitViewData( SvLBox* pView,SvLBoxEntry* pEntry,
 }
 
 void SvLBoxContextBmp::Paint( const Point& _rPos, SvLBox& _rDev,
-    USHORT _nViewDataEntryFlags, SvLBoxEntry* _pEntry )
+    sal_uInt16 _nViewDataEntryFlags, SvLBoxEntry* _pEntry )
 {
     DBG_CHKTHIS(SvLBoxContextBmp,0);
 
@@ -629,7 +629,7 @@ void SvLBoxContextBmp::Paint( const Point& _rPos, SvLBox& _rDev,
 
     sal_Bool _bSemiTransparent = _pEntry && ( 0 != ( SV_ENTRYFLAG_SEMITRANSPARENT  & _pEntry->GetFlags( ) ) );
     // draw
-    USHORT nStyle = _rDev.IsEnabled() ? 0 : IMAGE_DRAW_DISABLE;
+    sal_uInt16 nStyle = _rDev.IsEnabled() ? 0 : IMAGE_DRAW_DISABLE;
     if ( _bSemiTransparent )
         nStyle |= IMAGE_DRAW_SEMITRANSPARENT;
     _rDev.DrawImage( _rPos, rImage, nStyle);