From efb22e19d86d3bc604132b6c0da224b7c493219c Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Mon, 30 Mar 2020 07:33:36 +0200
Subject: [PATCH] OO-4602: escape special - from windows
---
src/main/java/org/olat/core/util/pdf/PdfDocument.java | 6 +++++-
src/test/java/org/olat/core/util/pdf/PdfDocumentTest.java | 3 ++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/olat/core/util/pdf/PdfDocument.java b/src/main/java/org/olat/core/util/pdf/PdfDocument.java
index 5c098e19067..2d8ae66e27f 100644
--- a/src/main/java/org/olat/core/util/pdf/PdfDocument.java
+++ b/src/main/java/org/olat/core/util/pdf/PdfDocument.java
@@ -217,7 +217,11 @@ public class PdfDocument {
}
public static String cleanString(String string) {
- return string.replace('\n', ' ').replace('\r', ' ').replace('\t', ' ').replace('\u00A0', ' ');
+ return string.replace('\n', ' ')
+ .replace('\r', ' ')
+ .replace('\t', ' ')
+ .replace('\u00A0', ' ')
+ .replace('\u2212', '-');
}
public void drawLine(float xStart, float yStart, float xEnd, float yEnd, float lineWidth)
diff --git a/src/test/java/org/olat/core/util/pdf/PdfDocumentTest.java b/src/test/java/org/olat/core/util/pdf/PdfDocumentTest.java
index bf077836796..fa59fe85456 100644
--- a/src/test/java/org/olat/core/util/pdf/PdfDocumentTest.java
+++ b/src/test/java/org/olat/core/util/pdf/PdfDocumentTest.java
@@ -48,7 +48,8 @@ public class PdfDocumentTest {
{ "Hello\tworld", "Hello world" },
{ "Hello\n\tworld", "Hello world" },
{ "Hello\n\tworld\u00A0", "Hello world " },
- { "Hello \u3044", "Hello \u3044" }
+ { "Hello \u3044", "Hello \u3044" },
+ { "Hello \u2212", "Hello -" }
});
}
--
GitLab