diff options
| author | Kurt Zenker <kz@openoffice.org> | 2009-06-04 16:21:29 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2009-06-04 16:21:29 +0000 |
| commit | 2dc34235a216d86471e459a42ab429e207436a20 (patch) | |
| tree | 5bf7a3a1110dd6b5297ff42d89449e99629a942e /svx/inc/svx | |
| parent | 46ba9cbfdc49baeaba4037f8f1a679f1aefe0d5d (diff) | |
CWS-TOOLING: integrate CWS clnoundo
2009-05-18 09:40:22 +0200 wg r271998 : i102011
2009-04-28 12:20:24 +0200 cl r271318 : CWS-TOOLING: rebase CWS clnoundo to trunk@270723 (milestone: DEV300:m46)
2009-04-02 11:37:14 +0200 cl r270388 : #i100371# check valid positions all the time to avoid crashes during model lock
2009-03-30 13:02:27 +0200 cl r270219 : #i100371# do not create undo actions in drawing layer during load
2009-03-30 12:59:41 +0200 cl r270218 : #i100371# do not create undo actions in drawing layer during load
2009-03-30 12:55:06 +0200 cl r270217 : #i100371# do not create undo actions in drawing layer during load
2009-03-30 12:53:27 +0200 cl r270216 : #i100371# do not create undo actions in drawing layer during load
2009-03-30 12:49:28 +0200 cl r270215 : #i100371# added EnableUndo() and IsUndoEnabled()
Diffstat (limited to 'svx/inc/svx')
| -rw-r--r-- | svx/inc/svx/svdedtv.hxx | 1 | ||||
| -rw-r--r-- | svx/inc/svx/svdmodel.hxx | 12 |
2 files changed, 13 insertions, 0 deletions
diff --git a/svx/inc/svx/svdedtv.hxx b/svx/inc/svx/svdedtv.hxx index d3259539d6..38b20ef276 100644 --- a/svx/inc/svx/svdedtv.hxx +++ b/svx/inc/svx/svdedtv.hxx @@ -232,6 +232,7 @@ public: void SetUndoComment(const String& rComment); void SetUndoComment(const String& rComment, const String& rObjDescr); #endif + bool IsUndoEnabled() const; std::vector< SdrUndoAction* > CreateConnectorUndo( SdrObject& rO ); void AddUndoActions( std::vector< SdrUndoAction* >& ); diff --git a/svx/inc/svx/svdmodel.hxx b/svx/inc/svx/svdmodel.hxx index e8a201a08c..c8d132536e 100644 --- a/svx/inc/svx/svdmodel.hxx +++ b/svx/inc/svx/svdmodel.hxx @@ -220,6 +220,7 @@ protected: Container* pRedoStack; SdrUndoGroup* pAktUndoGroup; // Fuer mehrstufige USHORT nUndoLevel; // Undo-Klammerung + bool mbUndoEnabled; // If false no undo is recorded or we are during the execution of an undo action USHORT nProgressPercent; // fuer den ProgressBar-Handler USHORT nLoadVersion; // Versionsnummer der geladenen Datei FASTBOOL bExtColorTable; // Keinen eigenen ColorTable @@ -728,6 +729,17 @@ public: bool IsInDestruction() const; static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelImplementationId(); + + /** enables (true) or disables (false) recording of undo actions + If undo actions are added while undo is disabled, they are deleted. + Disabling undo does not clear the current undo buffer! */ + void EnableUndo( bool bEnable ); + + /** returns true if undo is currently enabled + This returns false if undo was disabled using EnableUndo( false ) and + also during the runtime of the Undo() and Redo() methods. */ + bool IsUndoEnabled() const; + }; typedef tools::WeakReference< SdrModel > SdrModelWeakRef; |