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 23e2ed0..6eb331d 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 $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;

diff --git a/SL/Template/Simple.pm b/SL/Template/Simple.pm
index a4b98ca..c525dab 100644 (file)
--- a/SL/Template/Simple.pm
+++ b/SL/Template/Simple.pm
@@ -32,6 +32,9 @@ sub new {
 sub _init {
   my ($self, %params) = @_;
 
+  $params{myconfig}  ||= \%::myconfig;
+  $params{userspath} ||= $::lx_office_conf{paths}->{userspath};
+
   $self->{$_} = $params{$_} for keys %params;
 
   $self->{variable_content_types}        ||= {};