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

[Noel Grandin (via logerrit)]

 sw/inc/unodraw.hxx                 |    3 +--
 sw/source/core/unocore/unodraw.cxx |    9 ---------
 2 files changed, 1 insertion(+), 11 deletions(-)

New commits:
commit 89cbbbe7f11b941be27b81eb50cfac614d195c2e
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Apr 21 09:33:01 2023 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Apr 21 13:41:09 2023 +0200

    SwXShape no longer needs to extend SvtListener
    
    after
        commit 40babcfa637957bf7b59caa3cd12a630189e3e63
        tdf#154827 and tdf#154428 graphics anchored in Writer as character.
    
    Change-Id: Iad3ad440690fa9b8530f32e17a113b8365656a05
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150746
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx
index cc3daaf49d69..3353843219e9 100644
--- a/sw/inc/unodraw.hxx
+++ b/sw/inc/unodraw.hxx
@@ -127,7 +127,7 @@ cppu::WeakImplHelper
     css::drawing::XShape
 >
 SwXShapeBaseClass;
-class SwXShape : public SwXShapeBaseClass, public SvtListener
+class SwXShape : public SwXShapeBaseClass
 {
     friend class SwXGroupShape;
     friend class SwFmDrawPage;
@@ -200,7 +200,6 @@ protected:
 public:
     SwXShape(css::uno::Reference<css::uno::XInterface> & xShape, SwDoc 
const*const pDoc);
 
-    virtual void Notify(const SfxHint&) override;
     static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId();
     virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType 
) override;
     virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) 
override;
diff --git a/sw/source/core/unocore/unodraw.cxx 
b/sw/source/core/unocore/unodraw.cxx
index 61e2649f212b..a096f4f12268 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -995,7 +995,6 @@ SwXShape::~SwXShape()
         m_xShapeAgg->setDelegator(xRef);
     }
     m_pImpl.reset();
-    EndListeningAll();
     if(m_pPage)
        const_cast<SwFmDrawPage*>(m_pPage)->RemoveShape(this);
 }
@@ -2084,14 +2083,6 @@ void SwXShape::removeVetoableChangeListener(
     OSL_FAIL("not implemented");
 }
 
-void SwXShape::Notify(const SfxHint& rHint)
-{
-    if(rHint.GetId() == SfxHintId::Dying)
-    {
-        EndListeningAll();
-    }
-}
-
 void SwXShape::attach(const uno::Reference< text::XTextRange > & xTextRange)
 {
     SolarMutexGuard aGuard;