mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

shell: tdf#88206 replace cppu::WeakImplHelper* etc.

Browse Source 
with the variadic variants.

Change-Id: I0eb2efbd123198c7d8a99e9dd7c613f9b2b23c2d
Reviewed-on: https://gerrit.libreoffice.org/18286
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
This commit is contained in:
Takeshi Abe 2015-09-03 09:33:40 +09:00 committed by Michael Stahl
parent f3c7e69536
commit cfaebe5de9
19 changed files with 35 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
shell/source/backends/desktopbe/desktopbackend.cxx
View File

@ -39,7 +39,7 @@
#include "com/sun/star/uno/XComponentContext.hpp" #include "com/sun/star/uno/XComponentContext.hpp"
#include "com/sun/star/uno/XCurrentContext.hpp" #include "com/sun/star/uno/XCurrentContext.hpp"
#include "cppuhelper/factory.hxx" #include "cppuhelper/factory.hxx"
#include "cppuhelper/implbase2.hxx" #include <cppuhelper/implbase.hxx>
#include "cppuhelper/implementationentry.hxx" #include "cppuhelper/implementationentry.hxx"
#include "cppuhelper/weak.hxx" #include "cppuhelper/weak.hxx"
#include "osl/diagnose.h" #include "osl/diagnose.h"
@ -64,7 +64,7 @@ css::uno::Sequence< OUString > SAL_CALL getDefaultSupportedServiceNames() {
} }
class Default: class Default:
public cppu::WeakImplHelper2< public cppu::WeakImplHelper<
css::lang::XServiceInfo, css::beans::XPropertySet >, css::lang::XServiceInfo, css::beans::XPropertySet >,
private boost::noncopyable private boost::noncopyable
{ {

4
shell/source/backends/gconfbe/gconfbackend.cxx
View File

@ -40,7 +40,7 @@
#include "com/sun/star/uno/XComponentContext.hpp" #include "com/sun/star/uno/XComponentContext.hpp"
#include "com/sun/star/uno/XCurrentContext.hpp" #include "com/sun/star/uno/XCurrentContext.hpp"
#include "cppuhelper/factory.hxx" #include "cppuhelper/factory.hxx"
#include "cppuhelper/implbase2.hxx" #include <cppuhelper/implbase.hxx>
#include "cppuhelper/implementationentry.hxx" #include "cppuhelper/implementationentry.hxx"
#include "cppuhelper/weak.hxx" #include "cppuhelper/weak.hxx"
#include "rtl/string.h" #include "rtl/string.h"
@ -65,7 +65,7 @@ css::uno::Sequence< OUString > SAL_CALL getServiceSupportedServiceNames() {
} }
class Service: class Service:
public cppu::WeakImplHelper2< public cppu::WeakImplHelper<
css::lang::XServiceInfo, css::beans::XPropertySet >, css::lang::XServiceInfo, css::beans::XPropertySet >,
private boost::noncopyable private boost::noncopyable
{ {

4
shell/source/backends/kde4be/kde4backend.cxx
View File

@ -40,7 +40,7 @@
#include "com/sun/star/uno/XComponentContext.hpp" #include "com/sun/star/uno/XComponentContext.hpp"
#include "com/sun/star/uno/XCurrentContext.hpp" #include "com/sun/star/uno/XCurrentContext.hpp"
#include "cppuhelper/factory.hxx" #include "cppuhelper/factory.hxx"
#include "cppuhelper/implbase2.hxx" #include <cppuhelper/implbase.hxx>
#include "cppuhelper/implementationentry.hxx" #include "cppuhelper/implementationentry.hxx"
#include "cppuhelper/weak.hxx" #include "cppuhelper/weak.hxx"
#include "rtl/string.h" #include "rtl/string.h"
@ -65,7 +65,7 @@ css::uno::Sequence< OUString > SAL_CALL getServiceSupportedServiceNames() {
} }
class Service: class Service:
public cppu::WeakImplHelper2< public cppu::WeakImplHelper<
css::lang::XServiceInfo, css::beans::XPropertySet >, css::lang::XServiceInfo, css::beans::XPropertySet >,
private boost::noncopyable private boost::noncopyable
{ {

4
shell/source/backends/kdebe/kdebackend.cxx
View File

@ -38,7 +38,7 @@
#include "com/sun/star/uno/XComponentContext.hpp" #include "com/sun/star/uno/XComponentContext.hpp"
#include "com/sun/star/uno/XCurrentContext.hpp" #include "com/sun/star/uno/XCurrentContext.hpp"
#include "cppuhelper/factory.hxx" #include "cppuhelper/factory.hxx"
#include "cppuhelper/implbase2.hxx" #include <cppuhelper/implbase.hxx>
#include "cppuhelper/implementationentry.hxx" #include "cppuhelper/implementationentry.hxx"
#include "cppuhelper/weak.hxx" #include "cppuhelper/weak.hxx"
#include "rtl/string.h" #include "rtl/string.h"
@ -65,7 +65,7 @@ css::uno::Sequence< OUString > SAL_CALL getServiceSupportedServiceNames() {
} }
class Service: class Service:
public cppu::WeakImplHelper2< public cppu::WeakImplHelper<
css::lang::XServiceInfo, css::beans::XPropertySet >, css::lang::XServiceInfo, css::beans::XPropertySet >,
private boost::noncopyable private boost::noncopyable
{ {

4
shell/source/backends/localebe/localebackend.hxx
View File

@ -22,14 +22,14 @@
#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XServiceInfo.hpp>
#include <cppuhelper/implbase2.hxx> #include <cppuhelper/implbase.hxx>
#include <rtl/string.hxx> #include <rtl/string.hxx>
namespace uno = css::uno ; namespace uno = css::uno ;
namespace lang = css::lang ; namespace lang = css::lang ;
class LocaleBackend : public ::cppu::WeakImplHelper2 < class LocaleBackend : public ::cppu::WeakImplHelper <
css::beans::XPropertySet, css::beans::XPropertySet,
lang::XServiceInfo > { lang::XServiceInfo > {

4
shell/source/backends/macbe/macbackend.hxx
View File

@ -22,7 +22,7 @@
#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XServiceInfo.hpp>
#include <cppuhelper/implbase2.hxx> #include <cppuhelper/implbase.hxx>
#include <rtl/string.hxx> #include <rtl/string.hxx>
// FIXME: stdio.h only for debugging... // FIXME: stdio.h only for debugging...
@ -31,7 +31,7 @@
namespace uno = css::uno; namespace uno = css::uno;
namespace lang = css::lang; namespace lang = css::lang;
class MacOSXBackend : public ::cppu::WeakImplHelper2 <css::beans::XPropertySet, lang::XServiceInfo > class MacOSXBackend : public ::cppu::WeakImplHelper <css::beans::XPropertySet, lang::XServiceInfo >
{ {
public: public:

4
shell/source/backends/wininetbe/wininetbackend.hxx
View File

@ -23,13 +23,13 @@
#include <com/sun/star/beans/Optional.hpp> #include <com/sun/star/beans/Optional.hpp>
#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XServiceInfo.hpp>
#include <cppuhelper/implbase2.hxx> #include <cppuhelper/implbase.hxx>
#include <rtl/string.hxx> #include <rtl/string.hxx>
namespace uno = css::uno ; namespace uno = css::uno ;
namespace lang = css::lang ; namespace lang = css::lang ;
class WinInetBackend : public ::cppu::WeakImplHelper2 < class WinInetBackend : public ::cppu::WeakImplHelper <
css::beans::XPropertySet, css::beans::XPropertySet,
lang::XServiceInfo > { lang::XServiceInfo > {

4
shell/source/cmdmail/cmdmailmsg.hxx
View File

@ -20,7 +20,7 @@
#ifndef INCLUDED_SHELL_SOURCE_CMDMAIL_CMDMAILMSG_HXX #ifndef INCLUDED_SHELL_SOURCE_CMDMAIL_CMDMAILMSG_HXX
#define INCLUDED_SHELL_SOURCE_CMDMAIL_CMDMAILMSG_HXX #define INCLUDED_SHELL_SOURCE_CMDMAIL_CMDMAILMSG_HXX
#include <cppuhelper/implbase2.hxx> #include <cppuhelper/implbase.hxx>
#include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XNameAccess.hpp>
@ -33,7 +33,7 @@
class CmdMailMsg : class CmdMailMsg :
public cppu::WeakImplHelper2< public cppu::WeakImplHelper<
::com::sun::star::system::XSimpleMailMessage2, ::com::sun::star::system::XSimpleMailMessage2,
::com::sun::star::container::XNameAccess > ::com::sun::star::container::XNameAccess >
{ {

2
shell/source/cmdmail/cmdmailsuppl.cxx
View File

@ -74,7 +74,7 @@ namespace // private
CmdMailSuppl::CmdMailSuppl( const Reference< XComponentContext >& xContext ) : CmdMailSuppl::CmdMailSuppl( const Reference< XComponentContext >& xContext ) :
WeakImplHelper3< XSimpleMailClientSupplier, XSimpleMailClient, XServiceInfo >() WeakImplHelper< XSimpleMailClientSupplier, XSimpleMailClient, XServiceInfo >()
{ {
m_xConfigurationProvider = theDefaultProvider::get(xContext); m_xConfigurationProvider = theDefaultProvider::get(xContext);
} }

4
shell/source/cmdmail/cmdmailsuppl.hxx
View File

@ -20,7 +20,7 @@
#ifndef INCLUDED_SHELL_SOURCE_CMDMAIL_CMDMAILSUPPL_HXX #ifndef INCLUDED_SHELL_SOURCE_CMDMAIL_CMDMAILSUPPL_HXX
#define INCLUDED_SHELL_SOURCE_CMDMAIL_CMDMAILSUPPL_HXX #define INCLUDED_SHELL_SOURCE_CMDMAIL_CMDMAILSUPPL_HXX
#include <cppuhelper/implbase3.hxx> #include <cppuhelper/implbase.hxx>
#include <osl/mutex.hxx> #include <osl/mutex.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp>
@ -35,7 +35,7 @@
class CmdMailSuppl : class CmdMailSuppl :
public cppu::WeakImplHelper3< public cppu::WeakImplHelper<
com::sun::star::system::XSimpleMailClientSupplier, com::sun::star::system::XSimpleMailClientSupplier,
com::sun::star::system::XSimpleMailClient, com::sun::star::system::XSimpleMailClient,
com::sun::star::lang::XServiceInfo > com::sun::star::lang::XServiceInfo >

4
shell/source/sessioninstall/SyncDbusSessionHelper.hxx
View File

@ -13,11 +13,11 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/uno/XComponentContext.hpp>
#include <org/freedesktop/PackageKit/SyncDbusSessionHelper.hpp> #include <org/freedesktop/PackageKit/SyncDbusSessionHelper.hpp>
#include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase.hxx>
namespace shell { namespace sessioninstall namespace shell { namespace sessioninstall
{ {
class SyncDbusSessionHelper : public ::cppu::WeakImplHelper1< ::org::freedesktop::PackageKit::XSyncDbusSessionHelper > class SyncDbusSessionHelper : public ::cppu::WeakImplHelper< ::org::freedesktop::PackageKit::XSyncDbusSessionHelper >
{ {
public: public:
SyncDbusSessionHelper(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> const&); SyncDbusSessionHelper(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> const&);

2
shell/source/unix/exec/shellexec.cxx
View File

@ -82,7 +82,7 @@ void escapeForShell( OStringBuffer & rBuffer, const OString & rURL)
ShellExec::ShellExec( const Reference< XComponentContext >& xContext ) : ShellExec::ShellExec( const Reference< XComponentContext >& xContext ) :
WeakImplHelper2< XSystemShellExecute, XServiceInfo >(), WeakImplHelper< XSystemShellExecute, XServiceInfo >(),
m_xContext(xContext) m_xContext(xContext)
{ {
try { try {

4
shell/source/unix/exec/shellexec.hxx
View File

@ -20,7 +20,7 @@
#ifndef INCLUDED_SHELL_SOURCE_UNIX_EXEC_SHELLEXEC_HXX #ifndef INCLUDED_SHELL_SOURCE_UNIX_EXEC_SHELLEXEC_HXX
#define INCLUDED_SHELL_SOURCE_UNIX_EXEC_SHELLEXEC_HXX #define INCLUDED_SHELL_SOURCE_UNIX_EXEC_SHELLEXEC_HXX
#include <cppuhelper/implbase2.hxx> #include <cppuhelper/implbase.hxx>
#include <osl/mutex.hxx> #include <osl/mutex.hxx>
#include <rtl/strbuf.hxx> #include <rtl/strbuf.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XServiceInfo.hpp>
@ -32,7 +32,7 @@
// class declaration // class declaration
class ShellExec : public ::cppu::WeakImplHelper2< com::sun::star::system::XSystemShellExecute, com::sun::star::lang::XServiceInfo > class ShellExec : public ::cppu::WeakImplHelper< com::sun::star::system::XSystemShellExecute, com::sun::star::lang::XServiceInfo >
{ {
OString m_aDesktopEnvironment; OString m_aDesktopEnvironment;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >

2
shell/source/win32/SysShExec.cxx
View File

@ -245,7 +245,7 @@ namespace // private
CSysShExec::CSysShExec( const Reference< css::uno::XComponentContext >& xContext ) : CSysShExec::CSysShExec( const Reference< css::uno::XComponentContext >& xContext ) :
WeakComponentImplHelper2< XSystemShellExecute, XServiceInfo >( m_aMutex ), WeakComponentImplHelper< XSystemShellExecute, XServiceInfo >( m_aMutex ),
m_xContext(xContext) m_xContext(xContext)
{ {
/* /*

4
shell/source/win32/SysShExec.hxx
View File

@ -20,7 +20,7 @@
#ifndef INCLUDED_SHELL_SOURCE_WIN32_SYSSHEXEC_HXX #ifndef INCLUDED_SHELL_SOURCE_WIN32_SYSSHEXEC_HXX
#define INCLUDED_SHELL_SOURCE_WIN32_SYSSHEXEC_HXX #define INCLUDED_SHELL_SOURCE_WIN32_SYSSHEXEC_HXX
#include <cppuhelper/compbase2.hxx> #include <cppuhelper/compbase.hxx>
#include <osl/mutex.hxx> #include <osl/mutex.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/uno/XComponentContext.hpp>
@ -39,7 +39,7 @@ protected:
class CSysShExec : class CSysShExec :
public CSysShExecBase, public CSysShExecBase,
public cppu::WeakComponentImplHelper2< public cppu::WeakComponentImplHelper<
com::sun::star::system::XSystemShellExecute, com::sun::star::system::XSystemShellExecute,
com::sun::star::lang::XServiceInfo > com::sun::star::lang::XServiceInfo >
{ {

5
shell/source/win32/simplemail/smplmailclient.hxx
View File

@ -20,12 +20,13 @@
#ifndef INCLUDED_SHELL_SOURCE_WIN32_SIMPLEMAIL_SMPLMAILCLIENT_HXX #ifndef INCLUDED_SHELL_SOURCE_WIN32_SIMPLEMAIL_SMPLMAILCLIENT_HXX
#define INCLUDED_SHELL_SOURCE_WIN32_SIMPLEMAIL_SMPLMAILCLIENT_HXX #define INCLUDED_SHELL_SOURCE_WIN32_SIMPLEMAIL_SMPLMAILCLIENT_HXX
#include <cppuhelper/compbase1.hxx> #include <cppuhelper/implbase.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/system/XSimpleMailClient.hpp> #include <com/sun/star/system/XSimpleMailClient.hpp>
#include <vector>
class CSmplMailClient : public cppu::WeakImplHelper1<css::system::XSimpleMailClient> class CSmplMailClient : public cppu::WeakImplHelper<css::system::XSimpleMailClient>
{ {
public: public:
virtual css::uno::Reference<css::system::XSimpleMailMessage> SAL_CALL createSimpleMailMessage() virtual css::uno::Reference<css::system::XSimpleMailMessage> SAL_CALL createSimpleMailMessage()

4
shell/source/win32/simplemail/smplmailmsg.hxx
View File

@ -20,7 +20,7 @@
#ifndef INCLUDED_SHELL_SOURCE_WIN32_SIMPLEMAIL_SMPLMAILMSG_HXX #ifndef INCLUDED_SHELL_SOURCE_WIN32_SIMPLEMAIL_SMPLMAILMSG_HXX
#define INCLUDED_SHELL_SOURCE_WIN32_SIMPLEMAIL_SMPLMAILMSG_HXX #define INCLUDED_SHELL_SOURCE_WIN32_SIMPLEMAIL_SMPLMAILMSG_HXX
#include <cppuhelper/compbase1.hxx> #include <cppuhelper/implbase.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <com/sun/star/system/XSimpleMailMessage2.hpp> #include <com/sun/star/system/XSimpleMailMessage2.hpp>
@ -30,7 +30,7 @@
class CSmplMailMsg : class CSmplMailMsg :
public cppu::WeakImplHelper1< com::sun::star::system::XSimpleMailMessage2 > public cppu::WeakImplHelper< com::sun::star::system::XSimpleMailMessage2 >
{ {
public: public:
CSmplMailMsg( ); CSmplMailMsg( );

2
shell/source/win32/simplemail/smplmailsuppl.cxx
View File

@ -46,7 +46,7 @@ namespace // private
} // end private namespace } // end private namespace
CSmplMailSuppl::CSmplMailSuppl() : CSmplMailSuppl::CSmplMailSuppl() :
WeakComponentImplHelper2<XSimpleMailClientSupplier, XServiceInfo>(m_aMutex) WeakComponentImplHelper<XSimpleMailClientSupplier, XServiceInfo>(m_aMutex)
{ {
} }

4
shell/source/win32/simplemail/smplmailsuppl.hxx
View File

@ -20,7 +20,7 @@
#ifndef INCLUDED_SHELL_SOURCE_WIN32_SIMPLEMAIL_SMPLMAILSUPPL_HXX #ifndef INCLUDED_SHELL_SOURCE_WIN32_SIMPLEMAIL_SMPLMAILSUPPL_HXX
#define INCLUDED_SHELL_SOURCE_WIN32_SIMPLEMAIL_SMPLMAILSUPPL_HXX #define INCLUDED_SHELL_SOURCE_WIN32_SIMPLEMAIL_SMPLMAILSUPPL_HXX
#include <cppuhelper/compbase2.hxx> #include <cppuhelper/compbase.hxx>
#include <osl/mutex.hxx> #include <osl/mutex.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/system/XSimpleMailClientSupplier.hpp> #include <com/sun/star/system/XSimpleMailClientSupplier.hpp>
@ -36,7 +36,7 @@ protected:
class CSmplMailSuppl : class CSmplMailSuppl :
public CSmplMailSupplBase, public CSmplMailSupplBase,
public cppu::WeakComponentImplHelper2< public cppu::WeakComponentImplHelper<
com::sun::star::system::XSimpleMailClientSupplier, com::sun::star::system::XSimpleMailClientSupplier,
com::sun::star::lang::XServiceInfo > com::sun::star::lang::XServiceInfo >
{ {