diff options
author | Takeshi Abe <tabe@fixedpoint.jp> | 2015-09-03 09:33:40 +0900 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2015-09-03 17:55:02 +0000 |
commit | cfaebe5de91c8049b086019e4c0ef90d5cbb883f (patch) | |
tree | 8c230b61455c1191be0a8bf17fde1d7ff851c472 /shell | |
parent | f3c7e6953675f4ed85a5212a6af3ee189400f34e (diff) |
shell: tdf#88206 replace cppu::WeakImplHelper* etc.
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>
Diffstat (limited to 'shell')
19 files changed, 35 insertions, 34 deletions
diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx b/shell/source/backends/desktopbe/desktopbackend.cxx index 57851af87a0b..d0d139159284 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 71fbdd63137c..1143f31d35d0 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 05931bd249ea..25af4d501588 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 77a561db2c7b..dd0dd2bd025f 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 cd5822142c6f..b90305c96cbd 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 1486d1d9ccfc..6de7fd95ea6b 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 1b90140fd5c5..d6913a4dd92d 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 b45226fc17e0..f07b70b86d91 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 07da391c5601..d426cbd4055c 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 02dc7f81e59a..c9ed773bd56e 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 47c72a8585b2..04d9776abefc 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 0239a668f1ff..b7657cb36cbf 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 92d689433b27..90c5b042bbd7 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 18e78fc8e40f..a0aef84e4d2d 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 e17b78860f11..b3b6ad99aa72 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 ee9a16746c49..5d85596a9705 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 9cf2c384a9fe..0762bd86cc29 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 d92de1844860..d363712eb439 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 45a2d482a960..c5e1f68eb672 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 > { |