summaryrefslogtreecommitdiff
path: root/sw/inc/IDocumentUndoRedo.hxx
diff options
context:
space:
mode:
authorOliver-Rainer Wittmann <orw@apache.org>2013-06-26 12:15:55 +0000
committerCaolán McNamara <caolanm@redhat.com>2013-06-26 16:22:38 +0100
commit25d84e2826de81d1e7a55ff0fdab7845b7a78e74 (patch)
tree904e93931dd60504341c9a710aad5140784222da /sw/inc/IDocumentUndoRedo.hxx
parent19694e844942d44d2c2d5e1d1b95b49d03916573 (diff)
Resolves: #i121751# restore cursor/selection on Undo/Redo language...
change for all text - group intrinsic actions of language change for all text into one Undo action - secure <SwRootFrm::CalcRects(..)> - catch NULL pointer - correct <CursorGuard> - really restore the cursor (cherry picked from commit 4207db473430e02a65a5f4d57db6e46a8db29a19) Conflicts: svl/inc/svl/undo.hxx svl/source/undo/undo.cxx sw/inc/IDocumentUndoRedo.hxx sw/source/core/edit/edundo.cxx sw/source/core/inc/UndoManager.hxx sw/source/core/layout/trvlfrm.cxx sw/source/core/undo/docundo.cxx Change-Id: I972988bbc21a519e0956ff196aa93a46287b9a2e
Diffstat (limited to 'sw/inc/IDocumentUndoRedo.hxx')
-rw-r--r--sw/inc/IDocumentUndoRedo.hxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/sw/inc/IDocumentUndoRedo.hxx b/sw/inc/IDocumentUndoRedo.hxx
index 26e76f0b838f..a50a4f0dcbb4 100644
--- a/sw/inc/IDocumentUndoRedo.hxx
+++ b/sw/inc/IDocumentUndoRedo.hxx
@@ -156,11 +156,13 @@ public:
*/
virtual sal_Bool Redo() = 0;
- /** Get comment of first Redo action.
+ /** Get Id and comment of first Redo action.
@param o_pStr if not 0, receives comment of first Redo action.
+ @param o_pId if not 0, receives Id of first Redo action.
@return true if there is a Redo action, false if none
*/
- virtual bool GetFirstRedoInfo(OUString *const o_pStr) const = 0;
+ virtual bool GetFirstRedoInfo(OUString *const o_pStr,
+ SwUndoId *const o_pId = 0) const = 0;
/** Get comments of Redo actions.
@return comments of all top-level Redo actions.