summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@gmail.com>2012-04-28 00:23:51 -0400
committerKohei Yoshida <kohei.yoshida@gmail.com>2012-04-28 00:24:50 -0400
commitdf92f499f963a5a4d8cb7100ea1f846bb0f91014 (patch)
treea4a191960ee83195d7d350089c1c8e6f45dfae78
parent852f502efd7eff39db8168abdb4ae41eb5933123 (diff)
Fixed crash on tear down during cppunit test.
Change-Id: I5573e554420967d8942295cabe788a9e56835ba0
-rw-r--r--sc/qa/extras/sceditfieldobj-cell.cxx3
-rw-r--r--sc/qa/extras/sceditfieldobj-header.cxx5
2 files changed, 8 insertions, 0 deletions
diff --git a/sc/qa/extras/sceditfieldobj-cell.cxx b/sc/qa/extras/sceditfieldobj-cell.cxx
index 962834a4c630..e7ad2ed92881 100644
--- a/sc/qa/extras/sceditfieldobj-cell.cxx
+++ b/sc/qa/extras/sceditfieldobj-cell.cxx
@@ -83,7 +83,10 @@ void ScEditFieldObj_Cell::setUp()
void ScEditFieldObj_Cell::tearDown()
{
if (nTest == NUMBER_OF_TESTS)
+ {
+ mxField.clear();
closeDocument(mxComponent);
+ }
UnoApiTest::tearDown();
}
diff --git a/sc/qa/extras/sceditfieldobj-header.cxx b/sc/qa/extras/sceditfieldobj-header.cxx
index 85d9817b4d46..44bdeb59f785 100644
--- a/sc/qa/extras/sceditfieldobj-header.cxx
+++ b/sc/qa/extras/sceditfieldobj-header.cxx
@@ -86,7 +86,12 @@ void ScEditFieldObj_Header::setUp()
void ScEditFieldObj_Header::tearDown()
{
if (nTest == NUMBER_OF_TESTS)
+ {
+ // Clear these before the component is destroyed. This is important!
+ mxField.clear();
+ mxRightText.clear();
closeDocument(mxComponent);
+ }
UnoApiTest::tearDown();
}