mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removetooltypes01: #i112600# remove tooltypes from avmedia

Browse Source
This commit is contained in:
Mikhail Voytenko
2011-01-13 12:36:39 +01:00
parent 0cb5080d65
commit 5d46e270c3
9 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
avmedia/inc/avmedia/mediaitem.hxx
View File

@@ -71,7 +71,7 @@ class MediaItem : public SfxPoolItem
public: public:
TYPEINFO(); 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 ); MediaItem( const MediaItem& rMediaItem );
virtual ~MediaItem(); virtual ~MediaItem();
@@ -82,8 +82,8 @@ public:
SfxMapUnit ePresUnit, SfxMapUnit ePresUnit,
XubString& rText, XubString& rText,
const IntlWrapper *pIntl ) const; const IntlWrapper *pIntl ) const;
virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
void merge( const MediaItem& rMediaItem ); void merge( const MediaItem& rMediaItem );

2
avmedia/inc/avmedia/mediaplayer.hxx
View File

@@ -52,7 +52,7 @@ namespace avmedia
class MediaPlayer : public SfxChildWindow class MediaPlayer : public SfxChildWindow
{ {
public: public:
MediaPlayer( Window*, USHORT, SfxBindings*, SfxChildWinInfo* ); MediaPlayer( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* );
~MediaPlayer(); ~MediaPlayer();
SFX_DECL_CHILDWINDOW( MediaPlayer ); SFX_DECL_CHILDWINDOW( MediaPlayer );

4
avmedia/inc/avmedia/mediatoolbox.hxx
View File

@@ -48,10 +48,10 @@ public:
SFX_DECL_TOOLBOX_CONTROL(); SFX_DECL_TOOLBOX_CONTROL();
MediaToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbX ); MediaToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbX );
~MediaToolBoxControl(); ~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 ); virtual Window* CreateItemWindow( Window* pParent );
private: private:

12
avmedia/source/framework/mediacontrol.cxx
View File

