diff options
| author | Armin Le Grand <alg@apache.org> | 2012-08-09 08:42:27 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-05-28 15:55:23 +0100 |
| commit | 12a4200e8ff7f045efcc7e9d15a24b15b248c437 (patch) | |
| tree | 00363aedf07713ec9ff931d933b86a6b35e20267 /sd/source | |
| parent | 64b07d99aa0b31b3d04519afe6afe0cdf36bcd6f (diff) | |
Related: #i120498# Enhanced Undo/Redo and user experience...
when editing texts in graphic objects and/or tables
(cherry picked from commit a096725779b210c7a2706e72596fd7c80e049fdd)
Conflicts:
editeng/inc/editeng/editeng.hxx
editeng/inc/editeng/editund2.hxx
editeng/inc/editeng/outliner.hxx
editeng/source/editeng/editundo.cxx
editeng/source/editeng/impedit.hxx
editeng/source/outliner/outliner.cxx
sd/source/core/undo/undomanager.cxx
sd/source/ui/view/drviewse.cxx
svx/Library_svxcore.mk
svx/Package_inc.mk
svx/inc/svx/svdedxv.hxx
svx/source/svdraw/svdedxv.cxx
Change-Id: I40e3ef2dff681f9b6f2f6b5d35507071f8110533
Comment unused variable pNewEditUndoManager to silence the compiler
(cherry picked from commit 568655083af7830e7b9edf56ef862ddf9a99003b)
Change-Id: Ib7179ee6c34ce03a75942978831c3a55968f161f
Removed unused variable
(cherry picked from commit 0bbde4414badfd40234de4a4c9f750194f5d1d5e)
Change-Id: I39e7f25426e8e7d1367102d603b0f6c84d96622f
Diffstat (limited to 'sd/source')
| -rw-r--r-- | sd/source/core/undo/undomanager.cxx | 8 | ||||
| -rw-r--r-- | sd/source/ui/view/drviewse.cxx | 5 |
2 files changed, 4 insertions, 9 deletions
diff --git a/sd/source/core/undo/undomanager.cxx b/sd/source/core/undo/undomanager.cxx index 35d91cc91eec..a2fc65326672 100644 --- a/sd/source/core/undo/undomanager.cxx +++ b/sd/source/core/undo/undomanager.cxx @@ -17,12 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "undo/undomanager.hxx" +#include <undo/undomanager.hxx> using namespace sd; UndoManager::UndoManager( sal_uInt16 nMaxUndoActionCount /* = 20 */ ) -: SfxUndoManager( nMaxUndoActionCount ) +: SdrUndoManager( nMaxUndoActionCount ) , mpLinkedUndoManager(NULL) { } @@ -32,7 +32,7 @@ void UndoManager::EnterListAction(const OUString &rComment, const OUString& rRep if( !IsDoing() ) { ClearLinkedRedoActions(); - SfxUndoManager::EnterListAction( rComment, rRepeatComment, nId ); + SdrUndoManager::EnterListAction( rComment, rRepeatComment, nId ); } } @@ -41,7 +41,7 @@ void UndoManager::AddUndoAction( SfxUndoAction *pAction, sal_Bool bTryMerg /* = if( !IsDoing() ) { ClearLinkedRedoActions(); - SfxUndoManager::AddUndoAction( pAction, bTryMerg ); + SdrUndoManager::AddUndoAction( pAction, bTryMerg ); } else { diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index 36d8f7802336..6651519d82ac 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -625,11 +625,6 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq) } } -////////////////////////////////////////////////////////////////////////////// -// service routine for Undo/Redo implementation -extern SfxUndoManager* ImpGetUndoManagerFromViewShell(DrawViewShell& rDViewShell); - - void DrawViewShell::FuSupport(SfxRequest& rReq) { if( rReq.GetSlot() == SID_STYLE_FAMILY && rReq.GetArgs()) |