Kaydet (Commit) b37acfc0 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

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.
üst 80c233cd
......@@ -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_ =
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment