[Libreoffice-commits] .: 2 commits - sal/qa

[David Tardon]

 sal/qa/rtl/strings/makefile.mk               |    2 +-
 sal/qa/rtl/strings/test_oustring_compare.cxx |    6 +++---
 sal/qa/rtl/strings/test_oustring_convert.cxx |    2 ++
 3 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 35c46ba74bf2eefc5fc50587ef8c637369efdd2b
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Feb 7 17:13:07 2011 +0100

    add (pre|post)extstl.h around cppunit headers

diff --git a/sal/qa/rtl/strings/test_oustring_compare.cxx b/sal/qa/rtl/strings/test_oustring_compare.cxx
index 60423ce..e2c6203 100644
--- a/sal/qa/rtl/strings/test_oustring_compare.cxx
+++ b/sal/qa/rtl/strings/test_oustring_compare.cxx
@@ -43,9 +43,9 @@ class Compare: public CppUnit::TestFixture
 private:
     void equalsIgnoreAsciiCaseAscii();
 
-    CPPUNIT_TEST_SUITE(Compare);
-    CPPUNIT_TEST(equalsIgnoreAsciiCaseAscii);
-    CPPUNIT_TEST_SUITE_END();
+CPPUNIT_TEST_SUITE(Compare);
+CPPUNIT_TEST(equalsIgnoreAsciiCaseAscii);
+CPPUNIT_TEST_SUITE_END();
 };
 
 } }
diff --git a/sal/qa/rtl/strings/test_oustring_convert.cxx b/sal/qa/rtl/strings/test_oustring_convert.cxx
index d1d5d4a..6b7bc7a 100644
--- a/sal/qa/rtl/strings/test_oustring_convert.cxx
+++ b/sal/qa/rtl/strings/test_oustring_convert.cxx
@@ -29,8 +29,10 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
 
+#include "preextstl.h"
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
+#include "postextstl.h"
 #include "rtl/strbuf.hxx"
 #include "rtl/string.hxx"
 #include "rtl/ustring.hxx"
commit 67b54e7dc3c510fb2ef5eb2f2560632ff2944c88
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Feb 7 17:09:05 2011 +0100

    TESTSHL2LIB does not exist anymore

diff --git a/sal/qa/rtl/strings/makefile.mk b/sal/qa/rtl/strings/makefile.mk
index 3c1b921..d1711a3 100644
--- a/sal/qa/rtl/strings/makefile.mk
+++ b/sal/qa/rtl/strings/makefile.mk
@@ -47,7 +47,7 @@ SHL1OBJS := \
     $(SLO)$/test_oustring_endswith.obj \
     $(SLO)$/test_oustring_noadditional.obj
 SHL1IMPLIB := i$(SHL1TARGET)
-SHL1STDLIBS := $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL1STDLIBS := $(SALLIB) $(CPPUNITLIB)
 SHL1VERSIONMAP := $(PRJ)$/qa$/export.map
 DEF1NAME := $(SHL1TARGET)