From fe4f272a385ee4fe5f541ff37eb710956a0ad38b Mon Sep 17 00:00:00 2001
From: Kohei Yoshida <kohei.yoshida@gmail.com>
Date: Tue, 17 Apr 2012 14:13:16 -0400
Subject: no TYPEINFO for edit undo objects.

---
 editeng/inc/editeng/editund2.hxx    |  1 -
 editeng/source/editeng/editundo.cxx | 23 +++--------------------
 editeng/source/editeng/editundo.hxx | 12 ------------
 3 files changed, 3 insertions(+), 33 deletions(-)

(limited to 'editeng')

diff --git a/editeng/inc/editeng/editund2.hxx b/editeng/inc/editeng/editund2.hxx
index dc465a98e169..6411da8ac5e0 100644
--- a/editeng/inc/editeng/editund2.hxx
+++ b/editeng/inc/editeng/editund2.hxx
@@ -57,7 +57,6 @@ private:
     EditEngine* mpEditEngine;
 
 public:
-    TYPEINFO();
     EditUndo(sal_uInt16 nI, EditEngine* pEE);
     virtual ~EditUndo();
 
diff --git a/editeng/source/editeng/editundo.cxx b/editeng/source/editeng/editundo.cxx
index be05f7d1906f..d44a173bf9bd 100644
--- a/editeng/source/editeng/editundo.cxx
+++ b/editeng/source/editeng/editundo.cxx
@@ -42,20 +42,6 @@ DBG_NAME( EditUndo )
 #define NO_UNDO         0xFFFF
 #define GROUP_NOTFOUND  0xFFFF
 
