diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-09-18 12:47:55 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-09-18 15:08:56 +0200 |
| commit | 2a32bf29b98403872235f880e91b1c08cd3d7f68 (patch) | |
| tree | 4c982e92c3220c2e0d918d1d4c7661006b920150 /vcl/source | |
| parent | Don't access broken service mgr during bootstrap failure (diff) | |
| download | core-2a32bf29b98403872235f880e91b1c08cd3d7f68.tar.gz core-2a32bf29b98403872235f880e91b1c08cd3d7f68.zip | |
Make getProcessComponentContext/ServiceFactory throw instead of returning null
...with the same rationale as recent 543158edba6678d3d76eee983a9d4edd2a422fee
"Require XComponentContext.getServiceManager to throw instead of returning null"
(this helps find problems like 065a758d0c2b66c6683d648347b7a6cdef4a80f7 "Enable
experimental gtk3 plugin only via SAL_USE_VCLPLUGIN").
Removed comphelper::createProcessComponent[WithAguments] and replaced its few
uses with direct calls to createInstance[WithArguments].
Change-Id: Ia44b8656f74de88ef6eab3eb6bd597729b08e1c8
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/app/svmain.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/gdi/impimagetree.cxx | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index fe895a54da0e..285f7137ccd4 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -487,7 +487,7 @@ void DeInitVCL() try { uno::Reference<lang::XComponent> const xDesktop( - comphelper::createProcessComponent( + comphelper::getProcessServiceFactory()->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop"))), uno::UNO_QUERY_THROW) ; diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx index 374ce851eae8..1e34be389a31 100644 --- a/vcl/source/gdi/impimagetree.cxx +++ b/vcl/source/gdi/impimagetree.cxx @@ -39,6 +39,7 @@ #include "com/sun/star/container/XNameAccess.hpp" #include "com/sun/star/io/XInputStream.hpp" #include "com/sun/star/lang/Locale.hpp" +#include "com/sun/star/lang/XMultiServiceFactory.hpp" #include "com/sun/star/uno/Any.hxx" #include "com/sun/star/uno/Exception.hpp" #include "com/sun/star/uno/Reference.hxx" @@ -409,7 +410,7 @@ bool ImplImageTree::find( args[0] <<= i->first + ".zip"; try { i->second.set( - comphelper::createProcessComponentWithArguments( + comphelper::getProcessServiceFactory()->createInstanceWithArguments( rtl::OUString( "com.sun.star.packages.zip.ZipFileAccess"), args), css::uno::UNO_QUERY_THROW); |