diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2015-07-01 17:07:31 +0900 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-07-06 07:35:17 +0000 |
| commit | 623c2b92b90ffce8ece14cbbd2da7067e2759e99 (patch) | |
| tree | e79297e6d2dd486e67e2720c3a63d30fe6f7d7ed /avmedia/source/macavf | |
| parent | c73e3bb925a2c08c9aea0e8e7a7e3502b68c044e (diff) | |
tdf#88206 Change uses of cppu::WeakImplHelper* etc.
to the variadic variants, in avmedia.
Change-Id: I7fe65771ea5e0d30c7906d0d33acdcbe9e8aa3ff
Reviewed-on: https://gerrit.libreoffice.org/16647
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'avmedia/source/macavf')
| -rw-r--r-- | avmedia/source/macavf/framegrabber.hxx | 5 | ||||
| -rw-r--r-- | avmedia/source/macavf/macavfcommon.hxx | 2 | ||||
| -rw-r--r-- | avmedia/source/macavf/manager.hxx | 5 | ||||
| -rw-r--r-- | avmedia/source/macavf/player.hxx | 5 | ||||
| -rw-r--r-- | avmedia/source/macavf/window.hxx | 5 |
5 files changed, 12 insertions, 10 deletions
diff --git a/avmedia/source/macavf/framegrabber.hxx b/avmedia/source/macavf/framegrabber.hxx index 51792fcf2cbf..37ed31a7beb0 100644 --- a/avmedia/source/macavf/framegrabber.hxx +++ b/avmedia/source/macavf/framegrabber.hxx @@ -21,6 +21,7 @@ #define INCLUDED_AVMEDIA_SOURCE_MACAVF_FRAMEGRABBER_HXX #include "macavfcommon.hxx" +#include <cppuhelper/implbase.hxx> #include "com/sun/star/media/XFrameGrabber.hdl" @@ -30,8 +31,8 @@ namespace avmedia { namespace macavf { // - FrameGrabber - // ---------------- -class FrameGrabber : public ::cppu::WeakImplHelper2 < ::com::sun::star::media::XFrameGrabber, - ::com::sun::star::lang::XServiceInfo > +class FrameGrabber : public ::cppu::WeakImplHelper< ::com::sun::star::media::XFrameGrabber, + ::com::sun::star::lang::XServiceInfo > { public: diff --git a/avmedia/source/macavf/macavfcommon.hxx b/avmedia/source/macavf/macavfcommon.hxx index d675bc34c50e..cac042102bfb 100644 --- a/avmedia/source/macavf/macavfcommon.hxx +++ b/avmedia/source/macavf/macavfcommon.hxx @@ -31,8 +31,6 @@ #include <rtl/ustring.hxx> #include <tools/stream.hxx> #include <tools/urlobj.hxx> -#include <cppuhelper/implbase1.hxx> -#include <cppuhelper/implbase2.hxx> #include <cppuhelper/weak.hxx> #include <cppuhelper/factory.hxx> diff --git a/avmedia/source/macavf/manager.hxx b/avmedia/source/macavf/manager.hxx index 0e022b76888c..8ee10f807ae3 100644 --- a/avmedia/source/macavf/manager.hxx +++ b/avmedia/source/macavf/manager.hxx @@ -21,6 +21,7 @@ #define INCLUDED_AVMEDIA_SOURCE_MACAVF_MANAGER_HXX #include "macavfcommon.hxx" +#include <cppuhelper/implbase.hxx> #include "com/sun/star/media/XManager.hdl" @@ -30,8 +31,8 @@ namespace avmedia { namespace macavf { -class Manager : public ::cppu::WeakImplHelper2 < ::com::sun::star::media::XManager, - ::com::sun::star::lang::XServiceInfo > +class Manager : public ::cppu::WeakImplHelper< ::com::sun::star::media::XManager, + ::com::sun::star::lang::XServiceInfo > { public: diff --git a/avmedia/source/macavf/player.hxx b/avmedia/source/macavf/player.hxx index de68fac1d379..450d19d24e81 100644 --- a/avmedia/source/macavf/player.hxx +++ b/avmedia/source/macavf/player.hxx @@ -22,6 +22,7 @@ #include <osl/conditn.h> #include "macavfcommon.hxx" +#include <cppuhelper/implbase.hxx> #include "com/sun/star/media/XPlayer.hdl" @@ -35,8 +36,8 @@ namespace avmedia { namespace macavf { class Player : public MacAVObserverHandler -, public ::cppu::WeakImplHelper2< ::com::sun::star::media::XPlayer, - ::com::sun::star::lang::XServiceInfo > +, public ::cppu::WeakImplHelper< ::com::sun::star::media::XPlayer, + ::com::sun::star::lang::XServiceInfo > { public: explicit Player( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& ); diff --git a/avmedia/source/macavf/window.hxx b/avmedia/source/macavf/window.hxx index 25c4b46ed4e0..d96dcd4d4500 100644 --- a/avmedia/source/macavf/window.hxx +++ b/avmedia/source/macavf/window.hxx @@ -21,6 +21,7 @@ #define INCLUDED_AVMEDIA_SOURCE_MACAVF_WINDOW_HXX #include "macavfcommon.hxx" +#include <cppuhelper/implbase.hxx> #include <cppuhelper/interfacecontainer.h> #include "com/sun/star/media/XPlayerWindow.hdl" @@ -46,8 +47,8 @@ class Player; class Window : public MacAVObserverHandler -, public ::cppu::WeakImplHelper2 < ::com::sun::star::media::XPlayerWindow, - ::com::sun::star::lang::XServiceInfo > +, public ::cppu::WeakImplHelper< ::com::sun::star::media::XPlayerWindow, + ::com::sun::star::lang::XServiceInfo > { public: |