Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision f2af9def

Von Moritz Bunkus vor fast 14 Jahren hinzugefügt

  • ID f2af9def6777d0192a83c8a86f1332569c742051
  • Vorgänger 2b82ec61
  • Nachfolger 2b339152

Globale Variablen nach %::lx_office_conf verschoben

Betroffen sind:
$sendmail
$openofficeorg_writer_bin
$xvfb_bin
$html2ps_bin
$ghostscript_bin
$latex_bin
$pg_dump_exe
$pg_restore_exe

Unterschiede anzeigen:

SL/Template/OpenDocument.pm
382 382
  my $pid = fork();
383 383
  if (0 == $pid) {
384 384
    $main::lxdebug->message(LXDebug->DEBUG2(), "  Child execing\n");
385
    exec($main::xvfb_bin, $display, "-screen", "0", "640x480x8", "-nolisten", "tcp");
385
    exec($::lx_office_conf{applications}->{xvfb}, $display, "-screen", "0", "640x480x8", "-nolisten", "tcp");
386 386
  }
387 387
  sleep(3);
388 388
  $main::lxdebug->message(LXDebug->DEBUG2(), "  parent dont sleeping\n");
......
457 457
        exit if ($new_pid);
458 458
        my $ssres = setsid();
459 459
        $main::lxdebug->message(LXDebug->DEBUG2(), "  Child execing\n");
460
        my @cmdline = ($main::openofficeorg_writer_bin,
460
        my @cmdline = ($::lx_office_conf{applications}->{openofficeorg_writer},
461 461
                       "-minimized", "-norestore", "-nologo", "-nolockcheck",
462 462
                       "-headless",
463 463
                       "-accept=socket,host=localhost,port=" .
......
509 509

  
510 510
  my @cmdline;
511 511
  if (!$main::openofficeorg_daemon) {
512
    @cmdline = ($main::openofficeorg_writer_bin,
512
    @cmdline = ($::lx_office_conf{applications}->{openofficeorg_writer},
513 513
                "-minimized", "-norestore", "-nologo", "-nolockcheck",
514 514
                "-headless",
515 515
                "file:${filename}.odt",

Auch abrufbar als: Unified diff