[Libreoffice-commits] core.git: sw/source

[Noel Grandin (via logerrit)]

 sw/source/ui/config/mailconfigpage.cxx    |    2 +-
 sw/source/ui/dbui/mmoutputtypepage.cxx    |    1 +
 sw/source/uibase/dbui/mailmergehelper.cxx |    7 ++-----
 sw/source/uibase/inc/mailmergehelper.hxx  |   17 +++++------------
 4 files changed, 9 insertions(+), 18 deletions(-)

New commits:
commit 4ff666e2ee9bd5871693262558deb6b95c2af43a
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Sat Mar 4 19:05:07 2023 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sun Mar 5 11:43:38 2023 +0000

    remove unused BaseMutex in SwMailTransferable
    
    Change-Id: Ib079e354433905b25aa44a64779e0c54701858ec
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148253
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/sw/source/ui/config/mailconfigpage.cxx 
b/sw/source/ui/config/mailconfigpage.cxx
index 89091dfe7f35..4f2d996b6f56 100644
--- a/sw/source/ui/config/mailconfigpage.cxx
+++ b/sw/source/ui/config/mailconfigpage.cxx
@@ -265,7 +265,7 @@ void SwTestAccountSettingsDialog::Test()
                 mail::MailServiceType_SMTP);
         if(m_bStop)
             return;
-        uno::Reference<XConnectionListener> xConnectionListener(new 
SwConnectionListener());
+        uno::Reference<XConnectionListener> xConnectionListener(new 
SwConnectionListener);
 
         if(m_pParent->m_pConfigItem->IsAuthentication() &&
                 m_pParent->m_pConfigItem->IsSMTPAfterPOP())
diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx 
b/sw/source/ui/dbui/mmoutputtypepage.cxx
index 11d89f39933e..c139bb0943c1 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.cxx
+++ b/sw/source/ui/dbui/mmoutputtypepage.cxx
@@ -24,6 +24,7 @@
 #include <bitmaps.hlst>
 #include <swtypes.hxx>
 
+#include <osl/diagnose.h>
 #include <rtl/ref.hxx>
 #include <com/sun/star/mail/XSmtpService.hpp>
 #include <vcl/idle.hxx>
diff --git a/sw/source/uibase/dbui/mailmergehelper.cxx 
b/sw/source/uibase/dbui/mailmergehelper.cxx
index d6efcfc675c5..4e6f7534da9a 100644
--- a/sw/source/uibase/dbui/mailmergehelper.cxx
+++ b/sw/source/uibase/dbui/mailmergehelper.cxx
@@ -102,7 +102,7 @@ uno::Reference< mail::XSmtpService > ConnectToSmtpServer(
             mail::MailServiceProvider::create( xContext ) );
         
xSmtpServer.set(xMailServiceProvider->create(mail::MailServiceType_SMTP), 
uno::UNO_QUERY);
 
-        uno::Reference< mail::XConnectionListener> xConnectionListener(new 
SwConnectionListener());
+        uno::Reference< mail::XConnectionListener> xConnectionListener(new 
SwConnectionListener);
 
         if(rConfigItem.IsAuthentication() && rConfigItem.IsSMTPAfterPOP())
         {
@@ -632,7 +632,6 @@ void SwConnectionListener::disposing(const 
lang::EventObject& /*aEvent*/)
 }
 
 SwMailTransferable::SwMailTransferable(OUString aBody, OUString aMimeType) :
-    cppu::WeakComponentImplHelper< datatransfer::XTransferable, 
beans::XPropertySet >(m_aMutex),
     m_aMimeType(std::move( aMimeType )),
     m_sBody(std::move( aBody )),
     m_bIsBody( true )
@@ -641,7 +640,6 @@ SwMailTransferable::SwMailTransferable(OUString aBody, 
OUString aMimeType) :
 
 SwMailTransferable::SwMailTransferable(OUString aURL,
                 OUString aName, OUString aMimeType) :
-    cppu::WeakComponentImplHelper< datatransfer::XTransferable, 
beans::XPropertySet >(m_aMutex),
     m_aMimeType(std::move( aMimeType )),
     m_aURL(std::move(aURL)),
     m_aName(std::move( aName )),
@@ -737,8 +735,7 @@ void SwMailTransferable::removeVetoableChangeListener(
 {
 }
 
-SwMailMessage::SwMailMessage() :
-        cppu::WeakComponentImplHelper< mail::XMailMessage>(m_aMutex)
+SwMailMessage::SwMailMessage()
 {
 }
 
diff --git a/sw/source/uibase/inc/mailmergehelper.hxx 
b/sw/source/uibase/inc/mailmergehelper.hxx
index ab6ff56e0e32..2497c8833ef8 100644
--- a/sw/source/uibase/inc/mailmergehelper.hxx
+++ b/sw/source/uibase/inc/mailmergehelper.hxx
@@ -26,9 +26,8 @@
 #include <com/sun/star/mail/XMailMessage.hpp>
 #include <com/sun/star/datatransfer/XTransferable.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/implbase.hxx>
-#include <cppuhelper/compbase.hxx>
+#include <comphelper/compbase.hxx>
 #include <utility>
 #include <vcl/customweld.hxx>
 #include <vcl/weld.hxx>
@@ -171,15 +170,11 @@ public:
 };
 
 class SW_DLLPUBLIC SwConnectionListener final :
-        public cppu::BaseMutex,
-        public cppu::WeakComponentImplHelper<css::mail::XConnectionListener>
+        public 
comphelper::WeakComponentImplHelper<css::mail::XConnectionListener>
 {
-    using cppu::WeakComponentImplHelperBase::disposing;
+    using comphelper::WeakComponentImplHelperBase::disposing;
 
 public:
-    SwConnectionListener() :
-        cppu::WeakComponentImplHelper<css::mail::XConnectionListener>(m_aMutex)
-    {}
     virtual ~SwConnectionListener() override;
 
     virtual void SAL_CALL connected(const css::lang::EventObject& aEvent) 
override;
@@ -190,8 +185,7 @@ public:
 };
 
 class SW_DLLPUBLIC SwMailTransferable final :
-        public cppu::BaseMutex,
-        public cppu::WeakComponentImplHelper<css::datatransfer::XTransferable, 
css::beans::XPropertySet>
+        public 
comphelper::WeakComponentImplHelper<css::datatransfer::XTransferable, 
css::beans::XPropertySet>
 {
     OUString  m_aMimeType;
     OUString  m_sBody;
@@ -225,8 +219,7 @@ class SW_DLLPUBLIC SwMailTransferable final :
 };
 
 class SW_DLLPUBLIC SwMailMessage final :
-        public cppu::BaseMutex,
-        public cppu::WeakComponentImplHelper<css::mail::XMailMessage>
+        public comphelper::WeakComponentImplHelper<css::mail::XMailMessage>
 {
     OUString m_sSenderName;
     OUString m_sSenderAddress;