undoapi: UndoCore.hxx: split out UndoAttribute.hxx

8 files changed, 302 insertions, 252 deletions

diff --git a/sw/source/core/doc/docfly.cxx b/sw/source/core/doc/docfly.cxx
index 2c0bd4e5b53e..ad59c85e1844 100644
--- a/sw/source/core/doc/docfly.cxx
+++ b/sw/source/core/doc/docfly.cxx
@@ -62,6 +62,7 @@
 #include <swtable.hxx>
 #include <crstate.hxx>
 #include <UndoCore.hxx>
+#include <UndoAttribute.hxx>
 #include <fmtcnct.hxx>
 #include <dflyobj.hxx>
 
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index 52fca779e71f..b335f50ed014 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -61,6 +61,7 @@
 #include <ndtxt.hxx>
 #include <pam.hxx>
 #include <UndoCore.hxx>
+#include <UndoAttribute.hxx>
 #include <ndgrf.hxx>
 #include <pagedesc.hxx>         // Fuer Sonderbehandlung in InsFrmFmt
 #include <rolbck.hxx>           // Undo-Attr
diff --git a/sw/source/core/doc/docftn.cxx b/sw/source/core/doc/docftn.cxx
index 8e9a7695601f..ed4ce39eb8de 100644
--- a/sw/source/core/doc/docftn.cxx
+++ b/sw/source/core/doc/docftn.cxx
@@ -36,7 +36,7 @@
 #include <pam.hxx>
 #include <pagedesc.hxx>
 #include <charfmt.hxx>
-#include <UndoCore.hxx>
+#include <UndoAttribute.hxx>
 #include <hints.hxx>
 #include <rolbck.hxx>
 #include <doc.hxx>
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index d593388bd6f7..5545fa3a9cd0 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -59,7 +59,7 @@
 #include <poolfmt.hxx>
 #include <txtfrm.hxx>
 #include <rootfrm.hxx>
-#include <UndoCore.hxx>
+#include <UndoAttribute.hxx>
 #include <swundo.hxx>
 #include <mdiexp.hxx>
 #include <docary.hxx>
