From 044be7107a97169e80360c79a9d07bec263ac818 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Sat, 7 Jun 2014 04:34:10 +0200 Subject: Revert "Make sure to dispose services supporting the XComponent protocol" This reverts commit 4cacc6080e61374fd573fffb3bc2a54968c1b61a. --- postprocess/qa/services.cxx | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) (limited to 'postprocess') diff --git a/postprocess/qa/services.cxx b/postprocess/qa/services.cxx index 2d29e918a420..c9d30f4f1031 100644 --- a/postprocess/qa/services.cxx +++ b/postprocess/qa/services.cxx @@ -9,10 +9,7 @@ #include -#include - #include -#include #include #include #include @@ -40,7 +37,6 @@ void ServicesTest::test() "/singletons/com.sun.star.reflection.theTypeDescriptionManager"), UNO_QUERY_THROW ); Sequence s = m_xContext->getServiceManager()->getAvailableServiceNames(); - std::vector< css::uno::Reference > comps; for (sal_Int32 i = 0; i < s.getLength(); i++) { if (!xTypeManager->hasByHierarchicalName(s[i])) @@ -58,13 +54,12 @@ void ServicesTest::test() Sequence< Reference< XServiceConstructorDescription > > xseq = xDesc->getConstructors(); for (sal_Int32 c = 0; c < xseq.getLength(); c++) if (!xseq[c]->getParameters().hasElements()) - { - Reference< XInterface > instance; try { OString message = OUStringToOString(s[i], RTL_TEXTENCODING_UTF8); bool bDefConstructor = xseq[c]->isDefaultConstructor(); Reference< css::lang::XMultiComponentFactory > serviceManager = m_xContext->getServiceManager(); + Reference< XInterface > instance; if( bDefConstructor ) instance = serviceManager->createInstanceWithContext(s[i], m_xContext); @@ -80,18 +75,6 @@ void ServicesTest::test() OUStringToOString(s[i] + ": " + e.Message, RTL_TEXTENCODING_UTF8); CPPUNIT_FAIL(exc.getStr()); } - css::uno::Reference comp( - instance, css::uno::UNO_QUERY); - if (comp.is()) { - comps.push_back(comp); - } - } - } - for (std::vector< css::uno::Reference >::iterator i( - comps.begin()); - i != comps.end(); ++i) - { - (*i)->dispose(); } } -- cgit