Merge branch 'master' into feature/gnumake4

Conflicts:
	basebmp/prj/d.lst
	basebmp/test/basictest.cxx
	basebmp/test/makefile.mk
	basegfx/inc/basegfx/basegfxdllapi.h
	basegfx/inc/basegfx/tools/debugplotter.hxx
	basegfx/inc/basegfx/tuple/b2ituple.hxx
	basegfx/prj/d.lst
	basegfx/source/numeric/makefile.mk
	basegfx/source/polygon/makefile.mk
	basegfx/source/range/makefile.mk
	basegfx/source/raster/makefile.mk
	basegfx/source/tuple/makefile.mk
	basegfx/source/vector/makefile.mk
	basegfx/test/basegfx1d.cxx
	basegfx/test/makefile.mk
	basegfx/util/makefile.mk
	canvas/Library_canvasfactory.mk
	canvas/Module_canvas.mk
	canvas/prj/build.lst
	canvas/prj/d.lst
	canvas/source/cairo/cairo_canvashelper_texturefill.cxx
	canvas/source/cairo/makefile.mk
	canvas/source/tools/makefile.mk
	comphelper/qa/string/makefile.mk
	cppcanvas/Module_cppcanvas.mk
	cppcanvas/inc/cppcanvas/cppcanvasdllapi.h
	cppcanvas/prj/build.lst
	cppcanvas/prj/d.lst
	cppcanvas/source/mtfrenderer/makefile.mk
	cppcanvas/util/makefile.mk
	i18npool/source/search/makefile.mk
	regexp/Library_regexp.mk
	regexp/prj/d.lst
	sax/CppunitTest_sax.mk
	sax/Library_sax.mk
	sax/prj/d.lst
	sax/qa/cppunit/test_converter.cxx
	sax/source/expatwrap/attrlistimpl.hxx
	sax/util/makefile.mk
	svtools/Library_svt.mk
	tools/Executable_sspretty.mk
	ucbhelper/prj/d.lst
	ucbhelper/source/provider/configureucb.cxx
	ucbhelper/source/provider/provconf.cxx
	ucbhelper/util/makefile.mk
	unotools/Library_utl.mk
	unotools/Module_unotools.mk
	unotools/Package_inc.mk
	unotools/prj/build.lst
	vcl/Library_desktop_detector.mk
	vcl/Library_vcl.mk
	vcl/Library_vclplug_gtk.mk
	vcl/aqua/source/gdi/salprn.cxx
	vcl/inc/aqua/saldata.hxx
	vcl/unx/generic/gdi/salgdi3.cxx

7 files changed, 382 insertions, 97 deletions

