Revert "fdo#34558 don't crash on undoing text frame removal"

This reverts commit e462a30d03c16aa4202f8d28ad52b15feb3d9255.

2 files changed, 1 insertions, 28 deletions

diff --git a/svx/inc/svx/svdundo.hxx b/svx/inc/svx/svdundo.hxx
index 8066c72e771a..0d3713ea74a5 100644
--- a/svx/inc/svx/svdundo.hxx
+++ b/svx/inc/svx/svdundo.hxx
@@ -20,7 +20,6 @@
 #ifndef _SVDUNDO_HXX
 #define _SVDUNDO_HXX
 
-#include <svl/lstner.hxx>
 #include <svl/solar.hrc>
 #include <svl/undo.hxx>
 #include <tools/gen.hxx>
@@ -253,12 +252,9 @@ public:
 //
 //************************************************************
 
-class SVX_DLLPUBLIC SdrUndoObjList : public SdrUndoObj, public SfxListener {
+class SVX_DLLPUBLIC SdrUndoObjList : public SdrUndoObj {
     bool                        bOwner;
 
-public:
-    TYPEINFO();
-
 protected:
     SdrObjList*                 pObjList;
     SdrView*                    pView;      // um bei ObjDel, Undo die
@@ -274,9 +270,6 @@ protected:
     void SetView(SdrView* pView1, SdrPageView* pPageView1) { pView=pView1; pPageView=pPageView1; }
     bool IsOwner() { return bOwner; }
     void SetOwner(bool bNew);
-
-private:
-    virtual void Notify(SfxBroadcaster& rBroadcaster, const SfxHint& rHint);
 };
 
 //************************************************************
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index 5e53ab17c195..452761dc8b57 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -655,8 +655,6 @@ OUString SdrUndoGeoObj::GetComment() const
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-TYPEINIT1(SdrUndoObjList, SfxListener);
-
 SdrUndoObjList::SdrUndoObjList(SdrObject& rNewObj, bool bOrdNumDirect)
 :   SdrUndoObj(rNewObj),
     bOwner(sal_False),
@@ -669,14 +667,10 @@ SdrUndoObjList::SdrUndoObjList(SdrObject& rNewObj, bool bOrdNumDirect)
     } else {
         nOrdNum=pObj->GetOrdNum();
     }
-
-    StartListening(*pObjList->GetModel());
 }
 
 SdrUndoObjList::~SdrUndoObjList()
 {
-    EndListening(*pObjList->GetModel());
-
     if (pObj!=NULL && IsOwner())
     {
         // Attribute have to go back to the regular Pool
@@ -692,20 +686,6 @@ void SdrUndoObjList::SetOwner(bool bNew)
     bOwner = bNew;
 }
 
-void SdrUndoObjList::Notify(SfxBroadcaster&, const SfxHint& rHint)
-{
-    const SdrHint* pSdrHint(dynamic_cast<const SdrHint*>(&rHint));
-    if (pSdrHint)
-    {
-        if ((pSdrHint->GetObject() == pObj) && (pSdrHint->GetKind() == HINT_OBJCHG))
-        {
-            const sal_uInt32 nNewOrdNum(pObj->GetOrdNum());
-            if (nNewOrdNum != nOrdNum)
-                nOrdNum = nNewOrdNum;
-        }
-    }
-}
-
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
 void SdrUndoRemoveObj::Undo()