1 files changed, 11 insertions, 23 deletions
diff --git a/cppu/qa/test_any.cxx b/cppu/qa/test_any.cxx
index 1ab601b04c46..71afe9b31a5a 100644
--- a/cppu/qa/test_any.cxx
+++ b/cppu/qa/test_any.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,6 +33,12 @@
 
 #include <stdlib.h> // wntmsci10 does not like <cstdlib>
 
+#include <cppunit/TestSuite.h>
+#include <cppunit/TestFixture.h>
+#include <cppunit/TestCase.h>
+#include <cppunit/plugin/TestPlugIn.h>
+#include <cppunit/extensions/HelperMacros.h>
+
 #include "Enum1.hpp"
 #include "Enum2.hpp"
 #include "Exception1.hpp"
@@ -55,7 +62,6 @@
 #include "com/sun/star/uno/Sequence.hxx"
 #include "com/sun/star/uno/Type.hxx"
 #include "com/sun/star/uno/XInterface.hpp"
-#include "testshl/simpleheader.hxx"
 #include "osl/diagnose.h"
 #include "osl/interlck.h"
 #include "rtl/string.h"
@@ -197,45 +203,25 @@ public:
 class Test: public CppUnit::TestFixture {
 public:
     void testVoid();
-
     void testBoolean();
-
     void testByte();
-
     void testShort();
-
     void testUnsignedShort();
-
     void testLong();
-
     void testUnsignedLong();
-
     void testHyper();
-
     void testUnsignedHyper();
-
     void testFloat();
-
     void testDouble();
-
     void testChar();
-
     void testString();
-
     void testType();
-
     void testSequence();
-
     void testEnum();
-
     void testStruct();
-
     void testPoly();
-
     void testException();
-
     void testInterface();
-
     void testNull();
 
     CPPUNIT_TEST_SUITE(Test);
@@ -2323,8 +2309,10 @@ void Test::testNull() {
     }
 }
 
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test, "alltests");
+CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 }
 
-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */