From 40da0a9d1cea08fae38c6bc478d1a69f8faaf627 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 17 Jul 2015 10:50:48 +0200 Subject: com::sun::uno->css in avmedia and animations Change-Id: Ie4365a488728c39fedacae7650b4b90260e7e44a Reviewed-on: https://gerrit.libreoffice.org/17153 Reviewed-by: Noel Grandin Tested-by: Noel Grandin --- avmedia/source/win/framegrabber.hxx | 18 ++++----- avmedia/source/win/manager.hxx | 16 ++++---- avmedia/source/win/player.hxx | 44 ++++++++++----------- avmedia/source/win/window.cxx | 8 ++-- avmedia/source/win/window.hxx | 78 ++++++++++++++++++------------------- 5 files changed, 82 insertions(+), 82 deletions(-) (limited to 'avmedia/source/win') diff --git a/avmedia/source/win/framegrabber.hxx b/avmedia/source/win/framegrabber.hxx index eb8fc01918de..98dc0cc78d1c 100644 --- a/avmedia/source/win/framegrabber.hxx +++ b/avmedia/source/win/framegrabber.hxx @@ -32,28 +32,28 @@ namespace avmedia { namespace win { // - FrameGrabber - -class FrameGrabber : public ::cppu::WeakImplHelper< ::com::sun::star::media::XFrameGrabber, - ::com::sun::star::lang::XServiceInfo > +class FrameGrabber : public ::cppu::WeakImplHelper< css::media::XFrameGrabber, + css::lang::XServiceInfo > { public: - explicit FrameGrabber( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr ); + explicit FrameGrabber( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxMgr ); ~FrameGrabber(); bool create( const OUString& rURL ); // XFrameGrabber - virtual ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) throw (::com::sun::star::uno::RuntimeException); + virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) throw (css::uno::RuntimeException); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException); + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException); private: - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMgr; - OUString maURL; + css::uno::Reference< css::lang::XMultiServiceFactory > mxMgr; + OUString maURL; IMediaDet* implCreateMediaDet( const OUString& rURL ) const; }; diff --git a/avmedia/source/win/manager.hxx b/avmedia/source/win/manager.hxx index 88ebaaf46b47..9f309c750c10 100644 --- a/avmedia/source/win/manager.hxx +++ b/avmedia/source/win/manager.hxx @@ -30,24 +30,24 @@ namespace avmedia { namespace win { -class Manager : public ::cppu::WeakImplHelper< ::com::sun::star::media::XManager, - ::com::sun::star::lang::XServiceInfo > +class Manager : public ::cppu::WeakImplHelper< css::media::XManager, + css::lang::XServiceInfo > { public: - explicit Manager( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr ); + explicit Manager( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxMgr ); ~Manager(); // XManager - virtual ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > SAL_CALL createPlayer( const OUString& aURL ) throw (::com::sun::star::uno::RuntimeException); + virtual css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const OUString& aURL ) throw (css::uno::RuntimeException); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException); + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException); private: - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMgr; + css::uno::Reference< css::lang::XMultiServiceFactory > mxMgr; }; } // namespace win diff --git a/avmedia/source/win/player.hxx b/avmedia/source/win/player.hxx index 481e2c36360c..79287bbb59d8 100644 --- a/avmedia/source/win/player.hxx +++ b/avmedia/source/win/player.hxx @@ -46,15 +46,15 @@ namespace avmedia { namespace win { // - Player - -typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::media::XPlayer, - ::com::sun::star::lang::XServiceInfo > Player_BASE; +typedef ::cppu::WeakComponentImplHelper< css::media::XPlayer, + css::lang::XServiceInfo > Player_BASE; class Player : public cppu::BaseMutex, public Player_BASE { public: - explicit Player( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr ); + explicit Player( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxMgr ); ~Player(); bool create( const OUString& rURL ); @@ -65,33 +65,33 @@ public: const IVideoWindow* getVideoWindow() const; // XPlayer - virtual void SAL_CALL start( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL stop( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isPlaying( ) throw (::com::sun::star::uno::RuntimeException); - virtual double SAL_CALL getDuration( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setMediaTime( double fTime ) throw (::com::sun::star::uno::RuntimeException); - virtual double SAL_CALL getMediaTime( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isPlaybackLoop( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setMute( sal_Bool bSet ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isMute( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setVolumeDB( sal_Int16 nVolumeDB ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getVolumeDB( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Size SAL_CALL getPreferredPlayerWindowSize( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayerWindow > SAL_CALL createPlayerWindow( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::media::XFrameGrabber > SAL_CALL createFrameGrabber( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL start( ) throw (css::uno::RuntimeException); + virtual void SAL_CALL stop( ) throw (css::uno::RuntimeException); + virtual sal_Bool SAL_CALL isPlaying( ) throw (css::uno::RuntimeException); + virtual double SAL_CALL getDuration( ) throw (css::uno::RuntimeException); + virtual void SAL_CALL setMediaTime( double fTime ) throw (css::uno::RuntimeException); + virtual double SAL_CALL getMediaTime( ) throw (css::uno::RuntimeException); + virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) throw (css::uno::RuntimeException); + virtual sal_Bool SAL_CALL isPlaybackLoop( ) throw (css::uno::RuntimeException); + virtual void SAL_CALL setMute( sal_Bool bSet ) throw (css::uno::RuntimeException); + virtual sal_Bool SAL_CALL isMute( ) throw (css::uno::RuntimeException); + virtual void SAL_CALL setVolumeDB( sal_Int16 nVolumeDB ) throw (css::uno::RuntimeException); + virtual sal_Int16 SAL_CALL getVolumeDB( ) throw (css::uno::RuntimeException); + virtual css::awt::Size SAL_CALL getPreferredPlayerWindowSize( ) throw (css::uno::RuntimeException); + virtual css::uno::Reference< css::media::XPlayerWindow > SAL_CALL createPlayerWindow( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::RuntimeException); + virtual css::uno::Reference< css::media::XFrameGrabber > SAL_CALL createFrameGrabber( ) throw (css::uno::RuntimeException); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException); + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException); // ::cppu::OComponentHelper virtual void SAL_CALL disposing(); private: - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMgr; + css::uno::Reference< css::lang::XMultiServiceFactory > mxMgr; OUString maURL; IGraphBuilder* mpGB; diff --git a/avmedia/source/win/window.cxx b/avmedia/source/win/window.cxx index c6823db8cd56..1c1660c54a9d 100644 --- a/avmedia/source/win/window.cxx +++ b/avmedia/source/win/window.cxx @@ -530,7 +530,7 @@ void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventLis maListeners.removeInterface( cppu::UnoType::get(), xListener ); } -void Window::fireMousePressedEvent( const ::com::sun::star::awt::MouseEvent& rEvt ) +void Window::fireMousePressedEvent( const css::awt::MouseEvent& rEvt ) { ::cppu::OInterfaceContainerHelper* pContainer = maListeners.getContainer( cppu::UnoType::get()); @@ -543,7 +543,7 @@ void Window::fireMousePressedEvent( const ::com::sun::star::awt::MouseEvent& rEv } } -void Window::fireMouseReleasedEvent( const ::com::sun::star::awt::MouseEvent& rEvt ) +void Window::fireMouseReleasedEvent( const css::awt::MouseEvent& rEvt ) { ::cppu::OInterfaceContainerHelper* pContainer = maListeners.getContainer( cppu::UnoType::get()); @@ -556,7 +556,7 @@ void Window::fireMouseReleasedEvent( const ::com::sun::star::awt::MouseEvent& rE } } -void Window::fireMouseMovedEvent( const ::com::sun::star::awt::MouseEvent& rEvt ) +void Window::fireMouseMovedEvent( const css::awt::MouseEvent& rEvt ) { ::cppu::OInterfaceContainerHelper* pContainer = maListeners.getContainer( cppu::UnoType::get()); @@ -569,7 +569,7 @@ void Window::fireMouseMovedEvent( const ::com::sun::star::awt::MouseEvent& rEvt } } -void Window::fireSetFocusEvent( const ::com::sun::star::awt::FocusEvent& rEvt ) +void Window::fireSetFocusEvent( const css::awt::FocusEvent& rEvt ) { ::cppu::OInterfaceContainerHelper* pContainer = maListeners.getContainer( cppu::UnoType::get()); diff --git a/avmedia/source/win/window.hxx b/avmedia/source/win/window.hxx index ff9f434ad3b7..79f183283610 100644 --- a/avmedia/source/win/window.hxx +++ b/avmedia/source/win/window.hxx @@ -36,70 +36,70 @@ namespace avmedia { namespace win { class Player; -class Window : public ::cppu::WeakImplHelper< ::com::sun::star::media::XPlayerWindow, - ::com::sun::star::lang::XServiceInfo > +class Window : public ::cppu::WeakImplHelper< css::media::XPlayerWindow, + css::lang::XServiceInfo > { public: - Window( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr, + Window( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxMgr, Player& rPlayer ); ~Window(); - bool create( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ); + bool create( const css::uno::Sequence< css::uno::Any >& aArguments ); void processGraphEvent(); void updatePointer(); // XPlayerWindow - virtual void SAL_CALL update( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL setZoomLevel( ::com::sun::star::media::ZoomLevel ZoomLevel ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::media::ZoomLevel SAL_CALL getZoomLevel( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPointerType( sal_Int32 nPointerType ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL update( ) throw (css::uno::RuntimeException); + virtual sal_Bool SAL_CALL setZoomLevel( css::media::ZoomLevel ZoomLevel ) throw (css::uno::RuntimeException); + virtual css::media::ZoomLevel SAL_CALL getZoomLevel( ) throw (css::uno::RuntimeException); + virtual void SAL_CALL setPointerType( sal_Int32 nPointerType ) throw (css::uno::RuntimeException); // XWindow - virtual void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Rectangle SAL_CALL getPosSize( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setVisible( sal_Bool Visible ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setEnable( sal_Bool Enable ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFocus( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw (css::uno::RuntimeException); + virtual css::awt::Rectangle SAL_CALL getPosSize( ) throw (css::uno::RuntimeException); + virtual void SAL_CALL setVisible( sal_Bool Visible ) throw (css::uno::RuntimeException); + virtual void SAL_CALL setEnable( sal_Bool Enable ) throw (css::uno::RuntimeException); + virtual void SAL_CALL setFocus( ) throw (css::uno::RuntimeException); + virtual void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException); + virtual void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException); + virtual void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException); + virtual void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException); + virtual void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException); + virtual void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException); + virtual void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException); + virtual void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException); + virtual void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException); + virtual void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException); + virtual void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException); + virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException); // XComponent - virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL dispose( ) throw (css::uno::RuntimeException); + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException); + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException); + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException); public: - void fireMousePressedEvent( const ::com::sun::star::awt::MouseEvent& rEvt ); - void fireMouseReleasedEvent( const ::com::sun::star::awt::MouseEvent& rEvt ); - void fireMouseMovedEvent( const ::com::sun::star::awt::MouseEvent& rEvt ); - void fireKeyPressedEvent( const ::com::sun::star::awt::KeyEvent& rEvt ); - void fireKeyReleasedEvent( const ::com::sun::star::awt::KeyEvent& rEvt ); - void fireSetFocusEvent( const ::com::sun::star::awt::FocusEvent& rEvt ); + void fireMousePressedEvent( const css::awt::MouseEvent& rEvt ); + void fireMouseReleasedEvent( const css::awt::MouseEvent& rEvt ); + void fireMouseMovedEvent( const css::awt::MouseEvent& rEvt ); + void fireKeyPressedEvent( const css::awt::KeyEvent& rEvt ); + void fireKeyReleasedEvent( const css::awt::KeyEvent& rEvt ); + void fireSetFocusEvent( const css::awt::FocusEvent& rEvt ); private: - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMgr; + css::uno::Reference< css::lang::XMultiServiceFactory > mxMgr; ::osl::Mutex maMutex; ::cppu::OMultiTypeInterfaceContainerHelper maListeners; - ::com::sun::star::media::ZoomLevel meZoomLevel; + css::media::ZoomLevel meZoomLevel; Player& mrPlayer; int mnFrameWnd; int mnParentWnd; -- cgit