mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Obtain resolver before spawning process_ in setUp

Browse Source 
...so that tearDown does not hang waiting for (idling) process_ to terminate
if setUp throws an exception when obtaining resolver.
This commit is contained in:
Stephan Bergmann
2012-04-10 16:30:05 +02:00
parent 80c233cddf
commit b37acfc09e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
unotest/source/cpp/officeconnection.cxx
View File

@@ -59,6 +59,9 @@ OfficeConnection::OfficeConnection(): process_(0) {}
OfficeConnection::~OfficeConnection() {} OfficeConnection::~OfficeConnection() {}
void OfficeConnection::setUp() { void OfficeConnection::setUp() {
css::uno::Reference< css::bridge::XUnoUrlResolver > resolver(
css::bridge::UnoUrlResolver::create(
cppu::defaultBootstrap_InitialComponentContext()));
rtl::OUString desc; rtl::OUString desc;
rtl::OUString argSoffice; rtl::OUString argSoffice;
CPPUNIT_ASSERT( CPPUNIT_ASSERT(
@@ -119,9 +122,6 @@ void OfficeConnection::setUp() {
"\"soffice\" argument starts with neither \"path:\" nor" "\"soffice\" argument starts with neither \"path:\" nor"
" \"connect:\""); " \"connect:\"");
} }
css::uno::Reference< css::bridge::XUnoUrlResolver > resolver(
css::bridge::UnoUrlResolver::create(
cppu::defaultBootstrap_InitialComponentContext()));
for (;;) { for (;;) {
try { try {
context_ = context_ =