[openoffice.org/f14/master] more magic needed for system cppunit

[Caolan McNamara]

commit 73309cd3f8869270ca93a58bc78f501c221a7cc6
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Jul 31 15:29:15 2010 +0100

    more magic needed for system cppunit

 workspace.cmcfixes77.patch |   28 ++++++++++++++++++++++++++++
 1 files changed, 28 insertions(+), 0 deletions(-)
---
diff --git a/workspace.cmcfixes77.patch b/workspace.cmcfixes77.patch
index 251a56d..280e89f 100644
--- a/workspace.cmcfixes77.patch
+++ b/workspace.cmcfixes77.patch
@@ -1309,3 +1309,31 @@ diff -r a1a3b75faa8a vcl/util/makefile2.pmk
 +CFLAGSCXX+=-DADAPT_EXT_STL
  .ENDIF
  .ENDIF
+--- a/test/source/cpp/officeconnection.cxx	2010-07-31 15:23:28.000000000 +0100
++++ b/test/source/cpp/officeconnection.cxx	2010-07-31 15:24:37.000000000 +0100
+@@ -33,7 +33,9 @@
+ #include "com/sun/star/lang/XMultiServiceFactory.hpp"
+ #include "com/sun/star/uno/Reference.hxx"
+ #include "cppuhelper/bootstrap.hxx"
++#include <preextstl.h>
+ #include "cppunit/TestAssert.h"
++#include <postextstl.h>
+ #include "osl/process.h"
+ #include "osl/time.h"
+ #include "sal/types.h"
+--- a/test/source/cpp/makefile.mk	2010-07-31 15:27:19.000000000 +0100
++++ b/test/source/cpp/makefile.mk	2010-07-31 15:23:28.000000000 +0100
+@@ -35,6 +35,13 @@
+ CDEFS += -DOOO_DLLIMPLEMENTATION_TEST
+ CFLAGSCXX += $(CPPUNIT_CFLAGS)
+ 
++#building with stlport, but cppunit was not built with stlport
++.IF "$(USE_SYSTEM_STL)"!="YES"
++.IF "$(SYSTEM_CPPUNIT)"=="YES"
++CFLAGSCXX+=-DADAPT_EXT_STL
++.ENDIF
++.ENDIF
++
+ SLOFILES = \
+     $(SLO)/getargument.obj \
+     $(SLO)/officeconnection.obj \