diff options
| author | Juergen Funk <juergen.funk_ml@cib.de> | 2024-10-07 12:15:06 +0200 |
|---|---|---|
| committer | Juergen Funk <juergen.funk_ml@cib.de> | 2024-10-07 12:15:06 +0200 |
| commit | ca68a98eaa26a76a0f9709070a0522c76131c0c4 (patch) | |
| tree | 9d68fb40f11ad7aff46f5903b69e8a7eb5c5767c | |
| parent | 88291a6f47899f36b4359a3d996e046da7401144 (diff) | |
Revert "tdf#158375 Hack to make sure process service factory is set"
private/juergen/check-cjk
This reverts commit 53d6a13635d918367664763437d3fb52ce5fd9c3.
| -rw-r--r-- | pyuno/source/loader/pyuno_loader.cxx | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/pyuno/source/loader/pyuno_loader.cxx b/pyuno/source/loader/pyuno_loader.cxx index b02ad302fa80..afdb016aa764 100644 --- a/pyuno/source/loader/pyuno_loader.cxx +++ b/pyuno/source/loader/pyuno_loader.cxx @@ -34,11 +34,8 @@ #include <cppuhelper/factory.hxx> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/uno/DeploymentException.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <comphelper/processfactory.hxx> #include <officecfg/Office/Common.hxx> // apparently PATH_MAX is not standard and not defined by MSVC @@ -247,17 +244,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* pyuno_Loader_get_implementation( css::uno::XComponentContext* ctx , css::uno::Sequence<css::uno::Any> const&) { - //HACK: Reading the configuration via officecfg::... below internally needs the - // comphelper::getProcessServiceFactory(), which might not be set if this code is e.g. executed - // in a uno.bin process when installing a LibreOffice extension written in Python, so make sure - // the process service factory is set: - try { - comphelper::getProcessServiceFactory(); - } catch (css::uno::DeploymentException const &) { - comphelper::setProcessServiceFactory( - css::uno::Reference<css::lang::XMultiServiceFactory>( - ctx->getServiceManager(), css::uno::UNO_QUERY_THROW)); - } if (officecfg::Office::Common::Security::Scripting::DisablePythonRuntime::get()) return nullptr; |