@@ -86,7 +86,7 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) :
const String aTimeText( RTL_CONSTASCII_USTRINGPARAM( " 00:00:00/00:00:00 " ) ); const String aTimeText( RTL_CONSTASCII_USTRINGPARAM( " 00:00:00/00:00:00 " ) );
SetBackground(); SetBackground();
SetPaintTransparent( TRUE ); SetPaintTransparent( sal_True );
SetParentClipMode( PARENTCLIPMODE_NOCLIP ); SetParentClipMode( PARENTCLIPMODE_NOCLIP );
if( MEDIACONTROLSTYLE_SINGLELINE != meControlStyle ) if( MEDIACONTROLSTYLE_SINGLELINE != meControlStyle )
@@ -104,11 +104,11 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) :
mpZoomListBox->SetBackground(); mpZoomListBox->SetBackground();
maZoomToolBox.SetBackground(); maZoomToolBox.SetBackground();
maZoomToolBox.SetPaintTransparent( TRUE ); maZoomToolBox.SetPaintTransparent( sal_True );
maPlayToolBox.SetBackground(); maPlayToolBox.SetBackground();
maPlayToolBox.SetPaintTransparent( TRUE ); maPlayToolBox.SetPaintTransparent( sal_True );
maMuteToolBox.SetBackground(); maMuteToolBox.SetBackground();
maMuteToolBox.SetPaintTransparent( TRUE ); maMuteToolBox.SetPaintTransparent( sal_True );
} }
@@ -362,7 +362,7 @@ void MediaControl::implUpdateToolboxes()
if( !mpZoomListBox->IsTravelSelect() && !mpZoomListBox->IsInDropDown() ) if( !mpZoomListBox->IsTravelSelect() && !mpZoomListBox->IsInDropDown() )
{ {
USHORT nSelectEntryPos ; sal_uInt16 nSelectEntryPos ;
switch( maItem.getZoom() ) switch( maItem.getZoom() )
{ {
@@ -454,7 +454,7 @@ void MediaControl::implUpdateTimeField( double fCurTime )
Image MediaControl::implGetImage( sal_Int32 nImageId ) const Image MediaControl::implGetImage( sal_Int32 nImageId ) const
{ {
return maImageList.GetImage( static_cast< USHORT >( nImageId ) ); return maImageList.GetImage( static_cast< sal_uInt16 >( nImageId ) );
} }
// ------------------------------------------------------------------------------ // ------------------------------------------------------------------------------

8
avmedia/source/framework/mediaitem.cxx
View File

@@ -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 ), SfxPoolItem( _nWhich ),
mnMaskSet( nMaskSet ), mnMaskSet( nMaskSet ),
meState( MEDIASTATE_STOP ), 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 ); 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; uno::Sequence< uno::Any > aSeq;
BOOL bRet = false; sal_Bool bRet = false;
if( ( rVal >>= aSeq ) && ( aSeq.getLength() == 9 ) ) if( ( rVal >>= aSeq ) && ( aSeq.getLength() == 9 ) )
{ {

2
avmedia/source/framework/mediaplayer.cxx
View File

@@ -45,7 +45,7 @@ namespace avmedia
// - MediaPlayer - // - 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 ) SfxChildWindow( _pParent, nId )
{ {
pWindow = new MediaFloater( _pBindings, this, _pParent ); pWindow = new MediaFloater( _pBindings, this, _pParent );

4
avmedia/source/framework/mediatoolbox.cxx
View File

@@ -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 ) SfxToolBoxControl( nSlotId, nId, rTbx )
{ {
rTbx.Invalidate(); 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() ) ); MediaToolBoxControl_Impl* pCtrl = static_cast< MediaToolBoxControl_Impl* >( GetToolBox().GetItemWindow( GetId() ) );

4
avmedia/source/viewer/mediaevent_impl.cxx
View File

@@ -117,7 +117,7 @@ void SAL_CALL MediaEventListenersImpl::mousePressed( const ::com::sun::star::awt
if( mpNotifyWindow ) if( mpNotifyWindow )
{ {
MouseEvent aVCLMouseEvt( Point( e.X, e.Y ), MouseEvent aVCLMouseEvt( Point( e.X, e.Y ),
sal::static_int_cast< USHORT >(e.ClickCount), sal::static_int_cast< sal_uInt16 >(e.ClickCount),
0, 0,
( ( e.Buttons & 1 ) ? MOUSE_LEFT : 0 ) | ( ( e.Buttons & 1 ) ? MOUSE_LEFT : 0 ) |
( ( e.Buttons & 2 ) ? MOUSE_RIGHT : 0 ) | ( ( e.Buttons & 2 ) ? MOUSE_RIGHT : 0 ) |
@@ -138,7 +138,7 @@ void SAL_CALL MediaEventListenersImpl::mouseReleased( const ::com::sun::star::aw
if( mpNotifyWindow ) if( mpNotifyWindow )
{ {
MouseEvent aVCLMouseEvt( Point( e.X, e.Y ), MouseEvent aVCLMouseEvt( Point( e.X, e.Y ),
sal::static_int_cast< USHORT >(e.ClickCount), sal::static_int_cast< sal_uInt16 >(e.ClickCount),
0, 0,
( ( e.Buttons & 1 ) ? MOUSE_LEFT : 0 ) | ( ( e.Buttons & 1 ) ? MOUSE_LEFT : 0 ) |
( ( e.Buttons & 2 ) ? MOUSE_RIGHT : 0 ) | ( ( e.Buttons & 2 ) ? MOUSE_RIGHT : 0 ) |

6
avmedia/source/win/interface.hxx
View File

@@ -90,7 +90,7 @@ public:
IMediaSample *pSample) = 0; IMediaSample *pSample) = 0;
virtual HRESULT __stdcall BufferCB( virtual HRESULT __stdcall BufferCB(
double SampleTime, double SampleTime,
WIN_BYTE *pBuffer, BYTE *pBuffer,
long BufferLen) = 0; long BufferLen) = 0;
}; };
@@ -103,13 +103,13 @@ ISampleGrabber : public IUnknown
{ {
public: public:
virtual HRESULT __stdcall SetOneShot( virtual HRESULT __stdcall SetOneShot(
WIN_BOOL OneShot) = 0; BOOL OneShot) = 0;
virtual HRESULT __stdcall SetMediaType( virtual HRESULT __stdcall SetMediaType(
const AM_MEDIA_TYPE *pType) = 0; const AM_MEDIA_TYPE *pType) = 0;
virtual HRESULT __stdcall GetConnectedMediaType( virtual HRESULT __stdcall GetConnectedMediaType(
AM_MEDIA_TYPE *pType) = 0; AM_MEDIA_TYPE *pType) = 0;
virtual HRESULT __stdcall SetBufferSamples( virtual HRESULT __stdcall SetBufferSamples(
WIN_BOOL BufferThem) = 0; BOOL BufferThem) = 0;
virtual HRESULT __stdcall GetCurrentBuffer( virtual HRESULT __stdcall GetCurrentBuffer(
long *pBufferSize, long *pBufferSize,
long *pBuffer) = 0; long *pBuffer) = 0;