[Libreoffice-commits] .: sc/CppunitTest_sc_ucalc.mk sc/Module_sc.mk sc/qa

[Bjoern Michaelsen]

 sc/CppunitTest_sc_ucalc.mk |   77 +++++++++++++++++++++++++++++++++++++++++++++
 sc/Module_sc.mk            |   18 +++++-----
 sc/qa/unit/ucalc.cxx       |    7 ----
 3 files changed, 88 insertions(+), 14 deletions(-)

New commits:
commit 136c0ccd62a0c5c3f579deaec0138e3c437469ec
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Tue Apr 5 11:50:53 2011 +0200

    starting sc_ucalc unit test

diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk
new file mode 100644
index 0000000..fac15fc
--- /dev/null
+++ b/sc/CppunitTest_sc_ucalc.mk
@@ -0,0 +1,77 @@
+#*************************************************************************
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Bjoern Michaelsen, Canonical Ltd. <bjoern.michaelsen at canonical.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#*************************************************************************
+
+$(eval $(call gb_CppunitTest_CppunitTest,sc_ucalc))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sc_ucalc, \
+    sc/qa/unit/ucalc \
+))
+
+$(eval $(call gb_CppunitTest_add_library_objects,sc_ucalc,sc))
+
+$(eval $(call gb_CppunitTest_add_linked_libs,sc_ucalc, \
+    avmedia \
+    basegfx \
+    comphelper \
+    cppu \
+    cppuhelper \
+    drawinglayer \
+    editeng \
+    for \
+    forui \
+    i18nisolang1 \
+    sal \
+    salhelper \
+    sb \
+    sfx \
+    sot \
+    svl \
+    svt \
+    svx \
+    svxcore \
+    tk \
+    tl \
+    ucbhelper \
+    utl \
+    vbahelper \
+    vcl \
+    xo \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sc_ucalc,\
+    -I$(realpath $(SRCDIR)/sc/inc/pch) \
+    -I$(realpath $(SRCDIR)/sc/source/ui/inc) \
+    -I$(realpath $(SRCDIR)/sc/inc) \
+    $$(INCLUDE) \
+    -I$(OUTDIR)/inc/offuh \
+    -I$(OUTDIR)/inc \
+))
+
+# vim: set noet sw=4:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 6878587..717cdbd 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -23,13 +23,15 @@
 $(eval $(call gb_Module_Module,sc))
 
 $(eval $(call gb_Module_add_targets,sc,\
-        AllLangResTarget_sc \
-        Library_sc \
-        Library_scd \
-        Library_scfilt \
-        Library_scui \
-        Library_vbaobj \
-        Package_uiconfig \
-        Package_xml \
+	AllLangResTarget_sc \
+	Library_sc \
+	Library_scd \
+	Library_scfilt \
+	Library_scui \
+	Library_vbaobj \
+	Package_uiconfig \
+	Package_xml \
 ))
+#	CppunitTest_sc_ucalc \
 
+# vim: set noet ts=4 sw=4:
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 2e6d1b4..e873bac 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -39,12 +39,8 @@
 //                 the need for manually calling regcomp and knowing what
 //                 services we need, and in what .so they are implemented
 
-#include "precompiled_sc.hxx"
 
-#include <cppunit/TestAssert.h>
-#include <cppunit/TestFixture.h>
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>
+#include <sal/cppunit.h>
 
 #include <sal/config.h>
 #include <osl/file.hxx>
@@ -1623,7 +1619,6 @@ CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 }
 
-#define CPPUNIT_PLUGIN_EXPORT extern "C" SAL_DLLPUBLIC_EXPORT
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */