From 01c934acbe89859b57302c8036147ca31b268610 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 29 Apr 2013 14:42:13 +0200 Subject: Check for theTypeDescriptionManager singleton ...rather than a TypeDescriptionManager service that is no longer available. Change-Id: I1054ab0a658597a60d11e2f9aa0960df25d14bc4 --- ure/source/uretest/cppmain.cc | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/ure/source/uretest/cppmain.cc b/ure/source/uretest/cppmain.cc index 331598efdb8a..4de525e1e58c 100644 --- a/ure/source/uretest/cppmain.cc +++ b/ure/source/uretest/cppmain.cc @@ -111,7 +111,6 @@ private: "com.sun.star.loader.SharedLibrary", "com.sun.star.reflection.CoreReflection", "com.sun.star.reflection.ProxyFactory", - "com.sun.star.reflection.TypeDescriptionManager", "com.sun.star.registry.ImplementationRegistration", "com.sun.star.registry.NestedRegistry", "com.sun.star.registry.SimpleRegistry", @@ -145,6 +144,15 @@ private: static_cast< ::cppu::OWeakObject * >(this)); } } + static char const * const singletons[] = { + "com.sun.star.reflection.theTypeDescriptionManager" + }; + for (std::size_t i = 0; i != SAL_N_ELEMENTS(singletons); ++i) { + css::uno::Reference< css::uno::XInterface > instance( + context_->getValueByName( + "/singletons/" + rtl::OUString::createFromAscii(singletons[i])), + css::uno::UNO_QUERY_THROW); + } css::util::theMacroExpander::get(context_); test( ::test::types::CppTest::create(context_), -- cgit