unotest/source/cpp/officeconnection.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
New commits: commit b37acfc09e9f24ca602bd1f9343b6af60d0656bc Author: Stephan Bergmann <sberg...@redhat.com> Date: Tue Apr 10 16:30:05 2012 +0200 Obtain resolver before spawning process_ in setUp ...so that tearDown does not hang waiting for (idling) process_ to terminate if setUp throws an exception when obtaining resolver. diff --git a/unotest/source/cpp/officeconnection.cxx b/unotest/source/cpp/officeconnection.cxx index 3791ddd..e8ccd66 100644 --- a/unotest/source/cpp/officeconnection.cxx +++ b/unotest/source/cpp/officeconnection.cxx @@ -59,6 +59,9 @@ OfficeConnection::OfficeConnection(): process_(0) {} OfficeConnection::~OfficeConnection() {} void OfficeConnection::setUp() { + css::uno::Reference< css::bridge::XUnoUrlResolver > resolver( + css::bridge::UnoUrlResolver::create( + cppu::defaultBootstrap_InitialComponentContext())); rtl::OUString desc; rtl::OUString argSoffice; CPPUNIT_ASSERT( @@ -119,9 +122,6 @@ void OfficeConnection::setUp() { "\"soffice\" argument starts with neither \"path:\" nor" " \"connect:\""); } - css::uno::Reference< css::bridge::XUnoUrlResolver > resolver( - css::bridge::UnoUrlResolver::create( - cppu::defaultBootstrap_InitialComponentContext())); for (;;) { try { context_ = _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits