diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2015-08-30 21:24:35 +0900 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-08-31 07:14:47 +0000 |
| commit | c1c6a8615c420e8b1dd1f94614a36e250dab8f96 (patch) | |
| tree | 46304fa1a82b0f3bde8d7c3341818ff69cec7934 /sd/source/ui/slideshow | |
| parent | 5670f4ca8785180f135927477945027518e92ed4 (diff) | |
sd: tdf#88206 replace cppu::WeakImplHelper* etc.
with the variadic variants.
Change-Id: I01909ee45c31d17356e13b1ff2430440daff9aa7
Reviewed-on: https://gerrit.libreoffice.org/18146
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sd/source/ui/slideshow')
| -rw-r--r-- | sd/source/ui/slideshow/slideshowimpl.hxx | 8 | ||||
| -rw-r--r-- | sd/source/ui/slideshow/slideshowviewimpl.hxx | 5 |
2 files changed, 6 insertions, 7 deletions
diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx index 705e0a36e4e2..4085a4ec71ca 100644 --- a/sd/source/ui/slideshow/slideshowimpl.hxx +++ b/sd/source/ui/slideshow/slideshowimpl.hxx @@ -22,8 +22,8 @@ #include "sal/config.h" #include "com/sun/star/uno/XComponentContext.hpp" -#include "cppuhelper/compbase1.hxx" -#include "cppuhelper/compbase2.hxx" +#include <cppuhelper/compbase.hxx> +#include <cppuhelper/implbase.hxx> #include "cppuhelper/basemutex.hxx" #include "cppuhelper/propertysetmixin.hxx" #include <com/sun/star/awt/XActivateListener.hpp> @@ -116,7 +116,7 @@ typedef boost::shared_ptr< WrappedShapeEventImpl > WrappedShapeEventImplPtr; typedef std::map< css::uno::Reference< css::drawing::XShape >, WrappedShapeEventImplPtr > WrappedShapeEventImplMap; class SlideShowListenerProxy : private ::cppu::BaseMutex, - public ::cppu::WeakImplHelper2< css::presentation::XSlideShowListener, css::presentation::XShapeEventListener > + public ::cppu::WeakImplHelper< css::presentation::XSlideShowListener, css::presentation::XShapeEventListener > { public: SlideShowListenerProxy( const rtl::Reference< SlideshowImpl >& xController, const css::uno::Reference< css::presentation::XSlideShow >& xSlideShow ); @@ -157,7 +157,7 @@ public: css::uno::Reference< css::presentation::XSlideShow > mxSlideShow; }; -typedef ::cppu::WeakComponentImplHelper2< css::presentation::XSlideShowController, css::container::XIndexAccess > SlideshowImplBase; +typedef ::cppu::WeakComponentImplHelper< css::presentation::XSlideShowController, css::container::XIndexAccess > SlideshowImplBase; class SlideshowImpl : private ::cppu::BaseMutex, public SlideshowImplBase { diff --git a/sd/source/ui/slideshow/slideshowviewimpl.hxx b/sd/source/ui/slideshow/slideshowviewimpl.hxx index 0967f311aaa9..c9378b3d7f88 100644 --- a/sd/source/ui/slideshow/slideshowviewimpl.hxx +++ b/sd/source/ui/slideshow/slideshowviewimpl.hxx @@ -20,8 +20,7 @@ #ifndef INCLUDED_SD_SOURCE_UI_SLIDESHOW_SLIDESHOWVIEWIMPL_HXX #define INCLUDED_SD_SOURCE_UI_SLIDESHOW_SLIDESHOWVIEWIMPL_HXX -#include <cppuhelper/implbase1.hxx> -#include <cppuhelper/compbase4.hxx> +#include <cppuhelper/compbase.hxx> #include <comphelper/broadcasthelper.hxx> #include <comphelper/listenernotification.hxx> #include <toolkit/helper/vclunohelper.hxx> @@ -159,7 +158,7 @@ protected: class ShowWindow; class SlideshowImpl; -typedef ::cppu::WeakComponentImplHelper4< ::com::sun::star::presentation::XSlideShowView, +typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::presentation::XSlideShowView, ::com::sun::star::awt::XWindowListener, ::com::sun::star::awt::XMouseListener, ::com::sun::star::awt::XMouseMotionListener > SlideShowView_Base; |