strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert cppuhelper/implbase.hxx usage in non-LIBO_INTERNAL_ONLY code, again

Browse source 
Change-Id: I8c40f4ea79941e7ca5438ff9756f62988719cebc
This commit is contained in:
Stephan Bergmann 2015-09-15 11:10:15 +02:00
parent 2532dd76b8
commit 63c707ad35
5 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
desktop/test/deployment/active/active_native.cxx
View file

@ -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
{

6
desktop/test/deployment/passive/passive_native.cxx
View file

@ -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
{

4
ure/source/uretest/cppmain.cc
View file

@ -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):

4
ure/source/uretest/cppserver.cc
View file

@ -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() {}

4
ure/source/uretest/cpptest.cc
View file

@ -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() {}