desktop/test/deployment/active/active_native.cxx | 6 +++--- desktop/test/deployment/passive/passive_native.cxx | 6 +++--- ure/source/uretest/cppmain.cc | 4 ++-- ure/source/uretest/cppserver.cc | 4 ++-- ure/source/uretest/cpptest.cc | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-)
New commits: commit 63c707ad358942d9a469d59a008d89dbf1c7341d Author: Stephan Bergmann <[email protected]> Date: Tue Sep 15 11:10:15 2015 +0200 Revert cppuhelper/implbase.hxx usage in non-LIBO_INTERNAL_ONLY code, again Change-Id: I8c40f4ea79941e7ca5438ff9756f62988719cebc diff --git a/desktop/test/deployment/active/active_native.cxx b/desktop/test/deployment/active/active_native.cxx index ee36e84..06da72a 100644 --- a/desktop/test/deployment/active/active_native.cxx +++ b/desktop/test/deployment/active/active_native.cxx @@ -46,7 +46,7 @@ #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/util/URL.hpp> #include <cppuhelper/factory.hxx> -#include <cppuhelper/implbase.hxx> +#include <cppuhelper/implbase2.hxx> #include <cppuhelper/implementationentry.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/weak.hxx> @@ -59,7 +59,7 @@ namespace { class Provider: - public cppu::WeakImplHelper< + public cppu::WeakImplHelper2< css::lang::XServiceInfo, css::frame::XDispatchProvider >, private boost::noncopyable { @@ -150,7 +150,7 @@ Provider::queryDispatches( } class Dispatch: - public cppu::WeakImplHelper< + public cppu::WeakImplHelper2< css::lang::XServiceInfo, css::frame::XDispatch >, private boost::noncopyable { diff --git a/desktop/test/deployment/passive/passive_native.cxx b/desktop/test/deployment/passive/passive_native.cxx index 6cbff69..70b11cc 100644 --- a/desktop/test/deployment/passive/passive_native.cxx +++ b/desktop/test/deployment/passive/passive_native.cxx @@ -45,7 +45,7 @@ #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/util/URL.hpp> #include <cppuhelper/factory.hxx> -#include <cppuhelper/implbase.hxx> +#include <cppuhelper/implbase2.hxx> #include <cppuhelper/implementationentry.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/weak.hxx> @@ -56,7 +56,7 @@ namespace { class Provider: - public cppu::WeakImplHelper< + public cppu::WeakImplHelper2< css::lang::XServiceInfo, css::frame::XDispatchProvider >, private boost::noncopyable { @@ -147,7 +147,7 @@ Provider::queryDispatches( } class Dispatch: - public cppu::WeakImplHelper< + public cppu::WeakImplHelper2< css::lang::XServiceInfo, css::frame::XDispatch >, private boost::noncopyable { diff --git a/ure/source/uretest/cppmain.cc b/ure/source/uretest/cppmain.cc index 6efcf64..ab38ef9 100644 --- a/ure/source/uretest/cppmain.cc +++ b/ure/source/uretest/cppmain.cc @@ -55,7 +55,7 @@ #include "com/sun/star/uri/VndSunStarPkgUrlReferenceFactory.hpp" #include "com/sun/star/util/theMacroExpander.hpp" #include "cppuhelper/factory.hxx" -#include <cppuhelper/implbase.hxx> +#include "cppuhelper/implbase1.hxx" #include "cppuhelper/implementationentry.hxx" #include "cppuhelper/interfacecontainer.hxx" #include "cppuhelper/unourl.hxx" @@ -77,7 +77,7 @@ namespace { -class Service: public ::cppu::WeakImplHelper< css::lang::XMain > { +class Service: public ::cppu::WeakImplHelper1< css::lang::XMain > { public: explicit Service( css::uno::Reference< css::uno::XComponentContext > const & context): diff --git a/ure/source/uretest/cppserver.cc b/ure/source/uretest/cppserver.cc index 09a02ff..69b33c3 100644 --- a/ure/source/uretest/cppserver.cc +++ b/ure/source/uretest/cppserver.cc @@ -27,7 +27,7 @@ #include "com/sun/star/uno/XComponentContext.hpp" #include "com/sun/star/uno/XInterface.hpp" #include "cppuhelper/factory.hxx" -#include <cppuhelper/implbase.hxx> +#include "cppuhelper/implbase1.hxx" #include "cppuhelper/implementationentry.hxx" #include "cppuhelper/weak.hxx" #include "rtl/ustring.h" @@ -40,7 +40,7 @@ namespace { -class Service: public ::cppu::WeakImplHelper< ::test::types::XServer > { +class Service: public ::cppu::WeakImplHelper1< ::test::types::XServer > { public: Service() {} diff --git a/ure/source/uretest/cpptest.cc b/ure/source/uretest/cpptest.cc index db8dd3b..d1f112d 100644 --- a/ure/source/uretest/cpptest.cc +++ b/ure/source/uretest/cpptest.cc @@ -25,7 +25,7 @@ #include "com/sun/star/uno/XComponentContext.hpp" #include "com/sun/star/uno/XInterface.hpp" #include "cppuhelper/factory.hxx" -#include <cppuhelper/implbase.hxx> +#include "cppuhelper/implbase1.hxx" #include "cppuhelper/implementationentry.hxx" #include "cppuhelper/weak.hxx" #include "rtl/ustring.h" @@ -38,7 +38,7 @@ namespace { -class Service: public cppu::WeakImplHelper< test::types::XTest > { +class Service: public cppu::WeakImplHelper1< test::types::XTest > { public: Service() {} _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
