summaryrefslogtreecommitdiff
path: root/svx/inc
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2012-08-15 13:57:45 +0200
committerMichael Stahl <mstahl@redhat.com>2012-08-16 18:44:05 +0200
commitaa2d9729bdac0173349a5f76e2346b8335de565f (patch)
treef0a0ff15f77151ae98d3d9435001dcf45b52b7ff /svx/inc
parent80f8d9f9f19f590f79be58965f30d2aea8d52c26 (diff)
Convert pUndoStack in SdrModel class from Container to std::deque
Change-Id: I59425c7d1e8603f45d193ae5e3498f8671510bc5
Diffstat (limited to 'svx/inc')
-rw-r--r--svx/inc/svx/svdmodel.hxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/svx/inc/svx/svdmodel.hxx b/svx/inc/svx/svdmodel.hxx
index 39daffeb9d98..2f1ad6b4a1f1 100644
--- a/svx/inc/svx/svdmodel.hxx
+++ b/svx/inc/svx/svdmodel.hxx
@@ -52,6 +52,7 @@ class OutputDevice;
#include "svx/svxdllapi.h"
#include <rtl/ref.hxx>
+#include <deque>
#if defined(UNX) || defined(WNT)
#define DEGREE_CHAR ((sal_Unicode)176) /* 0xB0 = Ansi */
@@ -191,7 +192,7 @@ protected:
rtl::Reference< SfxStyleSheetBasePool > mxStyleSheetPool;
SfxStyleSheet* pDefaultStyleSheet;
sfx2::LinkManager* pLinkManager; // LinkManager
- Container* pUndoStack;
+ std::deque<SfxUndoAction*>* pUndoStack;
Container* pRedoStack;
SdrUndoGroup* pAktUndoGroup; // Fuer mehrstufige
sal_uInt16 nUndoLevel; // Undo-Klammerung
@@ -575,8 +576,8 @@ public:
sal_uIntPtr GetMaxUndoActionCount() const { return nMaxUndoCount; }
void ClearUndoBuffer();
// UndoAction(0) ist die aktuelle (also die zuletzt eingegangene)
- sal_uIntPtr GetUndoActionCount() const { return pUndoStack!=NULL ? pUndoStack->Count() : 0; }
- const SfxUndoAction* GetUndoAction(sal_uIntPtr nNum) const { return (SfxUndoAction*)(pUndoStack!=NULL ? pUndoStack->GetObject(nNum) : NULL); }
+ sal_uIntPtr GetUndoActionCount() const { return pUndoStack!=NULL ? pUndoStack->size() : 0; }
+ const SfxUndoAction* GetUndoAction(sal_uIntPtr nNum) const { return (SfxUndoAction*)(pUndoStack!=NULL ? (*pUndoStack)[nNum] : NULL); }
// RedoAction(0) ist die aktuelle (also die des letzten Undo)
sal_uIntPtr GetRedoActionCount() const { return pRedoStack!=NULL ? pRedoStack->Count() : 0; }
const SfxUndoAction* GetRedoAction(sal_uIntPtr nNum) const { return (SfxUndoAction*)(pRedoStack!=NULL ? pRedoStack->GetObject(nNum) : NULL); }