diff options
Diffstat (limited to 'svx/source/stbctrls/zoomctrl.cxx')
-rwxr-xr-x[-rw-r--r--] | svx/source/stbctrls/zoomctrl.cxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx index 3c269e0f2c7f..7cf7bc8af8d5 100644..100755 --- a/svx/source/stbctrls/zoomctrl.cxx +++ b/svx/source/stbctrls/zoomctrl.cxx @@ -36,7 +36,7 @@ #include <svx/dialogs.hrc> -#include "zoomctrl.hxx" +#include "svx/zoomctrl.hxx" #include <svx/zoomitem.hxx> #include "stbctrls.h" #include <svx/dialmgr.hxx> @@ -48,27 +48,27 @@ SFX_IMPL_STATUSBAR_CONTROL(SvxZoomStatusBarControl,SvxZoomItem); class ZoomPopup_Impl : public PopupMenu { public: - ZoomPopup_Impl( USHORT nZ, USHORT nValueSet ); + ZoomPopup_Impl( sal_uInt16 nZ, sal_uInt16 nValueSet ); - USHORT GetZoom() const { return nZoom; } - USHORT GetCurId() const { return nCurId; } + sal_uInt16 GetZoom() const { return nZoom; } + sal_uInt16 GetCurId() const { return nCurId; } private: - USHORT nZoom; - USHORT nCurId; + sal_uInt16 nZoom; + sal_uInt16 nCurId; virtual void Select(); }; // ----------------------------------------------------------------------- -ZoomPopup_Impl::ZoomPopup_Impl( USHORT nZ, USHORT nValueSet ) +ZoomPopup_Impl::ZoomPopup_Impl( sal_uInt16 nZ, sal_uInt16 nValueSet ) : PopupMenu( ResId( RID_SVXMNU_ZOOM, DIALOG_MGR() ) ), nZoom( nZ ) { - static USHORT aTable[] = + static sal_uInt16 aTable[] = { SVX_ZOOM_ENABLE_50, ZOOM_50, SVX_ZOOM_ENABLE_100, ZOOM_100, @@ -79,9 +79,9 @@ ZoomPopup_Impl::ZoomPopup_Impl( USHORT nZ, USHORT nValueSet ) SVX_ZOOM_ENABLE_PAGEWIDTH, ZOOM_PAGE_WIDTH }; - for ( USHORT nPos = 0; nPos < SAL_N_ELEMENTS(aTable); nPos += 2 ) + for ( sal_uInt16 nPos = 0; nPos < SAL_N_ELEMENTS(aTable); nPos += 2 ) if ( ( aTable[nPos] != ( aTable[nPos] & nValueSet ) ) ) - EnableItem( aTable[nPos+1], FALSE ); + EnableItem( aTable[nPos+1], sal_False ); } // ----------------------------------------------------------------------- @@ -107,8 +107,8 @@ void ZoomPopup_Impl::Select() // class SvxZoomStatusBarControl ------------------------------------------ -SvxZoomStatusBarControl::SvxZoomStatusBarControl( USHORT _nSlotId, - USHORT _nId, +SvxZoomStatusBarControl::SvxZoomStatusBarControl( sal_uInt16 _nSlotId, + sal_uInt16 _nId, StatusBar& rStb ) : SfxStatusBarControl( _nSlotId, _nId, rStb ), @@ -119,7 +119,7 @@ SvxZoomStatusBarControl::SvxZoomStatusBarControl( USHORT _nSlotId, // ----------------------------------------------------------------------- -void SvxZoomStatusBarControl::StateChanged( USHORT, SfxItemState eState, +void SvxZoomStatusBarControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) { if( SFX_ITEM_AVAILABLE != eState ) @@ -210,7 +210,7 @@ void SvxZoomStatusBarControl::Command( const CommandEvent& rCEvt ) SfxStatusBarControl::Command( rCEvt ); } -ULONG SvxZoomStatusBarControl::GetDefItemWidth(const StatusBar& rStb) +sal_uIntPtr SvxZoomStatusBarControl::GetDefItemWidth(const StatusBar& rStb) { long nWidth1 = rStb.GetTextWidth(String::CreateFromAscii("XXXXX%")); return nWidth1; |