diff --git a/sw/source/core/inc/UndoAttribute.hxx b/sw/source/core/inc/UndoAttribute.hxx
new file mode 100644
index 000000000000..975e37202982
--- /dev/null
+++ b/sw/source/core/inc/UndoAttribute.hxx
@@ -0,0 +1,288 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef SW_UNDO_ATTRIBUTE_HXX
+#define SW_UNDO_ATTRIBUTE_HXX
+
+#include <undobj.hxx>
+
+#include <memory>
+
+#ifndef _SVSTDARR_HXX
+#define _SVSTDARR_USHORTS
+#define _SVSTDARR_ULONGS
+#define _SVSTDARR_BOOLS
+#define _SVSTDARR_BYTES
+#define _SVSTDARR_USHORTSSORT
+#include <svl/svstdarr.hxx>
+#endif
+#include <svl/itemset.hxx>
+
+#include <swtypes.hxx>
+#include <calbck.hxx>
+
+
+class SvxTabStopItem;
+class SwFmt;
+class SwFtnInfo;
+class SwEndNoteInfo;
+
+
+class SwUndoAttr : public SwUndo, private SwUndRng
+{
+    SfxItemSet m_AttrSet;                           // attributes for Redo
+    const ::std::auto_ptr<SwHistory> m_pHistory;    // History for Undo
+    ::std::auto_ptr<SwRedlineData> m_pRedlineData;  // Redlining
+    ::std::auto_ptr<SwRedlineSaveDatas> m_pRedlineSaveData;
+    ULONG m_nNodeIndex;                             // Offset: for Redlining
+    const SetAttrMode m_nInsertFlags;               // insert flags
+
+    void RemoveIdx( SwDoc& rDoc );
+
+public:
+    SwUndoAttr( const SwPaM&, const SfxItemSet &, const SetAttrMode nFlags );
+    SwUndoAttr( const SwPaM&, const SfxPoolItem&, const SetAttrMode nFlags );
+
+    virtual ~SwUndoAttr();
+
+    virtual void UndoImpl( ::sw::UndoRedoContext & );
+    virtual void RedoImpl( ::sw::UndoRedoContext & );
+    virtual void RepeatImpl( ::sw::RepeatContext & );
+
+    void SaveRedlineData( const SwPaM& rPam, BOOL bInsCntnt );
+
+    SwHistory& GetHistory() { return *m_pHistory; }
+
+};
+
+class SwUndoResetAttr : public SwUndo, private SwUndRng
+{
+    const ::std::auto_ptr<SwHistory> m_pHistory;
+    SvUShortsSort m_Ids;
+    const USHORT m_nFormatId;             // Format-Id for Redo
+
+public:
+    SwUndoResetAttr( const SwPaM&, USHORT nFmtId );
+    SwUndoResetAttr( const SwPosition&, USHORT nFmtId );
+
+    virtual ~SwUndoResetAttr();
+
+    virtual void UndoImpl( ::sw::UndoRedoContext & );
+    virtual void RedoImpl( ::sw::UndoRedoContext & );
+    virtual void RepeatImpl( ::sw::RepeatContext & );
+
+    void SetAttrs( const SvUShortsSort& rArr );
+
+    SwHistory& GetHistory() { return *m_pHistory; }
+
+};
+
+class SwUndoFmtAttr : public SwUndo
+{
+    friend class SwUndoDefaultAttr;
+    SwFmt * m_pFmt;
+    ::std::auto_ptr<SfxItemSet> m_pOldSet;    // old attributes
+    ULONG m_nNodeIndex;
+    const USHORT m_nFmtWhich;
+    const bool m_bSaveDrawPt;
+
+    bool IsFmtInDoc( SwDoc* );   //is the attribute format still in the Doc?
+    void SaveFlyAnchor( bool bSaveDrawPt = false );
+    // --> OD 2004-10-26 #i35443# - Add return value, type <bool>.
+    // Return value indicates, if anchor attribute is restored.
+    // Notes: - If anchor attribute is restored, all other existing attributes
+    //          are also restored.
+    //        - Anchor attribute isn't restored successfully, if it contains
+    //          an invalid anchor position and all other existing attributes
+    //          aren't restored.
+    //          This situation occurs for undo of styles.
+    bool RestoreFlyAnchor(::sw::UndoRedoContext & rContext);
+    // <--
+    // --> OD 2008-02-27 #refactorlists# - removed <rAffectedItemSet>
+    void Init();
+    // <--
+
+public:
+    // register at the Format and save old attributes
+    // --> OD 2008-02-27 #refactorlists# - removed <rNewSet>
+    SwUndoFmtAttr( const SfxItemSet& rOldSet,
+                   SwFmt& rFmt,
+                   bool bSaveDrawPt = true );
+    // <--
+    SwUndoFmtAttr( const SfxPoolItem& rItem,
+                   SwFmt& rFmt,
+                   bool bSaveDrawPt = true );
+
+    virtual ~SwUndoFmtAttr();
+
+    virtual void UndoImpl( ::sw::UndoRedoContext & );
+    virtual void RedoImpl( ::sw::UndoRedoContext & );
+    virtual void RepeatImpl( ::sw::RepeatContext & );
+
+    virtual SwRewriter GetRewriter() const;
+
+    void PutAttr( const SfxPoolItem& rItem );
+    SwFmt* GetFmt( SwDoc& rDoc );   // checks if it is still in the Doc!
+};
+
+// --> OD 2008-02-12 #newlistlevelattrs#
+class SwUndoFmtResetAttr : public SwUndo
+{
+    public:
+        SwUndoFmtResetAttr( SwFmt& rChangedFormat,
+                            const USHORT nWhichId );
+        ~SwUndoFmtResetAttr();
+
+        virtual void UndoImpl( ::sw::UndoRedoContext & );
+        virtual void RedoImpl( ::sw::UndoRedoContext & );
+
+    private:
+        // format at which a certain attribute is reset.
+        SwFmt * const m_pChangedFormat;
+        // which ID of the reset attribute
+        const USHORT m_nWhichId;
+        // old attribute which has been reset - needed for undo.
+        ::std::auto_ptr<SfxPoolItem> m_pOldItem;
+};
+// <--
+
+class SwUndoDontExpandFmt : public SwUndo
+{
+    const ULONG m_nNodeIndex;
+    const xub_StrLen m_nContentIndex;
+
+public:
+    SwUndoDontExpandFmt( const SwPosition& rPos );
+
+    virtual void UndoImpl( ::sw::UndoRedoContext & );
+    virtual void RedoImpl( ::sw::UndoRedoContext & );
+    virtual void RepeatImpl( ::sw::RepeatContext & );
+};
+
+// helper class to receive changed attribute sets
+class SwUndoFmtAttrHelper : public SwClient
+{
+    ::std::auto_ptr<SwUndoFmtAttr> m_pUndo;
+    const bool m_bSaveDrawPt;
+
+public:
+    SwUndoFmtAttrHelper( SwFmt& rFmt, bool bSaveDrawPt = true );
+
+    virtual void Modify( SfxPoolItem*, SfxPoolItem* );
+
+    SwUndoFmtAttr* GetUndo() const  { return m_pUndo.get(); }
+    // release the undo object (so it is not deleted here), and return it
+    SwUndoFmtAttr* ReleaseUndo()    { return m_pUndo.release(); }
+};
+
+
+class SwUndoMoveLeftMargin : public SwUndo, private SwUndRng
+{
+    const ::std::auto_ptr<SwHistory> m_pHistory;
+    const bool m_bModulus;
+
+public:
+    SwUndoMoveLeftMargin( const SwPaM&, BOOL bRight, BOOL bModulus );
+
+    virtual ~SwUndoMoveLeftMargin();
+
+    virtual void UndoImpl( ::sw::UndoRedoContext & );
+    virtual void RedoImpl( ::sw::UndoRedoContext & );
+    virtual void RepeatImpl( ::sw::RepeatContext & );
+
+    SwHistory& GetHistory() { return *m_pHistory; }
+
+};
+
+
+//--------------------------------------------------------------------
+
+class SwUndoDefaultAttr : public SwUndo
+{
+    ::std::auto_ptr<SfxItemSet> m_pOldSet;        // the old attributes
+    ::std::auto_ptr<SvxTabStopItem> m_pTabStop;
+
+public:
+    // registers at the format and saves old attributes
+    SwUndoDefaultAttr( const SfxItemSet& rOldSet );
+
+    virtual ~SwUndoDefaultAttr();
+
+    virtual void UndoImpl( ::sw::UndoRedoContext & );
+    virtual void RedoImpl( ::sw::UndoRedoContext & );
+};
+
+
+//--------------------------------------------------------------------
+
+class SwUndoChangeFootNote : public SwUndo, private SwUndRng
+{
+    const ::std::auto_ptr<SwHistory> m_pHistory;
+    const String m_Text;
+    const USHORT m_nNumber;
+    const bool m_bEndNote;
+
+public:
+    SwUndoChangeFootNote( const SwPaM& rRange, const String& rTxt,
+                          USHORT nNum, bool bIsEndNote );
+    virtual ~SwUndoChangeFootNote();
+
+    virtual void UndoImpl( ::sw::UndoRedoContext & );
+    virtual void RedoImpl( ::sw::UndoRedoContext & );
+    virtual void RepeatImpl( ::sw::RepeatContext & );
+
+    SwHistory& GetHistory() { return *m_pHistory; }
+};
+
+class SwUndoFootNoteInfo : public SwUndo
+{
+    ::std::auto_ptr<SwFtnInfo> m_pFootNoteInfo;
+
+public:
+    SwUndoFootNoteInfo( const SwFtnInfo &rInfo );
+
+    virtual ~SwUndoFootNoteInfo();
+
+    virtual void UndoImpl( ::sw::UndoRedoContext & );
+    virtual void RedoImpl( ::sw::UndoRedoContext & );
+};
+
+class SwUndoEndNoteInfo : public SwUndo
+{
+    ::std::auto_ptr<SwEndNoteInfo> m_pEndNoteInfo;
+
+public:
+    SwUndoEndNoteInfo( const SwEndNoteInfo &rInfo );
+
+    virtual ~SwUndoEndNoteInfo();
+
+    virtual void UndoImpl( ::sw::UndoRedoContext & );
+    virtual void RedoImpl( ::sw::UndoRedoContext & );
+};
+
+#endif // SW_UNDO_ATTRIBUTE_HXX
+
diff --git a/sw/source/core/inc/UndoCore.hxx b/sw/source/core/inc/UndoCore.hxx
index 02d7c4b30a88..0ac921f6c597 100644
--- a/sw/source/core/inc/UndoCore.hxx
+++ b/sw/source/core/inc/UndoCore.hxx
@@ -36,22 +36,12 @@
 
 #include <tools/mempool.hxx>
 
