shell/source/backends/desktopbe/desktopbackend.cxx | 4 ++--
shell/source/backends/gconfbe/gconfbackend.cxx | 4 ++--
shell/source/backends/kde4be/kde4backend.cxx | 4 ++--
shell/source/backends/kdebe/kdebackend.cxx | 4 ++--
shell/source/backends/localebe/localebackend.hxx | 4 ++--
shell/source/backends/macbe/macbackend.hxx | 4 ++--
shell/source/backends/wininetbe/wininetbackend.hxx | 4 ++--
shell/source/cmdmail/cmdmailmsg.hxx | 4 ++--
shell/source/cmdmail/cmdmailsuppl.cxx | 2 +-
shell/source/cmdmail/cmdmailsuppl.hxx | 4 ++--
shell/source/sessioninstall/SyncDbusSessionHelper.hxx | 4 ++--
shell/source/unix/exec/shellexec.cxx | 2 +-
shell/source/unix/exec/shellexec.hxx | 4 ++--
shell/source/win32/SysShExec.cxx | 2 +-
shell/source/win32/SysShExec.hxx | 4 ++--
shell/source/win32/simplemail/smplmailclient.hxx | 5 +++--
shell/source/win32/simplemail/smplmailmsg.hxx | 4 ++--
shell/source/win32/simplemail/smplmailsuppl.cxx | 2 +-
shell/source/win32/simplemail/smplmailsuppl.hxx | 4 ++--
19 files changed, 35 insertions(+), 34 deletions(-)
New commits:
commit cfaebe5de91c8049b086019e4c0ef90d5cbb883f
Author: Takeshi Abe <t...@fixedpoint.jp>
Date: Thu Sep 3 09:33:40 2015 +0900
shell: tdf#88206 replace cppu::WeakImplHelper* etc.
with the variadic variants.
Change-Id: I0eb2efbd123198c7d8a99e9dd7c613f9b2b23c2d
Reviewed-on: https://gerrit.libreoffice.org/18286
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Michael Stahl <mst...@redhat.com>
diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx
b/shell/source/backends/desktopbe/desktopbackend.cxx
index 57851af..d0d1391 100644
--- a/shell/source/backends/desktopbe/desktopbackend.cxx
+++ b/shell/source/backends/desktopbe/desktopbackend.cxx
@@ -39,7 +39,7 @@
#include "com/sun/star/uno/XComponentContext.hpp"
#include "com/sun/star/uno/XCurrentContext.hpp"
#include "cppuhelper/factory.hxx"
-#include "cppuhelper/implbase2.hxx"
+#include <cppuhelper/implbase.hxx>
#include "cppuhelper/implementationentry.hxx"
#include "cppuhelper/weak.hxx"
#include "osl/diagnose.h"
@@ -64,7 +64,7 @@ css::uno::Sequence< OUString > SAL_CALL
getDefaultSupportedServiceNames() {
}
class Default:
- public cppu::WeakImplHelper2<
+ public cppu::WeakImplHelper<
css::lang::XServiceInfo, css::beans::XPropertySet >,
private boost::noncopyable
{
diff --git a/shell/source/backends/gconfbe/gconfbackend.cxx
b/shell/source/backends/gconfbe/gconfbackend.cxx
index 71fbdd6..1143f31 100644
--- a/shell/source/backends/gconfbe/gconfbackend.cxx
+++ b/shell/source/backends/gconfbe/gconfbackend.cxx
@@ -40,7 +40,7 @@
#include "com/sun/star/uno/XComponentContext.hpp"
#include "com/sun/star/uno/XCurrentContext.hpp"
#include "cppuhelper/factory.hxx"
-#include "cppuhelper/implbase2.hxx"
+#include <cppuhelper/implbase.hxx>
#include "cppuhelper/implementationentry.hxx"
#include "cppuhelper/weak.hxx"
#include "rtl/string.h"
@@ -65,7 +65,7 @@ css::uno::Sequence< OUString > SAL_CALL
getServiceSupportedServiceNames() {
}
class Service:
- public cppu::WeakImplHelper2<
+ public cppu::WeakImplHelper<
css::lang::XServiceInfo, css::beans::XPropertySet >,
private boost::noncopyable
{
diff --git a/shell/source/backends/kde4be/kde4backend.cxx
b/shell/source/backends/kde4be/kde4backend.cxx
index 05931bd..25af4d5 100644
--- a/shell/source/backends/kde4be/kde4backend.cxx
+++ b/shell/source/backends/kde4be/kde4backend.cxx
@@ -40,7 +40,7 @@
#include "com/sun/star/uno/XComponentContext.hpp"
#include "com/sun/star/uno/XCurrentContext.hpp"
#include "cppuhelper/factory.hxx"
-#include "cppuhelper/implbase2.hxx"
+#include <cppuhelper/implbase.hxx>
#include "cppuhelper/implementationentry.hxx"
#include "cppuhelper/weak.hxx"
#include "rtl/string.h"
@@ -65,7 +65,7 @@ css::uno::Sequence< OUString > SAL_CALL
getServiceSupportedServiceNames() {
}
class Service:
- public cppu::WeakImplHelper2<
+ public cppu::WeakImplHelper<
css::lang::XServiceInfo, css::beans::XPropertySet >,
private boost::noncopyable
{
diff --git a/shell/source/backends/kdebe/kdebackend.cxx
b/shell/source/backends/kdebe/kdebackend.cxx
index 77a561d..dd0dd2b 100644
--- a/shell/source/backends/kdebe/kdebackend.cxx
+++ b/shell/source/backends/kdebe/kdebackend.cxx
@@ -38,7 +38,7 @@
#include "com/sun/star/uno/XComponentContext.hpp"
#include "com/sun/star/uno/XCurrentContext.hpp"
#include "cppuhelper/factory.hxx"
-#include "cppuhelper/implbase2.hxx"
+#include <cppuhelper/implbase.hxx>
#include "cppuhelper/implementationentry.hxx"
#include "cppuhelper/weak.hxx"
#include "rtl/string.h"
@@ -65,7 +65,7 @@ css::uno::Sequence< OUString > SAL_CALL
getServiceSupportedServiceNames() {
}
class Service:
- public cppu::WeakImplHelper2<
+ public cppu::WeakImplHelper<
css::lang::XServiceInfo, css::beans::XPropertySet >,
private boost::noncopyable
{
diff --git a/shell/source/backends/localebe/localebackend.hxx
b/shell/source/backends/localebe/localebackend.hxx
index cd58221..b90305c 100644
--- a/shell/source/backends/localebe/localebackend.hxx
+++ b/shell/source/backends/localebe/localebackend.hxx
@@ -22,14 +22,14 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <rtl/string.hxx>
namespace uno = css::uno ;
namespace lang = css::lang ;
-class LocaleBackend : public ::cppu::WeakImplHelper2 <
+class LocaleBackend : public ::cppu::WeakImplHelper <
css::beans::XPropertySet,
lang::XServiceInfo > {
diff --git a/shell/source/backends/macbe/macbackend.hxx
b/shell/source/backends/macbe/macbackend.hxx
index 1486d1d..6de7fd9 100644
--- a/shell/source/backends/macbe/macbackend.hxx
+++ b/shell/source/backends/macbe/macbackend.hxx
@@ -22,7 +22,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <rtl/string.hxx>
// FIXME: stdio.h only for debugging...
@@ -31,7 +31,7 @@
namespace uno = css::uno;
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:
diff --git a/shell/source/backends/wininetbe/wininetbackend.hxx
b/shell/source/backends/wininetbe/wininetbackend.hxx
index 1b90140..d6913a4 100644
--- a/shell/source/backends/wininetbe/wininetbackend.hxx
+++ b/shell/source/backends/wininetbe/wininetbackend.hxx
@@ -23,13 +23,13 @@
#include <com/sun/star/beans/Optional.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <rtl/string.hxx>
namespace uno = css::uno ;
namespace lang = css::lang ;
-class WinInetBackend : public ::cppu::WeakImplHelper2 <
+class WinInetBackend : public ::cppu::WeakImplHelper <
css::beans::XPropertySet,
lang::XServiceInfo > {
diff --git a/shell/source/cmdmail/cmdmailmsg.hxx
b/shell/source/cmdmail/cmdmailmsg.hxx
index b45226f..f07b70b 100644
--- a/shell/source/cmdmail/cmdmailmsg.hxx
+++ b/shell/source/cmdmail/cmdmailmsg.hxx
@@ -20,7 +20,7 @@
#ifndef 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/container/XNameAccess.hpp>
@@ -33,7 +33,7 @@
class CmdMailMsg :
- public cppu::WeakImplHelper2<
+ public cppu::WeakImplHelper<
::com::sun::star::system::XSimpleMailMessage2,
::com::sun::star::container::XNameAccess >
{
diff --git a/shell/source/cmdmail/cmdmailsuppl.cxx
b/shell/source/cmdmail/cmdmailsuppl.cxx
index 07da391..d426cbd 100644
--- a/shell/source/cmdmail/cmdmailsuppl.cxx
+++ b/shell/source/cmdmail/cmdmailsuppl.cxx
@@ -74,7 +74,7 @@ namespace // private
CmdMailSuppl::CmdMailSuppl( const Reference< XComponentContext >& xContext ) :
- WeakImplHelper3< XSimpleMailClientSupplier, XSimpleMailClient,
XServiceInfo >()
+ WeakImplHelper< XSimpleMailClientSupplier, XSimpleMailClient, XServiceInfo
>()
{
m_xConfigurationProvider = theDefaultProvider::get(xContext);
}
diff --git a/shell/source/cmdmail/cmdmailsuppl.hxx
b/shell/source/cmdmail/cmdmailsuppl.hxx
index 02dc7f8..c9ed773 100644
--- a/shell/source/cmdmail/cmdmailsuppl.hxx
+++ b/shell/source/cmdmail/cmdmailsuppl.hxx
@@ -20,7 +20,7 @@
#ifndef 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 <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -35,7 +35,7 @@
class CmdMailSuppl :
- public cppu::WeakImplHelper3<
+ public cppu::WeakImplHelper<
com::sun::star::system::XSimpleMailClientSupplier,
com::sun::star::system::XSimpleMailClient,
com::sun::star::lang::XServiceInfo >
diff --git a/shell/source/sessioninstall/SyncDbusSessionHelper.hxx
b/shell/source/sessioninstall/SyncDbusSessionHelper.hxx
index 47c72a8..04d9776 100644
--- a/shell/source/sessioninstall/SyncDbusSessionHelper.hxx
+++ b/shell/source/sessioninstall/SyncDbusSessionHelper.hxx
@@ -13,11 +13,11 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <org/freedesktop/PackageKit/SyncDbusSessionHelper.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
namespace shell { namespace sessioninstall
{
- class SyncDbusSessionHelper : public ::cppu::WeakImplHelper1<
::org::freedesktop::PackageKit::XSyncDbusSessionHelper >
+ class SyncDbusSessionHelper : public ::cppu::WeakImplHelper<
::org::freedesktop::PackageKit::XSyncDbusSessionHelper >
{
public:
SyncDbusSessionHelper(::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext> const&);
diff --git a/shell/source/unix/exec/shellexec.cxx
b/shell/source/unix/exec/shellexec.cxx
index 0239a66..b7657cb 100644
--- a/shell/source/unix/exec/shellexec.cxx
+++ b/shell/source/unix/exec/shellexec.cxx
@@ -82,7 +82,7 @@ void escapeForShell( OStringBuffer & rBuffer, const OString &
rURL)
ShellExec::ShellExec( const Reference< XComponentContext >& xContext ) :
- WeakImplHelper2< XSystemShellExecute, XServiceInfo >(),
+ WeakImplHelper< XSystemShellExecute, XServiceInfo >(),
m_xContext(xContext)
{
try {
diff --git a/shell/source/unix/exec/shellexec.hxx
b/shell/source/unix/exec/shellexec.hxx
index 92d6894..90c5b04 100644
--- a/shell/source/unix/exec/shellexec.hxx
+++ b/shell/source/unix/exec/shellexec.hxx
@@ -20,7 +20,7 @@
#ifndef 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 <rtl/strbuf.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -32,7 +32,7 @@
// 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;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext
>
diff --git a/shell/source/win32/SysShExec.cxx b/shell/source/win32/SysShExec.cxx
index 18e78fc..a0aef84 100644
--- a/shell/source/win32/SysShExec.cxx
+++ b/shell/source/win32/SysShExec.cxx
@@ -245,7 +245,7 @@ namespace // private
CSysShExec::CSysShExec( const Reference< css::uno::XComponentContext >&
xContext ) :
- WeakComponentImplHelper2< XSystemShellExecute, XServiceInfo >( m_aMutex ),
+ WeakComponentImplHelper< XSystemShellExecute, XServiceInfo >( m_aMutex ),
m_xContext(xContext)
{
/*
diff --git a/shell/source/win32/SysShExec.hxx b/shell/source/win32/SysShExec.hxx
index e17b788..b3b6ad9 100644
--- a/shell/source/win32/SysShExec.hxx
+++ b/shell/source/win32/SysShExec.hxx
@@ -20,7 +20,7 @@
#ifndef 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 <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
@@ -39,7 +39,7 @@ protected:
class CSysShExec :
public CSysShExecBase,
- public cppu::WeakComponentImplHelper2<
+ public cppu::WeakComponentImplHelper<
com::sun::star::system::XSystemShellExecute,
com::sun::star::lang::XServiceInfo >
{
diff --git a/shell/source/win32/simplemail/smplmailclient.hxx
b/shell/source/win32/simplemail/smplmailclient.hxx
index ee9a167..5d85596 100644
--- a/shell/source/win32/simplemail/smplmailclient.hxx
+++ b/shell/source/win32/simplemail/smplmailclient.hxx
@@ -20,12 +20,13 @@
#ifndef 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/system/XSimpleMailClient.hpp>
+#include <vector>
-class CSmplMailClient : public
cppu::WeakImplHelper1<css::system::XSimpleMailClient>
+class CSmplMailClient : public
cppu::WeakImplHelper<css::system::XSimpleMailClient>
{
public:
virtual css::uno::Reference<css::system::XSimpleMailMessage> SAL_CALL
createSimpleMailMessage()
diff --git a/shell/source/win32/simplemail/smplmailmsg.hxx
b/shell/source/win32/simplemail/smplmailmsg.hxx
index 9cf2c38..0762bd8 100644
--- a/shell/source/win32/simplemail/smplmailmsg.hxx
+++ b/shell/source/win32/simplemail/smplmailmsg.hxx
@@ -20,7 +20,7 @@
#ifndef 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/IllegalArgumentException.hpp>
#include <com/sun/star/system/XSimpleMailMessage2.hpp>
@@ -30,7 +30,7 @@
class CSmplMailMsg :
- public cppu::WeakImplHelper1< com::sun::star::system::XSimpleMailMessage2
>
+ public cppu::WeakImplHelper< com::sun::star::system::XSimpleMailMessage2 >
{
public:
CSmplMailMsg( );
diff --git a/shell/source/win32/simplemail/smplmailsuppl.cxx
b/shell/source/win32/simplemail/smplmailsuppl.cxx
index d92de18..d363712 100644
--- a/shell/source/win32/simplemail/smplmailsuppl.cxx
+++ b/shell/source/win32/simplemail/smplmailsuppl.cxx
@@ -46,7 +46,7 @@ namespace // private
} // end private namespace
CSmplMailSuppl::CSmplMailSuppl() :
- WeakComponentImplHelper2<XSimpleMailClientSupplier, XServiceInfo>(m_aMutex)
+ WeakComponentImplHelper<XSimpleMailClientSupplier, XServiceInfo>(m_aMutex)
{
}
diff --git a/shell/source/win32/simplemail/smplmailsuppl.hxx
b/shell/source/win32/simplemail/smplmailsuppl.hxx
index 45a2d48..c5e1f68 100644
--- a/shell/source/win32/simplemail/smplmailsuppl.hxx
+++ b/shell/source/win32/simplemail/smplmailsuppl.hxx
@@ -20,7 +20,7 @@
#ifndef 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 <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/system/XSimpleMailClientSupplier.hpp>
@@ -36,7 +36,7 @@ protected:
class CSmplMailSuppl :
public CSmplMailSupplBase,
- public cppu::WeakComponentImplHelper2<
+ public cppu::WeakComponentImplHelper<
com::sun::star::system::XSimpleMailClientSupplier,
com::sun::star::lang::XServiceInfo >
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
