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 | |
| 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')
| -rw-r--r-- | slideshow/test/demoshow.cxx | 7 | ||||
| -rw-r--r-- | slideshow/test/slidetest.cxx | 1 | ||||
| -rw-r--r-- | slideshow/test/testshape.cxx | 4 | ||||
| -rw-r--r-- | slideshow/test/testview.cxx | 4 | ||||
| -rw-r--r-- | slideshow/test/views.cxx | 1 |
5 files changed, 7 insertions, 10 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 diff --git a/slideshow/test/slidetest.cxx b/slideshow/test/slidetest.cxx index 5a72b6bbc469..dcd88856e381 100644 --- a/slideshow/test/slidetest.cxx +++ b/slideshow/test/slidetest.cxx @@ -23,7 +23,6 @@ #include "cppunit/extensions/HelperMacros.h" #include "cppunit/plugin/TestPlugIn.h" -#include <cppuhelper/compbase1.hxx> #include <comphelper/broadcasthelper.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> diff --git a/slideshow/test/testshape.cxx b/slideshow/test/testshape.cxx index fbd1d2a27e5b..1aa53348f54f 100644 --- a/slideshow/test/testshape.cxx +++ b/slideshow/test/testshape.cxx @@ -22,7 +22,7 @@ #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> -#include <cppuhelper/compbase1.hxx> +#include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> #include <comphelper/make_shared_from_uno.hxx> @@ -39,7 +39,7 @@ namespace target = slideshow::internal; using namespace ::com::sun::star; // our test shape subject -typedef ::cppu::WeakComponentImplHelper1< drawing::XShape > ShapeBase; +typedef ::cppu::WeakComponentImplHelper< drawing::XShape > ShapeBase; class ImplTestShape : public TestShape, private cppu::BaseMutex, public ShapeBase diff --git a/slideshow/test/testview.cxx b/slideshow/test/testview.cxx index 0901f1c866b9..9538e928872c 100644 --- a/slideshow/test/testview.cxx +++ b/slideshow/test/testview.cxx @@ -22,7 +22,7 @@ #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> -#include <cppuhelper/compbase1.hxx> +#include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> #include <comphelper/make_shared_from_uno.hxx> @@ -45,7 +45,7 @@ namespace target = slideshow::internal; using namespace ::com::sun::star; // our test view subject -typedef ::cppu::WeakComponentImplHelper1< presentation::XSlideShowView > ViewBase; +typedef ::cppu::WeakComponentImplHelper< presentation::XSlideShowView > ViewBase; class ImplTestView : public TestView, private cppu::BaseMutex, public ViewBase diff --git a/slideshow/test/views.cxx b/slideshow/test/views.cxx index 4b751b237d2e..41e614310a80 100644 --- a/slideshow/test/views.cxx +++ b/slideshow/test/views.cxx @@ -22,7 +22,6 @@ #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> -#include <cppuhelper/compbase1.hxx> #include <comphelper/broadcasthelper.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> |