-#ifndef _SVSTDARR_HXX
-#define _SVSTDARR_USHORTS
-#define _SVSTDARR_ULONGS
-#define _SVSTDARR_BOOLS
-#define _SVSTDARR_BYTES
-#define _SVSTDARR_USHORTSSORT
-#include <svl/svstdarr.hxx>
-#endif
-#include <svl/itemset.hxx>
-
 #include <swtypes.hxx>
 #include <IDocumentContentOperations.hxx>
 #include <calbck.hxx>
 
 
-class SwFmt;
+class SfxItemSet;
 class SwFmtColl;
 class SwTxtNode;
 class SwTableNode;
@@ -60,16 +50,14 @@ class SwHistoryBookmark;
 class SwSectionData;
 class SwSectionFmt;
 class SwTOXBase;
-class SvxTabStopItem;
 class Graphic;
 class SwGrfNode;
-class SwFtnInfo;
-class SwEndNoteInfo;
 class SwFmtAnchor;
 class SdrMarkList;
 class SwUndoDelete;
 class SwRedlineSaveData;
 class SwUndoAttrTbl;
+class SwUndoFmtAttr;
 
 namespace sfx2 {
     class MetadatableUndo;
@@ -371,153 +359,6 @@ public:
 };
 
 
-class SwUndoAttr : public SwUndo, private SwUndRng
-{
-    SfxItemSet m_AttrSet;                           // attributes for Redo
-    const ::std::auto_ptr<SwHistory> m_pHistory;    // History for Undo
-    ::std::auto_ptr<SwRedlineData> m_pRedlineData;  // Redlining
-    ::std::auto_ptr<SwRedlineSaveDatas> m_pRedlineSaveData;
-    ULONG m_nNodeIndex;                             // Offset: for Redlining
-    const SetAttrMode m_nInsertFlags;               // insert flags
-
-    void RemoveIdx( SwDoc& rDoc );
-
-public:
-    SwUndoAttr( const SwPaM&, const SfxItemSet &, const SetAttrMode nFlags );
-    SwUndoAttr( const SwPaM&, const SfxPoolItem&, const SetAttrMode nFlags );
-
-    virtual ~SwUndoAttr();
-
-    virtual void UndoImpl( ::sw::UndoRedoContext & );
-    virtual void RedoImpl( ::sw::UndoRedoContext & );
-    virtual void RepeatImpl( ::sw::RepeatContext & );
-
-    void SaveRedlineData( const SwPaM& rPam, BOOL bInsCntnt );
-
-    SwHistory& GetHistory() { return *m_pHistory; }
-
-};
-
-class SwUndoResetAttr : public SwUndo, private SwUndRng
-{
-    const ::std::auto_ptr<SwHistory> m_pHistory;
-    SvUShortsSort m_Ids;
-    const USHORT m_nFormatId;             // Format-Id for Redo
-
-public:
-    SwUndoResetAttr( const SwPaM&, USHORT nFmtId );
-    SwUndoResetAttr( const SwPosition&, USHORT nFmtId );
-
-    virtual ~SwUndoResetAttr();
-
-    virtual void UndoImpl( ::sw::UndoRedoContext & );
-    virtual void RedoImpl( ::sw::UndoRedoContext & );
-    virtual void RepeatImpl( ::sw::RepeatContext & );
-
-    void SetAttrs( const SvUShortsSort& rArr );
-
-    SwHistory& GetHistory() { return *m_pHistory; }
-
-};
-
-class SwUndoFmtAttr : public SwUndo
-{
-    friend class SwUndoDefaultAttr;
-    SwFmt * m_pFmt;
-    ::std::auto_ptr<SfxItemSet> m_pOldSet;    // old attributes
-    ULONG m_nNodeIndex;
-    const USHORT m_nFmtWhich;
-    const bool m_bSaveDrawPt;
-
-    bool IsFmtInDoc( SwDoc* );   //is the attribute format still in the Doc?
-    void SaveFlyAnchor( bool bSaveDrawPt = false );
-    // --> OD 2004-10-26 #i35443# - Add return value, type <bool>.
-    // Return value indicates, if anchor attribute is restored.
-    // Notes: - If anchor attribute is restored, all other existing attributes
-    //          are also restored.
-    //        - Anchor attribute isn't restored successfully, if it contains
-    //          an invalid anchor position and all other existing attributes
-    //          aren't restored.
-    //          This situation occurs for undo of styles.
-    bool RestoreFlyAnchor(::sw::UndoRedoContext & rContext);
-    // <--
-    // --> OD 2008-02-27 #refactorlists# - removed <rAffectedItemSet>
-    void Init();
-    // <--
-
-public:
-    // register at the Format and save old attributes
-    // --> OD 2008-02-27 #refactorlists# - removed <rNewSet>
-    SwUndoFmtAttr( const SfxItemSet& rOldSet,
-                   SwFmt& rFmt,
-                   bool bSaveDrawPt = true );
-    // <--
-    SwUndoFmtAttr( const SfxPoolItem& rItem,
-                   SwFmt& rFmt,
-                   bool bSaveDrawPt = true );
-
-    virtual ~SwUndoFmtAttr();
-
-    virtual void UndoImpl( ::sw::UndoRedoContext & );
-    virtual void RedoImpl( ::sw::UndoRedoContext & );
-    virtual void RepeatImpl( ::sw::RepeatContext & );
-
-    virtual SwRewriter GetRewriter() const;
-
-    void PutAttr( const SfxPoolItem& rItem );
-    SwFmt* GetFmt( SwDoc& rDoc );   // checks if it is still in the Doc!
-};
-
-// --> OD 2008-02-12 #newlistlevelattrs#
-class SwUndoFmtResetAttr : public SwUndo
-{
-    public:
-        SwUndoFmtResetAttr( SwFmt& rChangedFormat,
-                            const USHORT nWhichId );
-        ~SwUndoFmtResetAttr();
-
-        virtual void UndoImpl( ::sw::UndoRedoContext & );
-        virtual void RedoImpl( ::sw::UndoRedoContext & );
-
-    private:
-        // format at which a certain attribute is reset.
-        SwFmt * const m_pChangedFormat;
-        // which ID of the reset attribute
-        const USHORT m_nWhichId;
-        // old attribute which has been reset - needed for undo.
-        ::std::auto_ptr<SfxPoolItem> m_pOldItem;
-};
-// <--
-
-class SwUndoDontExpandFmt : public SwUndo
-{
-    const ULONG m_nNodeIndex;
-    const xub_StrLen m_nContentIndex;
-
-public:
-    SwUndoDontExpandFmt( const SwPosition& rPos );
-
-    virtual void UndoImpl( ::sw::UndoRedoContext & );
-    virtual void RedoImpl( ::sw::UndoRedoContext & );
-    virtual void RepeatImpl( ::sw::RepeatContext & );
-};
-
-// helper class to receive changed attribute sets
-class SwUndoFmtAttrHelper : public SwClient
-{
-    ::std::auto_ptr<SwUndoFmtAttr> m_pUndo;
-    const bool m_bSaveDrawPt;
-
-public:
-    SwUndoFmtAttrHelper( SwFmt& rFmt, bool bSaveDrawPt = true );
-
-    virtual void Modify( SfxPoolItem*, SfxPoolItem* );
-
-    SwUndoFmtAttr* GetUndo() const  { return m_pUndo.get(); }
-    // release the undo object (so it is not deleted here), and return it
-    SwUndoFmtAttr* ReleaseUndo()    { return m_pUndo.release(); }
-};
-
 
 class SwUndoFmtColl : public SwUndo, private SwUndRng
 {
@@ -569,26 +410,6 @@ public:
 };
 
 
