diff options
| author | Marcel Metz <mmetz@adrian-broher.net> | 2011-12-05 20:08:31 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2011-12-05 22:53:16 +0100 |
| commit | 0158333f1b8d578cc56dc51c3e3f8daf0578210b (patch) | |
| tree | 3e6d0a52516f55772dbb168fcce88fdb95b5e9b8 /sc/inc | |
| parent | 6ea8ea456cf5df267284278ecda42aa9b089a682 (diff) | |
Replace ScChangeTrackMsgStack with std::stack< ScChangeTrackMsgInfo* >
Diffstat (limited to 'sc/inc')
| -rw-r--r-- | sc/inc/chgtrack.hxx | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx index 11159edbb9d3..5dc02d81bc59 100644 --- a/sc/inc/chgtrack.hxx +++ b/sc/inc/chgtrack.hxx @@ -30,11 +30,11 @@ #define SC_CHGTRACK_HXX #include <deque> +#include <stack> #include <tools/string.hxx> #include <tools/datetime.hxx> #include <tools/table.hxx> -#include <tools/stack.hxx> #include <tools/mempool.hxx> #include <tools/link.hxx> #include <unotools/options.hxx> @@ -689,8 +689,6 @@ enum ScChangeActionContentCellType SC_CACCT_MATREF }; -class Stack; - class ScChangeActionContent : public ScChangeAction { friend class ScChangeTrack; @@ -779,7 +777,7 @@ class ScChangeActionContent : public ScChangeAction // pRejectActions!=NULL: reject actions get // stacked, no SetNewValue, no Append sal_Bool Select( ScDocument*, ScChangeTrack*, - sal_Bool bOldest, Stack* pRejectActions ); + sal_Bool bOldest, ::std::stack<ScChangeActionContent*>* pRejectActions ); void PutValueToDoc( ScBaseCell*, const String&, ScDocument*, SCsCOL nDx, SCsROW nDy ) const; @@ -901,8 +899,6 @@ public: // --- ScChangeActionReject ------------------------------------------------- -class Stack; - class ScChangeActionReject : public ScChangeAction { friend class ScChangeTrack; @@ -955,7 +951,7 @@ struct ScChangeTrackMsgInfo // MsgQueue for notification via ModifiedLink typedef std::deque<ScChangeTrackMsgInfo*> ScChangeTrackMsgQueue; -DECLARE_STACK( ScChangeTrackMsgStack, ScChangeTrackMsgInfo* ) +typedef std::stack<ScChangeTrackMsgInfo*> ScChangeTrackMsgStack; enum ScChangeTrackMergeState { |