diff options
| author | Armin Le Grand <alg@apache.org> | 2012-08-10 13:19:02 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-05-28 15:55:23 +0100 |
| commit | 71e37a5c3886ff35d7240a9fb6b30aceec057782 (patch) | |
| tree | fc4007d2288553c4823ffa9865593f28784103ce /include | |
| parent | 12a4200e8ff7f045efcc7e9d15a24b15b248c437 (diff) | |
Related: #i120498# fixed error with half text edit undone
extended as preparation for #i120515#
(cherry picked from commit ddd9492911585313faf1769f88323a8421bf93db)
Conflicts:
svx/inc/svx/sdrundomanager.hxx
svx/inc/svx/svdedxv.hxx
Change-Id: I50272a5719ee6e6a1a7fd1bafe9d94f480b1dbf5
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/sdrundomanager.hxx | 10 | ||||
| -rw-r--r-- | include/svx/svdedxv.hxx | 6 |
2 files changed, 16 insertions, 0 deletions
diff --git a/include/svx/sdrundomanager.hxx b/include/svx/sdrundomanager.hxx index 0d899f647aa9..860742f8bae7 100644 --- a/include/svx/sdrundomanager.hxx +++ b/include/svx/sdrundomanager.hxx @@ -33,6 +33,11 @@ private: Link maEndTextEditHdl; SfxUndoAction* mpLastUndoActionBeforeTextEdit; + bool mbEndTextEditTriggeredFromUndo; + +protected: + // call to check for TextEdit active + bool isTextEditActive() const; public: SdrUndoManager(sal_uInt16 nMaxUndoActionCount = 20); @@ -47,6 +52,11 @@ public: // reset all text edit actions will be removed from this undo manager to // restore the state before activation void SetEndTextEditHdl(const Link& rLink); + + // check from outside if we are inside a callback for ending text edit. This + // is needed to detect inside end text edit if it is a regular one or triggered + // by a last undo during text edit + bool isEndTextEditTriggeredFromUndo() { return mbEndTextEditTriggeredFromUndo; } }; ////////////////////////////////////////////////////////////////////////////// diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx index c0d8a2a2eaac..0bdad27e229d 100644 --- a/include/svx/svdedxv.hxx +++ b/include/svx/svdedxv.hxx @@ -116,6 +116,12 @@ private: SVX_DLLPRIVATE void ImpClearVars(); protected: + // central method to get an SdrUndoManager for enhanced TextEdit. Default will + // try to return a dynamic_casted GetModel()->GetSdrUndoManager(). Applications + // which want to use this feature will need to overload this virtual method, + // provide their document UndoManager and derive it from SdrUndoManager. + virtual SdrUndoManager* getSdrUndoManagerForEnhancedTextEdit() const; + OutlinerView* ImpFindOutlinerView(Window* pWin) const; // Eine neue OutlinerView auf dem Heap anlegen und alle erforderlichen Parameter setzen. |