diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-10-31 09:22:53 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-10-31 09:22:53 +0100 |
| commit | ced1151a1ad00fb2913a4c0f54e4544f4e566c05 (patch) | |
| tree | 416403e0c91acc4cbfe6219f1930ea0273a856e0 /desktop | |
| parent | 6bc62f4f43c7458399169ddb2cba30ae4188b1bd (diff) | |
Get rid of vcl::unohelper::GetMultiServiceFactory
...which effectively is just a glorious wrapper around
comphelper::getProcessServiceFactory.
In turn gets also rid of ImplSVAppData's mxMSF and mpMSFTempFileName and the
rSMgr parameter to InitVCL.
All the VCL users "soffice", "spadmin", and "unopkg gui" appear to still work
fine.
Change-Id: I797d48f7d0d8c35bb82124c9ab0ee63850c4d863
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_service.cxx | 4 | ||||
| -rw-r--r-- | desktop/source/pkgchk/unopkg/unopkg_misc.cxx | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx index 7c83aabac00e..6f067b9ba829 100644 --- a/desktop/source/deployment/gui/dp_gui_service.cxx +++ b/desktop/source/deployment/gui/dp_gui_service.cxx @@ -244,9 +244,7 @@ void ServiceImpl::startExecuteModal( if (! bOfficePipePresent) { OSL_ASSERT( ! bAppUp ); app.reset( new MyApp ); - if (! InitVCL( Reference<lang::XMultiServiceFactory>( - m_xComponentContext->getServiceManager(), - UNO_QUERY_THROW ) )) + if (! InitVCL() ) throw RuntimeException( OUSTR("Cannot initialize VCL!"), static_cast<OWeakObject *>(this) ); AllSettings as = app->GetSettings(); diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx index 932d1cd00259..7a6c899c6ed2 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx @@ -490,9 +490,7 @@ Reference<XComponentContext> getUNO( { //We show a message box or print to the console that there //is another instance already running - if ( ! InitVCL( Reference<lang::XMultiServiceFactory>( - xComponentContext->getServiceManager(), - UNO_QUERY_THROW ) )) + if ( ! InitVCL() ) throw RuntimeException( OUSTR("Cannot initialize VCL!"), NULL ); { |