diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-04-10 16:30:05 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-04-10 16:30:05 +0200 |
| commit | b37acfc09e9f24ca602bd1f9343b6af60d0656bc (patch) | |
| tree | 42f7e474b52566c733173a58e74a5e0ff5e5de3b /unotest | |
| parent | 80c233cddff5daca7ffa3fca0499f539fae5ce62 (diff) | |
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.
Diffstat (limited to 'unotest')
| -rw-r--r-- | unotest/source/cpp/officeconnection.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/unotest/source/cpp/officeconnection.cxx b/unotest/source/cpp/officeconnection.cxx index 3791dddf8703..e8ccd66a4729 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_ = |