diff options
author | Mikhail Voytenko <mav@openoffice.org> | 2011-01-13 12:36:39 +0100 |
---|---|---|
committer | Mikhail Voytenko <mav@openoffice.org> | 2011-01-13 12:36:39 +0100 |
commit | 5d46e270c357034f81c91d787cf50dff586ee5a2 (patch) | |
tree | 6ed7760ad6a1b7f8e2968f959259d022bf5cff86 | |
parent | removetooltypes01: #i112600# Exchange misleading sal_uIntPtr with sal_uLong i... (diff) | |
download | core-5d46e270c357034f81c91d787cf50dff586ee5a2.tar.gz core-5d46e270c357034f81c91d787cf50dff586ee5a2.zip |
removetooltypes01: #i112600# remove tooltypes from avmedia
-rw-r--r-- | avmedia/inc/avmedia/mediaitem.hxx | 6 | ||||
-rw-r--r-- | avmedia/inc/avmedia/mediaplayer.hxx | 2 | ||||
-rw-r--r-- | avmedia/inc/avmedia/mediatoolbox.hxx | 4 | ||||
-rw-r--r-- | avmedia/source/framework/mediacontrol.cxx | 12 | ||||
-rw-r--r-- | avmedia/source/framework/mediaitem.cxx | 8 | ||||
-rw-r--r-- | avmedia/source/framework/mediaplayer.cxx | 2 | ||||
-rw-r--r-- | avmedia/source/framework/mediatoolbox.cxx | 4 | ||||
-rw-r--r-- | avmedia/source/viewer/mediaevent_impl.cxx | 4 | ||||
-rw-r--r-- | avmedia/source/win/interface.hxx | 6 |
9 files changed, 24 insertions, 24 deletions
diff --git a/avmedia/inc/avmedia/mediaitem.hxx b/avmedia/inc/avmedia/mediaitem.hxx index 5fe0fede94ff..60901a7245bd 100644 --- a/avmedia/inc/avmedia/mediaitem.hxx +++ b/avmedia/inc/avmedia/mediaitem.hxx @@ -71,7 +71,7 @@ class MediaItem : public SfxPoolItem public: TYPEINFO(); - MediaItem( USHORT nWhich = 0, sal_uInt32 nMaskSet = AVMEDIA_SETMASK_NONE ); + MediaItem( sal_uInt16 nWhich = 0, sal_uInt32 nMaskSet = AVMEDIA_SETMASK_NONE ); MediaItem( const MediaItem& rMediaItem ); virtual ~MediaItem(); @@ -82,8 +82,8 @@ public: SfxMapUnit ePresUnit, XubString& rText, const IntlWrapper *pIntl ) const; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); void merge( const MediaItem& rMediaItem ); diff --git a/avmedia/inc/avmedia/mediaplayer.hxx b/avmedia/inc/avmedia/mediaplayer.hxx index ad60b1bdebf3..8d55ab5c401a 100644 --- a/avmedia/inc/avmedia/mediaplayer.hxx +++ b/avmedia/inc/avmedia/mediaplayer.hxx @@ -52,7 +52,7 @@ namespace avmedia class MediaPlayer : public SfxChildWindow { public: - MediaPlayer( Window*, USHORT, SfxBindings*, SfxChildWinInfo* ); + MediaPlayer( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); ~MediaPlayer(); SFX_DECL_CHILDWINDOW( MediaPlayer ); diff --git a/avmedia/inc/avmedia/mediatoolbox.hxx b/avmedia/inc/avmedia/mediatoolbox.hxx index 890fffaf0340..2ae34dc0bd23 100644 --- a/avmedia/inc/avmedia/mediatoolbox.hxx +++ b/avmedia/inc/avmedia/mediatoolbox.hxx @@ -48,10 +48,10 @@ public: SFX_DECL_TOOLBOX_CONTROL(); - MediaToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbX ); + MediaToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbX ); ~MediaToolBoxControl(); - virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual Window* CreateItemWindow( Window* pParent ); private: diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx index 2eb18cb164d9..701b7c6cf238 100644 --- a/avmedia/source/framework/mediacontrol.cxx +++ b/avmedia/source/framework/mediacontrol.cxx @@ -86,7 +86,7 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) : const String aTimeText( RTL_CONSTASCII_USTRINGPARAM( " 00:00:00/00:00:00 " ) ); SetBackground(); - SetPaintTransparent( TRUE ); + SetPaintTransparent( sal_True ); SetParentClipMode( PARENTCLIPMODE_NOCLIP ); if( MEDIACONTROLSTYLE_SINGLELINE != meControlStyle ) @@ -104,11 +104,11 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) : mpZoomListBox->SetBackground(); maZoomToolBox.SetBackground(); - maZoomToolBox.SetPaintTransparent( TRUE ); + maZoomToolBox.SetPaintTransparent( sal_True ); maPlayToolBox.SetBackground(); - maPlayToolBox.SetPaintTransparent( TRUE ); + maPlayToolBox.SetPaintTransparent( sal_True ); maMuteToolBox.SetBackground(); - maMuteToolBox.SetPaintTransparent( TRUE ); + maMuteToolBox.SetPaintTransparent( sal_True ); } @@ -362,7 +362,7 @@ void MediaControl::implUpdateToolboxes() if( !mpZoomListBox->IsTravelSelect() && !mpZoomListBox->IsInDropDown() ) { - USHORT nSelectEntryPos ; + sal_uInt16 nSelectEntryPos ; switch( maItem.getZoom() ) { @@ -454,7 +454,7 @@ void MediaControl::implUpdateTimeField( double fCurTime ) Image MediaControl::implGetImage( sal_Int32 nImageId ) const { - return maImageList.GetImage( static_cast< USHORT >( nImageId ) ); + return maImageList.GetImage( static_cast< sal_uInt16 >( nImageId ) ); } // ------------------------------------------------------------------------------ diff --git a/avmedia/source/framework/mediaitem.cxx b/avmedia/source/framework/mediaitem.cxx index f9f85eb1ee66..f75fafa0509e 100644 --- a/avmedia/source/framework/mediaitem.cxx +++ b/avmedia/source/framework/mediaitem.cxx @@ -50,7 +50,7 @@ TYPEINIT1_AUTOFACTORY( MediaItem, ::SfxPoolItem ); // ------------------------------------------------------------------------------ -MediaItem::MediaItem( USHORT _nWhich, sal_uInt32 nMaskSet ) : +MediaItem::MediaItem( sal_uInt16 _nWhich, sal_uInt32 nMaskSet ) : SfxPoolItem( _nWhich ), mnMaskSet( nMaskSet ), meState( MEDIASTATE_STOP ), @@ -122,7 +122,7 @@ SfxItemPresentation MediaItem::GetPresentation( SfxItemPresentation, //------------------------------------------------------------------------ -BOOL MediaItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE ) const +sal_Bool MediaItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 ) const { uno::Sequence< uno::Any > aSeq( 9 ); @@ -143,10 +143,10 @@ BOOL MediaItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE ) const //------------------------------------------------------------------------ -BOOL MediaItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE ) +sal_Bool MediaItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 ) { uno::Sequence< uno::Any > aSeq; - BOOL bRet = false; + sal_Bool bRet = false; if( ( rVal >>= aSeq ) && ( aSeq.getLength() == 9 ) ) { diff --git a/avmedia/source/framework/mediaplayer.cxx b/avmedia/source/framework/mediaplayer.cxx index caab783c6a7c..b476f9a2ef41 100644 --- a/avmedia/source/framework/mediaplayer.cxx +++ b/avmedia/source/framework/mediaplayer.cxx @@ -45,7 +45,7 @@ namespace avmedia // - MediaPlayer - // --------------- -MediaPlayer::MediaPlayer( Window* _pParent, USHORT nId, SfxBindings* _pBindings, SfxChildWinInfo* pInfo ) : +MediaPlayer::MediaPlayer( Window* _pParent, sal_uInt16 nId, SfxBindings* _pBindings, SfxChildWinInfo* pInfo ) : SfxChildWindow( _pParent, nId ) { pWindow = new MediaFloater( _pBindings, this, _pParent ); diff --git a/avmedia/source/framework/mediatoolbox.cxx b/avmedia/source/framework/mediatoolbox.cxx index 2da70b056bfc..74bacb3861f0 100644 --- a/avmedia/source/framework/mediatoolbox.cxx +++ b/avmedia/source/framework/mediatoolbox.cxx @@ -95,7 +95,7 @@ SFX_IMPL_TOOLBOX_CONTROL( ::avmedia::MediaToolBoxControl, ::avmedia::MediaItem ) // ----------------------------------------------------------------------------- -MediaToolBoxControl::MediaToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) : +MediaToolBoxControl::MediaToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ) { rTbx.Invalidate(); @@ -109,7 +109,7 @@ MediaToolBoxControl::~MediaToolBoxControl() // ----------------------------------------------------------------------------- -void MediaToolBoxControl::StateChanged( USHORT /* nSID */, SfxItemState eState, const SfxPoolItem* pState ) +void MediaToolBoxControl::StateChanged( sal_uInt16 /* nSID */, SfxItemState eState, const SfxPoolItem* pState ) { MediaToolBoxControl_Impl* pCtrl = static_cast< MediaToolBoxControl_Impl* >( GetToolBox().GetItemWindow( GetId() ) ); diff --git a/avmedia/source/viewer/mediaevent_impl.cxx b/avmedia/source/viewer/mediaevent_impl.cxx index cf86f54df8f9..72941cd6a78e 100644 --- a/avmedia/source/viewer/mediaevent_impl.cxx +++ b/avmedia/source/viewer/mediaevent_impl.cxx @@ -117,7 +117,7 @@ void SAL_CALL MediaEventListenersImpl::mousePressed( const ::com::sun::star::awt if( mpNotifyWindow ) { MouseEvent aVCLMouseEvt( Point( e.X, e.Y ), - sal::static_int_cast< USHORT >(e.ClickCount), + sal::static_int_cast< sal_uInt16 >(e.ClickCount), 0, ( ( e.Buttons & 1 ) ? MOUSE_LEFT : 0 ) | ( ( e.Buttons & 2 ) ? MOUSE_RIGHT : 0 ) | @@ -138,7 +138,7 @@ void SAL_CALL MediaEventListenersImpl::mouseReleased( const ::com::sun::star::aw if( mpNotifyWindow ) { MouseEvent aVCLMouseEvt( Point( e.X, e.Y ), - sal::static_int_cast< USHORT >(e.ClickCount), + sal::static_int_cast< sal_uInt16 >(e.ClickCount), 0, ( ( e.Buttons & 1 ) ? MOUSE_LEFT : 0 ) | ( ( e.Buttons & 2 ) ? MOUSE_RIGHT : 0 ) | diff --git a/avmedia/source/win/interface.hxx b/avmedia/source/win/interface.hxx index a5928139e7a7..cf45bb40ab9a 100644 --- a/avmedia/source/win/interface.hxx +++ b/avmedia/source/win/interface.hxx @@ -90,7 +90,7 @@ public: IMediaSample *pSample) = 0; virtual HRESULT __stdcall BufferCB( double SampleTime, - WIN_BYTE *pBuffer, + BYTE *pBuffer, long BufferLen) = 0; }; @@ -103,13 +103,13 @@ ISampleGrabber : public IUnknown { public: virtual HRESULT __stdcall SetOneShot( - WIN_BOOL OneShot) = 0; + BOOL OneShot) = 0; virtual HRESULT __stdcall SetMediaType( const AM_MEDIA_TYPE *pType) = 0; virtual HRESULT __stdcall GetConnectedMediaType( AM_MEDIA_TYPE *pType) = 0; virtual HRESULT __stdcall SetBufferSamples( - WIN_BOOL BufferThem) = 0; + BOOL BufferThem) = 0; virtual HRESULT __stdcall GetCurrentBuffer( long *pBufferSize, long *pBuffer) = 0; |