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 /include/editeng | |
| 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 'include/editeng')
| -rw-r--r-- | include/editeng/editeng.hxx | 4 | ||||
| -rw-r--r-- | include/editeng/editund2.hxx | 6 | ||||
| -rw-r--r-- | include/editeng/outliner.hxx | 4 |
3 files changed, 8 insertions, 6 deletions
diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx index e55dbacb9ff6..a3ba78d93e40 100644 --- a/include/editeng/editeng.hxx +++ b/include/editeng/editeng.hxx @@ -303,8 +303,8 @@ public: void ShowParagraph( sal_Int32 nParagraph, sal_Bool bShow = sal_True ); - ::svl::IUndoManager& - GetUndoManager(); + ::svl::IUndoManager& GetUndoManager(); + ::svl::IUndoManager* SetUndoManager(::svl::IUndoManager* pNew); void UndoActionStart( sal_uInt16 nId ); void UndoActionStart(sal_uInt16 nId, const ESelection& rSel); void UndoActionEnd( sal_uInt16 nId ); diff --git a/include/editeng/editund2.hxx b/include/editeng/editund2.hxx index 2312aee93c79..b8106288f97e 100644 --- a/include/editeng/editund2.hxx +++ b/include/editeng/editund2.hxx @@ -25,14 +25,16 @@ class EditEngine; -class EDITENG_DLLPRIVATE EditUndoManager : public SfxUndoManager +class EDITENG_DLLPUBLIC EditUndoManager : public SfxUndoManager { using SfxUndoManager::Undo; using SfxUndoManager::Redo; + friend class ImpEditEngine; EditEngine* mpEditEngine; + void SetEditEngine(EditEngine* pNew); public: - EditUndoManager(EditEngine* pEE); + EditUndoManager(sal_uInt16 nMaxUndoActionCount = 20); virtual sal_Bool Undo(); virtual sal_Bool Redo(); diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx index 9848b6af6cc1..8b4b92e32550 100644 --- a/include/editeng/outliner.hxx +++ b/include/editeng/outliner.hxx @@ -891,8 +891,8 @@ public: sal_uLong Read( SvStream& rInput, const String& rBaseURL, sal_uInt16, SvKeyValueIterator* pHTTPHeaderAttrs = NULL ); - ::svl::IUndoManager& - GetUndoManager(); + ::svl::IUndoManager& GetUndoManager(); + ::svl::IUndoManager* SetUndoManager(::svl::IUndoManager* pNew); void QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel ); void QuickInsertField( const SvxFieldItem& rFld, const ESelection& rSel ); |