diff options
| author | Armin Le Grand <alg@apache.org> | 2013-06-23 11:25:32 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-06-24 16:08:17 +0100 |
| commit | 91b8728108193706e142c25903c0dcd4ea8b0b21 (patch) | |
| tree | 7a979cf11476fc5dd2bcd39ca3a1efa0ad7b5a1b /include/svl/undo.hxx | |
| parent | b139f6fedfcf3cbed0eadeb007e2155b576413d2 (diff) | |
Resolves: #i120020# corrected paragraph merge...
corresponding undo and ownership of linked undo actions
(cherry picked from commit e58fe7afee5163833479b76a474416a77d95f075)
Conflicts:
editeng/source/editeng/impedit2.cxx
sc/source/ui/undo/undobase.cxx
sc/source/ui/undo/undodraw.cxx
svl/inc/svl/undo.hxx
Change-Id: I6672990558a496dfc692554437897d013e258f40
Diffstat (limited to 'include/svl/undo.hxx')
| -rw-r--r-- | include/svl/undo.hxx | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/include/svl/undo.hxx b/include/svl/undo.hxx index f36cd816b607..c1054a6ac3bf 100644 --- a/include/svl/undo.hxx +++ b/include/svl/undo.hxx @@ -46,17 +46,20 @@ public: }; //==================================================================== +class SfxLinkUndoAction; class SVL_DLLPUBLIC SfxUndoAction { - sal_Bool bLinked; +private: + SfxLinkUndoAction* mpSfxLinkUndoAction; + public: TYPEINFO(); SfxUndoAction(); virtual ~SfxUndoAction(); - virtual sal_Bool IsLinked(); - virtual void SetLinked( sal_Bool bIsLinked = sal_True ); + virtual void SetLinkToSfxLinkUndoAction(SfxLinkUndoAction* pSfxLinkUndoAction); + virtual void Undo(); virtual void UndoWithContext( SfxUndoContext& i_context ); virtual void Redo(); @@ -446,6 +449,10 @@ class SVL_DLLPUBLIC SfxLinkUndoAction : public SfxUndoAction */ { +private: + friend class SfxUndoAction; + void LinkedSfxUndoActionDestructed(const SfxUndoAction& rCandidate); + public: TYPEINFO(); SfxLinkUndoAction(::svl::IUndoManager *pManager); |