From df92f499f963a5a4d8cb7100ea1f846bb0f91014 Mon Sep 17 00:00:00 2001
From: Kohei Yoshida <kohei.yoshida@gmail.com>
Date: Sat, 28 Apr 2012 00:23:51 -0400
Subject: Fixed crash on tear down during cppunit test.

Change-Id: I5573e554420967d8942295cabe788a9e56835ba0
---
 sc/qa/extras/sceditfieldobj-cell.cxx   | 3 +++
 sc/qa/extras/sceditfieldobj-header.cxx | 5 +++++
 2 files changed, 8 insertions(+)

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();
 }
-- 
cgit