diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2015-09-04 18:25:57 +0900 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-09-07 07:37:07 +0000 |
| commit | ca7bab0561aa6afa399f1d2f449402545768859e (patch) | |
| tree | bfde19ec9d99544ecf51cfb551a0ac5d76634d9a /slideshow/test/demoshow.cxx | |
| parent | 9ea32ccd6e45e2d914e09413a4164045aff9f0fd (diff) | |
slideshow: tdf#88206 replace cppu::WeakImplHelper* etc.
with the variadic variants.
Change-Id: I3160235d0e6253626a8facbfed33e3c252505cbf
Reviewed-on: https://gerrit.libreoffice.org/18336
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'slideshow/test/demoshow.cxx')
| -rw-r--r-- | slideshow/test/demoshow.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/slideshow/test/demoshow.cxx b/slideshow/test/demoshow.cxx index 70ad12250132..507ecc6ccb26 100644 --- a/slideshow/test/demoshow.cxx +++ b/slideshow/test/demoshow.cxx @@ -23,8 +23,7 @@ #include <cppuhelper/bootstrap.hxx> #include <cppuhelper/servicefactory.hxx> #include <cppuhelper/interfacecontainer.hxx> -#include <cppuhelper/compbase1.hxx> -#include <cppuhelper/compbase2.hxx> +#include <cppuhelper/compbase.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/broadcasthelper.hxx> @@ -66,7 +65,7 @@ using namespace ::com::sun::star; namespace { -typedef ::cppu::WeakComponentImplHelper1< presentation::XSlideShowView > ViewBase; +typedef ::cppu::WeakComponentImplHelper< presentation::XSlideShowView > ViewBase; class View : public ::comphelper::OBaseMutex, public ViewBase { @@ -201,7 +200,7 @@ private: Size maSize; }; -typedef ::cppu::WeakComponentImplHelper2< drawing::XDrawPage, +typedef ::cppu::WeakComponentImplHelper< drawing::XDrawPage, beans::XPropertySet > SlideBase; class DummySlide : public ::comphelper::OBaseMutex, public SlideBase |