diff options
Diffstat (limited to 'sd/source/ui/app/tbxww.cxx')
-rwxr-xr-x[-rw-r--r--] | sd/source/ui/app/tbxww.cxx | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/sd/source/ui/app/tbxww.cxx b/sd/source/ui/app/tbxww.cxx index 9a7e9d4e8877..8bc14f34794c 100644..100755 --- a/sd/source/ui/app/tbxww.cxx +++ b/sd/source/ui/app/tbxww.cxx @@ -59,7 +59,7 @@ SFX_IMPL_TOOLBOX_CONTROL( SdTbxControl, TbxImageItem ) |* \************************************************************************/ -SdTbxControl::SdTbxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) : +SdTbxControl::SdTbxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ) { rTbx.SetItemBits( nId, TIB_DROPDOWN | rTbx.GetItemBits( nId ) ); @@ -146,7 +146,7 @@ SfxPopupWindow* SdTbxControl::CreatePopupWindow() /*-------------------------------------------------------------------------*/ -void SdTbxControl::StateChanged( USHORT nSId, +void SdTbxControl::StateChanged( sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pState ) { SfxToolBoxControl::StateChanged( nSId, eState, pState ); @@ -159,11 +159,11 @@ void SdTbxControl::StateChanged( USHORT nSId, if( pItem ) { ToolBox& rTbx = GetToolBox(); - USHORT nImage = pItem->GetValue(); + sal_uInt16 nImage = pItem->GetValue(); if( nImage == 0 ) { if( rTbx.IsItemChecked( nSId ) ) - rTbx.CheckItem( nSId, FALSE ); + rTbx.CheckItem( nSId, sal_False ); } else { @@ -187,28 +187,28 @@ void SdTbxControl::StateChanged( USHORT nSId, { if( nSId != SID_OBJECT_CHOOSE_MODE && rTbx.IsItemChecked( SID_OBJECT_CHOOSE_MODE ) ) - rTbx.CheckItem( SID_OBJECT_CHOOSE_MODE, FALSE ); + rTbx.CheckItem( SID_OBJECT_CHOOSE_MODE, sal_False ); if( nSId != SID_DRAWTBX_TEXT && rTbx.IsItemChecked( SID_DRAWTBX_TEXT ) ) - rTbx.CheckItem( SID_DRAWTBX_TEXT, FALSE ); + rTbx.CheckItem( SID_DRAWTBX_TEXT, sal_False ); if( nSId != SID_DRAWTBX_RECTANGLES && rTbx.IsItemChecked( SID_DRAWTBX_RECTANGLES ) ) - rTbx.CheckItem( SID_DRAWTBX_RECTANGLES, FALSE ); + rTbx.CheckItem( SID_DRAWTBX_RECTANGLES, sal_False ); if( nSId != SID_DRAWTBX_ELLIPSES && rTbx.IsItemChecked( SID_DRAWTBX_ELLIPSES ) ) - rTbx.CheckItem( SID_DRAWTBX_ELLIPSES, FALSE ); + rTbx.CheckItem( SID_DRAWTBX_ELLIPSES, sal_False ); if( nSId != SID_DRAWTBX_LINES && rTbx.IsItemChecked( SID_DRAWTBX_LINES ) ) - rTbx.CheckItem( SID_DRAWTBX_LINES, FALSE ); + rTbx.CheckItem( SID_DRAWTBX_LINES, sal_False ); if( nSId != SID_DRAWTBX_ARROWS && rTbx.IsItemChecked( SID_DRAWTBX_ARROWS ) ) - rTbx.CheckItem( SID_DRAWTBX_ARROWS, FALSE ); + rTbx.CheckItem( SID_DRAWTBX_ARROWS, sal_False ); if( nSId != SID_DRAWTBX_3D_OBJECTS && rTbx.IsItemChecked( SID_DRAWTBX_3D_OBJECTS ) ) - rTbx.CheckItem( SID_DRAWTBX_3D_OBJECTS, FALSE ); + rTbx.CheckItem( SID_DRAWTBX_3D_OBJECTS, sal_False ); if( nSId != SID_DRAWTBX_CONNECTORS && rTbx.IsItemChecked( SID_DRAWTBX_CONNECTORS ) ) - rTbx.CheckItem( SID_DRAWTBX_CONNECTORS, FALSE ); + rTbx.CheckItem( SID_DRAWTBX_CONNECTORS, sal_False ); } } } @@ -218,7 +218,7 @@ void SdTbxControl::StateChanged( USHORT nSId, /*-------------------------------------------------------------------------*/ -BOOL SdTbxControl::IsCheckable( USHORT nSId ) +sal_Bool SdTbxControl::IsCheckable( sal_uInt16 nSId ) { switch( nSId ) { @@ -324,9 +324,9 @@ BOOL SdTbxControl::IsCheckable( USHORT nSId ) case SID_CONNECTOR_LINES_CIRCLE_END: case SID_CONNECTOR_LINES_CIRCLES: - return( TRUE ); + return( sal_True ); } - return( FALSE ); + return( sal_False ); } |