recover my cppunit test for tools again

3 files changed, 7 insertions, 39 deletions

diff --git a/tools/Module_tools.mk b/tools/Module_tools.mk
index 064f6d74de7d..aa84e1c038ab 100644
--- a/tools/Module_tools.mk
+++ b/tools/Module_tools.mk
@@ -36,6 +36,10 @@ $(eval $(call gb_Module_add_targets,tools,\
     StaticLibrary_toolshelpers \
 ))
 
+$(eval $(call gb_Module_add_check_targets,tools,\
+    CppunitTest_tools_test \
+))
+
 ifneq ($(CROSS_COMPILING),YES)
 $(eval $(call gb_Module_add_targets,tools,\
     Executable_bestreversemap \
diff --git a/tools/qa/test_reversemap.cxx b/tools/qa/cppunit/test_reversemap.cxx
index e1ea8698ce87..a6e13147007e 100644
--- a/tools/qa/test_reversemap.cxx
+++ b/tools/qa/cppunit/test_reversemap.cxx
@@ -27,11 +27,7 @@
  */
 
 #include "precompiled_tools.hxx"
-#include "sal/config.h"
-
-#include <cppunit/TestFixture.h>
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>
+#include <sal/cppunit.h>
 
 #include <rtl/ustring.hxx>
 #include <vector>
@@ -170,4 +166,6 @@ namespace
     CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 }
 
+CPPUNIT_PLUGIN_IMPLEMENT();
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/tools/qa/version.map b/tools/qa/version.map
deleted file mode 100644
index 3308588ef6f8..000000000000
--- a/tools/qa/version.map
+++ /dev/null
@@ -1,34 +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.
-#
-#*************************************************************************
-
-UDK_3_0_0 {
-    global:
-        cppunitTestPlugIn;
-
-    local:
-        *;
-};