Vorlagen: (kaputte) Unterstützung für XML-Vorlagen entfernt

Außerdem ein paar Vorkommen der schon seit längerem entfernte Winston
& Taxbird entfernt.

diff --git a/SL/Form.pm b/SL/Form.pm
index 94e2026..097b65d 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -930,13 +930,6 @@ sub parse_template {
     $template_type  = 'HTML';
     $ext_for_format = 'html';
 
-  } elsif (($self->{"format"} =~ /xml/i) || (!$self->{"format"} && ($self->{"IN"} =~ /xml$/i))) {
-    $template_type  = 'XML';
-    $ext_for_format = 'xml';
-
-  } elsif ( $self->{"format"} =~ /elster(?:winston|taxbird)/i ) {
-    $template_type = 'XML';
-
   } elsif ( $self->{"format"} =~ /excel/i ) {
     $template_type  = 'Excel';
     $ext_for_format = 'xls';

diff --git a/SL/Template.pm b/SL/Template.pm
index 39157d2..8682c7e 100644 (file)
--- a/SL/Template.pm
+++ b/SL/Template.pm
@@ -19,7 +19,6 @@ use SL::Template::LaTeX;
 use SL::Template::OpenDocument;
 use SL::Template::PlainText;
 use SL::Template::ShellCommand;
-use SL::Template::XML;
 
 sub create {
   my %params  = @_;
@@ -47,7 +46,7 @@ sub available_templates {
   my @alldir  = sort grep {
        -d ($::lx_office_conf{paths}->{templates} . "/$_")
     && !/^\.\.?$/
-    && !m/\.(?:html|tex|sty|odt|xml|txb)$/
+    && !m/\.(?:html|tex|sty|odt)$/
     && !m/^(?:webpages$|print$|mail$|\.)/
   } keys %dir_h;
 

diff --git a/SL/Template/XML.pm b/SL/Template/XML.pm
deleted file mode 100644 (file)
index d9bd766..0000000
--- a/SL/Template/XML.pm
+++ /dev/null
@@ -1,42 +0,0 @@
-package SL::Template::XML;
-
-use parent qw(SL::Template::HTML);
-
-use strict;
-
-sub new {
-  #evtl auskommentieren
-  my $type = shift;
-
-  return $type->SUPER::new(@_);
-}
-
-sub format_string {
-  my ($self, $variable) = @_;
-  my $form = $self->{"form"};
-
-  $variable = $main::locale->quote_special_chars('Template/XML', $variable);
-
-  # Allow no markup to be converted into the output format
-  my @markup_replace = ('b', 'i', 's', 'u', 'sub', 'sup');
-
-  foreach my $key (@markup_replace) {
-    $variable =~ s/\<(\/?)${key}\>//g;
-  }
-
-  return $variable;
-}
-
-sub get_mime_type() {
-  my ($self) = @_;
-
-  return "text";
-
-}
-
-sub uses_temp_file {
-  # tempfile needet for XML Output
-  return 1;
-}
-
-1;

diff --git a/locale/de/special_chars b/locale/de/special_chars
index 964fa49..e9e7e1e 100644 (file)
--- a/locale/de/special_chars
+++ b/locale/de/special_chars
@@ -27,12 +27,6 @@ order=< > \n
 >=&gt;
 \n=<br>
 
-[Template/XML]
-order=< > \n
-<=&lt;
->=&gt;
-\n=<br>
-
 [Template/LaTeX]
 order=\\ <pagebreak> & \n \r " $ <bullet> % _ # ^ { } < > £ ± ² ³ ° § ® © ~ \xad \xa0 ➔ → ← ↔ ↕ | − ≤ ≥ ‐ ​ Ω μ Δ ‑
 \\=\\textbackslash\s