diff options
| author | Noel Grandin <noel@peralex.com> | 2015-07-17 10:50:48 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-07-17 10:21:15 +0000 |
| commit | 40da0a9d1cea08fae38c6bc478d1a69f8faaf627 (patch) | |
| tree | d514ddb5e51af23e7978d9133a13a24ab27427f0 /avmedia/source/opengl | |
| parent | 0f732c41bc4edd7075ff68a81c0ca299e3e913c9 (diff) | |
com::sun::uno->css in avmedia and animations
Change-Id: Ie4365a488728c39fedacae7650b4b90260e7e44a
Reviewed-on: https://gerrit.libreoffice.org/17153
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'avmedia/source/opengl')
| -rw-r--r-- | avmedia/source/opengl/oglmanager.hxx | 12 | ||||
| -rw-r--r-- | avmedia/source/opengl/oglplayer.cxx | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/avmedia/source/opengl/oglmanager.hxx b/avmedia/source/opengl/oglmanager.hxx index 05dc96152aed..8b7766198cbf 100644 --- a/avmedia/source/opengl/oglmanager.hxx +++ b/avmedia/source/opengl/oglmanager.hxx @@ -22,19 +22,19 @@ class OGLManager : public ::cppu::WeakImplHelper< com::sun::star::media::XManage { public: - explicit OGLManager( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rMgr ); + explicit OGLManager( const css::uno::Reference< css::lang::XMultiServiceFactory >& rMgr ); virtual ~OGLManager(); // XManager - virtual ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > SAL_CALL createPlayer( const OUString& rURL ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const OUString& rURL ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xMgr; + css::uno::Reference< css::lang::XMultiServiceFactory > m_xMgr; }; } // namespace ogl diff --git a/avmedia/source/opengl/oglplayer.cxx b/avmedia/source/opengl/oglplayer.cxx index 75caec60ae92..446723f0016e 100644 --- a/avmedia/source/opengl/oglplayer.cxx +++ b/avmedia/source/opengl/oglplayer.cxx @@ -184,7 +184,7 @@ void SAL_CALL OGLPlayer::setMediaTime( double fTime ) throw ( uno::RuntimeExcept gltf_animation_set_time(m_pHandle, fTime); } -double SAL_CALL OGLPlayer::getMediaTime() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) +double SAL_CALL OGLPlayer::getMediaTime() throw ( css::uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard(m_aMutex); assert(m_pHandle); @@ -338,7 +338,7 @@ uno::Reference< media::XFrameGrabber > SAL_CALL OGLPlayer::createFrameGrabber() } OUString SAL_CALL OGLPlayer::getImplementationName() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) + throw ( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.avmedia.Player_OpenGL"); } |