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

[Fridrich Strba]

 binfilter/bf_svtools/source/svdde/ddeimp.hxx     |   12 ++++++++++++
 binfilter/bf_svtools/source/svdde/svt_ddesvr.cxx |    4 ++--
 binfilter/inc/bf_svtools/svdde.hxx               |   16 +++++++++-------
 3 files changed, 23 insertions(+), 9 deletions(-)

New commits:
commit 6406e1187f5370fd40ebb384545bbff282a8da13
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Tue May 10 14:43:45 2011 +0200

    Committing some more DECLARE_LIST removal that compiles on linux

diff --git a/binfilter/bf_svtools/source/svdde/ddeimp.hxx b/binfilter/bf_svtools/source/svdde/ddeimp.hxx
index c6cf7d1..787fed7 100644
--- a/binfilter/bf_svtools/source/svdde/ddeimp.hxx
+++ b/binfilter/bf_svtools/source/svdde/ddeimp.hxx
@@ -63,6 +63,18 @@ class DdeItem;
 class DdeTopics;
 class DdeItems;
 
+// ----------------
+// - Conversation -
+// ----------------
+
+struct Conversation
+{
+    HCONV       hConv;
+    DdeTopic*   pTopic;
+};
+
+typedef ::std::vector< Conversation* > ConvList;
+
 // ---------------
 // - DdeInternal -
 // ---------------
diff --git a/binfilter/bf_svtools/source/svdde/svt_ddesvr.cxx b/binfilter/bf_svtools/source/svdde/svt_ddesvr.cxx
index 8d917ef..53a61e2 100644
--- a/binfilter/bf_svtools/source/svdde/svt_ddesvr.cxx
+++ b/binfilter/bf_svtools/source/svdde/svt_ddesvr.cxx
@@ -208,9 +208,9 @@ HDDEDATA CALLBACK _export DdeInternal::SvrCallback(
 
     for ( pService = rAll.First(); pService; pService = rAll.Next() )
     {
-        for( pC = pService->pConv->First(); pC;
-             pC = pService->pConv->Next() )
+        for ( size_t i = 0, n = pService->pConv->size(); i < n; ++i )
         {
+            pC = (*pService->pConv)[ i ];
             if ( pC->hConv == hConv )
                 goto found;
         }
diff --git a/binfilter/inc/bf_svtools/svdde.hxx b/binfilter/inc/bf_svtools/svdde.hxx
index 5df2a44..6916424 100644
--- a/binfilter/inc/bf_svtools/svdde.hxx
+++ b/binfilter/inc/bf_svtools/svdde.hxx
@@ -38,6 +38,7 @@
 #include <tools/string.hxx>
 #include <tools/list.hxx>
 #include <tools/link.hxx>
+#include <vector>
 
 namespace binfilter
 {
@@ -50,22 +51,23 @@ class DdeLink;
 class DdeRequest;
 class DdeWarmLink;
 class DdeHotLink;
-class ConvList;
 struct DdeDataImp;
 struct DdeImp;
 
-DECLARE_LIST( DdeConnections, DdeConnection* )
-DECLARE_LIST( DdeTransactions, DdeTransaction* )
-DECLARE_LIST( DdeFormats, long )
+typedef ::std::vector< DdeConnection* > DdeConnections;
+typedef ::std::vector< DdeTransaction* > DdeTransactions;
+typedef ::std::vector< long > DdeFormats;
+
 
 #ifdef WNT
 class DdeService;
 class DdeItem;
 class DdeItemImp;
 class DdeTopic;
-DECLARE_LIST( DdeServices, DdeService* )
-DECLARE_LIST( DdeTopics, DdeTopic* )
-DECLARE_LIST( DdeItems, DdeItem* )
+
+typedef ::std::vector< DdeService* > DdeServices;
+typedef ::std::vector< DdeTopic* > DdeTopics;
+typedef ::std::vector< DdeItem* > DdeItems;
 #endif