Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 2b339152

Von Moritz Bunkus vor fast 14 Jahren hinzugefügt

  • ID 2b3391521b469f9f7b2928d104a9f620dddb25d2
  • Vorgänger f2af9def
  • Nachfolger be6f6cfd

Globale Variablen für Druckvorlagen nach %::lx_office_conf verschoben

Betroffen sind:
$latex_templates
$excel_templates
$opendocument_templates
$openofficeorg_daemon
$openofficeorg_daemon_port

Unterschiede anzeigen:

SL/Template/OpenDocument.pm
419 419
sub is_openoffice_running {
420 420
  $main::lxdebug->enter_sub();
421 421

  
422
  my $output = `./scripts/oo-uno-test-conn.py $main::openofficeorg_daemon_port 2> /dev/null`;
422
  my $cmd    = "./scripts/oo-uno-test-conn.py " . $::lx_office_conf{print_templates}->{openofficeorg_daemon_port} . " 2> /dev/null";
423
  my $output = `$cmd`;
423 424
  chomp $output;
424 425

  
425 426
  my $res = ($? == 0) || $output;
......
461 462
                       "-minimized", "-norestore", "-nologo", "-nolockcheck",
462 463
                       "-headless",
463 464
                       "-accept=socket,host=localhost,port=" .
464
                       $main::openofficeorg_daemon_port . ";urp;");
465
                       $::lx_office_conf{print_templates}->{openofficeorg_daemon_port} . ";urp;");
465 466
        exec(@cmdline);
466 467
      }
467 468

  
......
508 509
  }
509 510

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

  
524 525
    @cmdline = ("./scripts/oo-uno-convert-pdf.py",
525
                $main::openofficeorg_daemon_port,
526
                $::lx_office_conf{print_templates}->{openofficeorg_daemon_port},
526 527
                "${filename}.odt");
527 528
  }
528 529

  

Auch abrufbar als: Unified diff