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 | 7470d7bd81ab783f5d46cfc8391a9b8c301d6aff (patch) | |
| tree | 815505fbcf555f3062427a5d5942c9ab24b73bdb /sc/inc | |
| parent | a3acf41195f4c39cba7950c389dc817b824f76ed (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 'sc/inc')
| -rw-r--r-- | sc/inc/document.hxx | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index e21b0af336f0..66f52fa5c2a8 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -136,6 +136,7 @@ class ScAutoNameCache; class ScTemporaryChartLock; class ScLookupCache; struct ScLookupCacheMapImpl; +class SfxUndoManager; namespace com { namespace sun { namespace star { namespace lang { @@ -232,6 +233,7 @@ friend class ScHorizontalCellIterator; friend class ScHorizontalAttrIterator; friend class ScDocAttrIterator; friend class ScAttrRectIterator; +friend class ScDocShell; #if OLD_PIVOT_IMPLEMENTATION friend class ScPivot; #endif @@ -241,6 +243,7 @@ private: vos::ORef<ScPoolHelper> xPoolHelper; + SfxUndoManager* mpUndoManager; ScFieldEditEngine* pEditEngine; // uses pEditPool from xPoolHelper ScNoteEditEngine* pNoteEngine; // uses pEditPool from xPoolHelper SfxItemPool* pNoteItemPool; // SfxItemPool to be used if pDrawLayer not created. @@ -407,7 +410,7 @@ private: mutable BOOL bStyleSheetUsageInvalid; - BOOL bUndoEnabled; + bool mbUndoEnabled; bool mbAdjustHeightEnabled; bool mbExecuteLinkEnabled; bool mbChangeReadOnlyEnabled; // allow changes in read-only document (for API import filters) @@ -914,8 +917,9 @@ public: BOOL IsClipOrUndo() const { return bIsClip || bIsUndo; } BOOL IsUndo() const { return bIsUndo; } BOOL IsClipboard() const { return bIsClip; } - BOOL IsUndoEnabled() const { return bUndoEnabled; } - void EnableUndo( BOOL bVal ) { bUndoEnabled = bVal; } + bool IsUndoEnabled() const { return mbUndoEnabled; } + void EnableUndo( bool bVal ); + bool IsAdjustHeightEnabled() const { return mbAdjustHeightEnabled; } void EnableAdjustHeight( bool bVal ) { mbAdjustHeightEnabled = bVal; } bool IsExecuteLinkEnabled() const { return mbExecuteLinkEnabled; } @@ -1678,6 +1682,7 @@ public: formula::FormulaGrammar::Grammar GetStorageGrammar() const { return eStorageGrammar; } + SfxUndoManager* GetUndoManager(); private: // CLOOK-Impl-Methoden void ImplCreateOptions(); // bei Gelegenheit auf on-demand umstellen? |