diff --git a/comphelper/qa/string/test_string.cxx b/comphelper/qa/string/test_string.cxx
new file mode 100644
index 000000000000..c448ebb9fb45
--- /dev/null
+++ b/comphelper/qa/string/test_string.cxx
@@ -0,0 +1,301 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * 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
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "precompiled_comphelper.hxx"
+#include "sal/config.h"
+
+#include "comphelper/string.hxx"
+#include <cppuhelper/implbase1.hxx>
+#include <com/sun/star/i18n/CharType.hpp>
+
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
+
+#include "rtl/string.h"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+
+namespace {
+
+class TestString: public CppUnit::TestFixture
+{
+public:
+    void test();
+    void testNatural();
+    void testDecimalStringToNumber();
+
+    CPPUNIT_TEST_SUITE(TestString);
+    CPPUNIT_TEST(test);
+    CPPUNIT_TEST(testNatural);
+    CPPUNIT_TEST(testDecimalStringToNumber);
+    CPPUNIT_TEST_SUITE_END();
+};
+
+void TestString::test()
+{
+    rtl::OUString s1(RTL_CONSTASCII_USTRINGPARAM("foobarbar"));
+    sal_Int32 n1;
+    rtl::OUString s2(
+        comphelper::string::searchAndReplaceAsciiL(
+            s1, RTL_CONSTASCII_STRINGPARAM("bar"),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("baaz")), 0, &n1));
+    CPPUNIT_ASSERT(
+        s2 == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("foobaazbar")));
+    CPPUNIT_ASSERT(n1 == 3);
+    sal_Int32 n2;
+    rtl::OUString s3(
+        comphelper::string::searchAndReplaceAsciiL(
+            s2, RTL_CONSTASCII_STRINGPARAM("bar"),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bz")),
+            n1 + RTL_CONSTASCII_LENGTH("baaz"), &n2));
+    CPPUNIT_ASSERT(
+        s3 == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("foobaazbz")));
+    CPPUNIT_ASSERT(n2 == 7);
+    sal_Int32 n3;
+    rtl::OUString s4(
+        comphelper::string::searchAndReplaceAsciiL(
+            s3, RTL_CONSTASCII_STRINGPARAM("bar"),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("baz")),
+            n2 + RTL_CONSTASCII_LENGTH("bz"), &n3));
+    CPPUNIT_ASSERT(s4 == s3);
+    CPPUNIT_ASSERT(n3 == -1);
+}
+
+void TestString::testDecimalStringToNumber()
+{
+    rtl::OUString s1(RTL_CONSTASCII_USTRINGPARAM("1234"));
+    CPPUNIT_ASSERT_EQUAL((sal_uInt32)1234, comphelper::string::decimalStringToNumber(s1));
+    s1 += rtl::OUString(static_cast<sal_Unicode>(0x07C6));
+    CPPUNIT_ASSERT_EQUAL((sal_uInt32)12346, comphelper::string::decimalStringToNumber(s1));
+    // Codepoints on 2 16bits words
+    sal_uInt32 utf16String[] = { 0x1D7FE /* 8 */, 0x1D7F7 /* 1 */};
+    s1 = rtl::OUString(utf16String, 2);
+    CPPUNIT_ASSERT_EQUAL((sal_uInt32)81, comphelper::string::decimalStringToNumber(s1));
+}
+
+using namespace ::com::sun::star;
+
+class testCollator : public cppu::WeakImplHelper1< i18n::XCollator >
+{
+public:
+    virtual sal_Int32 SAL_CALL compareSubstring(
+        const rtl::OUString& str1, sal_Int32 off1, sal_Int32 len1,
+        const rtl::OUString& str2, sal_Int32 off2, sal_Int32 len2) throw(uno::RuntimeException)
+    {
+        return str1.copy(off1, len1).compareTo(str2.copy(off2, len2));
+    }
+    virtual sal_Int32 SAL_CALL compareString(
+        const rtl::OUString& str1,
+        const rtl::OUString& str2) throw(uno::RuntimeException)
+    {
+        return str1.compareTo(str2);
+    }
+    virtual sal_Int32 SAL_CALL loadDefaultCollator(const lang::Locale&, sal_Int32)
+        throw(uno::RuntimeException) {return 0;}
+    virtual sal_Int32 SAL_CALL loadCollatorAlgorithm(const rtl::OUString&,
+        const lang::Locale&, sal_Int32) throw(uno::RuntimeException) {return 0;}
+    virtual void SAL_CALL loadCollatorAlgorithmWithEndUserOption(const rtl::OUString&,
+        const lang::Locale&, const uno::Sequence< sal_Int32 >&) throw(uno::RuntimeException) {}
+    virtual uno::Sequence< rtl::OUString > SAL_CALL listCollatorAlgorithms(const lang::Locale&)
+        throw(uno::RuntimeException)
+    {
+        return uno::Sequence< rtl::OUString >();
+    }
+    virtual uno::Sequence< sal_Int32 > SAL_CALL listCollatorOptions(const rtl::OUString&)
+        throw(uno::RuntimeException)
+    {
+        return uno::Sequence< sal_Int32 >();
+    }
+};
+
+#define IS_DIGIT(CHAR) (((CHAR) >= 48) && ((CHAR <= 57)))
+
+class testBreakIterator : public cppu::WeakImplHelper1< i18n::XBreakIterator >
+{
+public:
+    virtual sal_Int32 SAL_CALL nextCharacters( const rtl::OUString&, sal_Int32,
+        const lang::Locale&, sal_Int16, sal_Int32, sal_Int32& )
+            throw(uno::RuntimeException) {return -1;}
+    virtual sal_Int32 SAL_CALL previousCharacters( const rtl::OUString&, sal_Int32,
+        const lang::Locale&, sal_Int16, sal_Int32, sal_Int32& )
+            throw(uno::RuntimeException) {return -1;}
+
+    virtual i18n::Boundary SAL_CALL previousWord( const rtl::OUString&, sal_Int32,
+        const lang::Locale&, sal_Int16) throw(uno::RuntimeException)
+        { return i18n::Boundary(); }
+    virtual i18n::Boundary SAL_CALL nextWord( const rtl::OUString&, sal_Int32,
+        const lang::Locale&, sal_Int16) throw(uno::RuntimeException)
+        { return i18n::Boundary(); }
+    virtual i18n::Boundary SAL_CALL getWordBoundary( const rtl::OUString&, sal_Int32,
+        const lang::Locale&, sal_Int16, sal_Bool )
+        throw(uno::RuntimeException)
+        { return i18n::Boundary(); }
+
+    virtual sal_Bool SAL_CALL isBeginWord( const rtl::OUString&, sal_Int32,
+        const lang::Locale&, sal_Int16 ) throw(uno::RuntimeException)
+        { return false; }
+    virtual sal_Bool SAL_CALL isEndWord( const rtl::OUString&, sal_Int32,
+        const lang::Locale& , sal_Int16 ) throw(uno::RuntimeException)
+        { return false; }
+    virtual sal_Int16 SAL_CALL getWordType( const rtl::OUString&, sal_Int32,
+        const lang::Locale& ) throw(uno::RuntimeException)
+        { return 0; }
+
+    virtual sal_Int32 SAL_CALL beginOfSentence( const rtl::OUString&, sal_Int32,
+        const lang::Locale& ) throw(uno::RuntimeException)
+        { return 0; }
+    virtual sal_Int32 SAL_CALL endOfSentence( const rtl::OUString& rText, sal_Int32,
+        const lang::Locale& ) throw(uno::RuntimeException)
+        { return rText.getLength(); }
+
+    virtual i18n::LineBreakResults SAL_CALL getLineBreak( const rtl::OUString&, sal_Int32,
+        const lang::Locale&, sal_Int32,
+        const i18n::LineBreakHyphenationOptions&,
+        const i18n::LineBreakUserOptions&)
+        throw(uno::RuntimeException)
+    {
+        return i18n::LineBreakResults();
+    }
+
+    virtual sal_Int16 SAL_CALL getScriptType( const rtl::OUString&, sal_Int32 )
+        throw(uno::RuntimeException) { return -1; }
+    virtual sal_Int32 SAL_CALL beginOfScript( const rtl::OUString&, sal_Int32,
+        sal_Int16 ) throw(uno::RuntimeException) { return -1; }
+    virtual sal_Int32 SAL_CALL endOfScript( const rtl::OUString&, sal_Int32,
+        sal_Int16 ) throw(uno::RuntimeException) { return -1; }
+    virtual sal_Int32 SAL_CALL previousScript( const rtl::OUString&, sal_Int32,
+        sal_Int16 ) throw(uno::RuntimeException) { return -1; }
+    virtual sal_Int32 SAL_CALL nextScript( const rtl::OUString&, sal_Int32,
+        sal_Int16 ) throw(uno::RuntimeException) { return -1; }
+
+    virtual sal_Int32 SAL_CALL beginOfCharBlock( const rtl::OUString&, sal_Int32,
+        const lang::Locale&, sal_Int16 ) throw(uno::RuntimeException) { return -1; }
+    virtual sal_Int32 SAL_CALL endOfCharBlock( const rtl::OUString& rText, sal_Int32 nStartPos,
+        const lang::Locale&, sal_Int16 CharType ) throw(uno::RuntimeException)
+    {
+        const sal_Unicode *pStr = rText.getStr()+nStartPos;
+        for (sal_Int32 nI = nStartPos; nI < rText.getLength(); ++nI)
+        {
+            if (CharType == i18n::CharType::DECIMAL_DIGIT_NUMBER && !IS_DIGIT(*pStr))
+                return nI;
+            else if (CharType != i18n::CharType::DECIMAL_DIGIT_NUMBER && IS_DIGIT(*pStr))
+                return nI;
+            ++pStr;
+        }
+        return -1;
+    }
+    virtual sal_Int32 SAL_CALL previousCharBlock( const rtl::OUString&, sal_Int32,
+        const lang::Locale&, sal_Int16 ) throw(uno::RuntimeException) { return -1; }
+    virtual sal_Int32 SAL_CALL nextCharBlock( const rtl::OUString& rText, sal_Int32 nStartPos,
+        const lang::Locale&, sal_Int16 CharType ) throw(uno::RuntimeException)
+    {
+        const sal_Unicode *pStr = rText.getStr()+nStartPos;
+        for (sal_Int32 nI = nStartPos; nI < rText.getLength(); ++nI)
+        {
+            if (CharType == i18n::CharType::DECIMAL_DIGIT_NUMBER && IS_DIGIT(*pStr))
+                return nI;
+            else if (CharType != i18n::CharType::DECIMAL_DIGIT_NUMBER && !IS_DIGIT(*pStr))
+                return nI;
+            ++pStr;
+        }
+        return -1;
+    }
+};
+
+void TestString::testNatural()
+{
+    using namespace comphelper::string;
+
+    uno::Reference< i18n::XCollator > xCollator(new testCollator);
+    uno::Reference< i18n::XBreakIterator > xBI(new testBreakIterator);
+
+// --- Some generic tests to ensure we do not alter original behavior
+// outside what we want
+    CPPUNIT_ASSERT(
+        compareNatural(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("ABC"))), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("ABC"))), xCollator, xBI, lang::Locale()) == 0
+    );
+    // Case sensitivity
+    CPPUNIT_ASSERT(
+        compareNatural(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("ABC"))), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("abc"))), xCollator, xBI, lang::Locale()) < 0
+    );
+    // Reverse
+    CPPUNIT_ASSERT(
+        compareNatural(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("abc"))), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("ABC"))), xCollator, xBI, lang::Locale()) > 0
+    );
+    // First shorter
+    CPPUNIT_ASSERT(
+        compareNatural(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("alongstring"))), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("alongerstring"))), xCollator, xBI, lang::Locale()) > 0
+    );
+    // Second shorter
+    CPPUNIT_ASSERT(
+        compareNatural(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("alongerstring"))), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("alongstring"))), xCollator, xBI, lang::Locale()) < 0
+    );
+// -- Here we go on natural order, each one is followed by classic compare and the reverse comparison
+    // That's why we originally made the patch
+    CPPUNIT_ASSERT(
+        compareNatural(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("Heading 9"))), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("Heading 10"))), xCollator, xBI, lang::Locale()) < 0
+    );
+    // Original behavior
+    CPPUNIT_ASSERT(
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("Heading 9"))).compareTo(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("Heading 10")))) > 0
+    );
+    CPPUNIT_ASSERT(
+        compareNatural(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("Heading 10"))), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("Heading 9"))), xCollator, xBI, lang::Locale()) > 0
+    );
+    // Harder
+    CPPUNIT_ASSERT(
+        compareNatural(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("July, the 4th"))), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("July, the 10th"))), xCollator, xBI, lang::Locale()) < 0
+    );
+    CPPUNIT_ASSERT(
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("July, the 4th"))).compareTo(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("July, the 10th")))) > 0
+    );
+    CPPUNIT_ASSERT(
+        compareNatural(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("July, the 10th"))), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("July, the 4th"))), xCollator, xBI, lang::Locale()) > 0
+    );
+    // Hardest
+    CPPUNIT_ASSERT(
+        compareNatural(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("abc08"))), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("abc010"))), xCollator, xBI, lang::Locale()) < 0
+    );
+    CPPUNIT_ASSERT(
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("abc08"))).compareTo(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("abc010")))) > 0
+    );
+    CPPUNIT_ASSERT(
+        compareNatural(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("abc010"))), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("abc08"))), xCollator, xBI, lang::Locale()) > 0
+    );
+    CPPUNIT_ASSERT(
+        compareNatural(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("apple10apple"))), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("apple10apple"))), xCollator, xBI, lang::Locale()) == 0
+    );
+}
+
+CPPUNIT_TEST_SUITE_REGISTRATION(TestString);
+
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/comphelper/qa/string/test_string_noadditional.cxx b/comphelper/qa/string/test_string_noadditional.cxx
new file mode 100644
index 000000000000..9f3bfe5061ab
--- /dev/null
+++ b/comphelper/qa/string/test_string_noadditional.cxx
@@ -0,0 +1,33 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * 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
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <cppunit/plugin/TestPlugIn.h>
+
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/comphelper/qa/test_string.cxx b/comphelper/qa/test_string.cxx
deleted file mode 100644
index 648b7a204340..000000000000
--- a/comphelper/qa/test_string.cxx
+++ /dev/null
@@ -1,82 +0,0 @@
-/*************************************************************************
- *
- * 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
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "precompiled_comphelper.hxx"
-#include "sal/config.h"
-
-#include "comphelper/string.hxx"
-#include "testshl/simpleheader.hxx"
-#include "rtl/string.h"
-#include "rtl/ustring.h"
-#include "rtl/ustring.hxx"
-#include "sal/types.h"
-
-namespace {
-
-class Test: public CppUnit::TestFixture {
-public:
-    void test();
-
-    CPPUNIT_TEST_SUITE(Test);
-    CPPUNIT_TEST(test);
-    CPPUNIT_TEST_SUITE_END();
-};
-
-void Test::test() {
-    rtl::OUString s1(RTL_CONSTASCII_USTRINGPARAM("foobarbar"));
-    sal_Int32 n1;
-    rtl::OUString s2(
-        comphelper::string::searchAndReplace(
-            s1, RTL_CONSTASCII_STRINGPARAM("bar"),
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("baaz")), 0, &n1));
-    CPPUNIT_ASSERT(
-        s2 == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("foobaazbar")));
-    CPPUNIT_ASSERT(n1 == 3);
-    sal_Int32 n2;
-    rtl::OUString s3(
-        comphelper::string::searchAndReplace(
-            s2, RTL_CONSTASCII_STRINGPARAM("bar"),
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bz")),
-            n1 + RTL_CONSTASCII_LENGTH("baaz"), &n2));
-    CPPUNIT_ASSERT(
-        s3 == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("foobaazbz")));
-    CPPUNIT_ASSERT(n2 == 7);
-    sal_Int32 n3;
-    rtl::OUString s4(
-        comphelper::string::searchAndReplace(
-            s3, RTL_CONSTASCII_STRINGPARAM("bar"),
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("baz")),
-            n2 + RTL_CONSTASCII_LENGTH("bz"), &n3));
-    CPPUNIT_ASSERT(s4 == s3);
-    CPPUNIT_ASSERT(n3 == -1);
-}
-
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test, "alltests");
-
-}
-
-NOADDITIONAL;
diff --git a/comphelper/qa/version.map b/comphelper/qa/version.map
index 7321bbca16ad..5e95a1532f8a 100644
--- a/comphelper/qa/version.map
+++ b/comphelper/qa/version.map
@@ -27,8 +27,7 @@
 
 UDK_3_0_0 {
     global:
-        registerAllTestFunction;
-
+        cppunitTestPlugIn;
     local:
         *;
 };
diff --git a/comphelper/qa/makefile.mk b/comphelper/qa/weakbag/makefile.mk
index 0360d308529e..fdba94838a56 100644
--- a/comphelper/qa/makefile.mk
+++ b/comphelper/qa/weakbag/makefile.mk
@@ -25,13 +25,14 @@
 #
 #*************************************************************************
 
-PRJ := ..
+PRJ := ..$/..
 PRJNAME := comphelper
-TARGET := qa
+TARGET := qa_weakbag
 
 ENABLE_EXCEPTIONS := TRUE
 
 .INCLUDE: settings.mk
+.INCLUDE : $(PRJ)$/version.mk
 
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
@@ -40,17 +41,13 @@ DLLPRE = # no leading "lib" on .so files
 INCPRE += $(MISC)$/$(TARGET)$/inc
 
 SHL1TARGET = $(TARGET)_weakbag
-SHL1OBJS = $(SLO)$/test_weakbag.obj
-SHL1STDLIBS = $(CPPUHELPERLIB) $(CPPULIB) $(CPPUNITLIB) $(TESTSHL2LIB) $(SALLIB)
-SHL1VERSIONMAP = version.map
+SHL1OBJS = $(SLO)$/test_weakbag.obj $(SLO)$/test_weakbag_noadditional.obj
+SHL1STDLIBS = $(CPPUHELPERLIB) $(CPPULIB) $(CPPUNITLIB) $(SALLIB) $(COMPHELPERLIB)
+SHL1VERSIONMAP = ..$/version.map
 SHL1IMPLIB = i$(SHL1TARGET)
 DEF1NAME = $(SHL1TARGET)
 
 SLOFILES = $(SHL1OBJS)
 
 .INCLUDE: target.mk
-
-ALLTAR: test
-
-test .PHONY: $(SHL1TARGETN)
-    $(TESTSHL2) $(SHL1TARGETN)
+.INCLUDE: _cppunit.mk
diff --git a/comphelper/qa/test_weakbag.cxx b/comphelper/qa/weakbag/test_weakbag.cxx
index 3827e393b58d..84767f0ede0e 100644
--- a/comphelper/qa/test_weakbag.cxx
+++ b/comphelper/qa/weakbag/test_weakbag.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,7 +33,10 @@
 #include "com/sun/star/uno/XInterface.hpp"
 #include "comphelper/weakbag.hxx"
 #include "cppuhelper/weak.hxx"
-#include "testshl/simpleheader.hxx"
+
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
 
 namespace {
 
@@ -63,8 +67,8 @@ public:
     CPPUNIT_TEST_SUITE_END();
 };
 
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test, "alltests");
+CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 }
 
-NOADDITIONAL;
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/comphelper/qa/weakbag/test_weakbag_noadditional.cxx b/comphelper/qa/weakbag/test_weakbag_noadditional.cxx
new file mode 100644
index 000000000000..9f3bfe5061ab
--- /dev/null
+++ b/comphelper/qa/weakbag/test_weakbag_noadditional.cxx
@@ -0,0 +1,33 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * 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
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <cppunit/plugin/TestPlugIn.h>
+
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */