correctly terminate tableautoformatfield

1 files changed, 27 insertions, 0 deletions

diff --git a/sc/qa/extras/tableautoformatfield.cxx b/sc/qa/extras/tableautoformatfield.cxx
index c4f596264bd4..ac0ad8c53692 100644
--- a/sc/qa/extras/tableautoformatfield.cxx
+++ b/sc/qa/extras/tableautoformatfield.cxx
@@ -34,10 +34,15 @@
 
 namespace ScAutoFormatFieldObj {
 
+#define NUMBER_OF_TESTS 2
+
 class ScTableAutoFormatField : public UnoApiTest
 {
 public:
 
+    virtual void setUp();
+    virtual void tearDown();
+
     uno::Reference< beans::XPropertySet > init();    void testRotateReference();
     void testVertJustify();
 
@@ -46,8 +51,13 @@ public:
     CPPUNIT_TEST(testVertJustify);
     CPPUNIT_TEST_SUITE_END();
 
+private:
+
+    static int nTest;
 };
 
+int ScTableAutoFormatField::nTest = 0;
+
 uno::Reference< beans::XPropertySet > ScTableAutoFormatField::init()
 {
     uno::Reference< container::XIndexAccess > xAutoFormatFields( m_xSFactory->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.TableAutoFormats"))), UNO_QUERY_THROW );
@@ -95,6 +105,23 @@ void ScTableAutoFormatField::testVertJustify()
     CPPUNIT_ASSERT_MESSAGE("value has not been changed", aValue == 3);
 }
 
+void ScTableAutoFormatField::setUp()
+{
+    nTest += 1;
+    UnoApiTest::setUp();
+}
+
+void ScTableAutoFormatField::tearDown()
+{
+    UnoApiTest::tearDown();
+
+    if (nTest == NUMBER_OF_TESTS)
+    {
+        mxDesktop->terminate();
+        uno::Reference< lang::XComponent>(m_xContext, UNO_QUERY_THROW)->dispose();
+    }
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(ScTableAutoFormatField);
 
 CPPUNIT_PLUGIN_IMPLEMENT();