-TYPEINIT1( EditUndo, SfxUndoAction );
-TYPEINIT1( EditUndoDelContent, EditUndo );
-TYPEINIT1( EditUndoConnectParas, EditUndo );
-TYPEINIT1( EditUndoSplitPara, EditUndo );
-TYPEINIT1( EditUndoInsertChars, EditUndo );
-TYPEINIT1( EditUndoRemoveChars, EditUndo );
-TYPEINIT1( EditUndoInsertFeature, EditUndo );
-TYPEINIT1( EditUndoMoveParagraphs, EditUndo );
-TYPEINIT1( EditUndoSetStyleSheet, EditUndo );
-TYPEINIT1( EditUndoSetParaAttribs, EditUndo );
-TYPEINIT1( EditUndoSetAttribs, EditUndo );
-TYPEINIT1( EditUndoTransliteration, EditUndo );
-TYPEINIT1( EditUndoMarkSelection, EditUndo );
-
 void lcl_DoSetSelection( EditView* pView, sal_uInt16 nPara )
 {
     EPaM aEPaM( nPara, 0 );
@@ -140,12 +126,10 @@ sal_Bool EditUndoManager::Redo()
 EditUndo::EditUndo(sal_uInt16 nI, EditEngine* pEE) :
     nId(nI), mpEditEngine(pEE)
 {
-    DBG_CTOR( EditUndo, 0 );
 }
 
 EditUndo::~EditUndo()
 {
-    DBG_DTOR( EditUndo, 0 );
 }
 
 EditEngine* EditUndo::GetEditEngine()
@@ -342,10 +326,9 @@ void EditUndoInsertChars::Redo()
 
 sal_Bool EditUndoInsertChars::Merge( SfxUndoAction* pNextAction )
 {
-    if ( !pNextAction->ISA( EditUndoInsertChars ) )
-        return sal_False;
-
-    EditUndoInsertChars* pNext = (EditUndoInsertChars*)pNextAction;
+    EditUndoInsertChars* pNext = dynamic_cast<EditUndoInsertChars*>(pNextAction);
+    if (!pNext)
+        return false;
 
     if ( aEPaM.nPara != pNext->aEPaM.nPara )
         return sal_False;
diff --git a/editeng/source/editeng/editundo.hxx b/editeng/source/editeng/editundo.hxx
index 63b08cff40e0..93583505acbe 100644
--- a/editeng/source/editeng/editundo.hxx
+++ b/editeng/source/editeng/editundo.hxx
@@ -54,7 +54,6 @@ private:
                                     // undestroyed object!
 
 public:
-    TYPEINFO();
     EditUndoDelContent(EditEngine* pEE, ContentNode* pNode, size_t nPortion);
     virtual ~EditUndoDelContent();
 
@@ -82,7 +81,6 @@ private:
     bool            bBackward;
 
 public:
-    TYPEINFO();
     EditUndoConnectParas(EditEngine* pEE, sal_uInt16 nNode, sal_uInt16 nSepPos,
                          const SfxItemSet& rLeftParaAttribs, const SfxItemSet& rRightParaAttribs,
                          const SfxStyleSheet* pLeftStyle, const SfxStyleSheet* pRightStyle, bool bBackward);
@@ -102,7 +100,6 @@ private:
     sal_uInt16          nSepPos;
 
 public:
-    TYPEINFO();
     EditUndoSplitPara(EditEngine* pEE, sal_uInt16 nNode, sal_uInt16 nSepPos);
     ~EditUndoSplitPara();
 
@@ -120,7 +117,6 @@ private:
     String          aText;
 
 public:
-    TYPEINFO();
     EditUndoInsertChars(EditEngine* pEE, const EPaM& rEPaM, const String& rStr);
 
     const EPaM&     GetEPaM() { return aEPaM; }
@@ -142,7 +138,6 @@ private:
     String          aText;
 
 public:
-    TYPEINFO();
     EditUndoRemoveChars(EditEngine* pEE, const EPaM& rEPaM, const String& rStr);
 
     const EPaM&     GetEPaM() { return aEPaM; }
@@ -162,7 +157,6 @@ private:
     SfxPoolItem*    pFeature;
 
 public:
-    TYPEINFO();
     EditUndoInsertFeature(EditEngine* pEE, const EPaM& rEPaM, const SfxPoolItem& rFeature);
     virtual ~EditUndoInsertFeature();
 
@@ -180,7 +174,6 @@ private:
     sal_uInt16          nDest;
 
 public:
-    TYPEINFO();
     EditUndoMoveParagraphs(EditEngine* pEE, const Range& rParas, sal_uInt16 nDest);
     virtual ~EditUndoMoveParagraphs();
 
@@ -202,7 +195,6 @@ private:
     SfxItemSet      aPrevParaAttribs;
 
 public:
-    TYPEINFO();
     EditUndoSetStyleSheet(EditEngine* pEE, sal_uInt16 nPara,
         const String& rPrevName, SfxStyleFamily ePrevFamily,
         const String& rNewName, SfxStyleFamily eNewFamily,
@@ -224,7 +216,6 @@ private:
     SfxItemSet      aNewItems;
 
 public:
-    TYPEINFO();
     EditUndoSetParaAttribs(EditEngine* pEE, sal_uInt16 nPara, const SfxItemSet& rPrevItems, const SfxItemSet& rNewItems);
     virtual ~EditUndoSetParaAttribs();
 
@@ -253,7 +244,6 @@ private:
 
 
 public:
-    TYPEINFO();
     EditUndoSetAttribs(EditEngine* pEE, const ESelection& rESel, const SfxItemSet& rNewItems);
     virtual ~EditUndoSetAttribs();
 
@@ -284,7 +274,6 @@ private:
     String              aText;
 
 public:
-    TYPEINFO();
     EditUndoTransliteration(EditEngine* pEE, const ESelection& rESel, sal_Int32 nMode);
     virtual ~EditUndoTransliteration();
 
@@ -305,7 +294,6 @@ private:
     ESelection      aSelection;
 
 public:
-    TYPEINFO();
     EditUndoMarkSelection(EditEngine* pEE, const ESelection& rSel);
     virtual ~EditUndoMarkSelection();
 
-- 
cgit