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 /sc/source/ui/undo/undodraw.cxx | |
| 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 'sc/source/ui/undo/undodraw.cxx')
| -rw-r--r-- | sc/source/ui/undo/undodraw.cxx | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/sc/source/ui/undo/undodraw.cxx b/sc/source/ui/undo/undodraw.cxx index fc047c117afe..2f42a798dc41 100644 --- a/sc/source/ui/undo/undodraw.cxx +++ b/sc/source/ui/undo/undodraw.cxx @@ -63,18 +63,12 @@ sal_uInt16 ScUndoDraw::GetId() const return 0; } -sal_Bool ScUndoDraw::IsLinked() +void ScUndoDraw::SetLinkToSfxLinkUndoAction(SfxLinkUndoAction* pSfxLinkUndoAction) { if (pDrawUndo) - return pDrawUndo->IsLinked(); + pDrawUndo->SetLinkToSfxLinkUndoAction(pSfxLinkUndoAction); else - return false; -} - -void ScUndoDraw::SetLinked( sal_Bool bIsLinked ) -{ - if (pDrawUndo) - pDrawUndo->SetLinked(bIsLinked); + SetLinkToSfxLinkUndoAction(pSfxLinkUndoAction); } sal_Bool ScUndoDraw::Merge( SfxUndoAction* pNextAction ) |