[Libreoffice-commits] .: binfilter/bf_sc binfilter/inc

[Joseph Powers]

 binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx |    9 ++++++---
 binfilter/inc/bf_sc/chgtrack.hxx                 |    5 +++--
 2 files changed, 9 insertions(+), 5 deletions(-)

New commits:
commit cbbc019409f304e80895a60ba818209ca06d1e41
Author: Rafael Dominguez <venccsralph at gmail.com>
Date:   Sun May 1 23:37:54 2011 -0700

    Remove DECLARE_QUEUE( ScChangeTrackMsgQueue,

diff --git a/binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx b/binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx
index a6106ac..8c976e3 100644
--- a/binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx
@@ -2152,8 +2152,11 @@ const USHORT ScChangeTrack::nContentSlots =
 /*N*/ 		delete pMsgInfo;
 /*N*/ 	while (( pMsgInfo = aMsgStackFinal.Pop() ))
 /*N*/ 		delete pMsgInfo;
-/*N*/ 	while (( pMsgInfo = aMsgQueue.Get() ))
-/*N*/ 		delete pMsgInfo;
+/*N*/
+/*N*/   ScChangeTrackMsgQueue::iterator itQueue;
+/*N*/ 	for (itQueue = aMsgQueue.begin(); itQueue != aMsgQueue.end(); ++itQueue)
+/*N*/ 		delete *itQueue;
+/*N*/   aMsgQueue.clear();
 /*N*/ }
 
 
@@ -2254,7 +2257,7 @@ const USHORT ScChangeTrack::nContentSlots =
 /*N*/ 			ScChangeTrackMsgInfo* pMsg;
 /*N*/ 			while (( pMsg = aMsgStackFinal.Pop() ))
 /*N*/ 			{
-/*N*/ 				aMsgQueue.Put( pMsg );
+/*N*/ 				aMsgQueue.push_back( pMsg );
 /*N*/ 				bNew = TRUE;
 /*N*/ 			}
 /*N*/ 			if ( bNew )
diff --git a/binfilter/inc/bf_sc/chgtrack.hxx b/binfilter/inc/bf_sc/chgtrack.hxx
index c6a8f73..a7821a2 100644
--- a/binfilter/inc/bf_sc/chgtrack.hxx
+++ b/binfilter/inc/bf_sc/chgtrack.hxx
@@ -29,13 +29,14 @@
 #ifndef SC_CHGTRACK_HXX
 #define SC_CHGTRACK_HXX
 
+#include <deque>
+
 #include <bf_svtools/bf_solar.h>
 
 
 #include <tools/datetime.hxx>
 #include <tools/table.hxx>
 #include <tools/stack.hxx>
-#include <tools/queue.hxx>
 #include <tools/mempool.hxx>
 #include <bf_svtools/lstner.hxx>
 
@@ -939,7 +940,7 @@ struct ScChangeTrackMsgInfo
 };
 
 // MsgQueue fuer Benachrichtigung via ModifiedLink
-/*N*/ DECLARE_QUEUE( ScChangeTrackMsgQueue, ScChangeTrackMsgInfo* )
+/*N*/ typedef std::deque<ScChangeTrackMsgInfo*> ScChangeTrackMsgQueue;
 /*N*/ DECLARE_STACK( ScChangeTrackMsgStack, ScChangeTrackMsgInfo* )
 
 enum ScChangeTrackMergeState