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 5f38d9177d6fca6e4ae2a9ea5e55aee4a3579ca3..ddd1e803caa2431f0677f9fac3d22c5c1b20f6b7 100644 --- a/src/main/java/org/olat/core/util/pdf/PdfDocument.java +++ b/src/main/java/org/olat/core/util/pdf/PdfDocument.java @@ -142,7 +142,7 @@ public class PdfDocument { PDFont textFont = bold ? fontBold : font; - text = text.replace('\n', ' ').replace('\r', ' '); + text = cleanString(text); List<String> lines = new ArrayList<>(); int lastSpace = -1; diff --git a/src/main/java/org/olat/course/nodes/cl/ui/CheckboxPDFExport.java b/src/main/java/org/olat/course/nodes/cl/ui/CheckboxPDFExport.java index 7c2956a8e493d8a773c2e01f4a06197b18157ffc..3c469aed89068fb212781b2449f55999a609ef8c 100644 --- a/src/main/java/org/olat/course/nodes/cl/ui/CheckboxPDFExport.java +++ b/src/main/java/org/olat/course/nodes/cl/ui/CheckboxPDFExport.java @@ -354,7 +354,7 @@ public class CheckboxPDFExport extends PdfDocument implements MediaResource { currentContentStream.setTextMatrix(Matrix.getRotateInstance(3 * (Math.PI / 2), textx + cellMargin, texty - cellMargin)); textx += colWidth; } - currentContentStream.showText(text); + currentContentStream.showText(cleanString(text)); currentContentStream.endText(); } diff --git a/src/main/java/org/olat/course/nodes/cl/ui/CheckedPDFExport.java b/src/main/java/org/olat/course/nodes/cl/ui/CheckedPDFExport.java index 1624f6349cfcd15120a8fb6bcd319d6326e57a51..2a0c5418fad966a982a54369f9128e97fbe401b3 100644 --- a/src/main/java/org/olat/course/nodes/cl/ui/CheckedPDFExport.java +++ b/src/main/java/org/olat/course/nodes/cl/ui/CheckedPDFExport.java @@ -315,7 +315,7 @@ public class CheckedPDFExport extends PdfDocument implements MediaResource { currentContentStream.beginText(); currentContentStream.setFont(font, fontSize); currentContentStream.newLineAtOffset(textx, texty - headerHeight + cellMargin); - currentContentStream.showText(text); + currentContentStream.showText(cleanString(text)); currentContentStream.endText(); textx += colWidth; } diff --git a/src/main/java/org/olat/modules/lecture/ui/export/LecturesBlockPDFExport.java b/src/main/java/org/olat/modules/lecture/ui/export/LecturesBlockPDFExport.java index 7b37f059b422ea1ccc76ed86bb3799b2c0aeb5ea..6a94c88efeec33ed5aba3065a54fb1f803edfe63 100644 --- a/src/main/java/org/olat/modules/lecture/ui/export/LecturesBlockPDFExport.java +++ b/src/main/java/org/olat/modules/lecture/ui/export/LecturesBlockPDFExport.java @@ -415,7 +415,7 @@ public class LecturesBlockPDFExport extends PdfDocument implements MediaResource //draw the content texty = currentY - 15; for (int i=offset; i<end; i++) { - String text = content[i].getName(); + String text = cleanString(content[i].getName()); if(text == null) continue; if(rowHeights[i] > rowHeight + 1) { diff --git a/src/main/java/org/olat/modules/lecture/ui/export/LecturesBlockSignaturePDFExport.java b/src/main/java/org/olat/modules/lecture/ui/export/LecturesBlockSignaturePDFExport.java index a65df821b1e842440f31423ca9b95c02575140c6..227a49997650879ecf4d5495788e911313f0fc21 100644 --- a/src/main/java/org/olat/modules/lecture/ui/export/LecturesBlockSignaturePDFExport.java +++ b/src/main/java/org/olat/modules/lecture/ui/export/LecturesBlockSignaturePDFExport.java @@ -276,7 +276,7 @@ public class LecturesBlockSignaturePDFExport extends PdfDocument implements Medi //draw the content texty = currentY - 15; for (int i=offset; i<end; i++) { - String text = content[i]; + String text = cleanString(content[i]); if(text == null) continue; if(rowHeights[i] > rowHeight + 1) {