path: root/pyuno
diff options
authorStephan Bergmann <>2014-11-25 23:22:13 +0100
committerStephan Bergmann <>2014-11-26 15:33:13 +0100
commita9d194f6f51656aeb42c13223177cb42f4efa895 (patch)
tree4479f879a5e40ec6bccff78237bf4332531c2b4b /pyuno
parentdce30375a0bb17b974f6dd6cb92a452e2f0dd492 (diff)
Revert "pyuno: set up fake command line in getComponentContext()"
This reverts commit 2386a92c1e6e8ec263edb4dc4fdcfeaa4673ce1f and its follow-ups 1acaa577b67158c060d2f57414f7aea86504a489 "sal: add special handling of argc==0 to osl_setCommandArgs()" and 01f27b5e5d428cc3c4aeabdcbbb8204494fbd435 "sal: fix osl_setCommandArgs() on WNT." The situation that osl_getCommandArgCount is called without a prior call to osl_setCommandArgs should be considered as harmless and can legitimately not only happen in the pyuno case discussed in the reverted commits, but also in case binary UNO is bootstrapped from within a Java process, as happens in test-javanative in ure/source/uretest/Makefile. Change-Id: I2829db390e37dfe5daeda33a4c0659b7d35e565a (cherry picked from commit 2ad716f406e0fdb9b9294876c64ae92fecbf5e27)
Diffstat (limited to 'pyuno')
1 files changed, 0 insertions, 5 deletions
diff --git a/pyuno/source/module/pyuno_module.cxx b/pyuno/source/module/pyuno_module.cxx
index e7ebb7355201..c2ca67b28bac 100644
--- a/pyuno/source/module/pyuno_module.cxx
+++ b/pyuno/source/module/pyuno_module.cxx
@@ -27,7 +27,6 @@
#include <osl/module.hxx>
#include <osl/thread.h>
-#include <osl/process.h>
#include <osl/file.hxx>
#include <typelib/typedescription.hxx>
@@ -250,10 +249,6 @@ static PyObject* getComponentContext(
- // cppu::defaultBootstrap_InitialComponentContext expects
- // command line arguments to be present
- osl_setCommandArgs(0, 0); // fake it
OUString iniFile;
if( path.isEmpty() )