Kaydet (Commit) fe4f272a authored tarafından Kohei Yoshida's avatar Kohei Yoshida

no TYPEINFO for edit undo objects.

üst 1159a534
...@@ -57,7 +57,6 @@ private: ...@@ -57,7 +57,6 @@ private:
EditEngine* mpEditEngine; EditEngine* mpEditEngine;
public: public:
TYPEINFO();
EditUndo(sal_uInt16 nI, EditEngine* pEE); EditUndo(sal_uInt16 nI, EditEngine* pEE);
virtual ~EditUndo(); virtual ~EditUndo();
......
...@@ -42,20 +42,6 @@ DBG_NAME( EditUndo ) ...@@ -42,20 +42,6 @@ DBG_NAME( EditUndo )
#define NO_UNDO 0xFFFF #define NO_UNDO 0xFFFF
#define GROUP_NOTFOUND 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 ) void lcl_DoSetSelection( EditView* pView, sal_uInt16 nPara )
{ {
EPaM aEPaM( nPara, 0 ); EPaM aEPaM( nPara, 0 );
...@@ -140,12 +126,10 @@ sal_Bool EditUndoManager::Redo() ...@@ -140,12 +126,10 @@ sal_Bool EditUndoManager::Redo()
EditUndo::EditUndo(sal_uInt16 nI, EditEngine* pEE) : EditUndo::EditUndo(sal_uInt16 nI, EditEngine* pEE) :
nId(nI), mpEditEngine(pEE) nId(nI), mpEditEngine(pEE)
{ {
DBG_CTOR( EditUndo, 0 );
} }
EditUndo::~EditUndo() EditUndo::~EditUndo()
{ {
DBG_DTOR( EditUndo, 0 );
} }
EditEngine* EditUndo::GetEditEngine() EditEngine* EditUndo::GetEditEngine()
...@@ -342,10 +326,9 @@ void EditUndoInsertChars::Redo() ...@@ -342,10 +326,9 @@ void EditUndoInsertChars::Redo()
sal_Bool EditUndoInsertChars::Merge( SfxUndoAction* pNextAction ) sal_Bool EditUndoInsertChars::Merge( SfxUndoAction* pNextAction )
{ {
if ( !pNextAction->ISA( EditUndoInsertChars ) ) EditUndoInsertChars* pNext = dynamic_cast<EditUndoInsertChars*>(pNextAction);
return sal_False; if (!pNext)
return false;
EditUndoInsertChars* pNext = (EditUndoInsertChars*)pNextAction;
if ( aEPaM.nPara != pNext->aEPaM.nPara ) if ( aEPaM.nPara != pNext->aEPaM.nPara )
return sal_False; return sal_False;
......
...@@ -54,7 +54,6 @@ private: ...@@ -54,7 +54,6 @@ private:
// undestroyed object! // undestroyed object!
public: public:
TYPEINFO();
EditUndoDelContent(EditEngine* pEE, ContentNode* pNode, size_t nPortion); EditUndoDelContent(EditEngine* pEE, ContentNode* pNode, size_t nPortion);
virtual ~EditUndoDelContent(); virtual ~EditUndoDelContent();
...@@ -82,7 +81,6 @@ private: ...@@ -82,7 +81,6 @@ private:
bool bBackward; bool bBackward;
public: public:
TYPEINFO();
EditUndoConnectParas(EditEngine* pEE, sal_uInt16 nNode, sal_uInt16 nSepPos, EditUndoConnectParas(EditEngine* pEE, sal_uInt16 nNode, sal_uInt16 nSepPos,
const SfxItemSet& rLeftParaAttribs, const SfxItemSet& rRightParaAttribs, const SfxItemSet& rLeftParaAttribs, const SfxItemSet& rRightParaAttribs,
const SfxStyleSheet* pLeftStyle, const SfxStyleSheet* pRightStyle, bool bBackward); const SfxStyleSheet* pLeftStyle, const SfxStyleSheet* pRightStyle, bool bBackward);
...@@ -102,7 +100,6 @@ private: ...@@ -102,7 +100,6 @@ private:
sal_uInt16 nSepPos; sal_uInt16 nSepPos;
public: public:
TYPEINFO();
EditUndoSplitPara(EditEngine* pEE, sal_uInt16 nNode, sal_uInt16 nSepPos); EditUndoSplitPara(EditEngine* pEE, sal_uInt16 nNode, sal_uInt16 nSepPos);
~EditUndoSplitPara(); ~EditUndoSplitPara();
...@@ -120,7 +117,6 @@ private: ...@@ -120,7 +117,6 @@ private:
String aText; String aText;
public: public:
TYPEINFO();
EditUndoInsertChars(EditEngine* pEE, const EPaM& rEPaM, const String& rStr); EditUndoInsertChars(EditEngine* pEE, const EPaM& rEPaM, const String& rStr);
const EPaM& GetEPaM() { return aEPaM; } const EPaM& GetEPaM() { return aEPaM; }
...@@ -142,7 +138,6 @@ private: ...@@ -142,7 +138,6 @@ private:
String aText; String aText;
public: public:
TYPEINFO();
EditUndoRemoveChars(EditEngine* pEE, const EPaM& rEPaM, const String& rStr); EditUndoRemoveChars(EditEngine* pEE, const EPaM& rEPaM, const String& rStr);
const EPaM& GetEPaM() { return aEPaM; } const EPaM& GetEPaM() { return aEPaM; }
...@@ -162,7 +157,6 @@ private: ...@@ -162,7 +157,6 @@ private:
SfxPoolItem* pFeature; SfxPoolItem* pFeature;
public: public:
TYPEINFO();
EditUndoInsertFeature(EditEngine* pEE, const EPaM& rEPaM, const SfxPoolItem& rFeature); EditUndoInsertFeature(EditEngine* pEE, const EPaM& rEPaM, const SfxPoolItem& rFeature);
virtual ~EditUndoInsertFeature(); virtual ~EditUndoInsertFeature();
...@@ -180,7 +174,6 @@ private: ...@@ -180,7 +174,6 @@ private:
sal_uInt16 nDest; sal_uInt16 nDest;
public: public:
TYPEINFO();
EditUndoMoveParagraphs(EditEngine* pEE, const Range& rParas, sal_uInt16 nDest); EditUndoMoveParagraphs(EditEngine* pEE, const Range& rParas, sal_uInt16 nDest);
virtual ~EditUndoMoveParagraphs(); virtual ~EditUndoMoveParagraphs();
...@@ -202,7 +195,6 @@ private: ...@@ -202,7 +195,6 @@ private:
SfxItemSet aPrevParaAttribs; SfxItemSet aPrevParaAttribs;
public: public:
TYPEINFO();
EditUndoSetStyleSheet(EditEngine* pEE, sal_uInt16 nPara, EditUndoSetStyleSheet(EditEngine* pEE, sal_uInt16 nPara,
const String& rPrevName, SfxStyleFamily ePrevFamily, const String& rPrevName, SfxStyleFamily ePrevFamily,
const String& rNewName, SfxStyleFamily eNewFamily, const String& rNewName, SfxStyleFamily eNewFamily,
...@@ -224,7 +216,6 @@ private: ...@@ -224,7 +216,6 @@ private:
SfxItemSet aNewItems; SfxItemSet aNewItems;
public: public:
TYPEINFO();
EditUndoSetParaAttribs(EditEngine* pEE, sal_uInt16 nPara, const SfxItemSet& rPrevItems, const SfxItemSet& rNewItems); EditUndoSetParaAttribs(EditEngine* pEE, sal_uInt16 nPara, const SfxItemSet& rPrevItems, const SfxItemSet& rNewItems);
virtual ~EditUndoSetParaAttribs(); virtual ~EditUndoSetParaAttribs();
...@@ -253,7 +244,6 @@ private: ...@@ -253,7 +244,6 @@ private:
public: public:
TYPEINFO();
EditUndoSetAttribs(EditEngine* pEE, const ESelection& rESel, const SfxItemSet& rNewItems); EditUndoSetAttribs(EditEngine* pEE, const ESelection& rESel, const SfxItemSet& rNewItems);
virtual ~EditUndoSetAttribs(); virtual ~EditUndoSetAttribs();
...@@ -284,7 +274,6 @@ private: ...@@ -284,7 +274,6 @@ private:
String aText; String aText;
public: public:
TYPEINFO();
EditUndoTransliteration(EditEngine* pEE, const ESelection& rESel, sal_Int32 nMode); EditUndoTransliteration(EditEngine* pEE, const ESelection& rESel, sal_Int32 nMode);
virtual ~EditUndoTransliteration(); virtual ~EditUndoTransliteration();
...@@ -305,7 +294,6 @@ private: ...@@ -305,7 +294,6 @@ private:
ESelection aSelection; ESelection aSelection;
public: public:
TYPEINFO();
EditUndoMarkSelection(EditEngine* pEE, const ESelection& rSel); EditUndoMarkSelection(EditEngine* pEE, const ESelection& rSel);
virtual ~EditUndoMarkSelection(); virtual ~EditUndoMarkSelection();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment