Kaydet (Commit) 5b14929d authored tarafından Kohei Yoshida's avatar Kohei Yoshida

Handle the correct deletion order of EditDLL in the base class.

Turns out that this change affected all cppunit runs.
üst c0de63a8
...@@ -53,7 +53,7 @@ public: ...@@ -53,7 +53,7 @@ public:
ResMgr* GetResMgr() const { return pResMgr; } ResMgr* GetResMgr() const { return pResMgr; }
GlobalEditData* GetGlobalData() const { return pGlobalData; } GlobalEditData* GetGlobalData() const { return pGlobalData; }
static EditDLL& Get(); static EditDLL& Get();
static void Release(); EDITENG_DLLPUBLIC static void Release();
}; };
#define EE_DLL() EditDLL::Get() #define EE_DLL() EditDLL::Get()
......
...@@ -74,8 +74,6 @@ void Test::setUp() ...@@ -74,8 +74,6 @@ void Test::setUp()
void Test::tearDown() void Test::tearDown()
{ {
SfxItemPool::Free(mpItemPool); SfxItemPool::Free(mpItemPool);
EditDLL::Release();
test::BootstrapFixture::tearDown(); test::BootstrapFixture::tearDown();
} }
......
...@@ -303,7 +303,6 @@ void Test::setUp() ...@@ -303,7 +303,6 @@ void Test::setUp()
void Test::tearDown() void Test::tearDown()
{ {
m_xDocShRef.Clear(); m_xDocShRef.Clear();
BootstrapFixture::tearDown(); BootstrapFixture::tearDown();
} }
......
...@@ -42,6 +42,7 @@ $(eval $(call gb_Library_use_libraries,test,\ ...@@ -42,6 +42,7 @@ $(eval $(call gb_Library_use_libraries,test,\
comphelper \ comphelper \
cppu \ cppu \
cppuhelper \ cppuhelper \
editeng \
i18nisolang1 \ i18nisolang1 \
sal \ sal \
tl \ tl \
......
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>
#include <tools/resmgr.hxx> #include <tools/resmgr.hxx>
#include <unotools/syslocaleoptions.hxx> #include <unotools/syslocaleoptions.hxx>
#include <editeng/eerdll.hxx>
using namespace ::com::sun::star; using namespace ::com::sun::star;
...@@ -107,6 +108,7 @@ void test::BootstrapFixture::setUp() ...@@ -107,6 +108,7 @@ void test::BootstrapFixture::setUp()
void test::BootstrapFixture::tearDown() void test::BootstrapFixture::tearDown()
{ {
ucbhelper::ContentBroker::deinitialize(); ucbhelper::ContentBroker::deinitialize();
EditDLL::Release();
test::BootstrapFixtureBase::tearDown(); test::BootstrapFixtureBase::tearDown();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment