diff options
Diffstat (limited to 'sw/source/ui/utlui/viewlayoutctrl.cxx')
-rw-r--r-- | sw/source/ui/utlui/viewlayoutctrl.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sw/source/ui/utlui/viewlayoutctrl.cxx b/sw/source/ui/utlui/viewlayoutctrl.cxx index dbee2286731a..1b755391c319 100644 --- a/sw/source/ui/utlui/viewlayoutctrl.cxx +++ b/sw/source/ui/utlui/viewlayoutctrl.cxx @@ -58,7 +58,7 @@ const long nImageHeight = 11; struct SwViewLayoutControl::SwViewLayoutControl_Impl { - USHORT mnState; // 0 = single, 1 = auto, 2 = book, 3 = none + sal_uInt16 mnState; // 0 = single, 1 = auto, 2 = book, 3 = none Image maImageSingleColumn; Image maImageSingleColumn_Active; Image maImageAutomatic; @@ -69,7 +69,7 @@ struct SwViewLayoutControl::SwViewLayoutControl_Impl // class SwViewLayoutControl ------------------------------------------ -SwViewLayoutControl::SwViewLayoutControl( USHORT _nSlotId, USHORT _nId, StatusBar& rStb ) : +SwViewLayoutControl::SwViewLayoutControl( sal_uInt16 _nSlotId, sal_uInt16 _nId, StatusBar& rStb ) : SfxStatusBarControl( _nSlotId, _nId, rStb ), mpImpl( new SwViewLayoutControl_Impl ) { @@ -93,14 +93,14 @@ SwViewLayoutControl::~SwViewLayoutControl() // ----------------------------------------------------------------------- -void SwViewLayoutControl::StateChanged( USHORT /*nSID*/, SfxItemState eState, const SfxPoolItem* pState ) +void SwViewLayoutControl::StateChanged( sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* pState ) { if ( SFX_ITEM_AVAILABLE != eState || pState->ISA( SfxVoidItem ) ) GetStatusBar().SetItemText( GetId(), String() ); else { DBG_ASSERT( pState->ISA( SvxViewLayoutItem ), "invalid item type" ); - const USHORT nColumns = static_cast<const SvxViewLayoutItem*>( pState )->GetValue(); + const sal_uInt16 nColumns = static_cast<const SvxViewLayoutItem*>( pState )->GetValue(); const bool bBookMode = static_cast<const SvxViewLayoutItem*>( pState )->IsBookMode(); // SingleColumn Mode @@ -165,13 +165,13 @@ void SwViewLayoutControl::Paint( const UserDrawEvent& rUsrEvt ) //pDev->SetFillColor( aOldFillColor ); } -BOOL SwViewLayoutControl::MouseButtonDown( const MouseEvent & rEvt ) +sal_Bool SwViewLayoutControl::MouseButtonDown( const MouseEvent & rEvt ) { const Rectangle aRect = getControlRect(); const Point aPoint = rEvt.GetPosPixel(); const long nXDiff = aPoint.X() - aRect.Left(); - USHORT nColumns = 1; + sal_uInt16 nColumns = 1; bool bBookMode = false; const long nXOffset = (aRect.GetWidth() - nImageWidthSum)/2; @@ -205,5 +205,5 @@ BOOL SwViewLayoutControl::MouseButtonDown( const MouseEvent & rEvt ) execute( aArgs ); - return TRUE; + return sal_True; } |