[Libreoffice-commits] .: Branch 'libreoffice-3-4' - 2 commits - binfilter/bf_svtools binfilter/inc

[Fridrich Strba]

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

New commits:
commit 1f2fc6b2febdefe6863c456045d946ffc4de1980
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Tue May 10 15:39:50 2011 +0200

    Revert "Remove DECLARE_LIST( ConvList, Conversation* )"
    
    This commit breaks Windows build.
    
    This reverts commit 508c29ec65a35a7177a82a21a19cf41dc2733a62.

diff --git a/binfilter/bf_svtools/source/svdde/ddeimp.hxx b/binfilter/bf_svtools/source/svdde/ddeimp.hxx
index c6cf7d1..1462c12 100644
--- a/binfilter/bf_svtools/source/svdde/ddeimp.hxx
+++ b/binfilter/bf_svtools/source/svdde/ddeimp.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -49,6 +49,16 @@
 #include <bf_svtools/bf_postwin.h>
 #include "ddewrap.hxx"
 
+/*
+extern "C"
+{
+#define BOOL WIN_BOOL
+#define BYTE WIN_BYTE
+#undef BOOL
+#undef BYTE
+};
+*/
+
 #endif
 
 #include <tools/string.hxx>
@@ -63,6 +73,18 @@ class DdeItem;
 class DdeTopics;
 class DdeItems;
 
+// ----------------
+// - Conversation -
+// ----------------
+
+struct Conversation
+{
+    HCONV       hConv;
+    DdeTopic*   pTopic;
+};
+
+DECLARE_LIST( ConvList, Conversation* );
+
 // ---------------
 // - DdeInternal -
 // ---------------
commit 31934433af3d720d01cd9618941cbfa717c9dba0
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Tue May 10 15:36:58 2011 +0200

    Revert "Committing some more DECLARE_LIST removal that compiles on linux"
    
    DECLARE_LIST still works so revert this changes and try to make binfilter
    first build and then refactor.
    
    This reverts commit 6406e1187f5370fd40ebb384545bbff282a8da13.

diff --git a/binfilter/bf_svtools/source/svdde/ddeimp.hxx b/binfilter/bf_svtools/source/svdde/ddeimp.hxx
index 787fed7..c6cf7d1 100644
--- a/binfilter/bf_svtools/source/svdde/ddeimp.hxx
+++ b/binfilter/bf_svtools/source/svdde/ddeimp.hxx
@@ -63,18 +63,6 @@ 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 53a61e2..8d917ef 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 ( size_t i = 0, n = pService->pConv->size(); i < n; ++i )
+        for( pC = pService->pConv->First(); pC;
+             pC = pService->pConv->Next() )
         {
-            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 6916424..5df2a44 100644
--- a/binfilter/inc/bf_svtools/svdde.hxx
+++ b/binfilter/inc/bf_svtools/svdde.hxx
@@ -38,7 +38,6 @@
 #include <tools/string.hxx>
 #include <tools/list.hxx>
 #include <tools/link.hxx>
-#include <vector>
 
 namespace binfilter
 {
@@ -51,23 +50,22 @@ class DdeLink;
 class DdeRequest;
 class DdeWarmLink;
 class DdeHotLink;
+class ConvList;
 struct DdeDataImp;
 struct DdeImp;
 
-typedef ::std::vector< DdeConnection* > DdeConnections;
-typedef ::std::vector< DdeTransaction* > DdeTransactions;
-typedef ::std::vector< long > DdeFormats;
-
+DECLARE_LIST( DdeConnections, DdeConnection* )
+DECLARE_LIST( DdeTransactions, DdeTransaction* )
+DECLARE_LIST( DdeFormats, long )
 
 #ifdef WNT
 class DdeService;
 class DdeItem;
 class DdeItemImp;
 class DdeTopic;
-
-typedef ::std::vector< DdeService* > DdeServices;
-typedef ::std::vector< DdeTopic* > DdeTopics;
-typedef ::std::vector< DdeItem* > DdeItems;
+DECLARE_LIST( DdeServices, DdeService* )
+DECLARE_LIST( DdeTopics, DdeTopic* )
+DECLARE_LIST( DdeItems, DdeItem* )
 #endif