From 1ad0aef2ab81eeb96396bd0bce1203f3f6e681af Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Wed, 10 Oct 2012 20:28:44 +0200 Subject: tubes: getProcessServiceFactory does not return NULL anymore Change-Id: I3e5e2e2c826a732028c1ffc32b9620d22c3409d1 --- tubes/source/manager.cxx | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'tubes') diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx index 80899767bc97..26b4872a0a37 100644 --- a/tubes/source/manager.cxx +++ b/tubes/source/manager.cxx @@ -269,26 +269,23 @@ void TeleManager_fileReceived( const OUString& rStr, const OString& rUuid ) } TeleManager::setCurrentUuid( sUuid ); - css::uno::Reference< css::lang::XMultiServiceFactory > rFactory = - ::comphelper::getProcessServiceFactory(); - - // Should happen only for unit test - if (rFactory == NULL) - return; - - css::uno::Sequence < css::beans::PropertyValue > args(0); try { + css::uno::Reference< css::lang::XMultiServiceFactory > rFactory = + comphelper::getProcessServiceFactory(); + css::uno::Reference < css::frame::XComponentLoader > xLoader( ::comphelper::getProcessServiceFactory()->createInstance( "com.sun.star.frame.Desktop" ), css::uno::UNO_QUERY_THROW ); + css::uno::Sequence < css::beans::PropertyValue > args(0); css::uno::Reference < css::util::XCloseable > xDoc( xLoader->loadComponentFromURL( rStr, "_blank", 0, args ), css::uno::UNO_QUERY_THROW ); } catch ( const css::uno::Exception& e ) { + // Expected to happen for unit test SAL_WARN( "tubes", "TeleManager_fileReceived: exception when loading: " << e.Message ); } } -- cgit v1.2.3