Kaydet (Commit) 390f842d authored tarafından Andrzej Hunt's avatar Andrzej Hunt Kaydeden (comit) Michael Meeks

Check whether Command Args are already set up before doing so.

Could already be set up e.g. if a client application is using UNO
separately, in addition to LOK.

Change-Id: I50c3230b6f2456360273902a308c303576baac10
üst 972c92c8
......@@ -577,7 +577,14 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath)
try
{
osl_setCommandArgs(0, NULL);
// If we've set up the command args elsewhere then we cannot do it
// 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())
{
osl_setCommandArgs(0, NULL);
}
initialize_uno(aAppURL);
force_c_locale();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment