[Libreoffice-commits] core.git: animations/source avmedia/source include/animations include/avmedia
Noel Grandin
noel at peralex.com
Fri Jul 17 03:21:42 PDT 2015
animations/source/animcore/animcore.cxx | 70 ++++++++++++------------
avmedia/source/framework/mediacontrol.cxx | 24 ++++----
avmedia/source/framework/mediaitem.cxx | 8 +-
avmedia/source/framework/soundhandler.cxx | 10 +--
avmedia/source/gstreamer/gstframegrabber.hxx | 12 ++--
avmedia/source/gstreamer/gstmanager.hxx | 16 ++---
avmedia/source/gstreamer/gstplayer.hxx | 54 +++++++++---------
avmedia/source/gstreamer/gstwindow.hxx | 66 +++++++++++-----------
avmedia/source/macavf/framegrabber.hxx | 16 ++---
avmedia/source/macavf/manager.hxx | 16 ++---
avmedia/source/macavf/player.hxx | 48 ++++++++--------
avmedia/source/macavf/window.hxx | 64 +++++++++++-----------
avmedia/source/opengl/oglmanager.hxx | 12 ++--
avmedia/source/opengl/oglplayer.cxx | 4 -
avmedia/source/quicktime/framegrabber.hxx | 22 +++----
avmedia/source/quicktime/manager.hxx | 16 ++---
avmedia/source/quicktime/player.hxx | 48 ++++++++--------
avmedia/source/quicktime/player.mm | 2
avmedia/source/quicktime/window.hxx | 64 +++++++++++-----------
avmedia/source/viewer/mediaevent_impl.cxx | 44 +++++++--------
avmedia/source/viewer/mediaevent_impl.hxx | 30 +++++-----
avmedia/source/vlc/vlcframegrabber.cxx | 8 +-
avmedia/source/vlc/vlcframegrabber.hxx | 16 ++---
avmedia/source/vlc/vlcmanager.hxx | 22 +++----
avmedia/source/vlc/vlcplayer.cxx | 38 ++++++-------
avmedia/source/vlc/vlcplayer.hxx | 62 ++++++++++-----------
avmedia/source/vlc/vlcwindow.hxx | 54 +++++++++---------
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 +++++++++++++--------------
include/animations/animationnodehelper.hxx | 19 +++---
include/avmedia/mediawindow.hxx | 8 +-
include/avmedia/modeltools.hxx | 2
35 files changed, 519 insertions(+), 520 deletions(-)
New commits:
commit 40da0a9d1cea08fae38c6bc478d1a69f8faaf627
Author: Noel Grandin <noel at peralex.com>
Date: Fri Jul 17 10:50:48 2015 +0200
com::sun::uno->css in avmedia and animations
Change-Id: Ie4365a488728c39fedacae7650b4b90260e7e44a
Reviewed-on: https://gerrit.libreoffice.org/17153
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
Tested-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/animations/source/animcore/animcore.cxx b/animations/source/animcore/animcore.cxx
old mode 100644
new mode 100755
index 2d23c2b..ec00e38
--- a/animations/source/animcore/animcore.cxx
+++ b/animations/source/animcore/animcore.cxx
@@ -430,7 +430,7 @@ AnimationNode::AnimationNode( sal_Int16 nNodeType )
mnFadeColor(0),
mfVolume(1.0),
mnCommand(0),
- mnIterateType( ::com::sun::star::presentation::ShapeAnimationSubType::AS_WHOLE ),
+ mnIterateType( css::presentation::ShapeAnimationSubType::AS_WHOLE ),
mfIterateInterval(0.0)
{
OSL_ENSURE((sal_uInt32)nNodeType < sizeof(mpTypes)/sizeof(Sequence<Type>*), "NodeType out of range");
@@ -2129,7 +2129,7 @@ namespace
class theAnimationNodeUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theAnimationNodeUnoTunnelId > {};
}
-const ::com::sun::star::uno::Sequence< sal_Int8 > & AnimationNode::getUnoTunnelId()
+const css::uno::Sequence< sal_Int8 > & AnimationNode::getUnoTunnelId()
{
return theAnimationNodeUnoTunnelId::get().getSeq();
}
@@ -2168,79 +2168,79 @@ void AnimationNode::fireChangeListener()
} // namespace animcore
-extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
-com_sun_star_animations_ParallelTimeContainer_get_implementation(::com::sun::star::uno::XComponentContext*,
- ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_animations_ParallelTimeContainer_get_implementation(css::uno::XComponentContext*,
+ css::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new animcore::AnimationNode(PAR));
}
-extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
-com_sun_star_animations_SequenceTimeContainer_get_implementation(::com::sun::star::uno::XComponentContext*,
- ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_animations_SequenceTimeContainer_get_implementation(css::uno::XComponentContext*,
+ css::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new animcore::AnimationNode(SEQ));
}
-extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
-com_sun_star_animations_IterateContainer_get_implementation(::com::sun::star::uno::XComponentContext*,
- ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_animations_IterateContainer_get_implementation(css::uno::XComponentContext*,
+ css::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new animcore::AnimationNode(ITERATE));
}
-extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
-com_sun_star_animations_Animate_get_implementation(::com::sun::star::uno::XComponentContext*,
- ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_animations_Animate_get_implementation(css::uno::XComponentContext*,
+ css::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new animcore::AnimationNode(ANIMATE));
}
-extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
-com_sun_star_animations_AnimateSet_get_implementation(::com::sun::star::uno::XComponentContext*,
- ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_animations_AnimateSet_get_implementation(css::uno::XComponentContext*,
+ css::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new animcore::AnimationNode(SET));
}
-extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
-com_sun_star_animations_AnimateColor_get_implementation(::com::sun::star::uno::XComponentContext*,
- ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_animations_AnimateColor_get_implementation(css::uno::XComponentContext*,
+ css::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new animcore::AnimationNode(ANIMATECOLOR));
}
-extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
-com_sun_star_animations_AnimateMotion_get_implementation(::com::sun::star::uno::XComponentContext*,
- ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_animations_AnimateMotion_get_implementation(css::uno::XComponentContext*,
+ css::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new animcore::AnimationNode(ANIMATEMOTION));
}
-extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
-com_sun_star_animations_AnimateTransform_get_implementation(::com::sun::star::uno::XComponentContext*,
- ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_animations_AnimateTransform_get_implementation(css::uno::XComponentContext*,
+ css::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new animcore::AnimationNode(ANIMATETRANSFORM));
}
-extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
-com_sun_star_animations_TransitionFilter_get_implementation(::com::sun::star::uno::XComponentContext*,
- ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_animations_TransitionFilter_get_implementation(css::uno::XComponentContext*,
+ css::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new animcore::AnimationNode(TRANSITIONFILTER));
}
-extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
-com_sun_star_animations_Audio_get_implementation(::com::sun::star::uno::XComponentContext*,
- ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_animations_Audio_get_implementation(css::uno::XComponentContext*,
+ css::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new animcore::AnimationNode(AUDIO));
}
-extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
-com_sun_star_animations_Command_get_implementation(::com::sun::star::uno::XComponentContext*,
- ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_animations_Command_get_implementation(css::uno::XComponentContext*,
+ css::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new animcore::AnimationNode(COMMAND));
}
diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx
index e98776a..695ee80 100644
--- a/avmedia/source/framework/mediacontrol.cxx
+++ b/avmedia/source/framework/mediacontrol.cxx
@@ -346,11 +346,11 @@ void MediaControl::implUpdateToolboxes()
switch( maItem.getZoom() )
{
- case( ::com::sun::star::media::ZoomLevel_ZOOM_1_TO_2 ): nSelectEntryPos = AVMEDIA_ZOOMLEVEL_50; break;
- case( ::com::sun::star::media::ZoomLevel_ORIGINAL ): nSelectEntryPos = AVMEDIA_ZOOMLEVEL_100; break;
- case( ::com::sun::star::media::ZoomLevel_ZOOM_2_TO_1 ): nSelectEntryPos = AVMEDIA_ZOOMLEVEL_200; break;
- case( ::com::sun::star::media::ZoomLevel_FIT_TO_WINDOW_FIXED_ASPECT ): nSelectEntryPos = AVMEDIA_ZOOMLEVEL_FIT; break;
- case( ::com::sun::star::media::ZoomLevel_FIT_TO_WINDOW ): nSelectEntryPos = AVMEDIA_ZOOMLEVEL_SCALED; break;
+ case( css::media::ZoomLevel_ZOOM_1_TO_2 ): nSelectEntryPos = AVMEDIA_ZOOMLEVEL_50; break;
+ case( css::media::ZoomLevel_ORIGINAL ): nSelectEntryPos = AVMEDIA_ZOOMLEVEL_100; break;
+ case( css::media::ZoomLevel_ZOOM_2_TO_1 ): nSelectEntryPos = AVMEDIA_ZOOMLEVEL_200; break;
+ case( css::media::ZoomLevel_FIT_TO_WINDOW_FIXED_ASPECT ): nSelectEntryPos = AVMEDIA_ZOOMLEVEL_FIT; break;
+ case( css::media::ZoomLevel_FIT_TO_WINDOW ): nSelectEntryPos = AVMEDIA_ZOOMLEVEL_SCALED; break;
default: nSelectEntryPos = AVMEDIA_ZOOMLEVEL_INVALID; break;
}
@@ -571,17 +571,17 @@ IMPL_LINK( MediaControl, implZoomSelectHdl, ListBox*, p )
if( p )
{
MediaItem aExecItem;
- ::com::sun::star::media::ZoomLevel eLevel;
+ css::media::ZoomLevel eLevel;
switch( p->GetSelectEntryPos() )
{
- case( AVMEDIA_ZOOMLEVEL_50 ): eLevel = ::com::sun::star::media::ZoomLevel_ZOOM_1_TO_2; break;
- case( AVMEDIA_ZOOMLEVEL_100 ): eLevel = ::com::sun::star::media::ZoomLevel_ORIGINAL; break;
- case( AVMEDIA_ZOOMLEVEL_200 ): eLevel = ::com::sun::star::media::ZoomLevel_ZOOM_2_TO_1; break;
- case( AVMEDIA_ZOOMLEVEL_FIT ): eLevel = ::com::sun::star::media::ZoomLevel_FIT_TO_WINDOW_FIXED_ASPECT; break;
- case( AVMEDIA_ZOOMLEVEL_SCALED ): eLevel = ::com::sun::star::media::ZoomLevel_FIT_TO_WINDOW; break;
+ case( AVMEDIA_ZOOMLEVEL_50 ): eLevel = css::media::ZoomLevel_ZOOM_1_TO_2; break;
+ case( AVMEDIA_ZOOMLEVEL_100 ): eLevel = css::media::ZoomLevel_ORIGINAL; break;
+ case( AVMEDIA_ZOOMLEVEL_200 ): eLevel = css::media::ZoomLevel_ZOOM_2_TO_1; break;
+ case( AVMEDIA_ZOOMLEVEL_FIT ): eLevel = css::media::ZoomLevel_FIT_TO_WINDOW_FIXED_ASPECT; break;
+ case( AVMEDIA_ZOOMLEVEL_SCALED ): eLevel = css::media::ZoomLevel_FIT_TO_WINDOW; break;
- default: eLevel = ::com::sun::star::media::ZoomLevel_NOT_AVAILABLE; break;
+ default: eLevel = css::media::ZoomLevel_NOT_AVAILABLE; break;
}
aExecItem.setZoom( eLevel );
diff --git a/avmedia/source/framework/mediaitem.cxx b/avmedia/source/framework/mediaitem.cxx
index 91fb5d0..cc7f22d 100644
--- a/avmedia/source/framework/mediaitem.cxx
+++ b/avmedia/source/framework/mediaitem.cxx
@@ -59,7 +59,7 @@ struct MediaItem::Impl
sal_Int16 m_nVolumeDB;
bool m_bLoop;
bool m_bMute;
- ::com::sun::star::media::ZoomLevel m_eZoom;
+ css::media::ZoomLevel m_eZoom;
explicit Impl(AVMediaSetMask nMaskSet)
: m_nMaskSet( nMaskSet )
@@ -69,7 +69,7 @@ struct MediaItem::Impl
, m_nVolumeDB( 0 )
, m_bLoop( false )
, m_bMute( false )
- , m_eZoom( ::com::sun::star::media::ZoomLevel_NOT_AVAILABLE )
+ , m_eZoom( css::media::ZoomLevel_NOT_AVAILABLE )
{
}
Impl(Impl const& rOther)
@@ -322,13 +322,13 @@ sal_Int16 MediaItem::getVolumeDB() const
return m_pImpl->m_nVolumeDB;
}
-void MediaItem::setZoom( ::com::sun::star::media::ZoomLevel eZoom )
+void MediaItem::setZoom( css::media::ZoomLevel eZoom )
{
m_pImpl->m_eZoom = eZoom;
m_pImpl->m_nMaskSet |= AVMediaSetMask::ZOOM;
}
-::com::sun::star::media::ZoomLevel MediaItem::getZoom() const
+css::media::ZoomLevel MediaItem::getZoom() const
{
return m_pImpl->m_eZoom;
}
diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx
index 3ed91fd..0da4018 100644
--- a/avmedia/source/framework/soundhandler.cxx
+++ b/avmedia/source/framework/soundhandler.cxx
@@ -165,7 +165,7 @@ SoundHandler::~SoundHandler()
}
/*-************************************************************************************************************
- @interface ::com::sun::star::frame::XDispatch
+ @interface css::frame::XDispatch
@short try to load audio file
@descr This method try to load given audio file by URL and play it. We use vcl/Sound class to do that.
@@ -242,7 +242,7 @@ void SAL_CALL SoundHandler::dispatch( const css::util::URL&
}
/*-************************************************************************************************************
- @interface ::com::sun::star::document::XExtendedFilterDetection
+ @interface css::document::XExtendedFilterDetection
@short try to detect file (given as argument included in "lDescriptor")
@descr We try to detect, if given file could be handled by this class and is a well known one.
@@ -338,9 +338,9 @@ IMPL_LINK_NOARG_TYPED(SoundHandler, implts_PlayerNotify, Idle *, void)
} // namespace framework
-extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
-com_sun_star_comp_framework_SoundHandler_get_implementation(::com::sun::star::uno::XComponentContext*,
- ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_comp_framework_SoundHandler_get_implementation(css::uno::XComponentContext*,
+ css::uno::Sequence<css::uno::Any> const &)
{
return cppu::acquire(new avmedia::SoundHandler);
}
diff --git a/avmedia/source/gstreamer/gstframegrabber.hxx b/avmedia/source/gstreamer/gstframegrabber.hxx
index 1704d4a..3d6b469 100644
--- a/avmedia/source/gstreamer/gstframegrabber.hxx
+++ b/avmedia/source/gstreamer/gstframegrabber.hxx
@@ -31,8 +31,8 @@ namespace avmedia { namespace gstreamer {
// - FrameGrabber -
-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 FrameGrabber : public FrameGrabber_BASE, private boost::noncopyable
{
@@ -45,12 +45,12 @@ public:
virtual ~FrameGrabber();
// XFrameGrabber
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) 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& ServiceName ) 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& ServiceName ) 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:
explicit FrameGrabber( const OUString &aURL );
diff --git a/avmedia/source/gstreamer/gstmanager.hxx b/avmedia/source/gstreamer/gstmanager.hxx
index be7bedb..68a9940 100644
--- a/avmedia/source/gstreamer/gstmanager.hxx
+++ b/avmedia/source/gstreamer/gstmanager.hxx
@@ -30,24 +30,24 @@
namespace avmedia { namespace gstreamer {
-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 );
virtual ~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, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const OUString& aURL ) 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& ServiceName ) 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& ServiceName ) 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 > mxMgr;
+ css::uno::Reference< css::lang::XMultiServiceFactory > mxMgr;
};
} // namespace gstreamer
diff --git a/avmedia/source/gstreamer/gstplayer.hxx b/avmedia/source/gstreamer/gstplayer.hxx
index 6d18616..1dd8304 100644
--- a/avmedia/source/gstreamer/gstplayer.hxx
+++ b/avmedia/source/gstreamer/gstplayer.hxx
@@ -35,15 +35,15 @@ namespace avmedia { namespace gstreamer {
// - Player -
-typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::media::XPlayer,
- ::com::sun::star::lang::XServiceInfo > GstPlayer_BASE;
+typedef ::cppu::WeakComponentImplHelper< css::media::XPlayer,
+ css::lang::XServiceInfo > GstPlayer_BASE;
class Player : public ::cppu::BaseMutex,
public GstPlayer_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 );
virtual ~Player();
void preparePlaybin( const OUString& rURL, GstElement *pSink );
@@ -52,44 +52,44 @@ public:
GstBusSyncReply processSyncMessage( GstMessage *message );
// XPlayer
- virtual void SAL_CALL start( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL stop( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL isPlaying( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual double SAL_CALL getDuration( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL setMediaTime( double fTime ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual double SAL_CALL getMediaTime( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL isPlaybackLoop( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL setMute( sal_Bool bSet ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL isMute( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL setVolumeDB( sal_Int16 nVolumeDB ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Int16 SAL_CALL getVolumeDB( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::awt::Size SAL_CALL getPreferredPlayerWindowSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- 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, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::media::XFrameGrabber > SAL_CALL createFrameGrabber( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL start( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL stop( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL isPlaying( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual double SAL_CALL getDuration( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL setMediaTime( double fTime ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual double SAL_CALL getMediaTime( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL isPlaybackLoop( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL setMute( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL isMute( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL setVolumeDB( sal_Int16 nVolumeDB ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Int16 SAL_CALL getVolumeDB( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::awt::Size SAL_CALL getPreferredPlayerWindowSize( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual 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;
+ virtual css::uno::Reference< css::media::XFrameGrabber > SAL_CALL createFrameGrabber( ) 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& ServiceName ) 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& ServiceName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// ::cppu::OComponentHelper
virtual void SAL_CALL disposing() SAL_OVERRIDE;
protected:
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMgr;
+ css::uno::Reference< css::lang::XMultiServiceFactory > mxMgr;
OUString maURL;
// Add elements and pipeline here
GstElement* mpPlaybin; // the playbin is also a pipeline
- bool mbFakeVideo;
+ bool mbFakeVideo;
gdouble mnUnmutedVolume;
- bool mbPlayPending;
- bool mbMuted;
- bool mbLooping;
- bool mbInitialized;
+ bool mbPlayPending;
+ bool mbMuted;
+ bool mbLooping;
+ bool mbInitialized;
long mnWindowID;
GstVideoOverlay* mpXOverlay;
diff --git a/avmedia/source/gstreamer/gstwindow.hxx b/avmedia/source/gstreamer/gstwindow.hxx
index 224dbec..60e1d9f 100644
--- a/avmedia/source/gstreamer/gstwindow.hxx
+++ b/avmedia/source/gstreamer/gstwindow.hxx
@@ -34,60 +34,60 @@ namespace avmedia { namespace gstreamer {
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 );
virtual ~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, std::exception) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL setZoomLevel( ::com::sun::star::media::ZoomLevel ZoomLevel ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::media::ZoomLevel SAL_CALL getZoomLevel( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL setPointerType( sal_Int32 nPointerType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL update( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL setZoomLevel( css::media::ZoomLevel ZoomLevel ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::media::ZoomLevel SAL_CALL getZoomLevel( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL setPointerType( sal_Int32 nPointerType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// 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, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::awt::Rectangle SAL_CALL getPosSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL setVisible( sal_Bool Visible ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL setEnable( sal_Bool Enable ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL setFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual 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;
- virtual 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;
- virtual 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;
- virtual 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;
- virtual 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;
- virtual 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;
- virtual 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;
- virtual 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;
- virtual 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;
- virtual 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;
- virtual 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;
- virtual 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;
+ virtual 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;
+ virtual css::awt::Rectangle SAL_CALL getPosSize( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL setVisible( sal_Bool Visible ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL setEnable( sal_Bool Enable ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL setFocus( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XComponent
- virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual 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;
- virtual 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;
+ virtual void SAL_CALL dispose( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) 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& ServiceName ) 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& ServiceName ) 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 > mxMgr;
+ css::uno::Reference< css::lang::XMultiServiceFactory > mxMgr;
::osl::Mutex maMutex;
- ::com::sun::star::media::ZoomLevel meZoomLevel;
+ css::media::ZoomLevel meZoomLevel;
Player& mrPlayer;
int mnPointerType;
diff --git a/avmedia/source/macavf/framegrabber.hxx b/avmedia/source/macavf/framegrabber.hxx
index 37ed31a..498808d 100644
--- a/avmedia/source/macavf/framegrabber.hxx
+++ b/avmedia/source/macavf/framegrabber.hxx
@@ -31,28 +31,28 @@ namespace avmedia { namespace macavf {
// - 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 >& );
+ explicit FrameGrabber( const css::uno::Reference< css::lang::XMultiServiceFactory >& );
virtual ~FrameGrabber();
bool create( const ::rtl::OUString& rURL );
bool create( AVAsset* pMovie );
// XFrameGrabber
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+ virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
private:
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMgr;
+ css::uno::Reference< css::lang::XMultiServiceFactory > mxMgr;
AVAssetImageGenerator* mpImageGen;
};
diff --git a/avmedia/source/macavf/manager.hxx b/avmedia/source/macavf/manager.hxx
index 8ee10f8..2268d79 100644
--- a/avmedia/source/macavf/manager.hxx
+++ b/avmedia/source/macavf/manager.hxx
@@ -31,24 +31,24 @@
namespace avmedia { namespace macavf {
-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:
- Manager( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr );
+ Manager( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxMgr );
virtual ~Manager();
// XManager
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > SAL_CALL createPlayer( const ::rtl::OUString& aURL ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const ::rtl::OUString& aURL ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+ virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
private:
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMgr;
+ css::uno::Reference< css::lang::XMultiServiceFactory > mxMgr;
};
} // namespace macavf
diff --git a/avmedia/source/macavf/player.hxx b/avmedia/source/macavf/player.hxx
index 450d19d..8d6d33c 100644
--- a/avmedia/source/macavf/player.hxx
+++ b/avmedia/source/macavf/player.hxx
@@ -36,44 +36,44 @@ namespace avmedia { namespace macavf {
class Player
: public MacAVObserverHandler
-, public ::cppu::WeakImplHelper< ::com::sun::star::media::XPlayer,
- ::com::sun::star::lang::XServiceInfo >
+, public ::cppu::WeakImplHelper< css::media::XPlayer,
+ css::lang::XServiceInfo >
{
public:
- explicit Player( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& );
+ explicit Player( const css::uno::Reference< css::lang::XMultiServiceFactory >& );
virtual ~Player();
bool create( const ::rtl::OUString& rURL );
bool create( AVAsset* );
// XPlayer
- virtual void SAL_CALL start() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual void SAL_CALL stop() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL isPlaying() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual double SAL_CALL getDuration() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual void SAL_CALL setMediaTime( double fTime ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual double SAL_CALL getMediaTime() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual void SAL_CALL setStopTime( double fTime ) throw (::com::sun::star::uno::RuntimeException);
- virtual double SAL_CALL getStopTime() throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL isPlaybackLoop() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual void SAL_CALL setMute( sal_Bool bSet ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL isMute() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual void SAL_CALL setVolumeDB( sal_Int16 nVolumeDB ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual sal_Int16 SAL_CALL getVolumeDB() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual ::com::sun::star::awt::Size SAL_CALL getPreferredPlayerWindowSize( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- 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) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::media::XFrameGrabber > SAL_CALL createFrameGrabber( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void SAL_CALL start() throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void SAL_CALL stop() throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL isPlaying() throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual double SAL_CALL getDuration() throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void SAL_CALL setMediaTime( double fTime ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual double SAL_CALL getMediaTime() throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void SAL_CALL setStopTime( double fTime ) throw (css::uno::RuntimeException);
+ virtual double SAL_CALL getStopTime() throw (css::uno::RuntimeException);
+ virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL isPlaybackLoop() throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void SAL_CALL setMute( sal_Bool bSet ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL isMute() throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void SAL_CALL setVolumeDB( sal_Int16 nVolumeDB ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual sal_Int16 SAL_CALL getVolumeDB() throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual css::awt::Size SAL_CALL getPreferredPlayerWindowSize( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::media::XPlayerWindow > SAL_CALL createPlayerWindow( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::media::XFrameGrabber > SAL_CALL createFrameGrabber( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+ virtual ::rtl::OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
AVPlayer* getAVPlayer() const { return mpPlayer; }
virtual bool handleObservation( NSString* pKeyPath ) SAL_OVERRIDE;
private:
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMgr;
+ css::uno::Reference< css::lang::XMultiServiceFactory > mxMgr;
AVPlayer* mpPlayer;
diff --git a/avmedia/source/macavf/window.hxx b/avmedia/source/macavf/window.hxx
index d96dcd4..971f038 100644
--- a/avmedia/source/macavf/window.hxx
+++ b/avmedia/source/macavf/window.hxx
@@ -47,12 +47,12 @@ class Player;
class Window
: public MacAVObserverHandler
-, public ::cppu::WeakImplHelper< ::com::sun::star::media::XPlayerWindow,
- ::com::sun::star::lang::XServiceInfo >
+, public ::cppu::WeakImplHelper< css::media::XPlayerWindow,
+ css::lang::XServiceInfo >
{
public:
- Window( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_rxMgr,
+ Window( const css::uno::Reference< css::lang::XMultiServiceFactory >& i_rxMgr,
Player& i_rPlayer,
NSView* i_pParentView
);
@@ -62,49 +62,49 @@ public:
void updatePointer();
// XPlayerWindow
- virtual void SAL_CALL update( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL setZoomLevel( ::com::sun::star::media::ZoomLevel ZoomLevel ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual ::com::sun::star::media::ZoomLevel SAL_CALL getZoomLevel( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual void SAL_CALL setPointerType( sal_Int32 nPointerType ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void SAL_CALL update( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL setZoomLevel( css::media::ZoomLevel ZoomLevel ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual css::media::ZoomLevel SAL_CALL getZoomLevel( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void SAL_CALL setPointerType( sal_Int32 nPointerType ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
// 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) SAL_OVERRIDE;
- virtual ::com::sun::star::awt::Rectangle SAL_CALL getPosSize( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual void SAL_CALL setVisible( sal_Bool Visible ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual void SAL_CALL setEnable( sal_Bool Enable ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual void SAL_CALL setFocus( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual void SAL_CALL addWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual void SAL_CALL removeWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual void SAL_CALL addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual void SAL_CALL removeFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual void SAL_CALL addKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual void SAL_CALL removeKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual void SAL_CALL addMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual void SAL_CALL removeMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual void SAL_CALL addMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual void SAL_CALL removeMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual void SAL_CALL addPaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual void SAL_CALL removePaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual css::awt::Rectangle SAL_CALL getPosSize( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void SAL_CALL setVisible( sal_Bool Visible ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void SAL_CALL setEnable( sal_Bool Enable ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void SAL_CALL setFocus( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
// XComponent
- virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void SAL_CALL dispose( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+ virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual bool handleObservation( NSString* pKeyPath ) SAL_OVERRIDE;
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 mnPointerType;
diff --git a/avmedia/source/opengl/oglmanager.hxx b/avmedia/source/opengl/oglmanager.hxx
index 05dc961..8b77661 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 75caec6..446723f 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");
}
diff --git a/avmedia/source/quicktime/framegrabber.hxx b/avmedia/source/quicktime/framegrabber.hxx
index ff259ba..ffba386 100644
--- a/avmedia/source/quicktime/framegrabber.hxx
+++ b/avmedia/source/quicktime/framegrabber.hxx
@@ -31,29 +31,29 @@ namespace avmedia { namespace quicktime {
// - 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:
- FrameGrabber( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr );
+ FrameGrabber( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxMgr );
virtual ~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) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+ virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
private:
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMgr;
- OUString maURL;
- QTMovie* mpMovie;
- bool mbInitialized;
+ css::uno::Reference< css::lang::XMultiServiceFactory > mxMgr;
+ OUString maURL;
+ QTMovie* mpMovie;
+ bool mbInitialized;
};
} // namespace quicktime
diff --git a/avmedia/source/quicktime/manager.hxx b/avmedia/source/quicktime/manager.hxx
index 3b34847..819809f 100644
--- a/avmedia/source/quicktime/manager.hxx
+++ b/avmedia/source/quicktime/manager.hxx
@@ -31,24 +31,24 @@
namespace avmedia { namespace quicktime {
-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:
- Manager( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr );
+ Manager( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxMgr );
virtual ~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) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const OUString& aURL ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+ virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
private:
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMgr;
+ css::uno::Reference< css::lang::XMultiServiceFactory > mxMgr;
};
} // namespace quicktime
diff --git a/avmedia/source/quicktime/player.hxx b/avmedia/source/quicktime/player.hxx
index 5f53d78..823bebe 100644
--- a/avmedia/source/quicktime/player.hxx
+++ b/avmedia/source/quicktime/player.hxx
@@ -32,41 +32,41 @@ namespace avmedia { namespace quicktime {
*/
-class Player : public ::cppu::WeakImplHelper< ::com::sun::star::media::XPlayer,
- ::com::sun::star::lang::XServiceInfo >
+class Player : public ::cppu::WeakImplHelper< css::media::XPlayer,
+ css::lang::XServiceInfo >
{
public:
- Player( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr );
+ Player( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxMgr );
virtual ~Player();
bool create( const OUString& rURL );
// XPlayer
- virtual void SAL_CALL start( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual void SAL_CALL stop( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL isPlaying( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual double SAL_CALL getDuration( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual void SAL_CALL setMediaTime( double fTime ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual double SAL_CALL getMediaTime( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL isPlaybackLoop( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual void SAL_CALL setMute( sal_Bool bSet ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL isMute( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual void SAL_CALL setVolumeDB( sal_Int16 nVolumeDB ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual sal_Int16 SAL_CALL getVolumeDB( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual ::com::sun::star::awt::Size SAL_CALL getPreferredPlayerWindowSize( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- 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) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::media::XFrameGrabber > SAL_CALL createFrameGrabber( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void SAL_CALL start( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void SAL_CALL stop( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL isPlaying( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual double SAL_CALL getDuration( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void SAL_CALL setMediaTime( double fTime ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual double SAL_CALL getMediaTime( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL isPlaybackLoop( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void SAL_CALL setMute( sal_Bool bSet ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL isMute( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void SAL_CALL setVolumeDB( sal_Int16 nVolumeDB ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual sal_Int16 SAL_CALL getVolumeDB( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual css::awt::Size SAL_CALL getPreferredPlayerWindowSize( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::media::XPlayerWindow > SAL_CALL createPlayerWindow( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::media::XFrameGrabber > SAL_CALL createFrameGrabber( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+ virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
QTMovie* getMovie();
private:
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMgr;
+ css::uno::Reference< css::lang::XMultiServiceFactory > mxMgr;
OUString maURL;
@@ -75,8 +75,8 @@ private:
float mnUnmutedVolume;
double mnStopTime;
- bool mbMuted;
- bool mbInitialized;
+ bool mbMuted;
+ bool mbInitialized;
};
} // namespace quicktime
diff --git a/avmedia/source/quicktime/player.mm b/avmedia/source/quicktime/player.mm
index 74745c7..78a11a7 100644
--- a/avmedia/source/quicktime/player.mm
+++ b/avmedia/source/quicktime/player.mm
@@ -341,7 +341,7 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( co
uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber( )
- throw (::com::sun::star::uno::RuntimeException)
+ throw (css::uno::RuntimeException)
{
uno::Reference< media::XFrameGrabber > xRet;
OSL_TRACE ("Player::createFrameGrabber");
diff --git a/avmedia/source/quicktime/window.hxx b/avmedia/source/quicktime/window.hxx
index 70edecb..307417a 100644
--- a/avmedia/source/quicktime/window.hxx
+++ b/avmedia/source/quicktime/window.hxx
@@ -34,12 +34,12 @@ namespace avmedia { namespace quicktime {
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 >& i_rxMgr,
+ Window( const css::uno::Reference< css::lang::XMultiServiceFactory >& i_rxMgr,
Player& i_rPlayer,
NSView* i_pParentView
);
@@ -49,47 +49,47 @@ public:
void updatePointer();
// XPlayerWindow
- virtual void SAL_CALL update( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL setZoomLevel( ::com::sun::star::media::ZoomLevel ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual ::com::sun::star::media::ZoomLevel SAL_CALL getZoomLevel( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual void SAL_CALL setPointerType( sal_Int32 nPointerType ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void SAL_CALL update( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL setZoomLevel( css::media::ZoomLevel ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual css::media::ZoomLevel SAL_CALL getZoomLevel( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void SAL_CALL setPointerType( sal_Int32 nPointerType ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
// XWindow
- virtual void SAL_CALL setPosSize( sal_Int32 , sal_Int32 , sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual ::com::sun::star::awt::Rectangle SAL_CALL getPosSize( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual void SAL_CALL setVisible( sal_Bool ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual void SAL_CALL setEnable( sal_Bool ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual void SAL_CALL setFocus( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual void SAL_CALL addWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual void SAL_CALL removeWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual void SAL_CALL addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual void SAL_CALL removeFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual void SAL_CALL addKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual void SAL_CALL removeKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual void SAL_CALL addMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual void SAL_CALL removeMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual void SAL_CALL addMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual void SAL_CALL removeMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual void SAL_CALL addPaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual void SAL_CALL removePaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void SAL_CALL setPosSize( sal_Int32 , sal_Int32 , sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual css::awt::Rectangle SAL_CALL getPosSize( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void SAL_CALL setVisible( sal_Bool ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void SAL_CALL setEnable( sal_Bool ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void SAL_CALL setFocus( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
// XComponent
- virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void SAL_CALL dispose( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+ virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
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 mnPointerType;
diff --git a/avmedia/source/viewer/mediaevent_impl.cxx b/avmedia/source/viewer/mediaevent_impl.cxx
index 3e42ebb..61d75f6 100644
--- a/avmedia/source/viewer/mediaevent_impl.cxx
+++ b/avmedia/source/viewer/mediaevent_impl.cxx
@@ -51,15 +51,15 @@ void MediaEventListenersImpl::cleanUp()
-void SAL_CALL MediaEventListenersImpl::disposing( const ::com::sun::star::lang::EventObject& /* Source */ )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+void SAL_CALL MediaEventListenersImpl::disposing( const css::lang::EventObject& /* Source */ )
+ throw (css::uno::RuntimeException, std::exception)
{
}
-void SAL_CALL MediaEventListenersImpl::keyPressed( const ::com::sun::star::awt::KeyEvent& e )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+void SAL_CALL MediaEventListenersImpl::keyPressed( const css::awt::KeyEvent& e )
+ throw (css::uno::RuntimeException, std::exception)
{
const ::osl::MutexGuard aGuard( maMutex );
const SolarMutexGuard aAppGuard;
@@ -78,8 +78,8 @@ void SAL_CALL MediaEventListenersImpl::keyPressed( const ::com::sun::star::awt::
-void SAL_CALL MediaEventListenersImpl::keyReleased( const ::com::sun::star::awt::KeyEvent& e )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+void SAL_CALL MediaEventListenersImpl::keyReleased( const css::awt::KeyEvent& e )
+ throw (css::uno::RuntimeException, std::exception)
{
const ::osl::MutexGuard aGuard( maMutex );
const SolarMutexGuard aAppGuard;
@@ -97,8 +97,8 @@ void SAL_CALL MediaEventListenersImpl::keyReleased( const ::com::sun::star::awt:
-void SAL_CALL MediaEventListenersImpl::mousePressed( const ::com::sun::star::awt::MouseEvent& e )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+void SAL_CALL MediaEventListenersImpl::mousePressed( const css::awt::MouseEvent& e )
+ throw (css::uno::RuntimeException, std::exception)
{
const ::osl::MutexGuard aGuard( maMutex );
const SolarMutexGuard aAppGuard;
@@ -118,8 +118,8 @@ void SAL_CALL MediaEventListenersImpl::mousePressed( const ::com::sun::star::awt
// ----------------------------------------------gvd-----------------------
-void SAL_CALL MediaEventListenersImpl::mouseReleased( const ::com::sun::star::awt::MouseEvent& e )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+void SAL_CALL MediaEventListenersImpl::mouseReleased( const css::awt::MouseEvent& e )
+ throw (css::uno::RuntimeException, std::exception)
{
const ::osl::MutexGuard aGuard( maMutex );
const SolarMutexGuard aAppGuard;
@@ -139,8 +139,8 @@ void SAL_CALL MediaEventListenersImpl::mouseReleased( const ::com::sun::star::aw
-void SAL_CALL MediaEventListenersImpl::mouseEntered( const ::com::sun::star::awt::MouseEvent& /* e */ )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+void SAL_CALL MediaEventListenersImpl::mouseEntered( const css::awt::MouseEvent& /* e */ )
+ throw (css::uno::RuntimeException, std::exception)
{
const ::osl::MutexGuard aGuard( maMutex );
const SolarMutexGuard aAppGuard;
@@ -152,8 +152,8 @@ void SAL_CALL MediaEventListenersImpl::mouseEntered( const ::com::sun::star::awt
-void SAL_CALL MediaEventListenersImpl::mouseExited( const ::com::sun::star::awt::MouseEvent& /* e */ )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+void SAL_CALL MediaEventListenersImpl::mouseExited( const css::awt::MouseEvent& /* e */ )
+ throw (css::uno::RuntimeException, std::exception)
{
const ::osl::MutexGuard aGuard( maMutex );
const SolarMutexGuard aAppGuard;
@@ -165,8 +165,8 @@ void SAL_CALL MediaEventListenersImpl::mouseExited( const ::com::sun::star::awt:
-void SAL_CALL MediaEventListenersImpl::mouseDragged( const ::com::sun::star::awt::MouseEvent& e )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+void SAL_CALL MediaEventListenersImpl::mouseDragged( const css::awt::MouseEvent& e )
+ throw (css::uno::RuntimeException, std::exception)
{
const ::osl::MutexGuard aGuard( maMutex );
const SolarMutexGuard aAppGuard;
@@ -180,8 +180,8 @@ void SAL_CALL MediaEventListenersImpl::mouseDragged( const ::com::sun::star::awt
-void SAL_CALL MediaEventListenersImpl::mouseMoved( const ::com::sun::star::awt::MouseEvent& e )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+void SAL_CALL MediaEventListenersImpl::mouseMoved( const css::awt::MouseEvent& e )
+ throw (css::uno::RuntimeException, std::exception)
{
const ::osl::MutexGuard aGuard( maMutex );
const SolarMutexGuard aAppGuard;
@@ -195,15 +195,15 @@ void SAL_CALL MediaEventListenersImpl::mouseMoved( const ::com::sun::star::awt::
-void SAL_CALL MediaEventListenersImpl::focusGained( const ::com::sun::star::awt::FocusEvent& /* e */ )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+void SAL_CALL MediaEventListenersImpl::focusGained( const css::awt::FocusEvent& /* e */ )
+ throw (css::uno::RuntimeException, std::exception)
{
}
-void SAL_CALL MediaEventListenersImpl::focusLost( const ::com::sun::star::awt::FocusEvent& /* e */ )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+void SAL_CALL MediaEventListenersImpl::focusLost( const css::awt::FocusEvent& /* e */ )
+ throw (css::uno::RuntimeException, std::exception)
{
}
diff --git a/avmedia/source/viewer/mediaevent_impl.hxx b/avmedia/source/viewer/mediaevent_impl.hxx
index 169f1f6..7ff4e6c 100644
--- a/avmedia/source/viewer/mediaevent_impl.hxx
+++ b/avmedia/source/viewer/mediaevent_impl.hxx
@@ -35,10 +35,10 @@ namespace avmedia
// - MediaEventListenersImpl -
- class MediaEventListenersImpl : public ::cppu::WeakImplHelper< ::com::sun::star::awt::XKeyListener,
- ::com::sun::star::awt::XMouseListener,
- ::com::sun::star::awt::XMouseMotionListener,
- ::com::sun::star::awt::XFocusListener >
+ class MediaEventListenersImpl : public ::cppu::WeakImplHelper< css::awt::XKeyListener,
+ css::awt::XMouseListener,
+ css::awt::XMouseMotionListener,
+ css::awt::XFocusListener >
{
public:
@@ -50,23 +50,23 @@ namespace avmedia
protected:
// XKeyListener
- virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL keyPressed( const ::com::sun::star::awt::KeyEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL keyReleased( const ::com::sun::star::awt::KeyEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL keyPressed( const css::awt::KeyEvent& e ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL keyReleased( const css::awt::KeyEvent& e ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XMouseListener
- virtual void SAL_CALL mousePressed( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL mouseReleased( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL mouseEntered( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL mouseExited( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL mousePressed( const css::awt::MouseEvent& e ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL mouseReleased( const css::awt::MouseEvent& e ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL mouseEntered( const css::awt::MouseEvent& e ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL mouseExited( const css::awt::MouseEvent& e ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XMouseMotionListener
- virtual void SAL_CALL mouseDragged( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL mouseMoved( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL mouseDragged( const css::awt::MouseEvent& e ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL mouseMoved( const css::awt::MouseEvent& e ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XFocusListener
- virtual void SAL_CALL focusGained( const ::com::sun::star::awt::FocusEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL focusLost( const ::com::sun::star::awt::FocusEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL focusGained( const css::awt::FocusEvent& e ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL focusLost( const css::awt::FocusEvent& e ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
diff --git a/avmedia/source/vlc/vlcframegrabber.cxx b/avmedia/source/vlc/vlcframegrabber.cxx
index bc5d03d..9783349 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 493a695..83fd08a 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 52d7675..5545aea 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 a8437b2..89e9981 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 )
{
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list