diff options
author | Takeshi Abe <tabe@fixedpoint.jp> | 2015-09-04 20:40:13 +0900 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2015-09-07 07:33:30 +0000 |
commit | 20a8b8ac6b4e3c17d28fb88dcc52b1d67ff6b39a (patch) | |
tree | b3365ad2c4ac335f049e43a4bc1814ccdfb7103f /stoc/source/simpleregistry/simpleregistry.cxx | |
parent | 44a488d5b7d72b05834835efd4467a5582c91840 (diff) |
stoc: tdf#88206 replace cppu::WeakImplHelper* etc.
with the variadic variants.
Change-Id: I34fe287036ca9b8e5edcb121ba70d9a93ab05276
Reviewed-on: https://gerrit.libreoffice.org/18338
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'stoc/source/simpleregistry/simpleregistry.cxx')
-rw-r--r-- | stoc/source/simpleregistry/simpleregistry.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/stoc/source/simpleregistry/simpleregistry.cxx b/stoc/source/simpleregistry/simpleregistry.cxx index 3d075e7cdbdc..c01d015e4aab 100644 --- a/stoc/source/simpleregistry/simpleregistry.cxx +++ b/stoc/source/simpleregistry/simpleregistry.cxx @@ -34,8 +34,7 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/uno/Sequence.hxx> -#include <cppuhelper/implbase1.hxx> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/weak.hxx> #include <osl/mutex.hxx> @@ -53,7 +52,7 @@ namespace { class SimpleRegistry: - public cppu::WeakImplHelper2< + public cppu::WeakImplHelper< css::registry::XSimpleRegistry, css::lang::XServiceInfo > { public: @@ -112,7 +111,7 @@ private: Registry registry_; }; -class Key: public cppu::WeakImplHelper1< css::registry::XRegistryKey > { +class Key: public cppu::WeakImplHelper< css::registry::XRegistryKey > { public: Key( rtl::Reference< SimpleRegistry > const & registry, |