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 /editeng | |
parent | c0de63a858ee02bba2a9154b239085a64a277999 (diff) |
Handle the correct deletion order of EditDLL in the base class.
Turns out that this change affected all cppunit runs.
Diffstat (limited to 'editeng')
-rw-r--r-- | editeng/inc/editeng/eerdll.hxx | 2 | ||||
-rw-r--r-- | editeng/qa/unit/core-test.cxx | 2 |
2 files changed, 1 insertions, 3 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(); } |