[Libreoffice-commits] .: 2 commits - lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk lotuswordpro/qa

[David Tardon]

 lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk |   17 +++----------
 lotuswordpro/qa/cppunit/test_lotuswordpro.cxx              |    6 ++++
 2 files changed, 10 insertions(+), 13 deletions(-)

New commits:
commit d41aec6e7fb5ad4d41d93cf6b9366b3147afdefe
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Apr 27 10:51:06 2011 +0200

    Revert "use add_linked_objects instead of explicit dep"
    
    This reverts commit 92aea9c0ca4a157605a7d94f77d3e9b328d9ead8.

diff --git a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
index af824a8..0def1a7 100644
--- a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
+++ b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
@@ -35,25 +35,12 @@ $(eval $(call gb_CppunitTest_add_exception_objects,lotuswordpro_test_lotuswordpr
     lotuswordpro/qa/cppunit/test_lotuswordpro \
 ))
 
-$(eval $(call gb_CppunitTest_add_library_objects,lotuswordpro_test_lotuswordpro,\
-    lwpft \
-))
-
 $(eval $(call gb_CppunitTest_add_linked_libs,lotuswordpro_test_lotuswordpro, \
     comphelper \
     cppu \
     cppuhelper \
-    icui18n \
-    icuuc \
     sal \
-    sfx \
-    sot \
-    svt \
-    svxcore \
-    tl \
-    ucbhelper \
     vcl \
-    xo \
     $(gb_STDLIBS) \
 ))
 
@@ -84,4 +71,8 @@ $(eval $(call gb_RdbTarget_add_components,lotuswordpro_test_lotuswordpro,\
     lotuswordpro/util/lwpfilter,\
 ))
 
+# we need to explicitly depend on library lwpft because it is not implied
+# by a link relation
+$(call gb_CppunitTest_get_target,lotuswordpro_test_lotuswordpro) : $(call gb_Library_get_target,lwpft)
+
 # vim: set noet sw=4:
commit c4a0b38fb0bbd86e4c6d1abc034e63c98d6ab475
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Apr 27 10:31:31 2011 +0200

    clean up

diff --git a/lotuswordpro/qa/cppunit/test_lotuswordpro.cxx b/lotuswordpro/qa/cppunit/test_lotuswordpro.cxx
index 29f7d6e..bb481bd 100644
--- a/lotuswordpro/qa/cppunit/test_lotuswordpro.cxx
+++ b/lotuswordpro/qa/cppunit/test_lotuswordpro.cxx
@@ -48,6 +48,7 @@ namespace
     {
     public:
         LotusWordProTest();
+        ~LotusWordProTest();
 
         virtual void setUp();
         virtual void tearDown();
@@ -90,6 +91,11 @@ namespace
         InitVCL(m_xMSF);
     }
 
+    LotusWordProTest::~LotusWordProTest()
+    {
+        DeInitVCL();
+    }
+
     void LotusWordProTest::setUp()
     {
     }