From: Andreas Beeker <kiwiwings@apache.org>
Date: Tue, 6 Dec 2016 00:21:22 +0000 (+0000)
Subject: Add "*" option to font_map/fallback to provide a catch-all configuration
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=83ff0e5ec40b06558fee0fc4c2450988a394c389;p=poi.git

Add "*" option to font_map/fallback to provide a catch-all configuration

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1772816 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/src/java/org/apache/poi/sl/draw/DrawTextParagraph.java b/src/java/org/apache/poi/sl/draw/DrawTextParagraph.java
index 751e08985f..65c22d7817 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("*");
+                    }
                 }
             }