summaryrefslogtreecommitdiff
path: root/avmedia/source/vlc
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-07-17 10:50:48 +0200
committerNoel Grandin <noelgrandin@gmail.com>2015-07-17 10:21:15 +0000
commit40da0a9d1cea08fae38c6bc478d1a69f8faaf627 (patch)
treed514ddb5e51af23e7978d9133a13a24ab27427f0 /avmedia/source/vlc
parent0f732c41bc4edd7075ff68a81c0ca299e3e913c9 (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/vlc')
-rw-r--r--avmedia/source/vlc/vlcframegrabber.cxx8
-rw-r--r--avmedia/source/vlc/vlcframegrabber.hxx16
-rw-r--r--avmedia/source/vlc/vlcmanager.hxx22
-rw-r--r--avmedia/source/vlc/vlcplayer.cxx38
-rw-r--r--avmedia/source/vlc/vlcplayer.hxx62
-rw-r--r--avmedia/source/vlc/vlcwindow.hxx54
6 files changed, 100 insertions, 100 deletions
diff --git a/avmedia/source/vlc/vlcframegrabber.cxx b/avmedia/source/vlc/vlcframegrabber.cxx
index bc5d03d7f1c0..9783349f81e6 100644
--- a/avmedia/source/vlc/vlcframegrabber.cxx
+++ b/avmedia/source/vlc/vlcframegrabber.cxx
@@ -67,7 +67,7 @@ VLCFrameGrabber::VLCFrameGrabber( wrapper::EventHandler& eh, const rtl::OUString
}
::uno::Reference< css::graphic::XGraphic > SAL_CALL VLCFrameGrabber::grabFrame( double fMediaTime )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception )
+ throw ( css::uno::RuntimeException, std::exception )
{
osl::Condition condition;
@@ -114,19 +114,19 @@ VLCFrameGrabber::VLCFrameGrabber( wrapper::EventHandler& eh, const rtl::OUString
return Graphic( bitmap ).GetXGraphic();
}
-::rtl::OUString SAL_CALL VLCFrameGrabber::getImplementationName() throw ( ::com::sun::star::uno::RuntimeException, std::exception )
+::rtl::OUString SAL_CALL VLCFrameGrabber::getImplementationName() throw ( css::uno::RuntimeException, std::exception )
{
return AVMEDIA_VLC_GRABBER_IMPLEMENTATIONNAME;
}
sal_Bool SAL_CALL VLCFrameGrabber::supportsService( const ::rtl::OUString& serviceName )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception )
+ throw ( css::uno::RuntimeException, std::exception )
{
return cppu::supportsService(this, serviceName);
}
::uno::Sequence< ::rtl::OUString > SAL_CALL VLCFrameGrabber::getSupportedServiceNames()
- throw ( ::com::sun::star::uno::RuntimeException, std::exception )
+ throw ( css::uno::RuntimeException, std::exception )
{
::uno::Sequence< OUString > aRet(1);
aRet[0] = AVMEDIA_VLC_GRABBER_SERVICENAME;
diff --git a/avmedia/source/vlc/vlcframegrabber.hxx b/avmedia/source/vlc/vlcframegrabber.hxx
index 493a695a733c..83fd08aae496 100644
--- a/avmedia/source/vlc/vlcframegrabber.hxx
+++ b/avmedia/source/vlc/vlcframegrabber.hxx
@@ -29,8 +29,8 @@
namespace avmedia {
namespace vlc {
-typedef ::cppu::WeakImplHelper< ::com::sun::star::media::XFrameGrabber,
- ::com::sun::star::lang::XServiceInfo > FrameGrabber_BASE;
+typedef ::cppu::WeakImplHelper< css::media::XFrameGrabber,
+ css::lang::XServiceInfo > FrameGrabber_BASE;
class VLCFrameGrabber : public FrameGrabber_BASE
{
@@ -41,15 +41,15 @@ class VLCFrameGrabber : public FrameGrabber_BASE
public:
VLCFrameGrabber( wrapper::EventHandler& eh, const rtl::OUString& url );
- ::com::sun::star::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ css::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime )
+ throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
::rtl::OUString SAL_CALL getImplementationName()
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsService( const ::rtl::OUString& serviceName )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
+ throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
};
}
diff --git a/avmedia/source/vlc/vlcmanager.hxx b/avmedia/source/vlc/vlcmanager.hxx
index 52d76756e010..5545aea3229e 100644
--- a/avmedia/source/vlc/vlcmanager.hxx
+++ b/avmedia/source/vlc/vlcmanager.hxx
@@ -28,26 +28,26 @@
namespace avmedia {
namespace vlc {
-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 >
{
std::unique_ptr<wrapper::Instance> mInstance;
wrapper::EventHandler mEventHandler;
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 );
virtual ~Manager();
- ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > SAL_CALL createPlayer( const rtl::OUString& aURL ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const rtl::OUString& aURL ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- sal_Bool SAL_CALL supportsService( const rtl::OUString& serviceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ rtl::OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ sal_Bool SAL_CALL supportsService( const rtl::OUString& serviceName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMgr;
- ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > mPlayer;
- rtl::OUString mURL;
- bool m_is_vlc_found;
+ css::uno::Reference< css::lang::XMultiServiceFactory > mxMgr;
+ css::uno::Reference< css::media::XPlayer > mPlayer;
+ rtl::OUString mURL;
+ bool m_is_vlc_found;
};
}
diff --git a/avmedia/source/vlc/vlcplayer.cxx b/avmedia/source/vlc/vlcplayer.cxx
index a8437b2ac6b1..89e99815efb1 100644
--- a/avmedia/source/vlc/vlcplayer.cxx
+++ b/avmedia/source/vlc/vlcplayer.cxx
@@ -66,7 +66,7 @@ unsigned VLCPlayer::getHeight() const
return mPlayer.getHeight();
}
-void SAL_CALL VLCPlayer::start() throw ( ::com::sun::star::uno::RuntimeException, std::exception )
+void SAL_CALL VLCPlayer::start() throw ( css::uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard(m_aMutex);
if (!mPlayer.play())
@@ -75,19 +75,19 @@ void SAL_CALL VLCPlayer::start() throw ( ::com::sun::star::uno::RuntimeException
}
}
-void SAL_CALL VLCPlayer::stop() throw ( ::com::sun::star::uno::RuntimeException, std::exception )
+void SAL_CALL VLCPlayer::stop() throw ( css::uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard(m_aMutex);
mPlayer.pause();
}
-sal_Bool SAL_CALL VLCPlayer::isPlaying() throw ( ::com::sun::star::uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL VLCPlayer::isPlaying() throw ( css::uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard(m_aMutex);
return mPlayer.isPlaying();
}
-double SAL_CALL VLCPlayer::getDuration() throw ( ::com::sun::star::uno::RuntimeException, std::exception )
+double SAL_CALL VLCPlayer::getDuration() throw ( css::uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard(m_aMutex);
return static_cast<double>( mMedia.getDuration() ) / MS_IN_SEC;
@@ -99,7 +99,7 @@ void SAL_CALL VLCPlayer::setScale( float factor )
mPlayer.setScale( factor );
}
-void SAL_CALL VLCPlayer::setMediaTime( double fTime ) throw ( ::com::sun::star::uno::RuntimeException, std::exception )
+void SAL_CALL VLCPlayer::setMediaTime( double fTime ) throw ( css::uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard(m_aMutex);
if ( fTime < 0.00000001 && !mPlayer.isPlaying() )
@@ -110,7 +110,7 @@ void SAL_CALL VLCPlayer::setMediaTime( double fTime ) throw ( ::com::sun::star::
mPlayer.setTime( fTime * MS_IN_SEC );
}
-double SAL_CALL VLCPlayer::getMediaTime() throw ( ::com::sun::star::uno::RuntimeException, std::exception )
+double SAL_CALL VLCPlayer::getMediaTime() throw ( css::uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard(m_aMutex);
return static_cast<double>( mPlayer.getTime() ) / MS_IN_SEC;
@@ -124,7 +124,7 @@ void VLCPlayer::replay()
start();
}
-void SAL_CALL VLCPlayer::setPlaybackLoop( sal_Bool bSet ) throw ( ::com::sun::star::uno::RuntimeException, std::exception )
+void SAL_CALL VLCPlayer::setPlaybackLoop( sal_Bool bSet ) throw ( css::uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard(m_aMutex);
mPlaybackLoop = bSet;
@@ -135,37 +135,37 @@ void SAL_CALL VLCPlayer::setPlaybackLoop( sal_Bool bSet ) throw ( ::com::sun::st
mEventManager.onEndReached();
}
-sal_Bool SAL_CALL VLCPlayer::isPlaybackLoop() throw ( ::com::sun::star::uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL VLCPlayer::isPlaybackLoop() throw ( css::uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard(m_aMutex);
return mPlaybackLoop;
}
-void SAL_CALL VLCPlayer::setVolumeDB( ::sal_Int16 nDB ) throw ( ::com::sun::star::uno::RuntimeException, std::exception )
+void SAL_CALL VLCPlayer::setVolumeDB( ::sal_Int16 nDB ) throw ( css::uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard(m_aMutex);
mPlayer.setVolume( static_cast<sal_Int16>( ( nDB + 40 ) * 10.0 / 4 ) );
}
-::sal_Int16 SAL_CALL VLCPlayer::getVolumeDB() throw ( ::com::sun::star::uno::RuntimeException, std::exception )
+::sal_Int16 SAL_CALL VLCPlayer::getVolumeDB() throw ( css::uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard(m_aMutex);
return static_cast<sal_Int16>( mPlayer.getVolume() / 10.0 * 4 - 40 );
}
-void SAL_CALL VLCPlayer::setMute( sal_Bool bSet ) throw ( ::com::sun::star::uno::RuntimeException, std::exception )
+void SAL_CALL VLCPlayer::setMute( sal_Bool bSet ) throw ( css::uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard(m_aMutex);
mPlayer.setMute( bSet );
}
-sal_Bool SAL_CALL VLCPlayer::isMute() throw ( ::com::sun::star::uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL VLCPlayer::isMute() throw ( css::uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard(m_aMutex);
return mPlayer.getMute();
}
-css::awt::Size SAL_CALL VLCPlayer::getPreferredPlayerWindowSize() throw ( ::com::sun::star::uno::RuntimeException, std::exception )
+css::awt::Size SAL_CALL VLCPlayer::getPreferredPlayerWindowSize() throw ( css::uno::RuntimeException, std::exception )
{
return css::awt::Size( 480, 360 );
}
@@ -216,7 +216,7 @@ void VLCPlayer::setVideoSize( unsigned width, unsigned height )
}
uno::Reference< css::media::XPlayerWindow > SAL_CALL VLCPlayer::createPlayerWindow( const uno::Sequence< uno::Any >& aArguments )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception )
+ throw ( css::uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -235,11 +235,11 @@ uno::Reference< css::media::XPlayerWindow > SAL_CALL VLCPlayer::createPlayerWind
setWindowID( winID );
}
- return ::com::sun::star::uno::Reference< css::media::XPlayerWindow >( window );
+ return css::uno::Reference< css::media::XPlayerWindow >( window );
}
uno::Reference< css::media::XFrameGrabber > SAL_CALL VLCPlayer::createFrameGrabber()
- throw ( ::com::sun::star::uno::RuntimeException, std::exception )
+ throw ( css::uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard(m_aMutex);
@@ -253,19 +253,19 @@ uno::Reference< css::media::XFrameGrabber > SAL_CALL VLCPlayer::createFrameGrabb
}
::rtl::OUString SAL_CALL VLCPlayer::getImplementationName()
- throw ( ::com::sun::star::uno::RuntimeException, std::exception )
+ throw ( css::uno::RuntimeException, std::exception )
{
return AVMEDIA_VLC_PLAYER_IMPLEMENTATIONNAME;
}
sal_Bool SAL_CALL VLCPlayer::supportsService( const ::rtl::OUString& serviceName )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception )
+ throw ( css::uno::RuntimeException, std::exception )
{
return cppu::supportsService(this, serviceName);
}
::uno::Sequence< ::rtl::OUString > SAL_CALL VLCPlayer::getSupportedServiceNames()
- throw ( ::com::sun::star::uno::RuntimeException, std::exception )
+ throw ( css::uno::RuntimeException, std::exception )
{
uno::Sequence< OUString > aRet(1);
aRet[0] = AVMEDIA_VLC_PLAYER_SERVICENAME;
diff --git a/avmedia/source/vlc/vlcplayer.hxx b/avmedia/source/vlc/vlcplayer.hxx
index 17725b6c9cea..b4d865716a13 100644
--- a/avmedia/source/vlc/vlcplayer.hxx
+++ b/avmedia/source/vlc/vlcplayer.hxx
@@ -33,22 +33,22 @@
namespace avmedia {
namespace vlc {
-typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::media::XPlayer,
- ::com::sun::star::lang::XServiceInfo > VLC_Base;
+typedef ::cppu::WeakComponentImplHelper< css::media::XPlayer,
+ css::lang::XServiceInfo > VLC_Base;
class VLCPlayer : public ::cppu::BaseMutex,
public VLC_Base
{
- wrapper::Instance& mInstance;
+ wrapper::Instance& mInstance;
wrapper::EventHandler& mEventHandler;
- wrapper::Media mMedia;
- wrapper::Player mPlayer;
- wrapper::EventManager mEventManager;
- const rtl::OUString mUrl;
- bool mPlaybackLoop;
- ::com::sun::star::uno::Reference< css::media::XFrameGrabber > mrFrameGrabber;
- intptr_t mPrevWinID;
+ wrapper::Media mMedia;
+ wrapper::Player mPlayer;
+ wrapper::EventManager mEventManager;
+ const rtl::OUString mUrl;
+ bool mPlaybackLoop;
+ css::uno::Reference< css::media::XFrameGrabber > mrFrameGrabber;
+ intptr_t mPrevWinID;
public:
VLCPlayer( const rtl::OUString& url,
wrapper::Instance& instance,
@@ -61,30 +61,30 @@ public:
void SAL_CALL setScale( float factor );
void SAL_CALL setWindowID( const intptr_t windowID );
- void SAL_CALL start() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- void SAL_CALL stop() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- sal_Bool SAL_CALL isPlaying() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- double SAL_CALL getDuration() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- void SAL_CALL setMediaTime( double fTime ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- double SAL_CALL getMediaTime() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- void SAL_CALL setPlaybackLoop( sal_Bool bSet ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- sal_Bool SAL_CALL isPlaybackLoop() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- void SAL_CALL setVolumeDB( ::sal_Int16 nDB ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- ::sal_Int16 SAL_CALL getVolumeDB() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- void SAL_CALL setMute( sal_Bool bSet ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- sal_Bool SAL_CALL isMute() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- css::awt::Size SAL_CALL getPreferredPlayerWindowSize() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- ::com::sun::star::uno::Reference< css::media::XPlayerWindow > SAL_CALL createPlayerWindow( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- ::com::sun::star::uno::Reference< css::media::XFrameGrabber > SAL_CALL createFrameGrabber()
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ void SAL_CALL start() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ void SAL_CALL stop() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ sal_Bool SAL_CALL isPlaying() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ double SAL_CALL getDuration() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ void SAL_CALL setMediaTime( double fTime ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ double SAL_CALL getMediaTime() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ void SAL_CALL setPlaybackLoop( sal_Bool bSet ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ sal_Bool SAL_CALL isPlaybackLoop() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ void SAL_CALL setVolumeDB( ::sal_Int16 nDB ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ ::sal_Int16 SAL_CALL getVolumeDB() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ void SAL_CALL setMute( sal_Bool bSet ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ sal_Bool SAL_CALL isMute() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ css::awt::Size SAL_CALL getPreferredPlayerWindowSize() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ css::uno::Reference< css::media::XPlayerWindow > SAL_CALL createPlayerWindow( const css::uno::Sequence< css::uno::Any >& aArguments )
+ throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ css::uno::Reference< css::media::XFrameGrabber > SAL_CALL createFrameGrabber()
+ throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
::rtl::OUString SAL_CALL getImplementationName()
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsService( const ::rtl::OUString& serviceName )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;;
- ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;;
+ throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;;
+ css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
+ throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;;
private:
void replay();
diff --git a/avmedia/source/vlc/vlcwindow.hxx b/avmedia/source/vlc/vlcwindow.hxx
index 35f2b1ffadb1..b1950de41720 100644
--- a/avmedia/source/vlc/vlcwindow.hxx
+++ b/avmedia/source/vlc/vlcwindow.hxx
@@ -26,13 +26,13 @@ namespace avmedia {
namespace vlc {
class VLCPlayer;
-class VLCWindow : public ::cppu::WeakImplHelper< ::com::sun::star::media::XPlayerWindow,
- ::com::sun::star::lang::XServiceInfo >
+class VLCWindow : public ::cppu::WeakImplHelper< css::media::XPlayerWindow,
+ css::lang::XServiceInfo >
{
- VLCPlayer& mPlayer;
- const intptr_t mPrevWinID;
- ::com::sun::star::media::ZoomLevel meZoomLevel;
- ::com::sun::star::awt::Rectangle mSize;
+ VLCPlayer& mPlayer;
+ const intptr_t mPrevWinID;
+ css::media::ZoomLevel meZoomLevel;
+ css::awt::Rectangle mSize;
public:
VLCWindow( VLCPlayer& player, const intptr_t prevWinID );
virtual ~VLCWindow();
@@ -44,29 +44,29 @@ public:
::rtl::OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsService( const ::rtl::OUString& serviceName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- 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, std::exception) SAL_OVERRIDE;
- ::com::sun::star::awt::Rectangle SAL_CALL getPosSize() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- void SAL_CALL setVisible( sal_Bool Visible ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- void SAL_CALL setEnable( sal_Bool Enable ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- void SAL_CALL setFocus() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- void SAL_CALL addWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- void SAL_CALL removeWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- void SAL_CALL addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- void SAL_CALL removeFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- void SAL_CALL addKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- void SAL_CALL removeKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- void SAL_CALL addMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- void SAL_CALL removeMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- void SAL_CALL addMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- void SAL_CALL removeMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- void SAL_CALL addPaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- void SAL_CALL removePaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ css::awt::Rectangle SAL_CALL getPosSize() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ void SAL_CALL setVisible( sal_Bool Visible ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ void SAL_CALL setEnable( sal_Bool Enable ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ void SAL_CALL setFocus() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
}