From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Fri, 17 Jan 2014 13:54:17 +0000 (+0100)
Subject: HTML-zu-LaTeX/OpenDocument: &nbsp; durch normale Leerzeichen ersetzen
X-Git-Tag: release-3.2.0beta~467^2~36
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=a4c6c83d27a9613e0fec95159988d16cdbe2782d;p=kivitendo-erp.git

HTML-zu-LaTeX/OpenDocument: &nbsp; durch normale Leerzeichen ersetzen
---

diff --git a/SL/Template/LaTeX.pm b/SL/Template/LaTeX.pm
index 4bb4ce63d..23e2ed0ae 100644
--- a/SL/Template/LaTeX.pm
+++ b/SL/Template/LaTeX.pm
@@ -71,7 +71,7 @@ sub _format_html {
 
   $content =~ s{ \r+ }{}gx;
   $content =~ s{ \n+ }{ }gx;
-  $content =~ s{ \s+ }{ }gx;
+  $content =~ s{ (?:\&nbsp;|\s)+ }{ }gx;
 
   my @parts = map {
     if (substr($_, 0, 1) eq '<') {
diff --git a/SL/Template/OpenDocument.pm b/SL/Template/OpenDocument.pm
index 085fa25db..85184c019 100644
--- a/SL/Template/OpenDocument.pm
+++ b/SL/Template/OpenDocument.pm
@@ -73,7 +73,7 @@ sub _format_html {
   $content                      =~ s{ ^<p> | </p>$ }{}gx;
   $content                      =~ s{ \r+ }{}gx;
   $content                      =~ s{ \n+ }{ }gx;
-  $content                      =~ s{ \s+ }{ }gx;
+  $content                      =~ s{ (?:\&nbsp;|\s)+ }{ }gx;
 
   my $in_p                      = 1;
   my $p_start_tag               = qq|<text:p text:style-name="@{[ $self->{current_text_style} ]}">|;