diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2015-07-03 11:41:33 +0900 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-07-10 07:40:06 +0000 |
| commit | 315afb12853624bdaac553a8528390c3a61c8351 (patch) | |
| tree | a585543cfb195540980cddcdf42fba067ef186f5 /bridges/test/java_uno | |
| parent | b854086df80b2607a3506bc8d455c98ae58aa295 (diff) | |
tdf#88206 replace cppu::WeakImplHelper* etc.
with the variadic variants, in binaryurp / bridges.
Change-Id: I2d158c24e73681907cae5815d4b07b1c74f74335
Reviewed-on: https://gerrit.libreoffice.org/16792
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'bridges/test/java_uno')
5 files changed, 10 insertions, 10 deletions
diff --git a/bridges/test/java_uno/acquire/testacquire.cxx b/bridges/test/java_uno/acquire/testacquire.cxx index 99d0a985802e..942572b36f5b 100644 --- a/bridges/test/java_uno/acquire/testacquire.cxx +++ b/bridges/test/java_uno/acquire/testacquire.cxx @@ -34,7 +34,7 @@ #include "com/sun/star/uno/XComponentContext.hpp" #include "com/sun/star/uno/XInterface.hpp" #include "cppuhelper/factory.hxx" -#include "cppuhelper/implbase3.hxx" +#include "cppuhelper/implbase.hxx" #include <cppuhelper/supportsservice.hxx> #include "cppuhelper/weak.hxx" #include "osl/conditn.hxx" @@ -176,7 +176,7 @@ css::uno::Any Derived::queryInterface(css::uno::Type const & type) namespace { -class Service: public cppu::WeakImplHelper3< +class Service: public cppu::WeakImplHelper< css::lang::XServiceInfo, css::lang::XMain, test::javauno::acquire::XTest > { public: diff --git a/bridges/test/java_uno/any/transport.cxx b/bridges/test/java_uno/any/transport.cxx index 380abf4f5ecd..e8015c70e6f7 100644 --- a/bridges/test/java_uno/any/transport.cxx +++ b/bridges/test/java_uno/any/transport.cxx @@ -25,7 +25,7 @@ #include "uno/environment.hxx" #include "jvmaccess/virtualmachine.hxx" #include "jvmaccess/unovirtualmachine.hxx" -#include "cppuhelper/implbase1.hxx" +#include "cppuhelper/implbase.hxx" #include "test/java_uno/anytest/XTransport.hpp" #include "test/java_uno/anytest/DerivedInterface.hpp" @@ -37,7 +37,7 @@ using ::test::java_uno::anytest::XTransport; namespace { -class Transport : public ::cppu::WeakImplHelper1< XTransport > +class Transport : public ::cppu::WeakImplHelper< XTransport > { public: virtual Any SAL_CALL mapAny( Any const & any ) diff --git a/bridges/test/java_uno/equals/testequals.cxx b/bridges/test/java_uno/equals/testequals.cxx index 34ca8c0d9d82..3cfd75f0c6b2 100644 --- a/bridges/test/java_uno/equals/testequals.cxx +++ b/bridges/test/java_uno/equals/testequals.cxx @@ -35,7 +35,7 @@ #include "com/sun/star/uno/XComponentContext.hpp" #include "com/sun/star/uno/XInterface.hpp" #include "cppuhelper/factory.hxx" -#include "cppuhelper/implbase2.hxx" +#include "cppuhelper/implbase.hxx" #include <cppuhelper/supportsservice.hxx> #include "cppuhelper/weak.hxx" #include "rtl/string.h" @@ -48,7 +48,7 @@ namespace { -class Service: public cppu::WeakImplHelper2< +class Service: public cppu::WeakImplHelper< css::lang::XServiceInfo, test::java_uno::equals::XTestInterface > { public: diff --git a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx index 4a20eee6477e..f36c35ea480c 100644 --- a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx +++ b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx @@ -36,7 +36,7 @@ #include "com/sun/star/uno/XComponentContext.hpp" #include "com/sun/star/uno/XInterface.hpp" #include "cppuhelper/factory.hxx" -#include "cppuhelper/implbase2.hxx" +#include "cppuhelper/implbase.hxx" #include "cppuhelper/implementationentry.hxx" #include "cppuhelper/weak.hxx" #include "osl/thread.hxx" @@ -47,7 +47,7 @@ namespace { -class Client: public cppu::WeakImplHelper2< +class Client: public cppu::WeakImplHelper< css::lang::XMain, test::javauno::nativethreadpool::XSource > { public: diff --git a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx index e119cd2b7366..81a3d9b8d1f4 100644 --- a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx +++ b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx @@ -34,7 +34,7 @@ #include "com/sun/star/uno/XComponentContext.hpp" #include "com/sun/star/uno/XInterface.hpp" #include "cppuhelper/factory.hxx" -#include "cppuhelper/implbase1.hxx" +#include "cppuhelper/implbase.hxx" #include "cppuhelper/implementationentry.hxx" #include "cppuhelper/weak.hxx" #include "rtl/ustring.hxx" @@ -43,7 +43,7 @@ namespace { class Server: - public cppu::WeakImplHelper1< test::javauno::nativethreadpool::XSource > + public cppu::WeakImplHelper< test::javauno::nativethreadpool::XSource > { public: explicit Server( |