SwXShape no longer needs to extend SvtListener
after
commit 40babcfa637957bf7b59caa3cd12a630189e3e63
tdf#154827 and tdf#154428 graphics anchored in Writer as character.
Change-Id: Iad3ad440690fa9b8530f32e17a113b8365656a05
diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx
index cc3daaf..33538432 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 61e2649..a096f4f 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;
