summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-12-04 15:49:48 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-12-04 15:56:17 +0100
commit7fbfc12474b85b31c9d120898fff6e226d76d662 (patch)
treecb03e0fada25647af8d9ad0f093562828297b555 /desktop
parent9eda6b307ba6c5426c40c4cad95e07e43858230e (diff)
Still no need for osl_setCommandArgs
(TOCTOU and all) Change-Id: I81253c8790b631117634bafa4eea65991a975ba0
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/lib/init.cxx6
1 files changed, 1 insertions, 5 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 8040f546e9ae..8a7ffd53b065 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -693,11 +693,7 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath)
// again (as an assert will fire), this will be the case e.g.
// for unit tests (and possibly if UNO is being used in addition
// to LOK in an external program).
- if (!osl_areCommandArgsSet())
- {
- SAL_INFO("lok", "commandArgs not previously set");
- osl_setCommandArgs(2, pArgs);
- }
+ osl_setCommandArgs(2, pArgs);
SAL_INFO("lok", "attempting to initalize UNO");
initialize_uno(aAppURL);
SAL_INFO("lok", "uno successfully initalized");