From 6a1de86e8de96710b53ecf596a7ed806a6d7832e Mon Sep 17 00:00:00 2001
From: Thomas Gutmann <gutmann-thomas@web.de>
Date: Tue, 20 Aug 2024 23:23:00 +0200
Subject: [PATCH] Based on the new hyperlink styling option a new default
 CSS-class is required

---
 .../eclipse/birt/report/engine/emitter/html/StyleTest.java    | 2 +-
 .../eclipse/birt/report/engine/emitter/pptx/TextWriter.java   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/engine/org.eclipse.birt.report.engine.emitter.html.tests/test/org/eclipse/birt/report/engine/emitter/html/StyleTest.java b/engine/org.eclipse.birt.report.engine.emitter.html.tests/test/org/eclipse/birt/report/engine/emitter/html/StyleTest.java
index 4fafec65795..c4633af212d 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.html.tests/test/org/eclipse/birt/report/engine/emitter/html/StyleTest.java
+++ b/engine/org.eclipse.birt.report.engine.emitter.html.tests/test/org/eclipse/birt/report/engine/emitter/html/StyleTest.java
@@ -56,7 +56,7 @@ public void testInlineStyle() throws EngineException, IOException {
 
 		String regex = "<style type=\"text/css\">";
 		Matcher matcher = Pattern.compile(regex).matcher(content);
-		assertEquals(false, matcher.find());
+		assertEquals(true, matcher.find());
 
 		regex = "<div[^<>]*style=\"[^<>]*color: rgb(255, 0, 0)[^<>]*>aaaa</div>";
 		matcher = Pattern.compile(regex).matcher(content);
diff --git a/engine/org.eclipse.birt.report.engine.emitter.pptx/src/org/eclipse/birt/report/engine/emitter/pptx/TextWriter.java b/engine/org.eclipse.birt.report.engine.emitter.pptx/src/org/eclipse/birt/report/engine/emitter/pptx/TextWriter.java
index ffd3b9f2424..c008ce759f7 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.pptx/src/org/eclipse/birt/report/engine/emitter/pptx/TextWriter.java
+++ b/engine/org.eclipse.birt.report.engine.emitter.pptx/src/org/eclipse/birt/report/engine/emitter/pptx/TextWriter.java
@@ -381,7 +381,7 @@ private void setTextProperty(String tag, TextStyle style) {
 		}
 		canvas.setBackgroundColor(style.getColor());
 		setTextFont(info.getFontName());
-		if (link.isHasHyperlinkDecoration()) {
+		if (link != null && link.isHasHyperlinkDecoration()) {
 			canvas.setHyperlink(link);
 		}
 		canvas.setBookmark(bmk_relationshipid);
@@ -424,7 +424,7 @@ private void startBlockText(int startX, int startY, int width, int height, Conta
 			writer.attribute("id", shapeId);
 			writer.attribute("name", "TextBox " + shapeId);
 			// hyperlink decoration at text area
-			if (!link.isHasHyperlinkDecoration()) {
+			if (link != null && !link.isHasHyperlinkDecoration()) {
 				canvas.setHyperlink(link);
 			}
 			writer.closeTag("p:cNvPr");