[openoffice.org] more magic needed for system cppunit

[Caolan McNamara]

commit 85f8284ae1796df79386fdfa50b3877e5fe7110e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Jul 31 20:05:02 2010 +0100

    more magic needed for system cppunit

 workspace.cmcfixes77.patch |   32 ++++++++++++++++++++++++++++++++
 1 files changed, 32 insertions(+), 0 deletions(-)
---
diff --git a/workspace.cmcfixes77.patch b/workspace.cmcfixes77.patch
index 280e89f..ce4e1cb 100644
--- a/workspace.cmcfixes77.patch
+++ b/workspace.cmcfixes77.patch
@@ -1337,3 +1337,35 @@ diff -r a1a3b75faa8a vcl/util/makefile2.pmk
  SLOFILES = \
      $(SLO)/getargument.obj \
      $(SLO)/officeconnection.obj \
+--- a/smoketestoo_native/makefile.mk	2010-07-31 19:54:31.000000000 +0100
++++ b/smoketestoo_native/makefile.mk	2010-07-31 20:03:00.000000000 +0100
+@@ -33,6 +33,13 @@
+ 
+ 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 = $(SHL1OBJS)
+ 
+ SHL1TARGET = smoketest
+--- a/smoketestoo_native/smoketest.cxx	2010-07-31 19:54:32.000000000 +0100
++++ b/smoketestoo_native/smoketest.cxx	2010-07-31 19:58:06.000000000 +0100
+@@ -44,11 +44,13 @@
+ #include "com/sun/star/uno/RuntimeException.hpp"
+ #include "com/sun/star/uno/Sequence.hxx"
+ #include "com/sun/star/util/URL.hpp"
++#include <preextstl.h>
+ #include "cppuhelper/implbase1.hxx"
+ #include "cppunit/TestAssert.h"
+ #include "cppunit/TestFixture.h"
+ #include "cppunit/extensions/HelperMacros.h"
+ #include "cppunit/plugin/TestPlugIn.h"
++#include <postextstl.h>
+ #include "osl/conditn.hxx"
+ #include "osl/diagnose.h"
+ #include "rtl/ustring.h"