[Libreoffice-commits] .: editeng/inc editeng/qa sc/qa test/Library_test.mk test/source

[Kohei Yoshida]

 editeng/inc/editeng/eerdll.hxx   |    2 +-
 editeng/qa/unit/core-test.cxx    |    2 --
 sc/qa/unit/ucalc.cxx             |    1 -
 test/Library_test.mk             |    1 +
 test/source/bootstrapfixture.cxx |    2 ++
 5 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 5b14929dd4f659420c5707b7c432fb9337cfff1d
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Thu Apr 12 00:53:55 2012 -0400

    Handle the correct deletion order of EditDLL in the base class.
    
    Turns out that this change affected all cppunit runs.

diff --git a/editeng/inc/editeng/eerdll.hxx b/editeng/inc/editeng/eerdll.hxx
index 226aefe..5fd9896 100644
--- a/editeng/inc/editeng/eerdll.hxx
+++ b/editeng/inc/editeng/eerdll.hxx
@@ -53,7 +53,7 @@ public:
     ResMgr*         GetResMgr() const       { return pResMgr; }
     GlobalEditData* GetGlobalData() const   { return pGlobalData; }
     static EditDLL& Get();
-    static void Release();
+    EDITENG_DLLPUBLIC static void Release();
 };
 
 #define EE_DLL() EditDLL::Get()
diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx
index 1e83599..fc5828f 100644
--- a/editeng/qa/unit/core-test.cxx
+++ b/editeng/qa/unit/core-test.cxx
@@ -74,8 +74,6 @@ void Test::setUp()
 void Test::tearDown()
 {
     SfxItemPool::Free(mpItemPool);
-    EditDLL::Release();
-
     test::BootstrapFixture::tearDown();
 }
 
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 8f15b8d..130ad67 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -303,7 +303,6 @@ void Test::setUp()
 void Test::tearDown()
 {
     m_xDocShRef.Clear();
-
     BootstrapFixture::tearDown();
 }
 
diff --git a/test/Library_test.mk b/test/Library_test.mk
index 571d26c..f66e101 100644
--- a/test/Library_test.mk
+++ b/test/Library_test.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_Library_use_libraries,test,\
     comphelper \
     cppu \
     cppuhelper \
+    editeng \
 	i18nisolang1 \
     sal \
 	tl \
diff --git a/test/source/bootstrapfixture.cxx b/test/source/bootstrapfixture.cxx
index 284dbf7..f4b8139 100644
--- a/test/source/bootstrapfixture.cxx
+++ b/test/source/bootstrapfixture.cxx
@@ -42,6 +42,7 @@
 #include <vcl/svapp.hxx>
 #include <tools/resmgr.hxx>
 #include <unotools/syslocaleoptions.hxx>
+#include <editeng/eerdll.hxx>
 
 using namespace ::com::sun::star;
 
@@ -107,6 +108,7 @@ void test::BootstrapFixture::setUp()
 void test::BootstrapFixture::tearDown()
 {
     ucbhelper::ContentBroker::deinitialize();
+    EditDLL::Release();
     test::BootstrapFixtureBase::tearDown();
 }