-class SwUndoMoveLeftMargin : public SwUndo, private SwUndRng
-{
-    const ::std::auto_ptr<SwHistory> m_pHistory;
-    const bool m_bModulus;
-
-public:
-    SwUndoMoveLeftMargin( const SwPaM&, BOOL bRight, BOOL bModulus );
-
-    virtual ~SwUndoMoveLeftMargin();
-
-    virtual void UndoImpl( ::sw::UndoRedoContext & );
-    virtual void RedoImpl( ::sw::UndoRedoContext & );
-    virtual void RepeatImpl( ::sw::RepeatContext & );
-
-    SwHistory& GetHistory() { return *m_pHistory; }
-
-};
-
-
-
 class SwUndoBookmark : public SwUndo
 {
     const ::std::auto_ptr<SwHistoryBookmark> m_pHistoryBookmark;
@@ -812,23 +633,6 @@ public:
 
 //--------------------------------------------------------------------
 
-class SwUndoDefaultAttr : public SwUndo
-{
-    ::std::auto_ptr<SfxItemSet> m_pOldSet;        // the old attributes
-    ::std::auto_ptr<SvxTabStopItem> m_pTabStop;
-
-public:
-    // registers at the format and saves old attributes
-    SwUndoDefaultAttr( const SfxItemSet& rOldSet );
-
-    virtual ~SwUndoDefaultAttr();
-
-    virtual void UndoImpl( ::sw::UndoRedoContext & );
-    virtual void RedoImpl( ::sw::UndoRedoContext & );
-};
-
-//--------------------------------------------------------------------
-
 class SwUndoReRead : public SwUndo
 {
     Graphic *pGrf;
@@ -917,53 +721,6 @@ public:
     void SetDrawObj( BYTE nLayerId );
 };
 
-//--------------------------------------------------------------------
-
-class SwUndoChangeFootNote : public SwUndo, private SwUndRng
-{
-    const ::std::auto_ptr<SwHistory> m_pHistory;
-    const String m_Text;
-    const USHORT m_nNumber;
-    const bool m_bEndNote;
-
-public:
-    SwUndoChangeFootNote( const SwPaM& rRange, const String& rTxt,
-                          USHORT nNum, bool bIsEndNote );
-    virtual ~SwUndoChangeFootNote();
-
-    virtual void UndoImpl( ::sw::UndoRedoContext & );
-    virtual void RedoImpl( ::sw::UndoRedoContext & );
-    virtual void RepeatImpl( ::sw::RepeatContext & );
-
-    SwHistory& GetHistory() { return *m_pHistory; }
-};
-
-class SwUndoFootNoteInfo : public SwUndo
-{
-    ::std::auto_ptr<SwFtnInfo> m_pFootNoteInfo;
-
-public:
-    SwUndoFootNoteInfo( const SwFtnInfo &rInfo );
-
-    virtual ~SwUndoFootNoteInfo();
-
-    virtual void UndoImpl( ::sw::UndoRedoContext & );
-    virtual void RedoImpl( ::sw::UndoRedoContext & );
-};
-
-class SwUndoEndNoteInfo : public SwUndo
-{
-    ::std::auto_ptr<SwEndNoteInfo> m_pEndNoteInfo;
-
-public:
-    SwUndoEndNoteInfo( const SwEndNoteInfo &rInfo );
-
-    virtual ~SwUndoEndNoteInfo();
-
-    virtual void UndoImpl( ::sw::UndoRedoContext & );
-    virtual void RedoImpl( ::sw::UndoRedoContext & );
-};
-
 
 //--------------------------------------------------------------------
 
diff --git a/sw/source/core/undo/unattr.cxx b/sw/source/core/undo/unattr.cxx
index 55a4e590d894..d1b92a8049e3 100644
--- a/sw/source/core/undo/unattr.cxx
+++ b/sw/source/core/undo/unattr.cxx
@@ -28,16 +28,18 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
 
-
 #define _SVSTDARR_USHORTS
 #define _SVSTDARR_USHORTSSORT
-#include <hintids.hxx>
-#include <svx/svdmodel.hxx>
-#include <editeng/tstpitem.hxx>
-#include <svx/svdpage.hxx>
+#include <UndoAttribute.hxx>
+
 #include <svl/itemiter.hxx>
 
+#include <editeng/tstpitem.hxx>
 
+#include <svx/svdmodel.hxx>
+#include <svx/svdpage.hxx>
+
+#include <hintids.hxx>
 #include <fmtflcnt.hxx>
 #include <txtftn.hxx>
 #include <fmtornt.hxx>
diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx
index f872439205eb..6bec8f0ef2c6 100644
--- a/sw/source/core/undo/unins.cxx
+++ b/sw/source/core/undo/unins.cxx
@@ -44,6 +44,7 @@
 #include <pam.hxx>
 #include <ndtxt.hxx>
 #include <UndoCore.hxx>
+#include <UndoAttribute.hxx>
 #include <rolbck.hxx>
 #include <ndgrf.hxx>
 #include <ndole.hxx>