diff --git a/src/java/org/apache/poi/sl/draw/DrawTextParagraph.java b/src/java/org/apache/poi/sl/draw/DrawTextParagraph.java index 751e08985..65c22d781 100644 --- a/src/java/org/apache/poi/sl/draw/DrawTextParagraph.java +++ b/src/java/org/apache/poi/sl/draw/DrawTextParagraph.java @@ -531,11 +531,19 @@ public class DrawTextParagraph implements Drawable { fallbackFont = font; } } else { - if (fontMap != null && fontMap.containsKey(mappedFont)) { - mappedFont = fontMap.get(mappedFont); + if (fontMap != null) { + if (fontMap.containsKey(mappedFont)) { + mappedFont = fontMap.get(mappedFont); + } else if (fontMap.containsKey("*")) { + mappedFont = fontMap.get("*"); + } } - if (fallbackMap != null && fallbackMap.containsKey(mappedFont)) { - fallbackFont = fallbackMap.get(mappedFont); + if (fallbackMap != null) { + if (fallbackMap.containsKey(mappedFont)) { + fallbackFont = fallbackMap.get(mappedFont); + } else if (fallbackMap.containsKey("*")) { + fallbackFont = fallbackMap.get("*"); + } } }