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