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 751e08985f250c72720fd9e5a0a02928b4075b81..65c22d7817496bfa67024e84c6695359521eda41 100644 (file)
--- 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;\r
                 }\r
             } else {\r
-                if (fontMap != null && fontMap.containsKey(mappedFont)) {\r
-                    mappedFont = fontMap.get(mappedFont);\r
+                if (fontMap != null) {\r
+                    if (fontMap.containsKey(mappedFont)) {\r
+                        mappedFont = fontMap.get(mappedFont);\r
+                    } else if (fontMap.containsKey("*")) {\r
+                        mappedFont = fontMap.get("*");\r
+                    }\r
                 }\r
-                if (fallbackMap != null && fallbackMap.containsKey(mappedFont)) {\r
-                    fallbackFont = fallbackMap.get(mappedFont);\r
+                if (fallbackMap != null) {\r
+                    if (fallbackMap.containsKey(mappedFont)) {\r
+                        fallbackFont = fallbackMap.get(mappedFont);\r
+                    } else if (fallbackMap.containsKey("*")) {\r
+                        fallbackFont = fallbackMap.get("*");\r
+                    }\r
                 }\r
             }\r
             \r