Refactoring: SL::Template: Parameterübergabe als Hash, nicht positionsabhängig (Teil 2)

diff --git a/SL/Template/LaTeX.pm b/SL/Template/LaTeX.pm
index 23e2ed0aeaa1456dfe4334fb6741fe33c6256960..6eb331d605b63c2b01ecc11d8d12ce00dbfe457f 100644 (file)
--- a/SL/Template/LaTeX.pm
+++ b/SL/Template/LaTeX.pm
@@ -589,7 +589,7 @@ sub parse_and_create_pdf {
 
   my $error;
   eval {
 
   my $error;
   eval {

-    my $template = SL::Template::LaTeX->new($template_file_name, $local_form, \%::myconfig, $::lx_office_conf{paths}->{userspath});
+    my $template = SL::Template::LaTeX->new(file_name => $template_file_name, form => $local_form);

     my $result   = $template->parse($tex_fh) && $template->convert_to_pdf;
 
     die $template->{error} unless $result;
     my $result   = $template->parse($tex_fh) && $template->convert_to_pdf;
 
     die $template->{error} unless $result;

diff --git a/SL/Template/Simple.pm b/SL/Template/Simple.pm
index a4b98ca714b123934683b32fe423c7f7a17d55cf..c525dabe49e1db83fcc9e6c641ed3be080027c2e 100644 (file)
--- a/SL/Template/Simple.pm
+++ b/SL/Template/Simple.pm
@@ -32,6 +32,9 @@ sub new {
 sub _init {
   my ($self, %params) = @_;
 
 sub _init {
   my ($self, %params) = @_;
 

+  $params{myconfig}  ||= \%::myconfig;
+  $params{userspath} ||= $::lx_office_conf{paths}->{userspath};
+

   $self->{$_} = $params{$_} for keys %params;
 
   $self->{variable_content_types}        ||= {};
   $self->{$_} = $params{$_} for keys %params;
 
   $self->{variable_content_types}        ||= {};