From d91984a2c64118801b903f426d95b834d2517ba6 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Tue, 5 Nov 2019 15:42:29 +0100 Subject: [PATCH] =?utf8?q?Vorlagen:=20(kaputte)=20Unterst=C3=BCtzung=20f?= =?utf8?q?=C3=BCr=20XML-Vorlagen=20entfernt?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Außerdem ein paar Vorkommen der schon seit längerem entfernte Winston & Taxbird entfernt. --- SL/Form.pm | 7 ------- SL/Template.pm | 3 +-- SL/Template/XML.pm | 42 ----------------------------------------- locale/de/special_chars | 6 ------ 4 files changed, 1 insertion(+), 57 deletions(-) delete mode 100644 SL/Template/XML.pm diff --git a/SL/Form.pm b/SL/Form.pm index 94e2026b3..097b65d8d 100644 --- 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 39157d2d2..8682c7e9a 100644 --- 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 index d9bd766f9..000000000 --- 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 964fa4905..e9e7e1e24 100644 --- a/locale/de/special_chars +++ b/locale/de/special_chars @@ -27,12 +27,6 @@ order=< > \n >=> \n=
-[Template/XML] -order=< > \n -<=< ->=> -\n=
- [Template/LaTeX] order=\\ & \n \r " $ % _ # ^ { } < > £ ± ² ³ ° § ® © ~ \xad \xa0 ➔ → ← ↔ ↕ | − ≤ ≥ ‐ ​ Ω μ Δ ‑ \\=\\textbackslash\s -- 2.20.1