sw/source/uibase/dbui/mailmergehelper.cxx | 6 +++---
sw/source/uibase/inc/mailmergehelper.hxx | 11 +++++------
2 files changed, 8 insertions(+), 9 deletions(-)
New commits:
commit 4000a0e6524f09612a3fe8f0a6214e0a68b7e007
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Sun May 3 12:08:05 2015 +0200
sw: use variadic cppu::WeakComponentImplHelper
Change-Id: I209ff18f4326c6757a0c98b8f40cc3898c8b114e
Reviewed-on: https://gerrit.libreoffice.org/15603
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
Tested-by: Jenkins <c...@libreoffice.org>
diff --git a/sw/source/uibase/dbui/mailmergehelper.cxx
b/sw/source/uibase/dbui/mailmergehelper.cxx
index e3cbdde..4a85ad2 100644
--- a/sw/source/uibase/dbui/mailmergehelper.cxx
+++ b/sw/source/uibase/dbui/mailmergehelper.cxx
@@ -680,7 +680,7 @@ void SwConnectionListener::disposing(const
lang::EventObject& /*aEvent*/)
}
SwMailTransferable::SwMailTransferable(const OUString& rBody, const OUString&
rMimeType) :
- cppu::WeakComponentImplHelper2< datatransfer::XTransferable,
beans::XPropertySet >(m_aMutex),
+ cppu::WeakComponentImplHelper< datatransfer::XTransferable,
beans::XPropertySet >(m_aMutex),
m_aMimeType( rMimeType ),
m_sBody( rBody ),
m_bIsBody( true )
@@ -689,7 +689,7 @@ SwMailTransferable::SwMailTransferable(const OUString&
rBody, const OUString& rM
SwMailTransferable::SwMailTransferable(const OUString& rURL,
const OUString& rName, const OUString& rMimeType) :
- cppu::WeakComponentImplHelper2< datatransfer::XTransferable,
beans::XPropertySet >(m_aMutex),
+ cppu::WeakComponentImplHelper< datatransfer::XTransferable,
beans::XPropertySet >(m_aMutex),
m_aMimeType( rMimeType ),
m_aURL(rURL),
m_aName( rName ),
@@ -798,7 +798,7 @@ void SwMailTransferable::removeVetoableChangeListener(
}
SwMailMessage::SwMailMessage() :
- cppu::WeakComponentImplHelper1< mail::XMailMessage>(m_aMutex)
+ cppu::WeakComponentImplHelper< mail::XMailMessage>(m_aMutex)
{
}
diff --git a/sw/source/uibase/inc/mailmergehelper.hxx
b/sw/source/uibase/inc/mailmergehelper.hxx
index 3d17a81..f24a8f7 100644
--- a/sw/source/uibase/inc/mailmergehelper.hxx
+++ b/sw/source/uibase/inc/mailmergehelper.hxx
@@ -29,8 +29,7 @@
#include <com/sun/star/datatransfer/XTransferable.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <cppuhelper/implbase.hxx>
-#include <cppuhelper/compbase1.hxx>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
#include <vcl/scrbar.hxx>
#include <rtl/ustring.hxx>
#include "swdllapi.h"
@@ -180,13 +179,13 @@ public:
class SW_DLLPUBLIC SwConnectionListener :
public SwMutexBase,
- public cppu::WeakComponentImplHelper1<
::com::sun::star::mail::XConnectionListener >
+ public cppu::WeakComponentImplHelper<
::com::sun::star::mail::XConnectionListener >
{
using cppu::WeakComponentImplHelperBase::disposing;
public:
SwConnectionListener() :
- cppu::WeakComponentImplHelper1<
::com::sun::star::mail::XConnectionListener>(m_aMutex)
+ cppu::WeakComponentImplHelper<
::com::sun::star::mail::XConnectionListener>(m_aMutex)
{}
virtual ~SwConnectionListener();
@@ -202,7 +201,7 @@ public:
class SW_DLLPUBLIC SwMailTransferable :
public SwMutexBase,
- public cppu::WeakComponentImplHelper2
+ public cppu::WeakComponentImplHelper
<
::com::sun::star::datatransfer::XTransferable,
::com::sun::star::beans::XPropertySet
@@ -241,7 +240,7 @@ class SW_DLLPUBLIC SwMailTransferable :
class SW_DLLPUBLIC SwMailMessage :
public SwMutexBase,
- public cppu::WeakComponentImplHelper1<
::com::sun::star::mail::XMailMessage >
+ public cppu::WeakComponentImplHelper<
::com::sun::star::mail::XMailMessage >
{
OUString
m_sSenderName;
OUString
m_sSenderAddress;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
