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

[Noel Grandin (via logerrit)]

 svx/source/xml/xmlgrhlp.cxx |   11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

New commits:
commit addd00fefe246e3045380e97e9a66a39a23ecb4a
Author:     Noel Grandin <noelgran...@gmail.com>
AuthorDate: Fri Dec 24 14:20:44 2021 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Dec 24 20:17:15 2021 +0100

    use comphelper::WeakComponentImplHelper in SvXMLGraphicImportExportHelper
    
    Change-Id: Ieb76e57ac8c9e2f456e5d7d2c127668d5f2b8490
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127418
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index 96be71b78769..a20db0d073d2 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -31,8 +31,7 @@
 #include <com/sun/star/embed/XHierarchicalStorageAccess.hpp>
 #include <comphelper/fileformat.h>
 #include <comphelper/graphicmimetype.hxx>
-#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase.hxx>
+#include <comphelper/compbase.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
@@ -930,7 +929,7 @@ namespace {
 
 namespace impl
 {
-typedef cppu::WeakComponentImplHelper<lang::XInitialization,
+typedef comphelper::WeakComponentImplHelper<lang::XInitialization,
                                         document::XGraphicObjectResolver,
                                         document::XGraphicStorageHandler,
                                         document::XBinaryStreamResolver,
@@ -940,7 +939,6 @@ typedef cppu::WeakComponentImplHelper<lang::XInitialization,
 } // namespace impl
 
 class SvXMLGraphicImportExportHelper :
-    public cppu::BaseMutex,
     public impl::SvXMLGraphicImportExportHelper_Base
 {
 public:
@@ -949,7 +947,7 @@ public:
 protected:
     // is called from WeakComponentImplHelper when XComponent::dispose() was
     // called from outside
-    virtual void SAL_CALL disposing() override;
+    virtual void disposing() override;
 
     // ____ XInitialization ____
     // one argument is allowed, which is the XStorage
@@ -992,11 +990,10 @@ private:
 };
 
 SvXMLGraphicImportExportHelper::SvXMLGraphicImportExportHelper( 
SvXMLGraphicHelperMode eMode ) :
-        impl::SvXMLGraphicImportExportHelper_Base( m_aMutex ),
         m_eGraphicHelperMode( eMode )
 {}
 
-void SAL_CALL SvXMLGraphicImportExportHelper::disposing()
+void SvXMLGraphicImportExportHelper::disposing()
 {
     Reference< XComponent > xComp( m_xGraphicObjectResolver, UNO_QUERY );
     OSL_ASSERT( xComp.is());