From 315afb12853624bdaac553a8528390c3a61c8351 Mon Sep 17 00:00:00 2001 From: Takeshi Abe Date: Fri, 3 Jul 2015 11:41:33 +0900 Subject: 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 Reviewed-by: Noel Grandin --- binaryurp/source/bridge.hxx | 4 ++-- binaryurp/source/bridgefactory.hxx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'binaryurp') diff --git a/binaryurp/source/bridge.hxx b/binaryurp/source/bridge.hxx index 232b02b53bed..1fe1bd6b5e3c 100644 --- a/binaryurp/source/bridge.hxx +++ b/binaryurp/source/bridge.hxx @@ -31,7 +31,7 @@ #include "com/sun/star/lang/XComponent.hpp" #include "com/sun/star/uno/Reference.hxx" #include "com/sun/star/uno/RuntimeException.hpp" -#include "cppuhelper/implbase2.hxx" +#include "cppuhelper/implbase.hxx" #include "osl/conditn.hxx" #include "osl/mutex.hxx" #include "rtl/ref.hxx" @@ -67,7 +67,7 @@ namespace rtl { class ByteSequence; } namespace binaryurp { class Bridge: - public cppu::WeakImplHelper2< + public cppu::WeakImplHelper< com::sun::star::bridge::XBridge, com::sun::star::lang::XComponent > { public: diff --git a/binaryurp/source/bridgefactory.hxx b/binaryurp/source/bridgefactory.hxx index 27ec27429d07..ac13ace16574 100644 --- a/binaryurp/source/bridgefactory.hxx +++ b/binaryurp/source/bridgefactory.hxx @@ -32,7 +32,7 @@ #include "com/sun/star/uno/Reference.hxx" #include "com/sun/star/uno/RuntimeException.hpp" #include "cppuhelper/basemutex.hxx" -#include "cppuhelper/compbase2.hxx" +#include "cppuhelper/compbase.hxx" #include "sal/types.h" namespace com { namespace sun { namespace star { @@ -49,7 +49,7 @@ namespace binaryurp { // the implementation does not care about a disposed state: typedef - cppu::WeakComponentImplHelper2< + cppu::WeakComponentImplHelper< com::sun::star::lang::XServiceInfo, com::sun::star::bridge::XBridgeFactory2 > BridgeFactoryBase; -- cgit v1.2.3