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 /avmedia/inc | |
| 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
Diffstat (limited to 'avmedia/inc')
| -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 |
3 files changed, 6 insertions, 6 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: |