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/svx/svdedxv.hxx | |
| 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/svx/svdedxv.hxx')
| -rw-r--r-- | include/svx/svdedxv.hxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx index f1ec6296b3f2..c0d8a2a2eaac 100644 --- a/include/svx/svdedxv.hxx +++ b/include/svx/svdedxv.hxx @@ -38,6 +38,7 @@ class EditStatus; class EditFieldInfo; class ImpSdrEditPara; struct PasteOrDropInfos; +class SdrUndoManager; namespace com { namespace sun { namespace star { namespace uno { class Any; @@ -97,7 +98,7 @@ protected: Link aOldCalcFieldValueLink; // Zum rufen des alten Handlers Point aMacroDownPos; - sal_uInt16 nMacroTol; + sal_uInt16 nMacroTol; unsigned bTextEditDontDelete : 1; // Outliner und View bei SdrEndTextEdit nicht deleten (f. Rechtschreibpruefung) unsigned bTextEditOnlyOneView : 1; // Nur eine OutlinerView (f. Rechtschreibpruefung) @@ -110,6 +111,8 @@ protected: rtl::Reference< sdr::SelectionController > mxLastSelectionController; private: + ::svl::IUndoManager* mpOldTextEditUndoManager; + SVX_DLLPRIVATE void ImpClearVars(); protected: @@ -130,6 +133,9 @@ protected: DECL_LINK(ImpOutlinerStatusEventHdl,EditStatus*); DECL_LINK(ImpOutlinerCalcFieldValueHdl,EditFieldInfo*); + // link for EndTextEditHdl + DECL_LINK(EndTextEditHdl, SdrUndoManager*); + void ImpMacroUp(const Point& rUpPos); void ImpMacroDown(const Point& rDownPos); |