diff options
author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-04-12 00:53:55 -0400 |
---|---|---|
committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-04-12 00:53:55 -0400 |
commit | 5b14929dd4f659420c5707b7c432fb9337cfff1d (patch) | |
tree | 7b65178bc915d0ebbad18ace80515a146e39b168 | |
parent | c0de63a858ee02bba2a9154b239085a64a277999 (diff) |
Handle the correct deletion order of EditDLL in the base class.
Turns out that this change affected all cppunit runs.
-rw-r--r-- | editeng/inc/editeng/eerdll.hxx | 2 | ||||
-rw-r--r-- | editeng/qa/unit/core-test.cxx | 2 | ||||
-rw-r--r-- | sc/qa/unit/ucalc.cxx | 1 | ||||
-rw-r--r-- | test/Library_test.mk | 1 | ||||
-rw-r--r-- | test/source/bootstrapfixture.cxx | 2 |
5 files changed, 4 insertions, 4 deletions
diff --git a/editeng/inc/editeng/eerdll.hxx b/editeng/inc/editeng/eerdll.hxx index 226aefe00479..5fd98960ffe3 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 1e83599e3358..fc5828f4a307 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 8f15b8d7f2a6..130ad670d0e1 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 571d26ccd3d3..f66e101857eb 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 284dbf7f3210..f4b81398a295 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(); } |