avmedia/source/framework/mediaitem.cxx | 4 -
avmedia/source/opengl/oglframegrabber.hxx | 12 ++---
avmedia/source/opengl/oglmanager.hxx | 3 -
avmedia/source/opengl/oglplayer.hxx | 39 +++++++++---------
avmedia/source/opengl/oglwindow.hxx | 63 ++++++++++++++----------------
5 files changed, 59 insertions(+), 62 deletions(-)
New commits:
commit ad0c0f685b14119e2e564fe0074f5f0c557a5e5f
Author: Noel Grandin <n...@peralex.com>
Date: Fri Jul 17 15:20:15 2015 +0200
com::sun::star->css in avmedia
Change-Id: Iab0a96e929002c587f6fb7baa75ab206feede119
Reviewed-on: https://gerrit.libreoffice.org/17163
Reviewed-by: Noel Grandin <noelgran...@gmail.com>
Tested-by: Noel Grandin <noelgran...@gmail.com>
diff --git a/avmedia/source/framework/mediaitem.cxx
b/avmedia/source/framework/mediaitem.cxx
index cc7f22d..758c334 100644
--- a/avmedia/source/framework/mediaitem.cxx
+++ b/avmedia/source/framework/mediaitem.cxx
@@ -137,7 +137,7 @@ bool MediaItem::GetPresentation( SfxItemPresentation,
return false;
}
-bool MediaItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 ) const
+bool MediaItem::QueryValue( css::uno::Any& rVal, sal_uInt8 ) const
{
uno::Sequence< uno::Any > aSeq( 10 );
@@ -157,7 +157,7 @@ bool MediaItem::QueryValue( com::sun::star::uno::Any& rVal,
sal_uInt8 ) const
return true;
}
-bool MediaItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 )
+bool MediaItem::PutValue( const css::uno::Any& rVal, sal_uInt8 )
{
uno::Sequence< uno::Any > aSeq;
bool bRet = false;
diff --git a/avmedia/source/opengl/oglframegrabber.hxx
b/avmedia/source/opengl/oglframegrabber.hxx
index bcb7e22..30c621e 100644
--- a/avmedia/source/opengl/oglframegrabber.hxx
+++ b/avmedia/source/opengl/oglframegrabber.hxx
@@ -18,8 +18,8 @@
namespace avmedia { namespace ogl {
-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 OGLFrameGrabber : public FrameGrabber_BASE
{
@@ -29,12 +29,12 @@ public:
virtual ~OGLFrameGrabber();
// 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& 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:
libgltf::glTFHandle& m_rHandle;
diff --git a/avmedia/source/opengl/oglmanager.hxx
b/avmedia/source/opengl/oglmanager.hxx
index 8b77661..c9823b7 100644
--- a/avmedia/source/opengl/oglmanager.hxx
+++ b/avmedia/source/opengl/oglmanager.hxx
@@ -17,8 +17,7 @@
namespace avmedia { namespace ogl {
-class OGLManager : public ::cppu::WeakImplHelper<
com::sun::star::media::XManager,
-
com::sun::star::lang::XServiceInfo >
+class OGLManager : public ::cppu::WeakImplHelper< css::media::XManager,
css::lang::XServiceInfo >
{
public:
diff --git a/avmedia/source/opengl/oglplayer.hxx
b/avmedia/source/opengl/oglplayer.hxx
index a8bf92d..64f8540 100644
--- a/avmedia/source/opengl/oglplayer.hxx
+++ b/avmedia/source/opengl/oglplayer.hxx
@@ -26,8 +26,7 @@ namespace avmedia { namespace ogl {
class OGLWindow;
-typedef ::cppu::WeakComponentImplHelper< com::sun::star::media::XPlayer,
- com::sun::star::lang::XServiceInfo >
Player_BASE;
+typedef ::cppu::WeakComponentImplHelper< css::media::XPlayer,
css::lang::XServiceInfo > Player_BASE;
class OGLPlayer : public cppu::BaseMutex,
public Player_BASE
@@ -41,25 +40,25 @@ public:
void releaseInputFiles();
// 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 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 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 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 >& rArguments ) 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 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 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 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 >& rArguments )
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& 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:
DECL_LINK_TYPED( TimerHandler, Timer*, void );
diff --git a/avmedia/source/opengl/oglwindow.hxx
b/avmedia/source/opengl/oglwindow.hxx
index 97f51e6..9abc307 100644
--- a/avmedia/source/opengl/oglwindow.hxx
+++ b/avmedia/source/opengl/oglwindow.hxx
@@ -24,43 +24,42 @@
namespace avmedia { namespace ogl {
-class OGLWindow : public ::cppu::WeakImplHelper<
com::sun::star::media::XPlayerWindow,
-
com::sun::star::lang::XServiceInfo >
+class OGLWindow : public ::cppu::WeakImplHelper< css::media::XPlayerWindow,
css::lang::XServiceInfo >
{
public:
OGLWindow( libgltf::glTFHandle& rHandle, OpenGLContext& rContext,
vcl::Window& rEventHandlerParent );
virtual ~OGLWindow();
- 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 SystemPointerType ) throw
(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-
- 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 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 setPosSize( sal_Int32 nX, sal_Int32 nY, sal_Int32
nWidth, sal_Int32 nHeight, sal_Int16 nFlags ) 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 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 SystemPointerType ) throw
(css::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;
+
+ 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;
+
+ virtual void SAL_CALL setPosSize( sal_Int32 nX, sal_Int32 nY, sal_Int32
nWidth, sal_Int32 nHeight, sal_Int16 nFlags ) 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;
private:
DECL_LINK( FocusGrabber, VclWindowEvent* );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
